2018-08-25 12:48:03 +02:00
|
|
|
package influxdb_test
|
|
|
|
|
|
|
|
import (
|
|
|
|
"fmt"
|
|
|
|
"os"
|
|
|
|
"testing"
|
2018-09-23 01:53:03 +02:00
|
|
|
"time"
|
2018-08-25 12:48:03 +02:00
|
|
|
|
|
|
|
influxdata "github.com/influxdata/influxdb/client/v2"
|
2020-06-03 15:16:19 +02:00
|
|
|
"github.com/mainflux/mainflux/pkg/transformers/senml"
|
2019-04-25 00:18:43 +02:00
|
|
|
"github.com/mainflux/mainflux/readers"
|
2018-08-25 12:48:03 +02:00
|
|
|
reader "github.com/mainflux/mainflux/readers/influxdb"
|
|
|
|
writer "github.com/mainflux/mainflux/writers/influxdb"
|
|
|
|
|
|
|
|
log "github.com/mainflux/mainflux/logger"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
|
|
"github.com/stretchr/testify/require"
|
|
|
|
)
|
|
|
|
|
|
|
|
const (
|
MF-1061 - Implement InfluxDB filters value, v, vb, vs, vd, from, to (#1312)
* MF-1061 - Implement InfluxDB filters value, v, vb, vs, vd, from, to
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use time filters as float64 instead of int64
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Fix reviews
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Remove unnecessary cast
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use a const for limit in tests
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Fix typo
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Revert float64 cast when dividing
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Remove value filter in favour to v
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use v, vb, vs, vd
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use v, vb, vs, vd
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Rm unecessary cast
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
2020-12-25 19:23:54 +01:00
|
|
|
testDB = "test"
|
|
|
|
chanID = "1"
|
|
|
|
subtopic = "topic"
|
|
|
|
msgsNum = 100
|
|
|
|
msgsValNum = 20
|
|
|
|
limit = 10
|
2018-08-25 12:48:03 +02:00
|
|
|
)
|
|
|
|
|
|
|
|
var (
|
MF-1061 - Implement InfluxDB filters value, v, vb, vs, vd, from, to (#1312)
* MF-1061 - Implement InfluxDB filters value, v, vb, vs, vd, from, to
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use time filters as float64 instead of int64
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Fix reviews
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Remove unnecessary cast
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use a const for limit in tests
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Fix typo
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Revert float64 cast when dividing
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Remove value filter in favour to v
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use v, vb, vs, vd
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use v, vb, vs, vd
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Rm unecessary cast
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
2020-12-25 19:23:54 +01:00
|
|
|
v float64 = 5
|
|
|
|
vs = "value"
|
|
|
|
vb = true
|
|
|
|
vd = "dataValue"
|
|
|
|
sum float64 = 42
|
2019-11-05 11:57:16 +01:00
|
|
|
)
|
|
|
|
|
|
|
|
var (
|
|
|
|
valueFields = 5
|
|
|
|
port string
|
|
|
|
client influxdata.Client
|
|
|
|
testLog, _ = log.New(os.Stdout, log.Info.String())
|
2018-11-05 19:18:51 +01:00
|
|
|
|
2018-08-25 12:48:03 +02:00
|
|
|
clientCfg = influxdata.HTTPConfig{
|
|
|
|
Username: "test",
|
|
|
|
Password: "test",
|
|
|
|
}
|
2018-11-05 19:18:51 +01:00
|
|
|
|
2019-11-05 11:57:16 +01:00
|
|
|
m = senml.Message{
|
2018-11-05 19:18:51 +01:00
|
|
|
Channel: chanID,
|
2018-12-05 13:09:25 +01:00
|
|
|
Publisher: "1",
|
2018-11-05 19:18:51 +01:00
|
|
|
Protocol: "mqtt",
|
|
|
|
Name: "name",
|
|
|
|
Unit: "U",
|
|
|
|
Time: 123456,
|
2018-11-18 16:42:39 +01:00
|
|
|
UpdateTime: 1234,
|
2018-08-25 12:48:03 +02:00
|
|
|
}
|
|
|
|
)
|
|
|
|
|
|
|
|
func TestReadAll(t *testing.T) {
|
2019-10-31 14:04:47 +01:00
|
|
|
writer := writer.New(client, testDB)
|
2018-08-25 12:48:03 +02:00
|
|
|
|
2019-11-05 11:57:16 +01:00
|
|
|
messages := []senml.Message{}
|
MF-1061 - Implement InfluxDB filters value, v, vb, vs, vd, from, to (#1312)
* MF-1061 - Implement InfluxDB filters value, v, vb, vs, vd, from, to
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use time filters as float64 instead of int64
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Fix reviews
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Remove unnecessary cast
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use a const for limit in tests
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Fix typo
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Revert float64 cast when dividing
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Remove value filter in favour to v
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use v, vb, vs, vd
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use v, vb, vs, vd
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Rm unecessary cast
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
2020-12-25 19:23:54 +01:00
|
|
|
valSubtopicMsgs := []senml.Message{}
|
|
|
|
boolMsgs := []senml.Message{}
|
|
|
|
stringMsgs := []senml.Message{}
|
|
|
|
dataMsgs := []senml.Message{}
|
2020-12-30 15:43:04 +01:00
|
|
|
now := float64(time.Now().UTC().Second())
|
MF-1061 - Implement InfluxDB filters value, v, vb, vs, vd, from, to (#1312)
* MF-1061 - Implement InfluxDB filters value, v, vb, vs, vd, from, to
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use time filters as float64 instead of int64
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Fix reviews
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Remove unnecessary cast
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use a const for limit in tests
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Fix typo
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Revert float64 cast when dividing
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Remove value filter in favour to v
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use v, vb, vs, vd
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use v, vb, vs, vd
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Rm unecessary cast
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
2020-12-25 19:23:54 +01:00
|
|
|
|
2018-11-05 19:18:51 +01:00
|
|
|
for i := 0; i < msgsNum; i++ {
|
|
|
|
// Mix possible values as well as value sum.
|
2019-11-05 11:57:16 +01:00
|
|
|
msg := m
|
2020-12-30 15:43:04 +01:00
|
|
|
msg.Time = now - float64(i)
|
MF-1061 - Implement InfluxDB filters value, v, vb, vs, vd, from, to (#1312)
* MF-1061 - Implement InfluxDB filters value, v, vb, vs, vd, from, to
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use time filters as float64 instead of int64
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Fix reviews
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Remove unnecessary cast
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use a const for limit in tests
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Fix typo
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Revert float64 cast when dividing
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Remove value filter in favour to v
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use v, vb, vs, vd
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use v, vb, vs, vd
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Rm unecessary cast
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
2020-12-25 19:23:54 +01:00
|
|
|
|
|
|
|
count := i % valueFields
|
2018-11-05 19:18:51 +01:00
|
|
|
switch count {
|
|
|
|
case 0:
|
2019-03-15 18:38:07 +01:00
|
|
|
msg.Subtopic = subtopic
|
2019-11-05 11:57:16 +01:00
|
|
|
msg.Value = &v
|
MF-1061 - Implement InfluxDB filters value, v, vb, vs, vd, from, to (#1312)
* MF-1061 - Implement InfluxDB filters value, v, vb, vs, vd, from, to
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use time filters as float64 instead of int64
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Fix reviews
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Remove unnecessary cast
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use a const for limit in tests
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Fix typo
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Revert float64 cast when dividing
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Remove value filter in favour to v
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use v, vb, vs, vd
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use v, vb, vs, vd
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Rm unecessary cast
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
2020-12-25 19:23:54 +01:00
|
|
|
valSubtopicMsgs = append(valSubtopicMsgs, msg)
|
2018-11-05 19:18:51 +01:00
|
|
|
case 1:
|
MF-1061 - Implement InfluxDB filters value, v, vb, vs, vd, from, to (#1312)
* MF-1061 - Implement InfluxDB filters value, v, vb, vs, vd, from, to
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use time filters as float64 instead of int64
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Fix reviews
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Remove unnecessary cast
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use a const for limit in tests
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Fix typo
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Revert float64 cast when dividing
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Remove value filter in favour to v
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use v, vb, vs, vd
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use v, vb, vs, vd
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Rm unecessary cast
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
2020-12-25 19:23:54 +01:00
|
|
|
msg.BoolValue = &vb
|
|
|
|
boolMsgs = append(boolMsgs, msg)
|
2018-11-05 19:18:51 +01:00
|
|
|
case 2:
|
MF-1061 - Implement InfluxDB filters value, v, vb, vs, vd, from, to (#1312)
* MF-1061 - Implement InfluxDB filters value, v, vb, vs, vd, from, to
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use time filters as float64 instead of int64
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Fix reviews
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Remove unnecessary cast
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use a const for limit in tests
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Fix typo
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Revert float64 cast when dividing
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Remove value filter in favour to v
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use v, vb, vs, vd
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use v, vb, vs, vd
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Rm unecessary cast
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
2020-12-25 19:23:54 +01:00
|
|
|
msg.StringValue = &vs
|
|
|
|
stringMsgs = append(stringMsgs, msg)
|
2018-11-05 19:18:51 +01:00
|
|
|
case 3:
|
MF-1061 - Implement InfluxDB filters value, v, vb, vs, vd, from, to (#1312)
* MF-1061 - Implement InfluxDB filters value, v, vb, vs, vd, from, to
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use time filters as float64 instead of int64
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Fix reviews
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Remove unnecessary cast
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use a const for limit in tests
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Fix typo
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Revert float64 cast when dividing
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Remove value filter in favour to v
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use v, vb, vs, vd
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use v, vb, vs, vd
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Rm unecessary cast
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
2020-12-25 19:23:54 +01:00
|
|
|
msg.DataValue = &vd
|
|
|
|
dataMsgs = append(dataMsgs, msg)
|
2018-11-05 19:18:51 +01:00
|
|
|
case 4:
|
2019-11-05 11:57:16 +01:00
|
|
|
msg.Sum = &sum
|
2018-11-05 19:18:51 +01:00
|
|
|
}
|
2019-11-05 11:57:16 +01:00
|
|
|
|
2018-08-25 12:48:03 +02:00
|
|
|
messages = append(messages, msg)
|
|
|
|
}
|
|
|
|
|
2020-12-30 15:43:04 +01:00
|
|
|
err := writer.Save(messages)
|
2019-10-31 14:04:47 +01:00
|
|
|
require.Nil(t, err, fmt.Sprintf("failed to store message to InfluxDB: %s", err))
|
|
|
|
|
2019-05-07 15:59:18 +02:00
|
|
|
reader := reader.New(client, testDB)
|
2018-08-25 12:48:03 +02:00
|
|
|
require.Nil(t, err, fmt.Sprintf("Creating new InfluxDB reader expected to succeed: %s.\n", err))
|
|
|
|
|
|
|
|
cases := map[string]struct {
|
2019-04-25 00:18:43 +02:00
|
|
|
chanID string
|
|
|
|
offset uint64
|
|
|
|
limit uint64
|
|
|
|
query map[string]string
|
|
|
|
page readers.MessagesPage
|
2018-08-25 12:48:03 +02:00
|
|
|
}{
|
|
|
|
"read message page for existing channel": {
|
2019-04-25 00:18:43 +02:00
|
|
|
chanID: chanID,
|
|
|
|
offset: 0,
|
MF-1061 - Implement InfluxDB filters value, v, vb, vs, vd, from, to (#1312)
* MF-1061 - Implement InfluxDB filters value, v, vb, vs, vd, from, to
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use time filters as float64 instead of int64
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Fix reviews
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Remove unnecessary cast
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use a const for limit in tests
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Fix typo
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Revert float64 cast when dividing
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Remove value filter in favour to v
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use v, vb, vs, vd
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use v, vb, vs, vd
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Rm unecessary cast
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
2020-12-25 19:23:54 +01:00
|
|
|
limit: limit,
|
2019-04-25 00:18:43 +02:00
|
|
|
page: readers.MessagesPage{
|
|
|
|
Total: msgsNum,
|
|
|
|
Offset: 0,
|
MF-1061 - Implement InfluxDB filters value, v, vb, vs, vd, from, to (#1312)
* MF-1061 - Implement InfluxDB filters value, v, vb, vs, vd, from, to
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use time filters as float64 instead of int64
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Fix reviews
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Remove unnecessary cast
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use a const for limit in tests
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Fix typo
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Revert float64 cast when dividing
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Remove value filter in favour to v
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use v, vb, vs, vd
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use v, vb, vs, vd
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Rm unecessary cast
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
2020-12-25 19:23:54 +01:00
|
|
|
Limit: limit,
|
2020-12-30 15:43:04 +01:00
|
|
|
Messages: fromSenml(messages[0:limit]),
|
2019-04-25 00:18:43 +02:00
|
|
|
},
|
2018-08-25 12:48:03 +02:00
|
|
|
},
|
|
|
|
"read message page for non-existent channel": {
|
2019-04-25 00:18:43 +02:00
|
|
|
chanID: "2",
|
|
|
|
offset: 0,
|
MF-1061 - Implement InfluxDB filters value, v, vb, vs, vd, from, to (#1312)
* MF-1061 - Implement InfluxDB filters value, v, vb, vs, vd, from, to
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use time filters as float64 instead of int64
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Fix reviews
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Remove unnecessary cast
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use a const for limit in tests
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Fix typo
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Revert float64 cast when dividing
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Remove value filter in favour to v
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use v, vb, vs, vd
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use v, vb, vs, vd
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Rm unecessary cast
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
2020-12-25 19:23:54 +01:00
|
|
|
limit: limit,
|
2019-04-25 00:18:43 +02:00
|
|
|
page: readers.MessagesPage{
|
|
|
|
Total: 0,
|
|
|
|
Offset: 0,
|
MF-1061 - Implement InfluxDB filters value, v, vb, vs, vd, from, to (#1312)
* MF-1061 - Implement InfluxDB filters value, v, vb, vs, vd, from, to
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use time filters as float64 instead of int64
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Fix reviews
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Remove unnecessary cast
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use a const for limit in tests
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Fix typo
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Revert float64 cast when dividing
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Remove value filter in favour to v
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use v, vb, vs, vd
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use v, vb, vs, vd
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Rm unecessary cast
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
2020-12-25 19:23:54 +01:00
|
|
|
Limit: limit,
|
2020-12-30 15:43:04 +01:00
|
|
|
Messages: []readers.Message{},
|
2019-04-25 00:18:43 +02:00
|
|
|
},
|
2018-08-25 12:48:03 +02:00
|
|
|
},
|
|
|
|
"read message last page": {
|
2019-04-25 00:18:43 +02:00
|
|
|
chanID: chanID,
|
|
|
|
offset: 95,
|
MF-1061 - Implement InfluxDB filters value, v, vb, vs, vd, from, to (#1312)
* MF-1061 - Implement InfluxDB filters value, v, vb, vs, vd, from, to
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use time filters as float64 instead of int64
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Fix reviews
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Remove unnecessary cast
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use a const for limit in tests
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Fix typo
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Revert float64 cast when dividing
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Remove value filter in favour to v
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use v, vb, vs, vd
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use v, vb, vs, vd
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Rm unecessary cast
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
2020-12-25 19:23:54 +01:00
|
|
|
limit: limit,
|
2019-04-25 00:18:43 +02:00
|
|
|
page: readers.MessagesPage{
|
|
|
|
Total: msgsNum,
|
|
|
|
Offset: 95,
|
MF-1061 - Implement InfluxDB filters value, v, vb, vs, vd, from, to (#1312)
* MF-1061 - Implement InfluxDB filters value, v, vb, vs, vd, from, to
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use time filters as float64 instead of int64
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Fix reviews
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Remove unnecessary cast
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use a const for limit in tests
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Fix typo
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Revert float64 cast when dividing
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Remove value filter in favour to v
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use v, vb, vs, vd
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use v, vb, vs, vd
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Rm unecessary cast
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
2020-12-25 19:23:54 +01:00
|
|
|
Limit: limit,
|
2020-12-30 15:43:04 +01:00
|
|
|
Messages: fromSenml(messages[95:msgsNum]),
|
2019-04-25 00:18:43 +02:00
|
|
|
},
|
2018-08-25 12:48:03 +02:00
|
|
|
},
|
2019-03-15 18:38:07 +01:00
|
|
|
"read message with non-existent subtopic": {
|
2019-04-25 00:18:43 +02:00
|
|
|
chanID: chanID,
|
|
|
|
offset: 0,
|
|
|
|
limit: msgsNum,
|
|
|
|
query: map[string]string{"subtopic": "not-present"},
|
|
|
|
page: readers.MessagesPage{
|
|
|
|
Total: 0,
|
|
|
|
Offset: 0,
|
|
|
|
Limit: msgsNum,
|
2020-12-30 15:43:04 +01:00
|
|
|
Messages: []readers.Message{},
|
2019-04-25 00:18:43 +02:00
|
|
|
},
|
2019-03-15 18:38:07 +01:00
|
|
|
},
|
|
|
|
"read message with subtopic": {
|
2019-04-25 00:18:43 +02:00
|
|
|
chanID: chanID,
|
|
|
|
offset: 0,
|
MF-1061 - Implement InfluxDB filters value, v, vb, vs, vd, from, to (#1312)
* MF-1061 - Implement InfluxDB filters value, v, vb, vs, vd, from, to
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use time filters as float64 instead of int64
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Fix reviews
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Remove unnecessary cast
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use a const for limit in tests
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Fix typo
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Revert float64 cast when dividing
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Remove value filter in favour to v
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use v, vb, vs, vd
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use v, vb, vs, vd
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Rm unecessary cast
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
2020-12-25 19:23:54 +01:00
|
|
|
limit: limit,
|
2019-04-25 00:18:43 +02:00
|
|
|
query: map[string]string{"subtopic": subtopic},
|
|
|
|
page: readers.MessagesPage{
|
MF-1061 - Implement InfluxDB filters value, v, vb, vs, vd, from, to (#1312)
* MF-1061 - Implement InfluxDB filters value, v, vb, vs, vd, from, to
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use time filters as float64 instead of int64
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Fix reviews
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Remove unnecessary cast
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use a const for limit in tests
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Fix typo
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Revert float64 cast when dividing
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Remove value filter in favour to v
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use v, vb, vs, vd
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use v, vb, vs, vd
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Rm unecessary cast
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
2020-12-25 19:23:54 +01:00
|
|
|
Total: uint64(len(valSubtopicMsgs)),
|
|
|
|
Offset: 0,
|
|
|
|
Limit: limit,
|
2020-12-30 15:43:04 +01:00
|
|
|
Messages: fromSenml(valSubtopicMsgs[0:limit]),
|
MF-1061 - Implement InfluxDB filters value, v, vb, vs, vd, from, to (#1312)
* MF-1061 - Implement InfluxDB filters value, v, vb, vs, vd, from, to
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use time filters as float64 instead of int64
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Fix reviews
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Remove unnecessary cast
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use a const for limit in tests
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Fix typo
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Revert float64 cast when dividing
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Remove value filter in favour to v
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use v, vb, vs, vd
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use v, vb, vs, vd
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Rm unecessary cast
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
2020-12-25 19:23:54 +01:00
|
|
|
},
|
|
|
|
},
|
|
|
|
"read message with value": {
|
|
|
|
chanID: chanID,
|
|
|
|
offset: 0,
|
|
|
|
limit: limit,
|
|
|
|
query: map[string]string{"v": fmt.Sprintf("%f", v)},
|
|
|
|
page: readers.MessagesPage{
|
|
|
|
Total: msgsValNum,
|
|
|
|
Offset: 0,
|
|
|
|
Limit: limit,
|
2020-12-30 15:43:04 +01:00
|
|
|
Messages: fromSenml(valSubtopicMsgs[0:limit]),
|
MF-1061 - Implement InfluxDB filters value, v, vb, vs, vd, from, to (#1312)
* MF-1061 - Implement InfluxDB filters value, v, vb, vs, vd, from, to
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use time filters as float64 instead of int64
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Fix reviews
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Remove unnecessary cast
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use a const for limit in tests
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Fix typo
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Revert float64 cast when dividing
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Remove value filter in favour to v
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use v, vb, vs, vd
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use v, vb, vs, vd
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Rm unecessary cast
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
2020-12-25 19:23:54 +01:00
|
|
|
},
|
|
|
|
},
|
|
|
|
"read message with boolean value": {
|
|
|
|
chanID: chanID,
|
|
|
|
offset: 0,
|
|
|
|
limit: limit,
|
|
|
|
query: map[string]string{"vb": fmt.Sprintf("%t", vb)},
|
|
|
|
page: readers.MessagesPage{
|
|
|
|
Total: msgsValNum,
|
|
|
|
Offset: 0,
|
|
|
|
Limit: limit,
|
2020-12-30 15:43:04 +01:00
|
|
|
Messages: fromSenml(boolMsgs[0:limit]),
|
MF-1061 - Implement InfluxDB filters value, v, vb, vs, vd, from, to (#1312)
* MF-1061 - Implement InfluxDB filters value, v, vb, vs, vd, from, to
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use time filters as float64 instead of int64
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Fix reviews
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Remove unnecessary cast
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use a const for limit in tests
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Fix typo
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Revert float64 cast when dividing
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Remove value filter in favour to v
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use v, vb, vs, vd
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use v, vb, vs, vd
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Rm unecessary cast
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
2020-12-25 19:23:54 +01:00
|
|
|
},
|
|
|
|
},
|
|
|
|
"read message with string value": {
|
|
|
|
chanID: chanID,
|
|
|
|
offset: 0,
|
|
|
|
limit: limit,
|
|
|
|
query: map[string]string{"vs": vs},
|
|
|
|
page: readers.MessagesPage{
|
|
|
|
Total: msgsValNum,
|
|
|
|
Offset: 0,
|
|
|
|
Limit: limit,
|
2020-12-30 15:43:04 +01:00
|
|
|
Messages: fromSenml(stringMsgs[0:limit]),
|
MF-1061 - Implement InfluxDB filters value, v, vb, vs, vd, from, to (#1312)
* MF-1061 - Implement InfluxDB filters value, v, vb, vs, vd, from, to
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use time filters as float64 instead of int64
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Fix reviews
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Remove unnecessary cast
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use a const for limit in tests
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Fix typo
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Revert float64 cast when dividing
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Remove value filter in favour to v
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use v, vb, vs, vd
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use v, vb, vs, vd
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Rm unecessary cast
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
2020-12-25 19:23:54 +01:00
|
|
|
},
|
|
|
|
},
|
|
|
|
"read message with data value": {
|
|
|
|
chanID: chanID,
|
|
|
|
offset: 0,
|
|
|
|
limit: limit,
|
|
|
|
query: map[string]string{"vd": vd},
|
|
|
|
page: readers.MessagesPage{
|
|
|
|
Total: msgsValNum,
|
|
|
|
Offset: 0,
|
|
|
|
Limit: limit,
|
2020-12-30 15:43:04 +01:00
|
|
|
Messages: fromSenml(dataMsgs[0:limit]),
|
MF-1061 - Implement InfluxDB filters value, v, vb, vs, vd, from, to (#1312)
* MF-1061 - Implement InfluxDB filters value, v, vb, vs, vd, from, to
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use time filters as float64 instead of int64
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Fix reviews
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Remove unnecessary cast
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use a const for limit in tests
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Fix typo
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Revert float64 cast when dividing
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Remove value filter in favour to v
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use v, vb, vs, vd
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use v, vb, vs, vd
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Rm unecessary cast
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
2020-12-25 19:23:54 +01:00
|
|
|
},
|
|
|
|
},
|
|
|
|
"read message with from/to": {
|
|
|
|
chanID: chanID,
|
|
|
|
offset: 0,
|
|
|
|
limit: limit,
|
|
|
|
query: map[string]string{
|
2020-12-30 15:43:04 +01:00
|
|
|
"from": fmt.Sprintf("%f", messages[5].Time),
|
MF-1061 - Implement InfluxDB filters value, v, vb, vs, vd, from, to (#1312)
* MF-1061 - Implement InfluxDB filters value, v, vb, vs, vd, from, to
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use time filters as float64 instead of int64
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Fix reviews
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Remove unnecessary cast
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use a const for limit in tests
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Fix typo
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Revert float64 cast when dividing
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Remove value filter in favour to v
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use v, vb, vs, vd
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use v, vb, vs, vd
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Rm unecessary cast
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
2020-12-25 19:23:54 +01:00
|
|
|
"to": fmt.Sprintf("%f", messages[0].Time),
|
|
|
|
},
|
|
|
|
page: readers.MessagesPage{
|
2020-12-30 15:43:04 +01:00
|
|
|
Total: 5,
|
2019-04-25 00:18:43 +02:00
|
|
|
Offset: 0,
|
MF-1061 - Implement InfluxDB filters value, v, vb, vs, vd, from, to (#1312)
* MF-1061 - Implement InfluxDB filters value, v, vb, vs, vd, from, to
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use time filters as float64 instead of int64
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Fix reviews
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Remove unnecessary cast
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use a const for limit in tests
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Fix typo
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Revert float64 cast when dividing
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Remove value filter in favour to v
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use v, vb, vs, vd
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Use v, vb, vs, vd
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
* Rm unecessary cast
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
2020-12-25 19:23:54 +01:00
|
|
|
Limit: limit,
|
2020-12-30 15:43:04 +01:00
|
|
|
Messages: fromSenml(messages[1:6]),
|
2019-04-25 00:18:43 +02:00
|
|
|
},
|
2019-03-15 18:38:07 +01:00
|
|
|
},
|
2018-08-25 12:48:03 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
for desc, tc := range cases {
|
2019-05-07 15:59:18 +02:00
|
|
|
result, err := reader.ReadAll(tc.chanID, tc.offset, tc.limit, tc.query)
|
|
|
|
assert.Nil(t, err, fmt.Sprintf("%s: expected no error got %s", desc, err))
|
2020-12-30 15:43:04 +01:00
|
|
|
assert.ElementsMatch(t, tc.page.Messages, result.Messages, fmt.Sprintf("%s: expected: %v, got: %v", desc, tc.page.Messages, result.Messages))
|
2019-11-05 11:57:16 +01:00
|
|
|
|
2019-04-25 00:18:43 +02:00
|
|
|
assert.Equal(t, tc.page.Total, result.Total, fmt.Sprintf("%s: expected %d got %d", desc, tc.page.Total, result.Total))
|
2018-08-25 12:48:03 +02:00
|
|
|
}
|
|
|
|
}
|
2020-12-30 15:43:04 +01:00
|
|
|
|
|
|
|
func fromSenml(in []senml.Message) []readers.Message {
|
|
|
|
var ret []readers.Message
|
|
|
|
for _, m := range in {
|
|
|
|
ret = append(ret, m)
|
|
|
|
}
|
|
|
|
return ret
|
|
|
|
}
|