1
0
mirror of https://github.com/mainflux/mainflux.git synced 2025-04-28 13:48:49 +08:00
Dušan Borovčanin 148c1aca0a MF-404 - InfluxDB batch size and timeout zero values (#411)
* Add zero value check for batch size and timeout

Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>

* Update InfluxDB writer tests

Test creation of InfluxDB writer with invalid (zero) batch size and timeout.

Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>

* Fix config load

Loading batch size and timeout from env variables were missing in loadConfigs method.

Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
2018-10-01 17:36:53 +02:00

138 lines
2.9 KiB
Go

//
// Copyright (c) 2018
// Mainflux
//
// SPDX-License-Identifier: Apache-2.0
//
package influxdb
import (
"errors"
"strconv"
"sync"
"time"
"github.com/mainflux/mainflux/writers"
influxdata "github.com/influxdata/influxdb/client/v2"
"github.com/mainflux/mainflux"
)
const pointName = "messages"
var _ writers.MessageRepository = (*influxRepo)(nil)
var (
errZeroValueSize = errors.New("zero value batch size")
errZeroValueTimeout = errors.New("zero value batch timeout")
)
type influxRepo struct {
client influxdata.Client
batch []*influxdata.Point
batchSize int
mu sync.Mutex
tick <-chan time.Time
cfg influxdata.BatchPointsConfig
}
type fields map[string]interface{}
type tags map[string]string
// New returns new InfluxDB writer.
func New(client influxdata.Client, database string, batchSize int, batchTimeout time.Duration) (writers.MessageRepository, error) {
if batchSize == 0 {
return &influxRepo{}, errZeroValueSize
}
if batchTimeout == 0 {
return &influxRepo{}, errZeroValueTimeout
}
repo := &influxRepo{
client: client,
cfg: influxdata.BatchPointsConfig{
Database: database,
},
batchSize: batchSize,
batch: []*influxdata.Point{},
}
repo.tick = time.NewTicker(batchTimeout).C
go func() {
for {
<-repo.tick
repo.save()
}
}()
return repo, nil
}
func (repo *influxRepo) save() error {
repo.mu.Lock()
defer repo.mu.Unlock()
bp, err := influxdata.NewBatchPoints(repo.cfg)
if err != nil {
return err
}
bp.AddPoints(repo.batch)
if err := repo.client.Write(bp); err != nil {
return err
}
// It would be nice to reset ticker at this point, which
// implies creating a new ticker and goroutine. It would
// introduce unnecessary complexity with no justified benefits.
repo.batch = []*influxdata.Point{}
return nil
}
func (repo *influxRepo) Save(msg mainflux.Message) error {
tags, fields := repo.tagsOf(&msg), repo.fieldsOf(&msg)
pt, err := influxdata.NewPoint(pointName, tags, fields, time.Now())
if err != nil {
return err
}
repo.mu.Lock()
repo.batch = append(repo.batch, pt)
repo.mu.Unlock()
if len(repo.batch)%repo.batchSize == 0 {
return repo.save()
}
return nil
}
func (repo *influxRepo) tagsOf(msg *mainflux.Message) tags {
time := strconv.FormatFloat(msg.Time, 'f', -1, 64)
update := strconv.FormatFloat(msg.UpdateTime, 'f', -1, 64)
channel := strconv.FormatUint(msg.Channel, 10)
publisher := strconv.FormatUint(msg.Publisher, 10)
return tags{
"Channel": channel,
"Publisher": publisher,
"Protocol": msg.Protocol,
"Name": msg.Name,
"Unit": msg.Unit,
"Link": msg.Link,
"Time": time,
"UpdateTime": update,
}
}
func (repo *influxRepo) fieldsOf(msg *mainflux.Message) fields {
return fields{
"Value": msg.Value,
"ValueSum": msg.ValueSum,
"BoolValue": msg.BoolValue,
"StringValue": msg.StringValue,
"DataValue": msg.DataValue,
}
}