Introduce extra runtime parameter for lazy results

ad-freiburg · Nov 24, 2024 · b969ccc · b969ccc
1 parent 5f28e83
commit b969ccc
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/src/engine/Operation.cpp b/src/engine/Operation.cpp
@@ -5,6 +5,7 @@
 #include "engine/Operation.h"
 
 #include "engine/QueryExecutionTree.h"
+#include "global/RuntimeParameters.h"
 #include "util/OnDestructionDontThrowDuringStackUnwinding.h"
 #include "util/TransparentFunctors.h"
 
@@ -179,14 +180,13 @@ CacheValue Operation::runComputationAndPrepareForCache(
       !unlikelyToFitInCache(cache.getMaxSizeSingleEntry())) {
     AD_CONTRACT_CHECK(!pinned);
     result.cacheDuringConsumption(
-        [maxSize = cache.getMaxSizeSingleEntry()](
-            const std::optional<Result::IdTableVocabPair>& currentIdTablePair,
-            const Result::IdTableVocabPair& newIdTable) {
+        [](const std::optional<Result::IdTableVocabPair>& currentIdTablePair,
+           const Result::IdTableVocabPair& newIdTable) {
           auto currentSize =
               currentIdTablePair.has_value()
                   ? CacheValue::getSize(currentIdTablePair.value().idTable_)
                   : 0_B;
-          return maxSize >=
+          return RuntimeParameters().get<"lazy-result-max-cache-size">() >=
                  currentSize + CacheValue::getSize(newIdTable.idTable_);
         },
         [runtimeInfo = getRuntimeInfoPointer(), &cache,

diff --git a/src/global/RuntimeParameters.h b/src/global/RuntimeParameters.h
@@ -50,7 +50,8 @@ inline auto& RuntimeParameters() {
         Bool<"group-by-disable-index-scan-optimizations">{false},
         SizeT<"service-max-value-rows">{10'000},
         SizeT<"query-planning-budget">{1500},
-        Bool<"throw-on-unbound-variables">{false}};
+        Bool<"throw-on-unbound-variables">{false},
+        MemorySizeParameter<"lazy-result-max-cache-size">{500_MB}};
   }();
   return params;
 }

diff --git a/test/OperationTest.cpp b/test/OperationTest.cpp
@@ -8,6 +8,7 @@
 
 #include "engine/NeutralElementOperation.h"
 #include "engine/ValuesForTesting.h"
+#include "global/RuntimeParameters.h"
 #include "util/IdTableHelpers.h"
 #include "util/IndexTestHelpers.h"
 #include "util/OperationTestHelpers.h"
@@ -582,21 +583,21 @@ TEST(Operation, checkLazyOperationIsNotCachedIfTooLarge) {
 
   ad_utility::Timer timer{ad_utility::Timer::InitialStatus::Started};
 
-  auto originalSize = qec->getQueryTreeCache().getMaxSizeSingleEntry();
+  auto originalSize = RuntimeParameters().get<"lazy-result-max-cache-size">();
 
   // Too small for storage
-  qec->getQueryTreeCache().setMaxSizeSingleEntry(1_B);
+  RuntimeParameters().set<"lazy-result-max-cache-size">(1_B);
 
   auto cacheValue = valuesForTesting.runComputationAndPrepareForCache(
       timer, ComputationMode::LAZY_IF_SUPPORTED, "test", false);
   EXPECT_FALSE(qec->getQueryTreeCache().cacheContains("test"));
-  qec->getQueryTreeCache().setMaxSizeSingleEntry(originalSize);
 
   for ([[maybe_unused]] Result::IdTableVocabPair& _ :
        cacheValue.resultTable().idTables()) {
   }
 
   EXPECT_FALSE(qec->getQueryTreeCache().cacheContains("test"));
+  RuntimeParameters().set<"lazy-result-max-cache-size">(originalSize);
 }
 
 // _____________________________________________________________________________