Skip to content

Commit f790451

Browse files
isabelatkinsonisabelatkinson
committed
resync retryable writes/transactions
1 parent 8460781 commit f790451

File tree

2 files changed

+88
-89
lines changed

2 files changed

+88
-89
lines changed

‎src/test/spec/json/retryable-writes/unified/client-bulkWrite-serverErrors.json

+72-58
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"description": "client bulkWrite retryable writes",
3-
"schemaVersion": "1.18",
3+
"schemaVersion": "1.20",
44
"runOnRequirements": [
55
{
66
"minServerVersion": "8.0",
@@ -15,7 +15,8 @@
1515
"id": "client0",
1616
"observeEvents": [
1717
"commandStartedEvent"
18-
]
18+
],
19+
"useMultipleMongoses": false
1920
}
2021
},
2122
{
@@ -53,6 +54,9 @@
5354
]
5455
}
5556
],
57+
"_yamlAnchors": {
58+
"namespace": "retryable-writes-tests.coll0"
59+
},
5660
"tests": [
5761
{
5862
"description": "client bulkWrite with no multi: true operations succeeds after retryable top-level error",
@@ -86,10 +90,7 @@
8690
"models": [
8791
{
8892
"insertOne": {
89-
"namespace": {
90-
"db": "retryable-writes-tests",
91-
"coll": "coll0"
92-
},
93+
"namespace": "retryable-writes-tests.coll0",
9394
"document": {
9495
"_id": 4,
9596
"x": 44
@@ -98,10 +99,7 @@
9899
},
99100
{
100101
"updateOne": {
101-
"namespace": {
102-
"db": "retryable-writes-tests",
103-
"coll": "coll0"
104-
},
102+
"namespace": "retryable-writes-tests.coll0",
105103
"filter": {
106104
"_id": 1
107105
},
@@ -114,10 +112,7 @@
114112
},
115113
{
116114
"replaceOne": {
117-
"namespace": {
118-
"db": "retryable-writes-tests",
119-
"coll": "coll0"
120-
},
115+
"namespace": "retryable-writes-tests.coll0",
121116
"filter": {
122117
"_id": 2
123118
},
@@ -128,16 +123,14 @@
128123
},
129124
{
130125
"deleteOne": {
131-
"namespace": {
132-
"db": "retryable-writes-tests",
133-
"coll": "coll0"
134-
},
126+
"namespace": "retryable-writes-tests.coll0",
135127
"filter": {
136128
"_id": 3
137129
}
138130
}
139131
}
140-
]
132+
],
133+
"verboseResults": true
141134
},
142135
"expectResult": {
143136
"insertedCount": 1,
@@ -146,13 +139,26 @@
146139
"modifiedCount": 2,
147140
"deletedCount": 1,
148141
"insertResults": {
149-
"$$unsetOrMatches": {}
142+
"0": {
143+
"insertedId": 4
144+
}
150145
},
151146
"updateResults": {
152-
"$$unsetOrMatches": {}
147+
"1": {
148+
"matchedCount": 1,
149+
"modifiedCount": 1,
150+
"upsertedId": null
151+
},
152+
"2": {
153+
"matchedCount": 1,
154+
"modifiedCount": 1,
155+
"upsertedId": null
156+
}
153157
},
154158
"deleteResults": {
155-
"$$unsetOrMatches": {}
159+
"3": {
160+
"deletedCount": 1
161+
}
156162
}
157163
}
158164
}
@@ -166,6 +172,9 @@
166172
"commandName": "bulkWrite",
167173
"databaseName": "admin",
168174
"command": {
175+
"bulkWrite": 1,
176+
"errorsOnly": false,
177+
"ordered": true,
169178
"ops": [
170179
{
171180
"insert": 0,
@@ -217,6 +226,9 @@
217226
"commandName": "bulkWrite",
218227
"databaseName": "admin",
219228
"command": {
229+
"bulkWrite": 1,
230+
"errorsOnly": false,
231+
"ordered": true,
220232
"ops": [
221233
{
222234
"insert": 0,
@@ -319,10 +331,7 @@
319331
"models": [
320332
{
321333
"updateMany": {
322-
"namespace": {
323-
"db": "retryable-writes-tests",
324-
"coll": "coll0"
325-
},
334+
"namespace": "retryable-writes-tests.coll0",
326335
"filter": {
327336
"_id": 1
328337
},
@@ -335,10 +344,7 @@
335344
},
336345
{
337346
"deleteMany": {
338-
"namespace": {
339-
"db": "retryable-writes-tests",
340-
"coll": "coll0"
341-
},
347+
"namespace": "retryable-writes-tests.coll0",
342348
"filter": {
343349
"_id": 3
344350
}
@@ -363,6 +369,9 @@
363369
"commandName": "bulkWrite",
364370
"databaseName": "admin",
365371
"command": {
372+
"bulkWrite": 1,
373+
"errorsOnly": true,
374+
"ordered": true,
366375
"ops": [
367376
{
368377
"update": 0,
@@ -431,10 +440,7 @@
431440
"models": [
432441
{
433442
"insertOne": {
434-
"namespace": {
435-
"db": "retryable-writes-tests",
436-
"coll": "coll0"
437-
},
443+
"namespace": "retryable-writes-tests.coll0",
438444
"document": {
439445
"_id": 4,
440446
"x": 44
@@ -443,10 +449,7 @@
443449
},
444450
{
445451
"updateOne": {
446-
"namespace": {
447-
"db": "retryable-writes-tests",
448-
"coll": "coll0"
449-
},
452+
"namespace": "retryable-writes-tests.coll0",
450453
"filter": {
451454
"_id": 1
452455
},
@@ -459,10 +462,7 @@
459462
},
460463
{
461464
"replaceOne": {
462-
"namespace": {
463-
"db": "retryable-writes-tests",
464-
"coll": "coll0"
465-
},
465+
"namespace": "retryable-writes-tests.coll0",
466466
"filter": {
467467
"_id": 2
468468
},
@@ -473,16 +473,14 @@
473473
},
474474
{
475475
"deleteOne": {
476-
"namespace": {
477-
"db": "retryable-writes-tests",
478-
"coll": "coll0"
479-
},
476+
"namespace": "retryable-writes-tests.coll0",
480477
"filter": {
481478
"_id": 3
482479
}
483480
}
484481
}
485-
]
482+
],
483+
"verboseResults": true
486484
},
487485
"expectResult": {
488486
"insertedCount": 1,
@@ -491,13 +489,26 @@
491489
"modifiedCount": 2,
492490
"deletedCount": 1,
493491
"insertResults": {
494-
"$$unsetOrMatches": {}
492+
"0": {
493+
"insertedId": 4
494+
}
495495
},
496496
"updateResults": {
497-
"$$unsetOrMatches": {}
497+
"1": {
498+
"matchedCount": 1,
499+
"modifiedCount": 1,
500+
"upsertedId": null
501+
},
502+
"2": {
503+
"matchedCount": 1,
504+
"modifiedCount": 1,
505+
"upsertedId": null
506+
}
498507
},
499508
"deleteResults": {
500-
"$$unsetOrMatches": {}
509+
"3": {
510+
"deletedCount": 1
511+
}
501512
}
502513
}
503514
}
@@ -511,6 +522,9 @@
511522
"commandName": "bulkWrite",
512523
"databaseName": "admin",
513524
"command": {
525+
"bulkWrite": 1,
526+
"errorsOnly": false,
527+
"ordered": true,
514528
"ops": [
515529
{
516530
"insert": 0,
@@ -562,6 +576,9 @@
562576
"commandName": "bulkWrite",
563577
"databaseName": "admin",
564578
"command": {
579+
"bulkWrite": 1,
580+
"errorsOnly": false,
581+
"ordered": true,
565582
"ops": [
566583
{
567584
"insert": 0,
@@ -647,10 +664,7 @@
647664
"models": [
648665
{
649666
"updateMany": {
650-
"namespace": {
651-
"db": "retryable-writes-tests",
652-
"coll": "coll0"
653-
},
667+
"namespace": "retryable-writes-tests.coll0",
654668
"filter": {
655669
"_id": 1
656670
},
@@ -663,10 +677,7 @@
663677
},
664678
{
665679
"deleteMany": {
666-
"namespace": {
667-
"db": "retryable-writes-tests",
668-
"coll": "coll0"
669-
},
680+
"namespace": "retryable-writes-tests.coll0",
670681
"filter": {
671682
"_id": 3
672683
}
@@ -693,6 +704,9 @@
693704
"commandName": "bulkWrite",
694705
"databaseName": "admin",
695706
"command": {
707+
"bulkWrite": 1,
708+
"errorsOnly": true,
709+
"ordered": true,
696710
"ops": [
697711
{
698712
"update": 0,

0 commit comments

Comments
 (0)