SERVER-44053 Rename blocking sort memory limit to "internalQueryMaxBlockingSortMemoryUsageBytes".

6 files changed, 17 insertions, 17 deletions

diff --git a/jstests/noPassthrough/external_sort_find.js b/jstests/noPassthrough/external_sort_find.js
index fee636eb89b..e3803e3d170 100644
--- a/jstests/noPassthrough/external_sort_find.js
+++ b/jstests/noPassthrough/external_sort_find.js
@@ -23,7 +23,7 @@ const kNumDocsExceedingMemLimit = 50;
 const kMemoryLimitExceededErrCode = 16819;
 
 const options = {
-    setParameter: "internalQueryExecMaxBlockingSortBytes=" + kMaxMemoryUsageBytes
+    setParameter: "internalQueryMaxBlockingSortMemoryUsageBytes=" + kMaxMemoryUsageBytes
 };
 const conn = MongoRunner.runMongod(options);
 assert.neq(null, conn, "mongod was unable to start up with options: " + tojson(options));
diff --git a/jstests/noPassthrough/log_format_slowms_samplerate_loglevel.js b/jstests/noPassthrough/log_format_slowms_samplerate_loglevel.js
index 56c8c3b7f47..0d48ac404d7 100644
--- a/jstests/noPassthrough/log_format_slowms_samplerate_loglevel.js
+++ b/jstests/noPassthrough/log_format_slowms_samplerate_loglevel.js
@@ -324,18 +324,18 @@ function runLoggingTests({db, readWriteMode, slowMs, logLevel, sampleRate}) {
         },
         {
             test: function(db) {
-                const originalSortBytes =
-                    db.adminCommand({getParameter: 1, internalQueryExecMaxBlockingSortBytes: 1});
+                const originalSortBytes = db.adminCommand(
+                    {getParameter: 1, internalQueryMaxBlockingSortMemoryUsageBytes: 1});
                 assert.commandWorked(originalSortBytes);
-                assert.commandWorked(
-                    db.adminCommand({setParameter: 1, internalQueryExecMaxBlockingSortBytes: 10}));
+                assert.commandWorked(db.adminCommand(
+                    {setParameter: 1, internalQueryMaxBlockingSortMemoryUsageBytes: 10}));
                 assert.eq(coll.aggregate([{$match: {a: 1}}, {$sort: {a: 1}}], {allowDiskUse: true})
                               .itcount(),
                           1);
                 assert.commandWorked(db.adminCommand({
                     setParameter: 1,
-                    internalQueryExecMaxBlockingSortBytes:
-                        originalSortBytes.internalQueryExecMaxBlockingSortBytes
+                    internalQueryMaxBlockingSortMemoryUsageBytes:
+                        originalSortBytes.internalQueryMaxBlockingSortMemoryUsageBytes
                 }));
             },
             logFields:
diff --git a/jstests/noPassthrough/plan_cache_list_failed_plans.js b/jstests/noPassthrough/plan_cache_list_failed_plans.js
index 778a8854fa5..13101d7247c 100644
--- a/jstests/noPassthrough/plan_cache_list_failed_plans.js
+++ b/jstests/noPassthrough/plan_cache_list_failed_plans.js
@@ -12,8 +12,8 @@ coll.drop();
 // Setup the database such that it will generate a failing plan and a succeeding plan.
 const numDocs = 32;
 const smallNumber = 10;
-assert.commandWorked(
-    testDB.adminCommand({setParameter: 1, internalQueryExecMaxBlockingSortBytes: smallNumber}));
+assert.commandWorked(testDB.adminCommand(
+    {setParameter: 1, internalQueryMaxBlockingSortMemoryUsageBytes: smallNumber}));
 for (let i = 0; i < numDocs * 2; ++i)
     assert.commandWorked(coll.insert({a: ((i >= (numDocs * 2) - smallNumber) ? 1 : 0), d: i}));
 
diff --git a/jstests/noPassthrough/plan_cache_list_plans_new_format.js b/jstests/noPassthrough/plan_cache_list_plans_new_format.js
index 0b95b880d5b..b687529e5ee 100644
--- a/jstests/noPassthrough/plan_cache_list_plans_new_format.js
+++ b/jstests/noPassthrough/plan_cache_list_plans_new_format.js
@@ -81,8 +81,8 @@ assert(coll.drop());
 // Setup the database such that it will generate a failing plan and a succeeding plan.
 const numDocs = 32;
 const smallNumber = 10;
-assert.commandWorked(
-    testDB.adminCommand({setParameter: 1, internalQueryExecMaxBlockingSortBytes: smallNumber}));
+assert.commandWorked(testDB.adminCommand(
+    {setParameter: 1, internalQueryMaxBlockingSortMemoryUsageBytes: smallNumber}));
 for (let i = 0; i < numDocs * 2; ++i)
     assert.commandWorked(coll.insert({a: ((i >= (numDocs * 2) - smallNumber) ? 1 : 0), d: i}));
 
diff --git a/jstests/noPassthrough/query_knobs_validation.js b/jstests/noPassthrough/query_knobs_validation.js
index 6f3e43834f4..1523187eba1 100644
--- a/jstests/noPassthrough/query_knobs_validation.js
+++ b/jstests/noPassthrough/query_knobs_validation.js
@@ -28,7 +28,7 @@ const expectedParamDefaults = {
     internalQueryPlannerEnableHashIntersection: false,
     internalQueryPlanOrChildrenIndependently: true,
     internalQueryMaxScansToExplode: 200,
-    internalQueryExecMaxBlockingSortBytes: 100 * 1024 * 1024,
+    internalQueryMaxBlockingSortMemoryUsageBytes: 100 * 1024 * 1024,
     internalQueryExecYieldIterations: 128,
     internalQueryExecYieldPeriodMS: 10,
     internalQueryFacetBufferSizeBytes: 100 * 1024 * 1024,
@@ -117,9 +117,9 @@ assertSetParameterSucceeds("internalQueryMaxScansToExplode", 11);
 assertSetParameterSucceeds("internalQueryMaxScansToExplode", 0);
 assertSetParameterFails("internalQueryMaxScansToExplode", -1);
 
-assertSetParameterSucceeds("internalQueryExecMaxBlockingSortBytes", 11);
-assertSetParameterSucceeds("internalQueryExecMaxBlockingSortBytes", 0);
-assertSetParameterFails("internalQueryExecMaxBlockingSortBytes", -1);
+assertSetParameterSucceeds("internalQueryMaxBlockingSortMemoryUsageBytes", 11);
+assertSetParameterSucceeds("internalQueryMaxBlockingSortMemoryUsageBytes", 0);
+assertSetParameterFails("internalQueryMaxBlockingSortMemoryUsageBytes", -1);
 
 assertSetParameterSucceeds("internalQueryExecYieldIterations", 10);
 assertSetParameterSucceeds("internalQueryExecYieldIterations", 0);
diff --git a/jstests/noPassthrough/use_disk.js b/jstests/noPassthrough/use_disk.js
index f4323bf3d35..61232cea24c 100644
--- a/jstests/noPassthrough/use_disk.js
+++ b/jstests/noPassthrough/use_disk.js
@@ -43,7 +43,7 @@ assert(!profileObj.hasOwnProperty("usedDisk"), tojson(profileObj));
 assert.eq(profileObj.hasSortStage, true, tojson(profileObj));
 
 assert.commandWorked(
-    testDB.adminCommand({setParameter: 1, internalQueryExecMaxBlockingSortBytes: 10}));
+    testDB.adminCommand({setParameter: 1, internalQueryMaxBlockingSortMemoryUsageBytes: 10}));
 assert.eq(
     8, coll.aggregate([{$match: {a: {$gte: 2}}}, {$sort: {a: 1}}], {allowDiskUse: true}).itcount());
 profileObj = getLatestProfilerEntry(testDB);
@@ -136,7 +136,7 @@ assert.eq(profileObj.usedDisk, true, tojson(profileObj));
 // Test that usedDisk is not set for a $lookup with a pipeline that does not use disk.
 //
 assert.commandWorked(testDB.adminCommand(
-    {setParameter: 1, internalQueryExecMaxBlockingSortBytes: 100 * 1024 * 1024}));
+    {setParameter: 1, internalQueryMaxBlockingSortMemoryUsageBytes: 100 * 1024 * 1024}));
 resetCollection();
 resetForeignCollection();
 coll.aggregate(