1
0
mirror of https://github.com/mainflux/mainflux.git synced 2025-05-04 22:17:59 +08:00
beres 61b2d6b87b MF-596 - Add subtopic to RawMessage (#642)
* Commit for mainflux-596
Modified and tested:
- cli
- http
- mqtt
- normalizer
- all readers
- sdk messages
- all writers
- ws
Missing:
- coap
- lora

Signed-off-by: ale <ale@metaverso.org>

* - fix subtopic name in, when starting with dot, http/ws/mqtt
- add some test on readers

Signed-off-by: ale <ale@metaverso.org>

* - fix string concatenation
- update http/transport regexp to match subtopic names with only \w-
- update ws/transport regexp like http ones with also the wildcard * and >

Signed-off-by: ale <ale@metaverso.org>

* added subtopic support to coap adapter

Signed-off-by: ale <ale@metaverso.org>

* - update replace functions with replaceall when needed
- renamed getDestChannel to fmtSubject
- update api/transport and ws/transport route to be more readable
- fix mqtt syntax
- renamed func andQuery to query as suggested by @anovakovic01
- have a nice we :)

Signed-off-by: ale <ale@metaverso.org>

* - fix error declaration on ws/nat/publisher
- fix regexp added missing allowed chars - and _ on coap/api/transport
- fix subtopic clean suffix / if present on coap/api/transport
- improve regexp on http and ws /api/transport, now does not accept url that do not strictly match
- add some ws subtopic tests

Signed-off-by: ale <ale@metaverso.org>

* - enabled wildcard chars on coap/api/transport
- allow use special chars on http and ws api/transport

Signed-off-by: ale <ale@metaverso.org>

* - use strings.Replace() insted ReplaceAll()

Signed-off-by: ale <ale@metaverso.org>

* - allow every chars on subtopics
- fix replace error on mqtt

Signed-off-by: ale <ale@metaverso.org>

* fix cassandra test

Signed-off-by: ale <ale@metaverso.org>

* fix ws test with invalid subtopic

Signed-off-by: ale <ale@metaverso.org>

* fix invalid GOCACHE in go1.12, replaced by -count 1, see https://golang.org/doc/go1.10#test

Signed-off-by: ale <ale@metaverso.org>

* - improve regexp on http/ws api/transport
- minor changes

Signed-off-by: ale <ale@metaverso.org>

* - add generic function parseSubtopic on ws/http adapters

Signed-off-by: ale <ale@metaverso.org>

* - add generic function fmtSubtopic on coap adapter

Signed-off-by: ale <ale@metaverso.org>
2019-03-15 18:38:07 +01:00

160 lines
3.4 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")
errNilBatch = errors.New("nil batch")
)
type influxRepo struct {
client influxdata.Client
batch influxdata.BatchPoints
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,
}
var err error
repo.batch, err = influxdata.NewBatchPoints(repo.cfg)
if err != nil {
return &influxRepo{}, err
}
repo.tick = time.NewTicker(batchTimeout).C
go func() {
for {
<-repo.tick
// Nil point indicates that savePoint method is triggered by the ticker.
repo.savePoint(nil)
}
}()
return repo, nil
}
func (repo *influxRepo) savePoint(point *influxdata.Point) error {
repo.mu.Lock()
defer repo.mu.Unlock()
if repo.batch == nil {
return errNilBatch
}
// Ignore ticker if there is nothing to save.
if len(repo.batch.Points()) == 0 && point == nil {
return nil
}
if point != nil {
repo.batch.AddPoint(point)
}
if len(repo.batch.Points())%repo.batchSize == 0 || point == nil {
if err := repo.client.Write(repo.batch); 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.
var err error
repo.batch, err = influxdata.NewBatchPoints(repo.cfg)
if err != nil {
return err
}
}
return nil
}
func (repo *influxRepo) Save(msg mainflux.Message) error {
tgs, flds := repo.tagsOf(&msg), repo.fieldsOf(&msg)
t := time.Unix(int64(msg.Time), 0)
pt, err := influxdata.NewPoint(pointName, tgs, flds, t)
if err != nil {
return err
}
return repo.savePoint(pt)
}
func (repo *influxRepo) tagsOf(msg *mainflux.Message) tags {
return tags{
"channel": msg.Channel,
"subtopic": msg.Subtopic,
"publisher": msg.Publisher,
"name": msg.Name,
}
}
func (repo *influxRepo) fieldsOf(msg *mainflux.Message) fields {
updateTime := strconv.FormatFloat(msg.UpdateTime, 'f', -1, 64)
ret := fields{
"protocol": msg.Protocol,
"unit": msg.Unit,
"link": msg.Link,
"updateTime": updateTime,
}
switch msg.Value.(type) {
case *mainflux.Message_FloatValue:
ret["value"] = msg.GetFloatValue()
case *mainflux.Message_StringValue:
ret["stringValue"] = msg.GetStringValue()
case *mainflux.Message_DataValue:
ret["dataValue"] = msg.GetDataValue()
case *mainflux.Message_BoolValue:
ret["boolValue"] = msg.GetBoolValue()
}
if msg.ValueSum != nil {
ret["valueSum"] = msg.GetValueSum().GetValue()
}
return ret
}