mirror
/
mongo
mirror of https://github.com/mongodb/mongo
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SERVER-105098: Robustify sharded_explain_*_with_limit_skip.js for range deletions (#41988) 

GitOrigin-RevId: 1129e3168f63d0c28910280a49f170a05fbdac7a
This commit is contained in:
Matt Olma 2025-10-01 10:29:30 -04:00 committed by MongoDB Bot
parent 7e5a8e27a2
commit ccd3b8bdf1
7 changed files with 87 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
jstests/query_golden_sharding/expected_output/featureFlagSbeFull/sharded_explain_find_with_limit_skip.md
View File

@ -76,7 +76,7 @@ Execution Engine: classic
"inputStage" : {
"inputStage" : {
"isEOF" : 0,
"nReturned" : 24,
"nReturned" : 5,
"stage" : "IXSCAN"
},
"isEOF" : 0,
@ -102,12 +102,12 @@ Execution Engine: classic
},
"nReturned" : 5,
"totalDocsExamined" : 5,
"totalKeysExamined" : 24
"totalKeysExamined" : 5
}
],
"stage" : "SHARD_MERGE_SORT",
"totalDocsExamined" : 10,
"totalKeysExamined" : 29
"totalKeysExamined" : 10
}
}
]
@ -182,7 +182,7 @@ Execution Engine: classic
"inputStage" : {
"inputStage" : {
"isEOF" : 1,
"nReturned" : 9,
"nReturned" : 5,
"stage" : "IXSCAN"
},
"isEOF" : 1,
@ -203,13 +203,13 @@ Execution Engine: classic
},
"nReturned" : 5,
"totalDocsExamined" : 5,
"totalKeysExamined" : 9
"totalKeysExamined" : 5
}
],
"skipAmount" : 5,
"stage" : "SHARD_MERGE_SORT",
"totalDocsExamined" : 9,
"totalKeysExamined" : 13
"totalKeysExamined" : 9
}
}
]
@ -294,7 +294,7 @@ Execution Engine: classic
"inputStage" : {
"inputStage" : {
"isEOF" : 0,
"nReturned" : 29,
"nReturned" : 10,
"stage" : "IXSCAN"
},
"isEOF" : 0,
@ -320,13 +320,13 @@ Execution Engine: classic
},
"nReturned" : 10,
"totalDocsExamined" : 10,
"totalKeysExamined" : 29
"totalKeysExamined" : 10
}
],
"skipAmount" : 5,
"stage" : "SHARD_MERGE_SORT",
"totalDocsExamined" : 20,
"totalKeysExamined" : 39
"totalKeysExamined" : 20
}
}
]
@ -409,7 +409,7 @@ Execution Engine: classic
"inputStage" : {
"inputStage" : {
"isEOF" : 1,
"nReturned" : 3,
"nReturned" : 2,
"stage" : "IXSCAN"
},
"isEOF" : 1,
@ -435,12 +435,12 @@ Execution Engine: classic
},
"nReturned" : 2,
"totalDocsExamined" : 2,
"totalKeysExamined" : 3
"totalKeysExamined" : 2
}
],
"stage" : "SHARD_MERGE_SORT",
"totalDocsExamined" : 3,
"totalKeysExamined" : 4
"totalKeysExamined" : 3
}
}
]
@ -525,7 +525,7 @@ Execution Engine: classic
"inputStage" : {
"inputStage" : {
"isEOF" : 1,
"nReturned" : 9,
"nReturned" : 6,
"stage" : "IXSCAN"
},
"isEOF" : 1,
@ -551,13 +551,13 @@ Execution Engine: classic
},
"nReturned" : 6,
"totalDocsExamined" : 6,
"totalKeysExamined" : 9
"totalKeysExamined" : 6
}
],
"skipAmount" : 5,
"stage" : "SHARD_MERGE_SORT",
"totalDocsExamined" : 9,
"totalKeysExamined" : 12
"totalKeysExamined" : 9
}
}
]

30
jstests/query_golden_sharding/expected_output/sbeDisabled/sharded_explain_find_with_limit_skip.md
View File

@ -76,7 +76,7 @@ Execution Engine: classic
"inputStage" : {
"inputStage" : {
"isEOF" : 0,
"nReturned" : 24,
"nReturned" : 5,
"stage" : "IXSCAN"
},
"isEOF" : 0,
@ -102,12 +102,12 @@ Execution Engine: classic
},
"nReturned" : 5,
"totalDocsExamined" : 5,
"totalKeysExamined" : 24
"totalKeysExamined" : 5
}
],
"stage" : "SHARD_MERGE_SORT",
"totalDocsExamined" : 10,
"totalKeysExamined" : 29
"totalKeysExamined" : 10
}
}
]
@ -182,7 +182,7 @@ Execution Engine: classic
"inputStage" : {
"inputStage" : {
"isEOF" : 1,
"nReturned" : 9,
"nReturned" : 5,
"stage" : "IXSCAN"
},
"isEOF" : 1,
@ -203,13 +203,13 @@ Execution Engine: classic
},
"nReturned" : 5,
"totalDocsExamined" : 5,
"totalKeysExamined" : 9
"totalKeysExamined" : 5
}
],
"skipAmount" : 5,
"stage" : "SHARD_MERGE_SORT",
"totalDocsExamined" : 9,
"totalKeysExamined" : 13
"totalKeysExamined" : 9
}
}
]
@ -294,7 +294,7 @@ Execution Engine: classic
"inputStage" : {
"inputStage" : {
"isEOF" : 0,
"nReturned" : 29,
"nReturned" : 10,
"stage" : "IXSCAN"
},
"isEOF" : 0,
@ -320,13 +320,13 @@ Execution Engine: classic
},
"nReturned" : 10,
"totalDocsExamined" : 10,
"totalKeysExamined" : 29
"totalKeysExamined" : 10
}
],
"skipAmount" : 5,
"stage" : "SHARD_MERGE_SORT",
"totalDocsExamined" : 20,
"totalKeysExamined" : 39
"totalKeysExamined" : 20
}
}
]
@ -409,7 +409,7 @@ Execution Engine: classic
"inputStage" : {
"inputStage" : {
"isEOF" : 1,
"nReturned" : 3,
"nReturned" : 2,
"stage" : "IXSCAN"
},
"isEOF" : 1,
@ -435,12 +435,12 @@ Execution Engine: classic
},
"nReturned" : 2,
"totalDocsExamined" : 2,
"totalKeysExamined" : 3
"totalKeysExamined" : 2
}
],
"stage" : "SHARD_MERGE_SORT",
"totalDocsExamined" : 3,
"totalKeysExamined" : 4
"totalKeysExamined" : 3
}
}
]
@ -525,7 +525,7 @@ Execution Engine: classic
"inputStage" : {
"inputStage" : {
"isEOF" : 1,
"nReturned" : 9,
"nReturned" : 6,
"stage" : "IXSCAN"
},
"isEOF" : 1,
@ -551,13 +551,13 @@ Execution Engine: classic
},
"nReturned" : 6,
"totalDocsExamined" : 6,
"totalKeysExamined" : 9
"totalKeysExamined" : 6
}
],
"skipAmount" : 5,
"stage" : "SHARD_MERGE_SORT",
"totalDocsExamined" : 9,
"totalKeysExamined" : 12
"totalKeysExamined" : 9
}
}
]

30
jstests/query_golden_sharding/expected_output/sbeFull/sharded_explain_find_with_limit_skip.md
View File

@ -76,7 +76,7 @@ Execution Engine: classic
"inputStage" : {
"inputStage" : {
"isEOF" : 0,
"nReturned" : 24,
"nReturned" : 5,
"stage" : "IXSCAN"
},
"isEOF" : 0,
@ -102,12 +102,12 @@ Execution Engine: classic
},
"nReturned" : 5,
"totalDocsExamined" : 5,
"totalKeysExamined" : 24
"totalKeysExamined" : 5
}
],
"stage" : "SHARD_MERGE_SORT",
"totalDocsExamined" : 10,
"totalKeysExamined" : 29
"totalKeysExamined" : 10
}
}
]
@ -182,7 +182,7 @@ Execution Engine: classic
"inputStage" : {
"inputStage" : {
"isEOF" : 1,
"nReturned" : 9,
"nReturned" : 5,
"stage" : "IXSCAN"
},
"isEOF" : 1,
@ -203,13 +203,13 @@ Execution Engine: classic
},
"nReturned" : 5,
"totalDocsExamined" : 5,
"totalKeysExamined" : 9
"totalKeysExamined" : 5
}
],
"skipAmount" : 5,
"stage" : "SHARD_MERGE_SORT",
"totalDocsExamined" : 9,
"totalKeysExamined" : 13
"totalKeysExamined" : 9
}
}
]
@ -294,7 +294,7 @@ Execution Engine: classic
"inputStage" : {
"inputStage" : {
"isEOF" : 0,
"nReturned" : 29,
"nReturned" : 10,
"stage" : "IXSCAN"
},
"isEOF" : 0,
@ -320,13 +320,13 @@ Execution Engine: classic
},
"nReturned" : 10,
"totalDocsExamined" : 10,
"totalKeysExamined" : 29
"totalKeysExamined" : 10
}
],
"skipAmount" : 5,
"stage" : "SHARD_MERGE_SORT",
"totalDocsExamined" : 20,
"totalKeysExamined" : 39
"totalKeysExamined" : 20
}
}
]
@ -409,7 +409,7 @@ Execution Engine: classic
"inputStage" : {
"inputStage" : {
"isEOF" : 1,
"nReturned" : 3,
"nReturned" : 2,
"stage" : "IXSCAN"
},
"isEOF" : 1,
@ -435,12 +435,12 @@ Execution Engine: classic
},
"nReturned" : 2,
"totalDocsExamined" : 2,
"totalKeysExamined" : 3
"totalKeysExamined" : 2
}
],
"stage" : "SHARD_MERGE_SORT",
"totalDocsExamined" : 3,
"totalKeysExamined" : 4
"totalKeysExamined" : 3
}
}
]
@ -525,7 +525,7 @@ Execution Engine: classic
"inputStage" : {
"inputStage" : {
"isEOF" : 1,
"nReturned" : 9,
"nReturned" : 6,
"stage" : "IXSCAN"
},
"isEOF" : 1,
@ -551,13 +551,13 @@ Execution Engine: classic
},
"nReturned" : 6,
"totalDocsExamined" : 6,
"totalKeysExamined" : 9
"totalKeysExamined" : 6
}
],
"skipAmount" : 5,
"stage" : "SHARD_MERGE_SORT",
"totalDocsExamined" : 9,
"totalKeysExamined" : 12
"totalKeysExamined" : 9
}
}
]

30
jstests/query_golden_sharding/expected_output/sbeRestricted/sharded_explain_find_with_limit_skip.md
View File

@ -76,7 +76,7 @@ Execution Engine: classic
"inputStage" : {
"inputStage" : {
"isEOF" : 0,
"nReturned" : 24,
"nReturned" : 5,
"stage" : "IXSCAN"
},
"isEOF" : 0,
@ -102,12 +102,12 @@ Execution Engine: classic
},
"nReturned" : 5,
"totalDocsExamined" : 5,
"totalKeysExamined" : 24
"totalKeysExamined" : 5
}
],
"stage" : "SHARD_MERGE_SORT",
"totalDocsExamined" : 10,
"totalKeysExamined" : 29
"totalKeysExamined" : 10
}
}
]
@ -182,7 +182,7 @@ Execution Engine: classic
"inputStage" : {
"inputStage" : {
"isEOF" : 1,
"nReturned" : 9,
"nReturned" : 5,
"stage" : "IXSCAN"
},
"isEOF" : 1,
@ -203,13 +203,13 @@ Execution Engine: classic
},
"nReturned" : 5,
"totalDocsExamined" : 5,
"totalKeysExamined" : 9
"totalKeysExamined" : 5
}
],
"skipAmount" : 5,
"stage" : "SHARD_MERGE_SORT",
"totalDocsExamined" : 9,
"totalKeysExamined" : 13
"totalKeysExamined" : 9
}
}
]
@ -294,7 +294,7 @@ Execution Engine: classic
"inputStage" : {
"inputStage" : {
"isEOF" : 0,
"nReturned" : 29,
"nReturned" : 10,
"stage" : "IXSCAN"
},
"isEOF" : 0,
@ -320,13 +320,13 @@ Execution Engine: classic
},
"nReturned" : 10,
"totalDocsExamined" : 10,
"totalKeysExamined" : 29
"totalKeysExamined" : 10
}
],
"skipAmount" : 5,
"stage" : "SHARD_MERGE_SORT",
"totalDocsExamined" : 20,
"totalKeysExamined" : 39
"totalKeysExamined" : 20
}
}
]
@ -409,7 +409,7 @@ Execution Engine: classic
"inputStage" : {
"inputStage" : {
"isEOF" : 1,
"nReturned" : 3,
"nReturned" : 2,
"stage" : "IXSCAN"
},
"isEOF" : 1,
@ -435,12 +435,12 @@ Execution Engine: classic
},
"nReturned" : 2,
"totalDocsExamined" : 2,
"totalKeysExamined" : 3
"totalKeysExamined" : 2
}
],
"stage" : "SHARD_MERGE_SORT",
"totalDocsExamined" : 3,
"totalKeysExamined" : 4
"totalKeysExamined" : 3
}
}
]
@ -525,7 +525,7 @@ Execution Engine: classic
"inputStage" : {
"inputStage" : {
"isEOF" : 1,
"nReturned" : 9,
"nReturned" : 6,
"stage" : "IXSCAN"
},
"isEOF" : 1,
@ -551,13 +551,13 @@ Execution Engine: classic
},
"nReturned" : 6,
"totalDocsExamined" : 6,
"totalKeysExamined" : 9
"totalKeysExamined" : 6
}
],
"skipAmount" : 5,
"stage" : "SHARD_MERGE_SORT",
"totalDocsExamined" : 9,
"totalKeysExamined" : 12
"totalKeysExamined" : 9
}
}
]

30
jstests/query_golden_sharding/expected_output/sharded_explain_count_with_limit_skip.md
View File

@ -51,7 +51,7 @@ Execution Engine: classic
"inputStage" : {
"inputStage" : {
"isEOF" : 0,
"nReturned" : 24,
"nReturned" : 5,
"stage" : "IXSCAN"
},
"isEOF" : 0,
@ -65,12 +65,12 @@ Execution Engine: classic
},
"nReturned" : 0,
"totalDocsExamined" : 0,
"totalKeysExamined" : 24
"totalKeysExamined" : 5
}
],
"stage" : "SHARD_MERGE",
"totalDocsExamined" : 0,
"totalKeysExamined" : 29
"totalKeysExamined" : 10
}
}
]
@ -129,7 +129,7 @@ Execution Engine: classic
"inputStage" : {
"inputStage" : {
"isEOF" : 1,
"nReturned" : 9,
"nReturned" : 5,
"stage" : "IXSCAN"
},
"isEOF" : 1,
@ -143,13 +143,13 @@ Execution Engine: classic
},
"nReturned" : 0,
"totalDocsExamined" : 0,
"totalKeysExamined" : 9
"totalKeysExamined" : 5
}
],
"skipAmount" : 5,
"stage" : "SHARD_MERGE",
"totalDocsExamined" : 0,
"totalKeysExamined" : 13
"totalKeysExamined" : 9
}
}
]
@ -209,7 +209,7 @@ Execution Engine: classic
"inputStage" : {
"inputStage" : {
"isEOF" : 0,
"nReturned" : 29,
"nReturned" : 10,
"stage" : "IXSCAN"
},
"isEOF" : 0,
@ -223,13 +223,13 @@ Execution Engine: classic
},
"nReturned" : 0,
"totalDocsExamined" : 0,
"totalKeysExamined" : 29
"totalKeysExamined" : 10
}
],
"skipAmount" : 5,
"stage" : "SHARD_MERGE",
"totalDocsExamined" : 0,
"totalKeysExamined" : 39
"totalKeysExamined" : 20
}
}
]
@ -289,7 +289,7 @@ Execution Engine: classic
"inputStage" : {
"inputStage" : {
"isEOF" : 1,
"nReturned" : 3,
"nReturned" : 2,
"stage" : "IXSCAN"
},
"isEOF" : 1,
@ -303,12 +303,12 @@ Execution Engine: classic
},
"nReturned" : 0,
"totalDocsExamined" : 0,
"totalKeysExamined" : 3
"totalKeysExamined" : 2
}
],
"stage" : "SHARD_MERGE",
"totalDocsExamined" : 0,
"totalKeysExamined" : 4
"totalKeysExamined" : 3
}
}
]
@ -369,7 +369,7 @@ Execution Engine: classic
"inputStage" : {
"inputStage" : {
"isEOF" : 1,
"nReturned" : 9,
"nReturned" : 6,
"stage" : "IXSCAN"
},
"isEOF" : 1,
@ -383,13 +383,13 @@ Execution Engine: classic
},
"nReturned" : 0,
"totalDocsExamined" : 0,
"totalKeysExamined" : 9
"totalKeysExamined" : 6
}
],
"skipAmount" : 5,
"stage" : "SHARD_MERGE",
"totalDocsExamined" : 0,
"totalKeysExamined" : 12
"totalKeysExamined" : 9
}
}
]

8
jstests/query_golden_sharding/sharded_explain_count_with_limit_skip.js
View File

@ -29,9 +29,13 @@ assert.commandWorked(bulk.execute());
assert.commandWorked(db.adminCommand({split: coll.getFullName(), middle: {x: 50}}));
// Move lower chunk to shard0
assert.commandWorked(db.adminCommand({moveChunk: coll.getFullName(), find: {x: 45}, to: st.shard0.shardName}));
assert.commandWorked(
db.adminCommand({moveChunk: coll.getFullName(), find: {x: 45}, to: st.shard0.shardName, _waitForDelete: true}),
);
// Move upper chunk to shard1
assert.commandWorked(db.adminCommand({moveChunk: coll.getFullName(), find: {x: 55}, to: st.shard1.shardName}));
assert.commandWorked(
db.adminCommand({moveChunk: coll.getFullName(), find: {x: 55}, to: st.shard1.shardName, _waitForDelete: true}),
);
function runCountAndExplain({query, options = {}, expected = {}}) {
const cmdObj = Object.assign({count: coll.getName(), query}, options);

8
jstests/query_golden_sharding/sharded_explain_find_with_limit_skip.js
View File

@ -29,9 +29,13 @@ assert.commandWorked(bulk.execute());
assert.commandWorked(db.adminCommand({split: coll.getFullName(), middle: {x: 50}}));
// Move lower chunk to shard0
assert.commandWorked(db.adminCommand({moveChunk: coll.getFullName(), find: {x: 45}, to: st.shard0.shardName}));
assert.commandWorked(
db.adminCommand({moveChunk: coll.getFullName(), find: {x: 45}, to: st.shard0.shardName, _waitForDelete: true}),
);
// Move upper chunk to shard1
assert.commandWorked(db.adminCommand({moveChunk: coll.getFullName(), find: {x: 55}, to: st.shard1.shardName}));
assert.commandWorked(
db.adminCommand({moveChunk: coll.getFullName(), find: {x: 55}, to: st.shard1.shardName, _waitForDelete: true}),
);
function runFindAndExplain({query, options = {}, expected = {}}) {
let cursor = coll.find(query);