SERVER-99808 Re-introduce queryHash for backwards compatibility (#31568)

GitOrigin-RevId: f1059bc

Author: csum112

jstests/libs/query/analyze_plan.js

@@ -1020,7 +1020,7 @@ export function getPlanCacheKeyFromExplain(explain) {
  * Get the 'planCacheShapeHash' from 'object'.
  */
 export function getPlanCacheShapeHashFromObject(object) {
-    // TODO SERVER 93305: Remove deprecated 'queryHash' usages.
+    // TODO SERVER-93305: Remove deprecated 'queryHash' usages.
     const planCacheShapeHash = object.planCacheShapeHash || object.queryHash;
     assert.neq(planCacheShapeHash, undefined);
     return planCacheShapeHash;

src/mongo/db/curop.cpp

@@ -1265,7 +1265,10 @@ void OpDebug::report(OperationContext* opCtx,
     }
 
     if (planCacheShapeHash) {
-        pAttrs->addDeepCopy("planCacheShapeHash", zeroPaddedHex(*planCacheShapeHash));
+        // TODO SERVER-93305: Remove deprecated 'queryHash' usages.
+        std::string planCacheShapeHashStr = zeroPaddedHex(*planCacheShapeHash);
+        pAttrs->addDeepCopy("planCacheShapeHash", planCacheShapeHashStr);
+        pAttrs->addDeepCopy("queryHash", planCacheShapeHashStr);
     }
     if (planCacheKey) {
         pAttrs->addDeepCopy("planCacheKey", zeroPaddedHex(*planCacheKey));
@@ -1485,7 +1488,10 @@ void OpDebug::append(OperationContext* opCtx,
     }
 
     if (planCacheShapeHash) {
-        b.append("planCacheShapeHash", zeroPaddedHex(*planCacheShapeHash));
+        // TODO SERVER-93305: Remove deprecated 'queryHash' usages.
+        std::string planCacheShapeHashStr = zeroPaddedHex(*planCacheShapeHash);
+        b.append("planCacheShapeHash", planCacheShapeHashStr);
+        b.append("queryHash", planCacheShapeHashStr);
     }
     if (planCacheKey) {
         b.append("planCacheKey", zeroPaddedHex(*planCacheKey));
@@ -1800,6 +1806,12 @@ std::function<BSONObj(ProfileFilter::Args)> OpDebug::appendStaged(StringSet requ
             b.append(field, zeroPaddedHex(*args.op.planCacheShapeHash));
         }
     });
+    // TODO SERVER-93305: Remove deprecated 'queryHash' usages.
+    addIfNeeded("queryHash", [](auto field, auto args, auto& b) {
+        if (args.op.planCacheShapeHash) {
+            b.append(field, zeroPaddedHex(*args.op.planCacheShapeHash));
+        }
+    });
     addIfNeeded("planCacheKey", [](auto field, auto args, auto& b) {
         if (args.op.planCacheKey) {
             b.append(field, zeroPaddedHex(*args.op.planCacheKey));

src/mongo/db/query/explain.cpp

@@ -150,7 +150,10 @@ void generatePlannerInfo(PlanExecutor* exec,
     }
 
     if (planCacheShapeHash) {
-        plannerBob.append("planCacheShapeHash", zeroPaddedHex(*planCacheShapeHash));
+        // TODO SERVER-93305: Remove deprecated 'queryHash' usages.
+        std::string planCacheShapeHashStr = zeroPaddedHex(*planCacheShapeHash);
+        plannerBob.append("queryHash", planCacheShapeHashStr);
+        plannerBob.append("planCacheShapeHash", planCacheShapeHashStr);
     }
 
     if (planCacheKeyHash) {
@@ -352,7 +355,10 @@ BSONObj explainVersionToBson(const PlanExplainer::ExplainVersion& version) {
 
 template <typename EntryType>
 void appendBasicPlanCacheEntryInfoToBSON(const EntryType& entry, BSONObjBuilder* out) {
-    out->append("planCacheShapeHash", zeroPaddedHex(entry.planCacheShapeHash));
+    // TODO SERVER-93305: Remove deprecated 'queryHash' usages.
+    std::string planCacheShapeHashStr = zeroPaddedHex(entry.planCacheShapeHash);
+    out->append("queryHash", planCacheShapeHashStr);
+    out->append("planCacheShapeHash", planCacheShapeHashStr);
     out->append("planCacheKey", zeroPaddedHex(entry.planCacheKey));
     out->append("isActive", entry.isActive);
     out->append("works",

src/mongo/db/query/plan_cache/plan_cache_callbacks.cpp

@@ -55,6 +55,8 @@ void logCreateInactiveCacheEntry(std::string&& query,
                 "Creating inactive cache entry for query",
                 "query"_attr = redact(query),
                 "planCacheShapeHash"_attr = planCacheShapeHash,
+                // TODO SERVER-93305: Remove deprecated 'queryHash' usages.
+                "queryHash"_attr = planCacheShapeHash,
                 "planCacheKey"_attr = planCacheKey,
                 "newWorks"_attr = newWorks);
 }
@@ -69,6 +71,8 @@ void logReplaceActiveCacheEntry(std::string&& query,
                 "Replacing active cache entry for query",
                 "query"_attr = redact(query),
                 "planCacheShapeHash"_attr = planCacheShapeHash,
+                // TODO SERVER-93305: Remove deprecated 'queryHash' usages.
+                "queryHash"_attr = planCacheShapeHash,
                 "planCacheKey"_attr = planCacheKey,
                 "oldWorks"_attr = works,
                 "newWorks"_attr = newWorks);
@@ -85,6 +89,8 @@ void logNoop(std::string&& query,
                 "an active cache entry with a lower works value",
                 "query"_attr = redact(query),
                 "planCacheShapeHash"_attr = planCacheShapeHash,
+                // TODO SERVER-93305: Remove deprecated 'queryHash' usages.
+                "queryHash"_attr = planCacheShapeHash,
                 "planCacheKey"_attr = planCacheKey,
                 "oldWorks"_attr = works,
                 "newWorks"_attr = newWorks);
@@ -100,6 +106,8 @@ void logIncreasingWorkValue(std::string&& query,
                 "Increasing work value associated with cache entry",
                 "query"_attr = redact(query),
                 "planCacheShapeHash"_attr = planCacheShapeHash,
+                // TODO SERVER-93305: Remove deprecated 'queryHash' usages.
+                "queryHash"_attr = planCacheShapeHash,
                 "planCacheKey"_attr = planCacheKey,
                 "oldWorks"_attr = works,
                 "increasedWorks"_attr = increasedWorks);
@@ -115,6 +123,8 @@ void logPromoteCacheEntry(std::string&& query,
                 "Inactive cache entry for query is being promoted to active entry",
                 "query"_attr = redact(query),
                 "planCacheShapeHash"_attr = planCacheShapeHash,
+                // TODO SERVER-93305: Remove deprecated 'queryHash' usages.
+                "queryHash"_attr = planCacheShapeHash,
                 "planCacheKey"_attr = planCacheKey,
                 "oldWorks"_attr = works,
                 "newWorks"_attr = newWorks);
@@ -132,6 +142,8 @@ void logUnexpectedPinnedCacheEntry(std::string&& query,
           "Found unexpected pinned plan cache entry",
           "query"_attr = redact(query),
           "planCacheShapeHash"_attr = planCacheShapeHash,
+          // TODO SERVER-93305: Remove deprecated 'queryHash' usages.
+          "queryHash"_attr = planCacheShapeHash,
           "planCacheKey"_attr = planCacheKey,
           "oldEntry"_attr = oldEntry,
           "newEntry"_attr = newEntry,