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.

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

Move $mod to compat test #1748

Merged
merged 10 commits into from
Jan 6, 2023
2 changes: 1 addition & 1 deletion integration/commands_diagnostic_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ func TestCommandsDiagnosticValidate(t *testing.T) {

actual.Remove("keysPerIndex")
actual.Remove("indexDetails")
testutil.CompareAndSetByPathNum(t, expected, actual, 10, types.NewPathFromString("nrecords"))
testutil.CompareAndSetByPathNum(t, expected, actual, 18, types.NewPathFromString("nrecords"))
chilagrow marked this conversation as resolved.
Show resolved Hide resolved
testutil.AssertEqual(t, expected, actual)
}

Expand Down
102 changes: 64 additions & 38 deletions integration/query_bitwise_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,10 @@ func TestQueryBitwiseAllClear(t *testing.T) {
"Array": {
value: primitive.A{1, 5},
expectedIDs: []any{
chilagrow marked this conversation as resolved.
Show resolved Hide resolved
"double-big", "double-zero",
"double-1", "double-2", "double-4",
"double-big", "double-min-overflow-verge", "double-zero",
"int32-min", "int32-zero",
"int64-big", "int64-min", "int64-zero",
"int64-3", "int64-big", "int64-min", "int64-zero",
},
},
"ArrayNegativeBitPositionValue": {
Expand Down Expand Up @@ -83,8 +84,10 @@ func TestQueryBitwiseAllClear(t *testing.T) {
"DoubleWhole": {
value: 2.0,
expectedIDs: []any{
"double-big", "double-zero",
"int32-min", "int32-zero",
"double-1", "double-2", "double-4",
"double-big", "double-min-overflow-verge", "double-zero",
"int32-1", "int32-2", "int32-3", "int32-min", "int32-zero",
"int64-1", "int64-2", "int64-3",
"int64-big", "int64-min", "int64-zero",
},
},
Expand All @@ -110,34 +113,40 @@ func TestQueryBitwiseAllClear(t *testing.T) {
"Binary": {
value: primitive.Binary{Data: []byte{2}},
expectedIDs: []any{
"double-big", "double-zero",
"int32-min", "int32-zero",
"double-1", "double-2", "double-4",
"double-big", "double-min-overflow-verge", "double-zero",
"int32-1", "int32-2", "int32-3", "int32-min", "int32-zero",
"int64-1", "int64-2", "int64-3",
"int64-big", "int64-min", "int64-zero",
},
},
"BinaryWithZeroBytes": {
value: primitive.Binary{Data: []byte{0, 0, 2}},
expectedIDs: []any{
"double-big", "double-whole", "double-zero",
"int32", "int32-min", "int32-zero",
"int64", "int64-big", "int64-min", "int64-zero",
"double-1", "double-2", "double-3", "double-big",
"double-min-overflow-verge", "double-whole", "double-zero",
"int32", "int32-1", "int32-min", "int32-zero",
"int64", "int64-1", "int64-big", "int64-min", "int64-zero",
},
},
"Binary9Bytes": {
value: primitive.Binary{Data: []byte{1, 2, 3, 4, 5, 6, 7, 8, 9}},
expectedIDs: []any{
"double-big", "double-whole", "double-zero",
"int32", "int32-zero",
"int64", "int64-big", "int64-zero",
"int64", "int64-1", "int64-big", "int64-zero",
},
},

"Int32": {
value: int32(2),
expectedIDs: []any{
"double-big", "double-zero",
"double-1", "double-2", "double-4", "double-big",
"double-min-overflow-verge", "double-zero",
"int32-1", "int32-2", "int32-3",
"int32-min", "int32-zero",
"int64-big", "int64-min", "int64-zero",
"int64-1", "int64-2", "int64-3", "int64-big",
"int64-min", "int64-zero",
},
},
"Int32NegativeValue": {
Expand All @@ -152,9 +161,11 @@ func TestQueryBitwiseAllClear(t *testing.T) {
"Int64Max": {
value: math.MaxInt64,
expectedIDs: []any{
"double-zero",
"double-1", "double-2",
"double-min-overflow-verge", "double-zero",
"int32-zero",
"int64-min", "int64-zero",
"int64-min",
"int64-zero",
},
},
"Int64NegativeValue": {
Expand Down Expand Up @@ -207,7 +218,7 @@ func TestQueryBitwiseAllSet(t *testing.T) {
}{
"Array": {
value: primitive.A{1, 5},
expectedIDs: []any{"double-whole", "int32", "int32-max", "int64", "int64-max"},
expectedIDs: []any{"double-3", "double-whole", "int32", "int32-max", "int64", "int64-max"},
},
"ArrayNegativeBitPositionValue": {
value: primitive.A{-1},
Expand Down Expand Up @@ -236,7 +247,7 @@ func TestQueryBitwiseAllSet(t *testing.T) {
},
"DoubleWhole": {
value: 2.0,
expectedIDs: []any{"double-whole", "int32", "int32-max", "int64", "int64-max"},
expectedIDs: []any{"double-3", "double-whole", "int32", "int32-max", "int64", "int64-max"},
},
"DoubleNegativeValue": {
value: -1.0,
Expand All @@ -259,16 +270,16 @@ func TestQueryBitwiseAllSet(t *testing.T) {

"Binary": {
value: primitive.Binary{Data: []byte{2}},
expectedIDs: []any{"double-whole", "int32", "int32-max", "int64", "int64-max"},
expectedIDs: []any{"double-3", "double-whole", "int32", "int32-max", "int64", "int64-max"},
},
"BinaryWithZeroBytes": {
value: primitive.Binary{Data: []byte{0, 0, 2}},
expectedIDs: []any{"int32-max", "int64-max"},
expectedIDs: []any{"double-4", "int32-2", "int32-3", "int32-max", "int64-2", "int64-3", "int64-max"},
},

"Int32": {
value: int32(2),
expectedIDs: []any{"double-whole", "int32", "int32-max", "int64", "int64-max"},
expectedIDs: []any{"double-3", "double-whole", "int32", "int32-max", "int64", "int64-max"},
},
"Int32NegativeValue": {
value: int32(-1),
Expand Down Expand Up @@ -334,8 +345,11 @@ func TestQueryBitwiseAnyClear(t *testing.T) {
"Array": {
value: primitive.A{1, 5},
expectedIDs: []any{
"double-big", "double-zero",
"double-1", "double-2", "double-4",
"double-big", "double-min-overflow-verge", "double-zero",
"int32-1", "int32-2", "int32-3",
"int32-min", "int32-zero",
"int64-1", "int64-2", "int64-3",
"int64-big", "int64-min", "int64-zero",
},
},
Expand Down Expand Up @@ -367,8 +381,11 @@ func TestQueryBitwiseAnyClear(t *testing.T) {
"DoubleWhole": {
value: 2.0,
expectedIDs: []any{
"double-big", "double-zero",
"double-1", "double-2", "double-4",
"double-big", "double-min-overflow-verge", "double-zero",
"int32-1", "int32-2", "int32-3",
"int32-min", "int32-zero",
"int64-1", "int64-2", "int64-3",
"int64-big", "int64-min", "int64-zero",
},
},
Expand All @@ -394,25 +411,32 @@ func TestQueryBitwiseAnyClear(t *testing.T) {
"Binary": {
value: primitive.Binary{Data: []byte{2}},
expectedIDs: []any{
"double-big", "double-zero",
"double-1", "double-2", "double-4",
"double-big", "double-min-overflow-verge", "double-zero",
"int32-1", "int32-2", "int32-3",
"int32-min", "int32-zero",
"int64-1", "int64-2", "int64-3",
"int64-big", "int64-min", "int64-zero",
},
},
"BinaryWithZeroBytes": {
value: primitive.Binary{Data: []byte{0, 0, 2}},
expectedIDs: []any{
"double-big", "double-whole", "double-zero",
"int32", "int32-min", "int32-zero",
"int64", "int64-big", "int64-min", "int64-zero",
"double-1", "double-2", "double-3",
"double-big", "double-min-overflow-verge", "double-whole", "double-zero",
"int32", "int32-1", "int32-min", "int32-zero",
"int64", "int64-1", "int64-big", "int64-min", "int64-zero",
},
},

"Int32": {
value: int32(2),
expectedIDs: []any{
"double-big", "double-zero",
"double-1", "double-2", "double-4",
"double-big", "double-min-overflow-verge", "double-zero",
"int32-1", "int32-2", "int32-3",
"int32-min", "int32-zero",
"int64-1", "int64-2", "int64-3",
"int64-big", "int64-min", "int64-zero",
},
},
Expand All @@ -428,9 +452,10 @@ func TestQueryBitwiseAnyClear(t *testing.T) {
"Int64Max": {
value: math.MaxInt64,
expectedIDs: []any{
"double-big", "double-whole", "double-zero",
"int32", "int32-max", "int32-min", "int32-zero",
"int64", "int64-big", "int64-min", "int64-zero",
"double-1", "double-2", "double-3", "double-4",
"double-big", "double-min-overflow-verge", "double-whole", "double-zero",
"int32", "int32-1", "int32-2", "int32-3", "int32-max", "int32-min", "int32-zero",
"int64", "int64-1", "int64-2", "int64-3", "int64-big", "int64-min", "int64-zero",
},
},
"Int64NegativeValue": {
Expand Down Expand Up @@ -484,9 +509,9 @@ func TestQueryBitwiseAnySet(t *testing.T) {
"Array": {
value: primitive.A{1, 5},
expectedIDs: []any{
"double-whole",
"int32", "int32-max",
"int64", "int64-max",
"double-3", "double-whole",
"int32", "int32-1", "int32-2", "int32-3", "int32-max",
"int64", "int64-1", "int64-2", "int64-max",
},
},
"ArrayNegativeBitPositionValue": {
Expand Down Expand Up @@ -517,7 +542,7 @@ func TestQueryBitwiseAnySet(t *testing.T) {
"DoubleWhole": {
value: 2.0,
expectedIDs: []any{
"double-whole",
"double-3", "double-whole",
"int32", "int32-max",
"int64", "int64-max",
},
Expand All @@ -543,17 +568,17 @@ func TestQueryBitwiseAnySet(t *testing.T) {

"Binary": {
value: primitive.Binary{Data: []byte{2}},
expectedIDs: []any{"double-whole", "int32", "int32-max", "int64", "int64-max"},
expectedIDs: []any{"double-3", "double-whole", "int32", "int32-max", "int64", "int64-max"},
},
"BinaryWithZeroBytes": {
value: primitive.Binary{Data: []byte{0, 0, 2}},
expectedIDs: []any{"int32-max", "int64-max"},
expectedIDs: []any{"double-4", "int32-2", "int32-3", "int32-max", "int64-2", "int64-3", "int64-max"},
},

"Int32": {
value: int32(2),
expectedIDs: []any{
"double-whole",
"double-3", "double-whole",
"int32", "int32-max",
"int64", "int64-max",
},
Expand All @@ -570,9 +595,10 @@ func TestQueryBitwiseAnySet(t *testing.T) {
"Int64Max": {
value: math.MaxInt64,
expectedIDs: []any{
"double-3", "double-4",
"double-big", "double-whole",
"int32", "int32-max", "int32-min",
"int64", "int64-big", "int64-max",
"int32", "int32-1", "int32-2", "int32-3", "int32-max", "int32-min",
"int64", "int64-1", "int64-2", "int64-3", "int64-big", "int64-max",
},
},
"Int64NegativeValue": {
Expand Down
3 changes: 1 addition & 2 deletions integration/query_comparison_compat_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -643,8 +643,7 @@ func TestQueryComparisonCompatLt(t *testing.T) {
filter: bson.D{{"v", bson.D{{"$lt", int64(42)}}}},
},
"Int64Min": {
filter: bson.D{{"v", bson.D{{"$lt", int64(math.MinInt64)}}}},
resultType: emptyResult,
chilagrow marked this conversation as resolved.
Show resolved Hide resolved
filter: bson.D{{"v", bson.D{{"$lt", int64(math.MinInt64)}}}},
},
"Int64Big": {
filter: bson.D{{"v", bson.D{{"$lt", int64(2<<60 + 1)}}}},
Expand Down
Loading