mirror of
https://github.com/mainflux/mainflux.git
synced 2025-04-26 13:48:53 +08:00

* 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>
104 lines
2.4 KiB
Go
104 lines
2.4 KiB
Go
//
|
|
// Copyright (c) 2018
|
|
// Mainflux
|
|
//
|
|
// SPDX-License-Identifier: Apache-2.0
|
|
//
|
|
|
|
package cassandra
|
|
|
|
import (
|
|
"fmt"
|
|
"github.com/gocql/gocql"
|
|
"github.com/mainflux/mainflux"
|
|
"github.com/mainflux/mainflux/readers"
|
|
)
|
|
|
|
var _ readers.MessageRepository = (*cassandraRepository)(nil)
|
|
|
|
type cassandraRepository struct {
|
|
session *gocql.Session
|
|
}
|
|
|
|
// New instantiates Cassandra message repository.
|
|
func New(session *gocql.Session) readers.MessageRepository {
|
|
return cassandraRepository{session: session}
|
|
}
|
|
|
|
func (cr cassandraRepository) ReadAll(chanID string, offset, limit uint64, query map[string]string) []mainflux.Message {
|
|
cql, values := buildQuery(chanID, offset, limit, query)
|
|
|
|
iter := cr.session.Query(cql, values...).Iter()
|
|
scanner := iter.Scanner()
|
|
|
|
// skip first OFFSET rows
|
|
for i := uint64(0); i < offset; i++ {
|
|
if !scanner.Next() {
|
|
break
|
|
}
|
|
}
|
|
|
|
var floatVal, valueSum *float64
|
|
var strVal, dataVal *string
|
|
var boolVal *bool
|
|
|
|
page := []mainflux.Message{}
|
|
for scanner.Next() {
|
|
var msg mainflux.Message
|
|
scanner.Scan(&msg.Channel, &msg.Subtopic, &msg.Publisher, &msg.Protocol,
|
|
&msg.Name, &msg.Unit, &floatVal, &strVal, &boolVal,
|
|
&dataVal, &valueSum, &msg.Time, &msg.UpdateTime, &msg.Link)
|
|
|
|
switch {
|
|
case floatVal != nil:
|
|
msg.Value = &mainflux.Message_FloatValue{FloatValue: *floatVal}
|
|
case strVal != nil:
|
|
msg.Value = &mainflux.Message_StringValue{StringValue: *strVal}
|
|
case boolVal != nil:
|
|
msg.Value = &mainflux.Message_BoolValue{BoolValue: *boolVal}
|
|
case dataVal != nil:
|
|
msg.Value = &mainflux.Message_DataValue{DataValue: *dataVal}
|
|
}
|
|
|
|
if valueSum != nil {
|
|
msg.ValueSum = &mainflux.SumValue{Value: *valueSum}
|
|
}
|
|
|
|
page = append(page, msg)
|
|
}
|
|
|
|
if err := iter.Close(); err != nil {
|
|
return []mainflux.Message{}
|
|
}
|
|
|
|
return page
|
|
}
|
|
|
|
func buildQuery(chanID string, offset, limit uint64, query map[string]string) (string, []interface{}) {
|
|
var condSql string
|
|
var values []interface{}
|
|
|
|
cql := `SELECT channel, subtopic, publisher, protocol, name, unit,
|
|
value, string_value, bool_value, data_value, value_sum, time,
|
|
update_time, link FROM messages WHERE channel = ? %s LIMIT ?
|
|
ALLOW FILTERING`
|
|
|
|
values = append(values, chanID)
|
|
|
|
for name, value := range query {
|
|
switch name {
|
|
case
|
|
"channel",
|
|
"subtopic",
|
|
"publisher",
|
|
"name",
|
|
"protocol":
|
|
condSql = fmt.Sprintf(`%s AND %s = ?`, condSql, name)
|
|
values = append(values, value)
|
|
}
|
|
}
|
|
|
|
values = append(values, offset+limit)
|
|
return fmt.Sprintf(cql, condSql), values
|
|
}
|