MF-1361 - Add StringValue and DataValue comparison filters #1714

AryanGodara · 2023-02-01T10:50:53Z

What does this do?

This pull request adds le, lt, ge, and gt comparators for StringValue and DataValue.

Which issue(s) does this PR fix/relate to?

Resolves #1361, and continues work on #1573.

List any changes that modify/break current functionality

N/A

Have you included tests for your changes?

Yes.

Did you document any new/modified functionality?

Yes.

Notes

N/A

codecov-commenter · 2023-02-03T13:02:57Z

Codecov Report

Merging #1714 (fb5e444) into master (2b78902) will increase coverage by 0.15%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##           master    #1714      +/-   ##
==========================================
+ Coverage   64.73%   64.89%   +0.15%     
==========================================
  Files         118      118              
  Lines        9702     9746      +44     
==========================================
+ Hits         6281     6325      +44     
  Misses       2753     2753              
  Partials      668      668

Files Changed	Coverage Δ
readers/api/transport.go	`70.00% <100.00%> (-0.25%)`	⬇️
readers/influxdb/messages.go	`85.27% <100.00%> (+1.66%)`	⬆️
readers/postgres/messages.go	`85.34% <100.00%> (+1.84%)`	⬆️
readers/timescale/messages.go	`84.82% <100.00%> (+1.82%)`	⬆️

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

readers/cassandra/messages.go

readers/mongodb/messages.go

readers/cassandra/messages.go

consumers/writers/influxdb/consumer_test.go

drasko · 2023-03-16T01:33:54Z

consumers/writers/influxdb/consumer.go

-		return errors.Wrap(errSaveMessage, err)
-	}
-	return nil
+	writeAPI := repo.client.WriteAPIBlocking(repo.cfg.Org, repo.cfg.Bucket)


I am having doubt on this variable naming... I would probably use wa instead of writeAPI, Go idiomatic is using simple names, especially if the code is near and readable... But it might be nitpicking.

@dborovcanin what do you think? There is a naming like this in several places.

readers/postgres/messages.go

readers/influxdb/messages_test.go

readers/influxdb/messages.go

arvindh123 · 2023-05-12T17:14:35Z

Hello @AryanGodara

I hope the following suggested changes in consumers/writers/cassandra/init.go will fix the problem

At this line Existing Code :
https://github.com/mainflux/mainflux/blob/a039a5d14e18929215c5ea119fbff29d7a8fa830/consumers/writers/cassandra/init.go#L23
Replace with following :

        PRIMARY KEY (channel, time, id, publisher, name)

At this line Existing Code :
https://github.com/mainflux/mainflux/blob/a039a5d14e18929215c5ea119fbff29d7a8fa830/consumers/writers/cassandra/init.go#L34
Replace with following :

        PRIMARY KEY (channel, created, id, publisher)

readers/mongodb/messages.go

readers/mongodb/README.md

readers/influxdb/messages.go

consumers/writers/cassandra/init.go

arvindh123

LGTM

readers/influxdb/messages_test.go

Signed-off-by: fatih <fatihdurmaz@sabanciuniv.edu>

Signed-off-by: aryan <aryangodara03@gmail.com>

drasko

LGTM

) * Upgrade InfluxDB from 1.x to 2.x Signed-off-by: fatih <fatihdurmaz@sabanciuniv.edu> * go mod tidy vendor Signed-off-by: aryan <aryangodara03@gmail.com> * add all changes to single commit Signed-off-by: aryan <aryangodara03@gmail.com> * handle unmarshal errors Signed-off-by: aryan <aryangodara03@gmail.com> * fix tests Signed-off-by: aryan <aryangodara03@gmail.com> * fix primary keys in cassandra writer Signed-off-by: aryan <aryangodara03@gmail.com> * update mongodb vs queries Signed-off-by: aryan <aryangodara03@gmail.com> * update mongodb queries Signed-off-by: aryan <aryangodara03@gmail.com> * update mongodb queries again Signed-off-by: aryan <aryangodara03@gmail.com> * update readmes, revert mongo and cassandra Signed-off-by: aryan <aryangodara03@gmail.com> * remove unwanted print statement Signed-off-by: aryan <aryangodara03@gmail.com> * fix errors in go.sum Signed-off-by: aryan <aryangodara03@gmail.com> * fix typos Signed-off-by: aryan <aryangodara03@gmail.com> * revert changes to cassandra init Signed-off-by: aryan <aryangodara03@gmail.com> * fix errors acc to pr review Signed-off-by: aryan <aryangodara03@gmail.com> * fix errors in datavalue testcases Signed-off-by: aryan <aryangodara03@gmail.com> --------- Signed-off-by: fatih <fatihdurmaz@sabanciuniv.edu> Signed-off-by: aryan <aryangodara03@gmail.com> Co-authored-by: fatih <fatihdurmaz@sabanciuniv.edu> Co-authored-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com> Signed-off-by: WashingtonKK <washingtonkigan@gmail.com>

) * Upgrade InfluxDB from 1.x to 2.x Signed-off-by: fatih <fatihdurmaz@sabanciuniv.edu> * go mod tidy vendor Signed-off-by: aryan <aryangodara03@gmail.com> * add all changes to single commit Signed-off-by: aryan <aryangodara03@gmail.com> * handle unmarshal errors Signed-off-by: aryan <aryangodara03@gmail.com> * fix tests Signed-off-by: aryan <aryangodara03@gmail.com> * fix primary keys in cassandra writer Signed-off-by: aryan <aryangodara03@gmail.com> * update mongodb vs queries Signed-off-by: aryan <aryangodara03@gmail.com> * update mongodb queries Signed-off-by: aryan <aryangodara03@gmail.com> * update mongodb queries again Signed-off-by: aryan <aryangodara03@gmail.com> * update readmes, revert mongo and cassandra Signed-off-by: aryan <aryangodara03@gmail.com> * remove unwanted print statement Signed-off-by: aryan <aryangodara03@gmail.com> * fix errors in go.sum Signed-off-by: aryan <aryangodara03@gmail.com> * fix typos Signed-off-by: aryan <aryangodara03@gmail.com> * revert changes to cassandra init Signed-off-by: aryan <aryangodara03@gmail.com> * fix errors acc to pr review Signed-off-by: aryan <aryangodara03@gmail.com> * fix errors in datavalue testcases Signed-off-by: aryan <aryangodara03@gmail.com> --------- Signed-off-by: fatih <fatihdurmaz@sabanciuniv.edu> Signed-off-by: aryan <aryangodara03@gmail.com> Co-authored-by: fatih <fatihdurmaz@sabanciuniv.edu> Co-authored-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com>

AryanGodara marked this pull request as ready for review February 3, 2023 12:19

AryanGodara requested a review from a team as a code owner February 3, 2023 12:19

dborovcanin requested a review from fbugarski February 23, 2023 08:04

arvindh123 reviewed Feb 24, 2023

View reviewed changes

readers/cassandra/messages.go Outdated Show resolved Hide resolved

AryanGodara force-pushed the mf1361 branch from 0866294 to 42e1ce6 Compare March 3, 2023 13:08

arvindh123 reviewed Mar 14, 2023

View reviewed changes

readers/mongodb/messages.go Outdated Show resolved Hide resolved

drasko requested changes Mar 16, 2023

View reviewed changes

AryanGodara force-pushed the mf1361 branch 6 times, most recently from 5babf77 to 2823bdb Compare May 11, 2023 08:32

arvindh123 reviewed May 12, 2023

View reviewed changes

readers/postgres/messages.go Show resolved Hide resolved

dborovcanin requested changes May 12, 2023

View reviewed changes

readers/influxdb/messages_test.go Outdated Show resolved Hide resolved

readers/influxdb/messages.go Outdated Show resolved Hide resolved

arvindh123 reviewed May 12, 2023

View reviewed changes

readers/influxdb/messages.go Outdated Show resolved Hide resolved

AryanGodara force-pushed the mf1361 branch from eb7abe9 to a039a5d Compare May 13, 2023 03:06

arvindh123 reviewed May 22, 2023

View reviewed changes

readers/mongodb/messages.go Outdated Show resolved Hide resolved

arvindh123 reviewed May 22, 2023

View reviewed changes

readers/mongodb/messages.go Outdated Show resolved Hide resolved

arvindh123 reviewed May 22, 2023

View reviewed changes

readers/mongodb/messages.go Outdated Show resolved Hide resolved

AryanGodara force-pushed the mf1361 branch 2 times, most recently from 7fd6f03 to cd66996 Compare June 19, 2023 08:53

AryanGodara force-pushed the mf1361 branch from cd66996 to 5890255 Compare June 27, 2023 09:06

AryanGodara force-pushed the mf1361 branch from 5890255 to 53317f3 Compare July 7, 2023 11:02

arvindh123 requested changes Jul 7, 2023

View reviewed changes

readers/mongodb/README.md Outdated Show resolved Hide resolved

readers/influxdb/messages.go Outdated Show resolved Hide resolved

arvindh123 requested changes Jul 7, 2023

View reviewed changes

consumers/writers/cassandra/init.go Outdated Show resolved Hide resolved

consumers/writers/cassandra/init.go Outdated Show resolved Hide resolved

arvindh123 approved these changes Jul 7, 2023

View reviewed changes

drasko requested changes Jul 7, 2023

View reviewed changes

readers/influxdb/messages_test.go Show resolved Hide resolved

drasko requested changes Jul 10, 2023

View reviewed changes

readers/influxdb/messages_test.go Show resolved Hide resolved

fthdrmzzz and others added 15 commits July 13, 2023 16:49

Upgrade InfluxDB from 1.x to 2.x

ead8195

Signed-off-by: fatih <fatihdurmaz@sabanciuniv.edu>

go mod tidy vendor

57d4062

Signed-off-by: aryan <aryangodara03@gmail.com>

add all changes to single commit

cdb6fe8

Signed-off-by: aryan <aryangodara03@gmail.com>

handle unmarshal errors

9ac1bd8

Signed-off-by: aryan <aryangodara03@gmail.com>

fix tests

7ab9d73

Signed-off-by: aryan <aryangodara03@gmail.com>

fix primary keys in cassandra writer

a33de94

Signed-off-by: aryan <aryangodara03@gmail.com>

update mongodb vs queries

4df6734

Signed-off-by: aryan <aryangodara03@gmail.com>

update mongodb queries

9e02044

Signed-off-by: aryan <aryangodara03@gmail.com>

update mongodb queries again

f74f39a

Signed-off-by: aryan <aryangodara03@gmail.com>

update readmes, revert mongo and cassandra

9c683d1

Signed-off-by: aryan <aryangodara03@gmail.com>

remove unwanted print statement

9f3c4d8

Signed-off-by: aryan <aryangodara03@gmail.com>

fix errors in go.sum

480bba1

Signed-off-by: aryan <aryangodara03@gmail.com>

fix typos

1a5a099

Signed-off-by: aryan <aryangodara03@gmail.com>

revert changes to cassandra init

9a01589

Signed-off-by: aryan <aryangodara03@gmail.com>

fix errors acc to pr review

d196f18

Signed-off-by: aryan <aryangodara03@gmail.com>

AryanGodara force-pushed the mf1361 branch from a7e696b to d196f18 Compare July 13, 2023 11:19

fix errors in datavalue testcases

625ee87

Signed-off-by: aryan <aryangodara03@gmail.com>

arvindh123 approved these changes Jul 26, 2023

View reviewed changes

Merge branch 'master' into mf1361

fb5e444

drasko approved these changes Jul 28, 2023

View reviewed changes

drasko merged commit 33eb8d8 into absmach:master Jul 28, 2023
3 checks passed

drasko mentioned this pull request Jul 31, 2023

MF-1361 - Add StringValue and DataValue comparison filters #1573

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

MF-1361 - Add StringValue and DataValue comparison filters #1714

MF-1361 - Add StringValue and DataValue comparison filters #1714

AryanGodara commented Feb 1, 2023 •

edited by dborovcanin

Loading

codecov-commenter commented Feb 3, 2023 •

edited by codecov bot

Loading

drasko Mar 16, 2023

arvindh123 commented May 12, 2023 •

edited

Loading

arvindh123 left a comment

drasko left a comment

MF-1361 - Add StringValue and DataValue comparison filters #1714

MF-1361 - Add StringValue and DataValue comparison filters #1714

Conversation

AryanGodara commented Feb 1, 2023 • edited by dborovcanin Loading

What does this do?

Which issue(s) does this PR fix/relate to?

List any changes that modify/break current functionality

Have you included tests for your changes?

Did you document any new/modified functionality?

Notes

codecov-commenter commented Feb 3, 2023 • edited by codecov bot Loading

Codecov Report

drasko Mar 16, 2023

Choose a reason for hiding this comment

arvindh123 commented May 12, 2023 • edited Loading

arvindh123 left a comment

Choose a reason for hiding this comment

drasko left a comment

Choose a reason for hiding this comment

AryanGodara commented Feb 1, 2023 •

edited by dborovcanin

Loading

codecov-commenter commented Feb 3, 2023 •

edited by codecov bot

Loading

arvindh123 commented May 12, 2023 •

edited

Loading