Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(query): Support for between func with count at root #6556

Merged
merged 14 commits into from
Sep 24, 2020
Merged

feat(query): Support for between func with count at root #6556

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
67422ee
Implement between func at root
ashish-goswami Sep 7, 2020
1d467ef
More changes
ashish-goswami Sep 15, 2020
04b51d4
Pass compare func while filtering a row
ashish-goswami Sep 15, 2020
3f7547c
Add test case and make code changes
ashish-goswami Sep 16, 2020
93a24cf
Fix minor bug, add more tests
ashish-goswami Sep 17, 2020
51bb51a
Temp
ashish-goswami Sep 17, 2020
958e6f8
Fix issues with predicate with lang and add tests
ashish-goswami Sep 17, 2020
8bb4261
Fix formating in common_test.go
ashish-goswami Sep 22, 2020
5412992
Fix between for count operations
ashish-goswami Sep 17, 2020
da90199
Add tests
ashish-goswami Sep 18, 2020
d7894e9
Add more tests
ashish-goswami Sep 22, 2020
18cec49
Remove fmt from tests
ashish-goswami Sep 22, 2020
5827954
Add fix for test
ashish-goswami Sep 23, 2020
9c6b5d0
Merge branch 'master' into ashish/between-count
ashish-goswami Sep 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gql/parser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3318,7 +3318,7 @@ func isGeoFunc(name string) bool {

func IsInequalityFn(name string) bool {
switch name {
case "eq", "le", "ge", "gt", "lt":
case "eq", "le", "ge", "gt", "lt", "between":
return true
}
return false
Expand Down
18 changes: 18 additions & 0 deletions query/common_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,7 @@ geometry : geo @index(geo) .
value : string @index(trigram) .
full_name : string @index(hash) .
nick_name : string @index(term) .
pet_name : [string] @index(exact) .
royal_title : string @index(hash, term, fulltext) @lang .
school : [uid] @count .
lossy : string @index(term) @lang .
Expand Down Expand Up @@ -315,6 +316,8 @@ noindex_dob : datetime .
noindex_alive : bool .
noindex_salary : float .
language : [string] .
score : [int] @index(int) .
average : [float] @index(float) .
`

func populateCluster() {
Expand Down Expand Up @@ -729,6 +732,21 @@ func populateCluster() {
<56> <connects> <58> (weight=1) .
<58> <connects> <59> (weight=1) .
<59> <connects> <60> (weight=1) .

# data for testing between operator.
<20000> <score> "90" .
<20000> <score> "56" .
<20000> <average> "46.93" .
<20000> <average> "55.10" .
<20000> <pet_name> "little master" .
<20000> <pet_name> "master blaster" .

<20001> <score> "68" .
<20001> <score> "85" .
<20001> <average> "35.20" .
<20001> <average> "49.33" .
<20001> <pet_name> "mahi" .
<20001> <pet_name> "ms" .
`)
if err != nil {
panic(fmt.Sprintf("Could not able add triple to the cluster. Got error %v", err.Error()))
Expand Down
2 changes: 1 addition & 1 deletion query/query.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2539,7 +2539,7 @@ func isValidFuncName(f string) bool {

func isInequalityFn(f string) bool {
switch f {
case "eq", "le", "ge", "gt", "lt":
case "eq", "le", "ge", "gt", "lt", "between":
return true
}
return false
Expand Down
Loading