Comments and clean up code.

Signed-off-by: Johannes Kalmbach <[email protected]>
ad-freiburg · Dec 13, 2024 · e9ea5f0 · e9ea5f0
1 parent 65c70d0
commit e9ea5f0
Show file tree

Hide file tree

Showing 9 changed files with 131 additions and 265 deletions.
diff --git a/src/engine/GroupBy.cpp b/src/engine/GroupBy.cpp
@@ -177,8 +177,6 @@ uint64_t GroupBy::getSizeEstimateBeforeLimit() {
     return _subtree->getMultiplicity(_subtree->getVariableColumn(var));
   };
 
-  // TODO<joka921> Once we can use `std::views` this can be solved
-  // more elegantly.
   float minMultiplicity = ql::ranges::min(
       _groupByVariables | ql::views::transform(varToMultiplicity));
   return _subtree->getSizeEstimate() / minMultiplicity;

diff --git a/src/engine/Join.cpp b/src/engine/Join.cpp
@@ -40,20 +40,10 @@ using LazyInputView =
 // Convert a `generator<IdTableVocab>` to a `generator<IdTableAndFirstCol>` for
 // more efficient access in the join columns below and apply the given
 // permutation to each table.
-LazyInputView convertGenerator(Result::Generator gen,
-                               OptionalPermutation permutation = {}) {
-  for (auto& [table, localVocab] : gen) {
-    applyPermutation(table, permutation);
-    // Make sure to actually move the table into the wrapper so that the tables
-    // live as long as the wrapper.
-    ad_utility::IdTableAndFirstCol t{std::move(table), std::move(localVocab)};
-    co_yield t;
-  }
-}
-// TODO<joka921> Do we need this duplicate overload, or can we get away with one
-// of them/templated
-LazyInputView convertGenerator(Result::LazyResult gen,
-                               OptionalPermutation permutation = {}) {
+CPP_template(typename Input)(
+    requires ad_utility::SameAsAny<Input, Result::Generator,
+                                   Result::LazyResult>) LazyInputView
+    convertGenerator(Input gen, OptionalPermutation permutation = {}) {
   for (auto& [table, localVocab] : gen) {
     applyPermutation(table, permutation);
     // Make sure to actually move the table into the wrapper so that the tables

diff --git a/src/engine/Result.h b/src/engine/Result.h
@@ -36,7 +36,7 @@ class Result {
   using ActualGenerator = cppcoro::generator<IdTableVocabPair>;
   using Generator = cppcoro::generator<IdTableVocabPair>;
   using LazyResult =
-      ad_utility::TypeEraseInputRangeOptionalMixin<IdTableVocabPair>;
+      ad_utility::TypeErasedInputRangeOptionalMixin<IdTableVocabPair>;
 
  private:
   // Needs to be mutable in order to be consumable from a const result.

diff --git a/src/parser/ParsedQuery.cpp b/src/parser/ParsedQuery.cpp
@@ -278,7 +278,7 @@ void ParsedQuery::GraphPattern::addLanguageFilter(const Variable& variable,
   std::vector<SparqlTriple*> matchingTriples;
   using BasicPattern = parsedQuery::BasicGraphPattern;
   namespace ad = ad_utility;
-  namespace stdv = std::views;
+  namespace stdv = ql::views;
   for (BasicPattern* basicPattern :
        _graphPatterns | stdv::transform(ad::getIf<BasicPattern>) |
            stdv::filter(ad::toBool)) {