Skip to content

Commit c4c9860

Browse files
matthewdalematthewdale
committed
Explicitly forbid 'level' in 'readConcern' for writes. Fix transactions test assertions.
1 parent 2994ef4 commit c4c9860

12 files changed

Lines changed: 102 additions & 13 deletions

‎source/causal-consistency/tests/causal-consistency-clientBulkWrite.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,9 @@
133133
"readConcern": {
134134
"afterClusterTime": {
135135
"$$exists": true
136+
},
137+
"level": {
138+
"$$exists": false
136139
}
137140
}
138141
}

‎source/causal-consistency/tests/causal-consistency-clientBulkWrite.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,3 +72,4 @@ tests:
7272
lsid: { $$sessionLsid: *session0 }
7373
readConcern:
7474
afterClusterTime: { $$exists: true }
75+
level: { $$exists: false }

‎source/causal-consistency/tests/causal-consistency-write-commands.json‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,9 @@
132132
"readConcern": {
133133
"afterClusterTime": {
134134
"$$exists": true
135+
},
136+
"level": {
137+
"$$exists": false
135138
}
136139
}
137140
}
@@ -203,6 +206,9 @@
203206
"readConcern": {
204207
"afterClusterTime": {
205208
"$$exists": true
209+
},
210+
"level": {
211+
"$$exists": false
206212
}
207213
}
208214
}
@@ -279,6 +285,9 @@
279285
"readConcern": {
280286
"afterClusterTime": {
281287
"$$exists": true
288+
},
289+
"level": {
290+
"$$exists": false
282291
}
283292
}
284293
}
@@ -357,6 +366,9 @@
357366
"readConcern": {
358367
"afterClusterTime": {
359368
"$$exists": true
369+
},
370+
"level": {
371+
"$$exists": false
360372
}
361373
}
362374
}
@@ -431,6 +443,9 @@
431443
"readConcern": {
432444
"afterClusterTime": {
433445
"$$exists": true
446+
},
447+
"level": {
448+
"$$exists": false
434449
}
435450
}
436451
}
@@ -500,6 +515,9 @@
500515
"readConcern": {
501516
"afterClusterTime": {
502517
"$$exists": true
518+
},
519+
"level": {
520+
"$$exists": false
503521
}
504522
}
505523
}
@@ -571,6 +589,9 @@
571589
"readConcern": {
572590
"afterClusterTime": {
573591
"$$exists": true
592+
},
593+
"level": {
594+
"$$exists": false
574595
}
575596
}
576597
}
@@ -646,6 +667,9 @@
646667
"readConcern": {
647668
"afterClusterTime": {
648669
"$$exists": true
670+
},
671+
"level": {
672+
"$$exists": false
649673
}
650674
}
651675
}
@@ -716,6 +740,9 @@
716740
"readConcern": {
717741
"afterClusterTime": {
718742
"$$exists": true
743+
},
744+
"level": {
745+
"$$exists": false
719746
}
720747
}
721748
}
@@ -789,6 +816,9 @@
789816
"readConcern": {
790817
"afterClusterTime": {
791818
"$$exists": true
819+
},
820+
"level": {
821+
"$$exists": false
792822
}
793823
}
794824
}
@@ -880,6 +910,9 @@
880910
"readConcern": {
881911
"afterClusterTime": {
882912
"$$exists": true
913+
},
914+
"level": {
915+
"$$exists": false
883916
}
884917
}
885918
}
@@ -896,6 +929,9 @@
896929
"readConcern": {
897930
"afterClusterTime": {
898931
"$$exists": true
932+
},
933+
"level": {
934+
"$$exists": false
899935
}
900936
}
901937
}
@@ -912,6 +948,9 @@
912948
"readConcern": {
913949
"afterClusterTime": {
914950
"$$exists": true
951+
},
952+
"level": {
953+
"$$exists": false
915954
}
916955
}
917956
}
@@ -976,6 +1015,9 @@
9761015
"readConcern": {
9771016
"afterClusterTime": {
9781017
"$$exists": true
1018+
},
1019+
"level": {
1020+
"$$exists": false
9791021
}
9801022
}
9811023
}
@@ -1043,6 +1085,9 @@
10431085
"readConcern": {
10441086
"afterClusterTime": {
10451087
"$$exists": true
1088+
},
1089+
"level": {
1090+
"$$exists": false
10461091
}
10471092
}
10481093
}
@@ -1107,6 +1152,9 @@
11071152
"readConcern": {
11081153
"afterClusterTime": {
11091154
"$$exists": true
1155+
},
1156+
"level": {
1157+
"$$exists": false
11101158
}
11111159
}
11121160
}
@@ -1170,6 +1218,9 @@
11701218
"readConcern": {
11711219
"afterClusterTime": {
11721220
"$$exists": true
1221+
},
1222+
"level": {
1223+
"$$exists": false
11731224
}
11741225
}
11751226
}

‎source/causal-consistency/tests/causal-consistency-write-commands.yml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ tests:
7272
lsid: { $$sessionLsid: *session0 }
7373
readConcern:
7474
afterClusterTime: { $$exists: true }
75+
level: { $$exists: false }
7576

7677
- description: "insertMany includes afterClusterTime in causally consistent session"
7778
operations:
@@ -94,6 +95,7 @@ tests:
9495
lsid: { $$sessionLsid: *session0 }
9596
readConcern:
9697
afterClusterTime: { $$exists: true }
98+
level: { $$exists: false }
9799

98100
- description: "updateOne includes afterClusterTime in causally consistent session"
99101
operations:
@@ -119,6 +121,7 @@ tests:
119121
lsid: { $$sessionLsid: *session0 }
120122
readConcern:
121123
afterClusterTime: { $$exists: true }
124+
level: { $$exists: false }
122125

123126
- description: "updateMany includes afterClusterTime in causally consistent session"
124127
operations:
@@ -144,6 +147,7 @@ tests:
144147
lsid: { $$sessionLsid: *session0 }
145148
readConcern:
146149
afterClusterTime: { $$exists: true }
150+
level: { $$exists: false }
147151

148152
- description: "replaceOne includes afterClusterTime in causally consistent session"
149153
operations:
@@ -169,6 +173,7 @@ tests:
169173
lsid: { $$sessionLsid: *session0 }
170174
readConcern:
171175
afterClusterTime: { $$exists: true }
176+
level: { $$exists: false }
172177

173178
- description: "deleteOne includes afterClusterTime in causally consistent session"
174179
operations:
@@ -191,6 +196,7 @@ tests:
191196
lsid: { $$sessionLsid: *session0 }
192197
readConcern:
193198
afterClusterTime: { $$exists: true }
199+
level: { $$exists: false }
194200

195201
- description: "deleteMany includes afterClusterTime in causally consistent session"
196202
operations:
@@ -213,6 +219,7 @@ tests:
213219
lsid: { $$sessionLsid: *session0 }
214220
readConcern:
215221
afterClusterTime: { $$exists: true }
222+
level: { $$exists: false }
216223

217224
- description: "findOneAndUpdate includes afterClusterTime in causally consistent session"
218225
operations:
@@ -235,6 +242,7 @@ tests:
235242
lsid: { $$sessionLsid: *session0 }
236243
readConcern:
237244
afterClusterTime: { $$exists: true }
245+
level: { $$exists: false }
238246

239247
- description: "findOneAndDelete includes afterClusterTime in causally consistent session"
240248
operations:
@@ -256,6 +264,7 @@ tests:
256264
lsid: { $$sessionLsid: *session0 }
257265
readConcern:
258266
afterClusterTime: { $$exists: true }
267+
level: { $$exists: false }
259268

260269
- description: "findOneAndReplace includes afterClusterTime in causally consistent session"
261270
operations:
@@ -278,6 +287,7 @@ tests:
278287
lsid: { $$sessionLsid: *session0 }
279288
readConcern:
280289
afterClusterTime: { $$exists: true }
290+
level: { $$exists: false }
281291

282292
- description: "bulkWrite includes afterClusterTime in causally consistent session"
283293
operations:
@@ -305,20 +315,23 @@ tests:
305315
lsid: { $$sessionLsid: *session0 }
306316
readConcern:
307317
afterClusterTime: { $$exists: true }
318+
level: { $$exists: false }
308319
- commandStartedEvent:
309320
commandName: update
310321
command:
311322
update: *collectionName
312323
lsid: { $$sessionLsid: *session0 }
313324
readConcern:
314325
afterClusterTime: { $$exists: true }
326+
level: { $$exists: false }
315327
- commandStartedEvent:
316328
commandName: delete
317329
command:
318330
delete: *collectionName
319331
lsid: { $$sessionLsid: *session0 }
320332
readConcern:
321333
afterClusterTime: { $$exists: true }
334+
level: { $$exists: false }
322335

323336
- description: "create includes afterClusterTime in causally consistent session"
324337
operations:
@@ -339,6 +352,7 @@ tests:
339352
lsid: { $$sessionLsid: *session0 }
340353
readConcern:
341354
afterClusterTime: { $$exists: true }
355+
level: { $$exists: false }
342356

343357
- description: "createIndexes includes afterClusterTime in causally consistent session"
344358
operations:
@@ -360,6 +374,7 @@ tests:
360374
lsid: { $$sessionLsid: *session0 }
361375
readConcern:
362376
afterClusterTime: { $$exists: true }
377+
level: { $$exists: false }
363378

364379
- description: "drop includes afterClusterTime in causally consistent session"
365380
operations:
@@ -380,6 +395,7 @@ tests:
380395
lsid: { $$sessionLsid: *session0 }
381396
readConcern:
382397
afterClusterTime: { $$exists: true }
398+
level: { $$exists: false }
383399

384400
- description: "dropIndexes includes afterClusterTime in causally consistent session"
385401
operations:
@@ -399,3 +415,4 @@ tests:
399415
lsid: { $$sessionLsid: *session0 }
400416
readConcern:
401417
afterClusterTime: { $$exists: true }
418+
level: { $$exists: false }

‎source/transactions-convenient-api/tests/unified/callback-aborts.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,9 @@
260260
"startTransaction": true,
261261
"autocommit": false,
262262
"readConcern": {
263-
"$$exists": false
263+
"afterClusterTime": {
264+
"$$exists": true
265+
}
264266
},
265267
"writeConcern": {
266268
"$$exists": false

‎source/transactions-convenient-api/tests/unified/callback-aborts.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,9 @@ tests:
136136
txnNumber: { $numberLong: "1" }
137137
startTransaction: true
138138
autocommit: false
139+
readConcern:
140+
afterClusterTime: { $$exists: true }
139141
# omitted fields
140-
readConcern: { $$exists: false }
141142
writeConcern: { $$exists: false }
142143
commandName: insert
143144
databaseName: *databaseName

‎source/transactions-convenient-api/tests/unified/callback-commits.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,9 @@
302302
"startTransaction": true,
303303
"autocommit": false,
304304
"readConcern": {
305-
"$$exists": false
305+
"afterClusterTime": {
306+
"$$exists": true
307+
}
306308
},
307309
"writeConcern": {
308310
"$$exists": false

‎source/transactions-convenient-api/tests/unified/callback-commits.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,8 @@ tests:
150150
txnNumber: { $numberLong: "1" }
151151
startTransaction: true
152152
autocommit: false
153-
# omitted fields
154-
readConcern: { $$exists: false }
153+
readConcern:
154+
afterClusterTime: { $$exists: true }
155155
writeConcern: { $$exists: false }
156156
commandName: insert
157157
databaseName: *databaseName

‎source/transactions/tests/unified/commit.json‎

Lines changed: 6 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)