SERVER-71663 Do not materialize document when group node doesn't have dependency

2 files changed, 14 insertions, 3 deletions

diff --git a/jstests/noPassthrough/read_only_allow_disk_use.js b/jstests/noPassthrough/read_only_allow_disk_use.js
index f3be69cbd4b..8162d6c736d 100644
--- a/jstests/noPassthrough/read_only_allow_disk_use.js
+++ b/jstests/noPassthrough/read_only_allow_disk_use.js
@@ -13,6 +13,8 @@
 (function() {
 "use strict";
 
+load("jstests/libs/sbe_util.js");  // For checkSBEEnabled.
+
 const memoryLimitMb = 1;
 const memoryLimitBytes = 1 * 1024 * 1024;
 const largeStr = "A".repeat(1024 * 1024);  // 1MB string
@@ -104,8 +106,11 @@ function runTest(conn, allowDiskUseByDefault) {
     // The 'count' command within the memory limit must pass.
     assert.eq(coll.count(), memoryLimitMb + 1);
 
-    // The 'count' command exceeding the memory limit must fail.
-    assertFailed({count: view.getName()});
+    // In SBE $sort and $count will not cause spilling, because the largeStr is not saved in memory.
+    // Otherwise, the 'count' command exceeding the memory limit must fail.
+    if (!checkSBEEnabled(testDb)) {
+        assertFailed({count: view.getName()});
+    }
 
     // The 'distinct' command within the memory limit must pass.
     assert.eq(coll.distinct("x"), [0, 1]);
diff --git a/jstests/noPassthrough/views_count_distinct_disk_use.js b/jstests/noPassthrough/views_count_distinct_disk_use.js
index 553509bf983..cd8d3046637 100644
--- a/jstests/noPassthrough/views_count_distinct_disk_use.js
+++ b/jstests/noPassthrough/views_count_distinct_disk_use.js
@@ -4,6 +4,8 @@
 (function() {
 "use strict";
 
+load("jstests/libs/sbe_util.js");  // For checkSBEEnabled.
+
 const conn = MongoRunner.runMongod();
 assert.neq(null, conn, "mongod was unable to start up");
 
@@ -33,7 +35,11 @@ function testDiskUse(cmd) {
 // stage needs to spill to disk if the memory limit is reached.
 assert.commandWorked(viewsDB.adminCommand(
     {setParameter: 1, internalQueryMaxBlockingSortMemoryUsageBytes: memoryLimitMb * 1024 * 1024}));
-testDiskUse({count: "largeView"});
+
+// In SBE the $sort will not cause spilling because it's only the integers being sorted on.
+if (!checkSBEEnabled(viewsDB)) {
+    testDiskUse({count: "largeView"});
+}
 
 // The 'distinct' command executes the view definition pipeline containing the '$sort' stage. This
 // stage needs to spill to disk if the memory limit is reached.