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

Jump to bottom

Support $gt comparision operator #330

Merged
merged 11 commits into from
Apr 4, 2022
Merged

Support $gt comparision operator #330

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
cdc4c05
issue-251, $eq operator
ribaraka Feb 7, 2022
49e85f8
comments were fixed. support for boolean data type was added
ribaraka Feb 8, 2022
b4dae70
linter is fixed.
ribaraka Feb 8, 2022
ef252a4
tests were integrated into TestFind. Added composite func
ribaraka Feb 10, 2022
9350d72
PR has been updated
ribaraka Apr 1, 2022
1001ee3
Merge branch 'main' into issue-251-gt
ribaraka Apr 1, 2022
517c7c9
Merge branch 'main' into issue-251-gt
ribaraka Apr 4, 2022
cdc0d16
Time datatype has been fixed
ribaraka Apr 4, 2022
cdc5ba9
Merge branch 'main' into issue-251-gt
ribaraka Apr 4, 2022
15185c0
fix
ribaraka Apr 4, 2022
f7c61ba
use only one comparison for $ gt and for $ eq
ribaraka Apr 4, 2022
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
5 changes: 4 additions & 1 deletion internal/handlers/common/compare.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,10 @@ func compareScalars(a, b any) compareResult {

case time.Time:
b, ok := b.(time.Time)
if ok {
switch {
case ok && a.Unix() != b.Unix():
return compareOrdered(a.Unix(), b.Unix())
case ok && a.Unix() == b.Unix():
AlekSi marked this conversation as resolved.
Show resolved Hide resolved
return compareOrdered(a.UnixNano(), b.UnixNano())
}
return notEqual
Expand Down
14 changes: 12 additions & 2 deletions internal/handlers/common/filter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,8 +181,18 @@ func filterFieldExpr(fieldValue any, expr *types.Document) (bool, error) {

case "$gt":
// {field: {$gt: exprValue}}
if c := compareScalars(fieldValue, exprValue); c != greater {
return false, nil
_, isValueDocument := fieldValue.(*types.Document)
_, isValueArray := fieldValue.(*types.Array)
AlekSi marked this conversation as resolved.
Show resolved Hide resolved
switch {
case isValueDocument, isValueArray:
if compare(fieldValue, exprValue) != greater {
return false, nil
}

default:
if compareScalars(fieldValue, exprValue) != greater {
return false, nil
}
}

case "$gte":
Expand Down
251 changes: 251 additions & 0 deletions internal/handlers/handler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1513,6 +1513,257 @@ func TestFind(t *testing.T) {
resp: must.NotFail(types.NewArray()),
},

"GtString": {
schemas: []string{"values"},
req: must.NotFail(types.NewDocument(
"find", "values",
"filter", must.NotFail(types.NewDocument(
"value", must.NotFail(types.NewDocument(
"$gt", "boo",
)),
)),
)),
resp: must.NotFail(types.NewArray(
must.NotFail(types.NewDocument(
"_id", types.ObjectID{0x61, 0x2e, 0xc2, 0x80, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, 0x02, 0x01},
"name", "string",
"value", "foo",
)),
must.NotFail(types.NewDocument(
"_id", types.ObjectID{0x61, 0x2e, 0xc2, 0x80, 0x00, 0x00, 0x02, 0x03, 0x00, 0x00, 0x02, 0x03},
"name", "string-shorter",
"value", "z",
)),
must.NotFail(types.NewDocument(
"_id", types.ObjectID{0x61, 0x2e, 0xc2, 0x80, 0x00, 0x00, 0x04, 0x04, 0x00, 0x00, 0x04, 0x04},
"name", "array-three",
"value", must.NotFail(types.NewArray(int32(42), "foo", types.Null)),
)),
)),
},
"GtDouble": {
schemas: []string{"values"},
req: must.NotFail(types.NewDocument(
"find", "values",
"filter", must.NotFail(types.NewDocument(
"value", must.NotFail(types.NewDocument(
"$gt", 42.12,
)),
)),
)),
resp: must.NotFail(types.NewArray(
must.NotFail(types.NewDocument(
"_id", types.ObjectID{0x61, 0x2e, 0xc2, 0x80, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01},
"name", "double",
"value", 42.13,
)),
must.NotFail(types.NewDocument(
"_id", types.ObjectID{0x61, 0x2e, 0xc2, 0x80, 0x00, 0x00, 0x01, 0x03, 0x00, 0x00, 0x01, 0x03},
"name", "double-max",
"value", math.MaxFloat64,
)),
must.NotFail(types.NewDocument(
"_id", types.ObjectID{0x61, 0x2e, 0xc2, 0x80, 0x00, 0x00, 0x01, 0x05, 0x00, 0x00, 0x01, 0x05},
"name", "double-positive-infinity",
"value", math.Inf(+1),
)),
must.NotFail(types.NewDocument(
"_id", types.ObjectID{0x61, 0x2e, 0xc2, 0x80, 0x00, 0x00, 0x04, 0x03, 0x00, 0x00, 0x04, 0x03},
"name", "array-one",
"value", must.NotFail(types.NewArray(42.13)),
)),
must.NotFail(types.NewDocument(
"_id", types.ObjectID{0x61, 0x2e, 0xc2, 0x80, 0x00, 0x00, 0x10, 0x03, 0x00, 0x00, 0x10, 0x03},
"name", "int32-max",
"value", int32(2147483647),
)),
must.NotFail(types.NewDocument(
"_id", types.ObjectID{0x61, 0x2e, 0xc2, 0x80, 0x00, 0x00, 0x12, 0x03, 0x00, 0x00, 0x12, 0x03},
"name", "int64-max",
"value", int64(9223372036854775807),
)),
)),
},
"GtInt32": {
schemas: []string{"values"},
req: must.NotFail(types.NewDocument(
"find", "values",
"filter", must.NotFail(types.NewDocument(
"value", must.NotFail(types.NewDocument(
"$gt", int32(41),
)),
)),
)),
resp: must.NotFail(types.NewArray(
must.NotFail(types.NewDocument(
"_id", types.ObjectID{0x61, 0x2e, 0xc2, 0x80, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01},
"name", "double",
"value", 42.13,
)),
must.NotFail(types.NewDocument(
"_id", types.ObjectID{0x61, 0x2e, 0xc2, 0x80, 0x00, 0x00, 0x01, 0x03, 0x00, 0x00, 0x01, 0x03},
"name", "double-max",
"value", math.MaxFloat64,
)),
must.NotFail(types.NewDocument(
"_id", types.ObjectID{0x61, 0x2e, 0xc2, 0x80, 0x00, 0x00, 0x01, 0x05, 0x00, 0x00, 0x01, 0x05},
"name", "double-positive-infinity",
"value", math.Inf(+1),
)),
must.NotFail(types.NewDocument(
"_id", types.ObjectID{0x61, 0x2e, 0xc2, 0x80, 0x00, 0x00, 0x04, 0x01, 0x00, 0x00, 0x04, 0x01},
"name", "array",
"value", must.NotFail(types.NewArray("array", int32(42))),
)),
must.NotFail(types.NewDocument(
"_id", types.ObjectID{0x61, 0x2e, 0xc2, 0x80, 0x00, 0x00, 0x04, 0x03, 0x00, 0x00, 0x04, 0x03},
"name", "array-one",
"value", must.NotFail(types.NewArray(42.13)),
)),
must.NotFail(types.NewDocument(
"_id", types.ObjectID{0x61, 0x2e, 0xc2, 0x80, 0x00, 0x00, 0x04, 0x04, 0x00, 0x00, 0x04, 0x04},
"name", "array-three",
"value", must.NotFail(types.NewArray(int32(42), "foo", types.Null)),
)),
must.NotFail(types.NewDocument(
"_id", types.ObjectID{0x61, 0x2e, 0xc2, 0x80, 0x00, 0x00, 0x10, 0x01, 0x00, 0x00, 0x10, 0x01},
"name", "int32",
"value", int32(42),
)),
must.NotFail(types.NewDocument(
"_id", types.ObjectID{0x61, 0x2e, 0xc2, 0x80, 0x00, 0x00, 0x10, 0x03, 0x00, 0x00, 0x10, 0x03},
"name", "int32-max",
"value", int32(2147483647),
)),
must.NotFail(types.NewDocument(
"_id", types.ObjectID{0x61, 0x2e, 0xc2, 0x80, 0x00, 0x00, 0x12, 0x01, 0x00, 0x00, 0x12, 0x01},
"name", "int64",
"value", int64(42),
)),
must.NotFail(types.NewDocument(
"_id", types.ObjectID{0x61, 0x2e, 0xc2, 0x80, 0x00, 0x00, 0x12, 0x03, 0x00, 0x00, 0x12, 0x03},
"name", "int64-max",
"value", int64(9223372036854775807),
)),
)),
},
"GtInt64": {
schemas: []string{"values"},
req: must.NotFail(types.NewDocument(
"find", "values",
"filter", must.NotFail(types.NewDocument(
"value", must.NotFail(types.NewDocument(
"$gt", int64(41),
)),
)),
)),
resp: must.NotFail(types.NewArray(
must.NotFail(types.NewDocument(
"_id", types.ObjectID{0x61, 0x2e, 0xc2, 0x80, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01},
"name", "double",
"value", 42.13,
)),
must.NotFail(types.NewDocument(
"_id", types.ObjectID{0x61, 0x2e, 0xc2, 0x80, 0x00, 0x00, 0x01, 0x03, 0x00, 0x00, 0x01, 0x03},
"name", "double-max",
"value", math.MaxFloat64,
)),
must.NotFail(types.NewDocument(
"_id", types.ObjectID{0x61, 0x2e, 0xc2, 0x80, 0x00, 0x00, 0x01, 0x05, 0x00, 0x00, 0x01, 0x05},
"name", "double-positive-infinity",
"value", math.Inf(+1),
)),
must.NotFail(types.NewDocument(
"_id", types.ObjectID{0x61, 0x2e, 0xc2, 0x80, 0x00, 0x00, 0x04, 0x01, 0x00, 0x00, 0x04, 0x01},
"name", "array",
"value", must.NotFail(types.NewArray("array", int32(42))),
)),
must.NotFail(types.NewDocument(
"_id", types.ObjectID{0x61, 0x2e, 0xc2, 0x80, 0x00, 0x00, 0x04, 0x03, 0x00, 0x00, 0x04, 0x03},
"name", "array-one",
"value", must.NotFail(types.NewArray(42.13)),
)),
must.NotFail(types.NewDocument(
"_id", types.ObjectID{0x61, 0x2e, 0xc2, 0x80, 0x00, 0x00, 0x04, 0x04, 0x00, 0x00, 0x04, 0x04},
"name", "array-three",
"value", must.NotFail(types.NewArray(int32(42), "foo", types.Null)),
)),
must.NotFail(types.NewDocument(
"_id", types.ObjectID{0x61, 0x2e, 0xc2, 0x80, 0x00, 0x00, 0x10, 0x01, 0x00, 0x00, 0x10, 0x01},
"name", "int32",
"value", int32(42),
)),
must.NotFail(types.NewDocument(
"_id", types.ObjectID{0x61, 0x2e, 0xc2, 0x80, 0x00, 0x00, 0x10, 0x03, 0x00, 0x00, 0x10, 0x03},
"name", "int32-max",
"value", int32(2147483647),
)),
must.NotFail(types.NewDocument(
"_id", types.ObjectID{0x61, 0x2e, 0xc2, 0x80, 0x00, 0x00, 0x12, 0x01, 0x00, 0x00, 0x12, 0x01},
"name", "int64",
"value", int64(42),
)),
must.NotFail(types.NewDocument(
"_id", types.ObjectID{0x61, 0x2e, 0xc2, 0x80, 0x00, 0x00, 0x12, 0x03, 0x00, 0x00, 0x12, 0x03},
"name", "int64-max",
"value", int64(9223372036854775807),
)),
)),
},
"GtDateTime": {
schemas: []string{"values"},
req: must.NotFail(types.NewDocument(
"find", "values",
"filter", must.NotFail(types.NewDocument(
"value", must.NotFail(types.NewDocument(
"$gt", time.Date(2021, 11, 1, 10, 18, 42, 121000000, time.UTC).Local(),
)),
)),
)),
resp: must.NotFail(types.NewArray(
must.NotFail(types.NewDocument(
"_id", types.ObjectID{0x61, 0x2e, 0xc2, 0x80, 0x00, 0x00, 0x9, 0x01, 0x00, 0x00, 0x09, 0x01},
"name", "datetime",
"value", time.Date(2021, 11, 1, 10, 18, 42, 123000000, time.UTC).Local(),
)),
must.NotFail(types.NewDocument(
"_id", types.ObjectID{0x61, 0x2e, 0xc2, 0x80, 0x00, 0x00, 0x9, 0x04, 0x00, 0x00, 0x09, 0x04},
"name", "datetime-year-max",
"value", time.Date(9999, 12, 31, 23, 59, 59, 999000000, time.UTC).Local(),
)),
)),
},
"GtTimestamp": {
schemas: []string{"values"},
req: must.NotFail(types.NewDocument(
"find", "values",
"filter", must.NotFail(types.NewDocument(
"value", must.NotFail(types.NewDocument(
"$gt", types.Timestamp(180388626444),
)),
)),
)),
resp: must.NotFail(types.NewArray(
must.NotFail(types.NewDocument(
"_id", types.ObjectID{0x61, 0x2e, 0xc2, 0x80, 0x00, 0x00, 0x11, 0x01, 0x00, 0x00, 0x11, 0x01},
"name", "timestamp",
"value", types.Timestamp(180388626445),
)),
)),
},
"GtNil": {
schemas: []string{"values"},
req: must.NotFail(types.NewDocument(
"find", "values",
"filter", must.NotFail(types.NewDocument(
"value", must.NotFail(types.NewDocument(
"$gt", types.Null,
)),
)),
)),
resp: must.NotFail(types.NewArray()),
},

"BitsAllClear": {
schemas: []string{"values"},
req: must.NotFail(types.NewDocument(
Expand Down