Address Robin's comment and improve parameter name

ad-freiburg · Feb 9, 2025 · bed12e4 · bed12e4
1 parent 612a8df
commit bed12e4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/src/engine/QueryExecutionTree.cpp b/src/engine/QueryExecutionTree.cpp
@@ -77,10 +77,10 @@ QueryExecutionTree::selectedVariablesToColumnIndices(
 
 // _____________________________________________________________________________
 size_t QueryExecutionTree::getCostEstimate() {
-  // If the result is cached and `zero-cost-for-cached-subtrees` is set to
-  // `true`, we set the cost estimate to zero.
+  // If the result is cached and `zero-cost-estimate-for-cached-subtrees` is set
+  // to `true`, we set the cost estimate to zero.
   if (cachedResult_ &&
-      RuntimeParameters().get<"zero-cost-for-cached-subtree">()) {
+      RuntimeParameters().get<"zero-cost-estimate-for-cached-subtree">()) {
     return 0;
   }
 

diff --git a/src/global/RuntimeParameters.h b/src/global/RuntimeParameters.h
@@ -62,7 +62,7 @@ inline auto& RuntimeParameters() {
         SizeT<"small-index-scan-size-estimate-divisor">{5},
         // Determines whether the cost estimate for a cached subtree should be
         // set to zero in query planning.
-        Bool<"zero-cost-for-cached-subtree">{false},
+        Bool<"zero-cost-estimate-for-cached-subtree">{false},
     };
   }();
   return params;

diff --git a/test/OperationTest.cpp b/test/OperationTest.cpp
@@ -243,18 +243,22 @@ TEST(OperationTest, estimatesForCachedResults) {
     [[maybe_unused]] auto res = qet->getResult();
   }
   // The result is now cached inside the static execution context. If we create
-  // the same operation again and `zero-cost-for-cached-subtrees` is set to
-  // `true`, the cost estimate should be zero. The size estimate does not
+  // the same operation again and `zero-cost-estimate-for-cached-subtrees` is
+  // set to `true`, the cost estimate should be zero. The size estimate does not
   // change (see the `getCostEstimate` function for details on why).
   {
-    RuntimeParameters().set<"zero-cost-for-cached-subtree">(true);
+    auto restoreWhenScopeEnds =
+        setRuntimeParameterForTest<"zero-cost-estimate-for-cached-subtree">(
+            true);
     auto qet = makeQet();
     EXPECT_EQ(qet->getCacheKey(), qet->getRootOperation()->getCacheKey());
     EXPECT_EQ(qet->getSizeEstimate(), 24u);
     EXPECT_EQ(qet->getCostEstimate(), 0u);
   }
   {
-    RuntimeParameters().set<"zero-cost-for-cached-subtree">(false);
+    auto restoreWhenScopeEnds =
+        setRuntimeParameterForTest<"zero-cost-estimate-for-cached-subtree">(
+            false);
     auto qet = makeQet();
     EXPECT_EQ(qet->getCacheKey(), qet->getRootOperation()->getCacheKey());
     EXPECT_EQ(qet->getSizeEstimate(), 24u);