diff --git a/jstests/query_golden_sharding/expected_output/featureFlagSbeFull/sharded_explain_find_with_limit_skip.md b/jstests/query_golden_sharding/expected_output/featureFlagSbeFull/sharded_explain_find_with_limit_skip.md index d19dcf053a5..a63237ff6b2 100644 --- a/jstests/query_golden_sharding/expected_output/featureFlagSbeFull/sharded_explain_find_with_limit_skip.md +++ b/jstests/query_golden_sharding/expected_output/featureFlagSbeFull/sharded_explain_find_with_limit_skip.md @@ -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 } } ] diff --git a/jstests/query_golden_sharding/expected_output/sbeDisabled/sharded_explain_find_with_limit_skip.md b/jstests/query_golden_sharding/expected_output/sbeDisabled/sharded_explain_find_with_limit_skip.md index bab5240aed3..5793cc95ab4 100644 --- a/jstests/query_golden_sharding/expected_output/sbeDisabled/sharded_explain_find_with_limit_skip.md +++ b/jstests/query_golden_sharding/expected_output/sbeDisabled/sharded_explain_find_with_limit_skip.md @@ -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 } } ] diff --git a/jstests/query_golden_sharding/expected_output/sbeFull/sharded_explain_find_with_limit_skip.md b/jstests/query_golden_sharding/expected_output/sbeFull/sharded_explain_find_with_limit_skip.md index d19dcf053a5..a63237ff6b2 100644 --- a/jstests/query_golden_sharding/expected_output/sbeFull/sharded_explain_find_with_limit_skip.md +++ b/jstests/query_golden_sharding/expected_output/sbeFull/sharded_explain_find_with_limit_skip.md @@ -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 } } ] diff --git a/jstests/query_golden_sharding/expected_output/sbeRestricted/sharded_explain_find_with_limit_skip.md b/jstests/query_golden_sharding/expected_output/sbeRestricted/sharded_explain_find_with_limit_skip.md index bab5240aed3..5793cc95ab4 100644 --- a/jstests/query_golden_sharding/expected_output/sbeRestricted/sharded_explain_find_with_limit_skip.md +++ b/jstests/query_golden_sharding/expected_output/sbeRestricted/sharded_explain_find_with_limit_skip.md @@ -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 } } ] diff --git a/jstests/query_golden_sharding/expected_output/sharded_explain_count_with_limit_skip.md b/jstests/query_golden_sharding/expected_output/sharded_explain_count_with_limit_skip.md index fc482c8abbb..95c92b8df18 100644 --- a/jstests/query_golden_sharding/expected_output/sharded_explain_count_with_limit_skip.md +++ b/jstests/query_golden_sharding/expected_output/sharded_explain_count_with_limit_skip.md @@ -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 } } ] diff --git a/jstests/query_golden_sharding/sharded_explain_count_with_limit_skip.js b/jstests/query_golden_sharding/sharded_explain_count_with_limit_skip.js index 3a9a0c4fca2..2e013b842c5 100644 --- a/jstests/query_golden_sharding/sharded_explain_count_with_limit_skip.js +++ b/jstests/query_golden_sharding/sharded_explain_count_with_limit_skip.js @@ -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); diff --git a/jstests/query_golden_sharding/sharded_explain_find_with_limit_skip.js b/jstests/query_golden_sharding/sharded_explain_find_with_limit_skip.js index 01e5aa7a3d3..11a840adaef 100644 --- a/jstests/query_golden_sharding/sharded_explain_find_with_limit_skip.js +++ b/jstests/query_golden_sharding/sharded_explain_find_with_limit_skip.js @@ -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);