Skip to content

Commit e67a701

Browse files
kevinAlbskevinAlbs
authored
CXX-2993 skip rangePreview tests on server 8.0+ (#1123)
* skip prose test 22 on server 8.0+ * update `fle2v2-Range-*` tests Update tests to specifications commit d036675f5e91ad9f45bcee5292a2d9a829224495 to skip on server version 8.0+. * sync `range-encryptedFields-*` files Synced from specifications commit d036675f5e91ad9f45bcee5292a2d9a829224495. This resolves CXX-2674 * fix lint
1 parent f7b69d3 commit e67a701

File tree

53 files changed

+731
-489
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+731
-489
lines changed

‎data/client_side_encryption/explicit-encryption/range-encryptedFields-Date.json

Lines changed: 26 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,33 @@
11
{
2-
"fields": [
3-
{
4-
"keyId": {
5-
"$binary": {
6-
"base64": "EjRWeBI0mHYSNBI0VniQEg==",
7-
"subType": "04"
8-
}
2+
"fields": [
3+
{
4+
"keyId": {
5+
"$binary": {
6+
"base64": "EjRWeBI0mHYSNBI0VniQEg==",
7+
"subType": "04"
8+
}
9+
},
10+
"path": "encryptedDate",
11+
"bsonType": "date",
12+
"queries": {
13+
"queryType": "rangePreview",
14+
"contention": {
15+
"$numberLong": "0"
916
},
10-
"path": "encryptedDate",
11-
"bsonType": "date",
12-
"queries": {
13-
"queryType": "rangePreview",
14-
"sparsity": {
15-
"$numberLong": "1"
16-
},
17-
"min": {
18-
"$date": {
19-
"$numberLong": "0"
20-
}
21-
},
22-
"max": {
23-
"$date": {
24-
"$numberLong": "200"
17+
"sparsity": {
18+
"$numberLong": "1"
19+
},
20+
"min": {
21+
"$date": {
22+
"$numberLong": "0"
2523
}
24+
},
25+
"max": {
26+
"$date": {
27+
"$numberLong": "200"
2628
}
2729
}
2830
}
29-
]
31+
}
32+
]
3033
}

‎data/client_side_encryption/explicit-encryption/range-encryptedFields-DecimalNoPrecision.json

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,23 @@
11
{
2-
"fields": [
3-
{
4-
"keyId": {
5-
"$binary": {
6-
"base64": "EjRWeBI0mHYSNBI0VniQEg==",
7-
"subType": "04"
8-
}
2+
"fields": [
3+
{
4+
"keyId": {
5+
"$binary": {
6+
"base64": "EjRWeBI0mHYSNBI0VniQEg==",
7+
"subType": "04"
8+
}
9+
},
10+
"path": "encryptedDecimalNoPrecision",
11+
"bsonType": "decimal",
12+
"queries": {
13+
"queryType": "rangePreview",
14+
"contention": {
15+
"$numberLong": "0"
916
},
10-
"path": "encryptedDecimalNoPrecision",
11-
"bsonType": "decimal",
12-
"queries": {
13-
"queryType": "rangePreview",
14-
"sparsity": {
15-
"$numberInt": "1"
16-
}
17+
"sparsity": {
18+
"$numberLong": "1"
1719
}
1820
}
19-
]
20-
}
21-
21+
}
22+
]
23+
}

‎data/client_side_encryption/explicit-encryption/range-encryptedFields-DecimalPrecision.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,11 @@
1111
"bsonType": "decimal",
1212
"queries": {
1313
"queryType": "rangePreview",
14+
"contention": {
15+
"$numberLong": "0"
16+
},
1417
"sparsity": {
15-
"$numberInt": "1"
18+
"$numberLong": "1"
1619
},
1720
"min": {
1821
"$numberDecimal": "0.0"

‎data/client_side_encryption/explicit-encryption/range-encryptedFields-DoubleNoPrecision.json

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,23 @@
11
{
2-
"fields": [
3-
{
4-
"keyId": {
5-
"$binary": {
6-
"base64": "EjRWeBI0mHYSNBI0VniQEg==",
7-
"subType": "04"
8-
}
2+
"fields": [
3+
{
4+
"keyId": {
5+
"$binary": {
6+
"base64": "EjRWeBI0mHYSNBI0VniQEg==",
7+
"subType": "04"
8+
}
9+
},
10+
"path": "encryptedDoubleNoPrecision",
11+
"bsonType": "double",
12+
"queries": {
13+
"queryType": "rangePreview",
14+
"contention": {
15+
"$numberLong": "0"
916
},
10-
"path": "encryptedDoubleNoPrecision",
11-
"bsonType": "double",
12-
"queries": {
13-
"queryType": "rangePreview",
14-
"sparsity": {
15-
"$numberLong": "1"
16-
}
17+
"sparsity": {
18+
"$numberLong": "1"
1719
}
1820
}
19-
]
20-
}
21-
21+
}
22+
]
23+
}

‎data/client_side_encryption/explicit-encryption/range-encryptedFields-DoublePrecision.json

Lines changed: 28 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,32 @@
11
{
2-
"fields": [
3-
{
4-
"keyId": {
5-
"$binary": {
6-
"base64": "EjRWeBI0mHYSNBI0VniQEg==",
7-
"subType": "04"
8-
}
2+
"fields": [
3+
{
4+
"keyId": {
5+
"$binary": {
6+
"base64": "EjRWeBI0mHYSNBI0VniQEg==",
7+
"subType": "04"
8+
}
9+
},
10+
"path": "encryptedDoublePrecision",
11+
"bsonType": "double",
12+
"queries": {
13+
"queryType": "rangePreview",
14+
"contention": {
15+
"$numberLong": "0"
16+
},
17+
"sparsity": {
18+
"$numberLong": "1"
19+
},
20+
"min": {
21+
"$numberDouble": "0.0"
22+
},
23+
"max": {
24+
"$numberDouble": "200.0"
925
},
10-
"path": "encryptedDoublePrecision",
11-
"bsonType": "double",
12-
"queries": {
13-
"queryType": "rangePreview",
14-
"sparsity": {
15-
"$numberLong": "1"
16-
},
17-
"min": {
18-
"$numberDouble": "0.0"
19-
},
20-
"max": {
21-
"$numberDouble": "200.0"
22-
},
23-
"precision": {
24-
"$numberInt": "2"
25-
}
26+
"precision": {
27+
"$numberInt": "2"
2628
}
2729
}
28-
]
29-
}
30-
30+
}
31+
]
32+
}

‎data/client_side_encryption/explicit-encryption/range-encryptedFields-Int.json

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,29 @@
11
{
2-
"fields": [
3-
{
4-
"keyId": {
5-
"$binary": {
6-
"base64": "EjRWeBI0mHYSNBI0VniQEg==",
7-
"subType": "04"
8-
}
2+
"fields": [
3+
{
4+
"keyId": {
5+
"$binary": {
6+
"base64": "EjRWeBI0mHYSNBI0VniQEg==",
7+
"subType": "04"
8+
}
9+
},
10+
"path": "encryptedInt",
11+
"bsonType": "int",
12+
"queries": {
13+
"queryType": "rangePreview",
14+
"contention": {
15+
"$numberLong": "0"
16+
},
17+
"sparsity": {
18+
"$numberLong": "1"
19+
},
20+
"min": {
21+
"$numberInt": "0"
922
},
10-
"path": "encryptedInt",
11-
"bsonType": "int",
12-
"queries": {
13-
"queryType": "rangePreview",
14-
"sparsity": {
15-
"$numberLong": "1"
16-
},
17-
"min": {
18-
"$numberInt": "0"
19-
},
20-
"max": {
21-
"$numberInt": "200"
22-
}
23+
"max": {
24+
"$numberInt": "200"
2325
}
2426
}
25-
]
26-
}
27-
27+
}
28+
]
29+
}

‎data/client_side_encryption/explicit-encryption/range-encryptedFields-Long.json

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,29 @@
11
{
2-
"fields": [
3-
{
4-
"keyId": {
5-
"$binary": {
6-
"base64": "EjRWeBI0mHYSNBI0VniQEg==",
7-
"subType": "04"
8-
}
2+
"fields": [
3+
{
4+
"keyId": {
5+
"$binary": {
6+
"base64": "EjRWeBI0mHYSNBI0VniQEg==",
7+
"subType": "04"
8+
}
9+
},
10+
"path": "encryptedLong",
11+
"bsonType": "long",
12+
"queries": {
13+
"queryType": "rangePreview",
14+
"contention": {
15+
"$numberLong": "0"
16+
},
17+
"sparsity": {
18+
"$numberLong": "1"
19+
},
20+
"min": {
21+
"$numberLong": "0"
922
},
10-
"path": "encryptedLong",
11-
"bsonType": "long",
12-
"queries": {
13-
"queryType": "rangePreview",
14-
"sparsity": {
15-
"$numberLong": "1"
16-
},
17-
"min": {
18-
"$numberLong": "0"
19-
},
20-
"max": {
21-
"$numberLong": "200"
22-
}
23+
"max": {
24+
"$numberLong": "200"
2325
}
2426
}
25-
]
26-
}
27-
27+
}
28+
]
29+
}

‎data/client_side_encryption/legacy/fle2v2-Range-Date-Aggregate.json

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
"runOn": [
33
{
44
"minServerVersion": "7.0.0",
5-
"serverless": "forbid",
65
"topology": [
76
"replicaset",
87
"sharded",
98
"load-balanced"
10-
]
9+
],
10+
"maxServerVersion": "7.99.99"
1111
}
1212
],
1313
"database_name": "default",
@@ -213,6 +213,8 @@
213213
"type": 1,
214214
"schema": {
215215
"default.default": {
216+
"escCollection": "enxcol_.default.esc",
217+
"ecocCollection": "enxcol_.default.ecoc",
216218
"fields": [
217219
{
218220
"keyId": {
@@ -268,6 +270,8 @@
268270
"type": 1,
269271
"schema": {
270272
"default.default": {
273+
"escCollection": "enxcol_.default.esc",
274+
"ecocCollection": "enxcol_.default.ecoc",
271275
"fields": [
272276
{
273277
"keyId": {
@@ -329,6 +333,8 @@
329333
"type": 1,
330334
"schema": {
331335
"default.default": {
336+
"escCollection": "enxcol_.default.esc",
337+
"ecocCollection": "enxcol_.default.ecoc",
332338
"fields": [
333339
{
334340
"keyId": {

‎data/client_side_encryption/legacy/fle2v2-Range-Date-Correctness.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
"runOn": [
33
{
44
"minServerVersion": "7.0.0",
5-
"serverless": "forbid",
65
"topology": [
76
"replicaset",
87
"sharded",
98
"load-balanced"
10-
]
9+
],
10+
"maxServerVersion": "7.99.99"
1111
}
1212
],
1313
"database_name": "default",

0 commit comments

Comments
 (0)