Small tweaks.

Signed-off-by: Johannes Kalmbach <[email protected]>
ad-freiburg · Dec 20, 2024 · 896df47 · 896df47
1 parent ecb6a2f
commit 896df47
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/engine/GroupBy.cpp b/src/engine/GroupBy.cpp
@@ -379,8 +379,9 @@ ProtoResult GroupBy::computeResult(bool requestLaziness) {
     if (subresult->isFullyMaterialized()) {
       // `computeWithHashMap` takes a range, so we artificially create one with
       // a single input.
-      return computeWithHashMap(std::array{std::pair{
-          std::ref(subresult->idTable()), subresult->getCopyOfLocalVocab()}});
+      return computeWithHashMap(
+          std::array{std::pair{std::cref(subresult->idTable()),
+                               std::cref(subresult->localVocab())}});
     } else {
       return computeWithHashMap(std::move(subresult->idTables()));
     }
@@ -1512,8 +1513,11 @@ Result GroupBy::computeGroupByForHashMapOptimization(
 
   ad_utility::Timer lookupTimer{ad_utility::Timer::Stopped};
   ad_utility::Timer aggregationTimer{ad_utility::Timer::Stopped};
-  for (const auto& [inputTableRef, inputLocalVocab] : subresults) {
+  for (const auto& [inputTableRef, inputLocalVocabRef] : subresults) {
+    // Also support `std::reference_wrapper` as the input.
     const IdTable& inputTable = inputTableRef;
+    const LocalVocab& inputLocalVocab = inputLocalVocabRef;
+
     localVocab.mergeWith(std::span{&inputLocalVocab, 1});
     // Initialize evaluation context
     sparqlExpression::EvaluationContext evaluationContext(

diff --git a/test/GroupByTest.cpp b/test/GroupByTest.cpp
@@ -788,6 +788,9 @@ TEST_F(GroupByOptimizations, hashMapOptimizationLazyAndMaterializedInputs) {
   };
   runTest(true);
   runTest(false);
+
+  // Disable optimization for following tests
+  RuntimeParameters().set<"group-by-hash-map-enabled">(false);
 }
 
 // _____________________________________________________________________________