Use QL_CONCEPT_OR_TYPENAME in CartesianProductJoin C++17 backport

ad-freiburg · Jan 24, 2025 · a98953a · a98953a
1 parent ab324c4
commit a98953a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 13 deletions.
diff --git a/src/engine/CartesianProductJoin.cpp b/src/engine/CartesianProductJoin.cpp
@@ -182,10 +182,10 @@ VariableToColumnMap CartesianProductJoin::computeVariableToColumnMap() const {
 }
 
 // _____________________________________________________________________________
-CPP_template(typename R)(requires ql::ranges::random_access_range<R>) IdTable
-    CartesianProductJoin::writeAllColumns(R idTables, size_t offset,
-                                          size_t limit,
-                                          size_t lastTableOffset) const {
+template <QL_CONCEPT_OR_TYPENAME(ql::ranges::random_access_range) R>
+IdTable CartesianProductJoin::writeAllColumns(R idTables, size_t offset,
+                                              size_t limit,
+                                              size_t lastTableOffset) const {
   AD_CORRECTNESS_CHECK(offset >= lastTableOffset);
   IdTable result{getResultWidth(), getExecutionContext()->getAllocator()};
   // TODO<joka921> Find a solution to cheaply handle the case, that only a
@@ -303,11 +303,10 @@ CartesianProductJoin::calculateSubResults(bool requestLaziness) {
 }
 
 // _____________________________________________________________________________
-CPP_template(typename R)(requires ql::ranges::range<R>) Result::Generator
-    CartesianProductJoin::produceTablesLazily(LocalVocab mergedVocab,
-                                              R idTables, size_t offset,
-                                              size_t limit,
-                                              size_t lastTableOffset) const {
+template <QL_CONCEPT_OR_TYPENAME(ql::ranges::range) R>
+Result::Generator CartesianProductJoin::produceTablesLazily(
+    LocalVocab mergedVocab, R idTables, size_t offset, size_t limit,
+    size_t lastTableOffset) const {
   while (limit > 0) {
     uint64_t limitWithChunkSize = std::min(limit, chunkSize_);
     IdTable idTable = writeAllColumns(ql::ranges::ref_view(idTables), offset,

diff --git a/src/engine/CartesianProductJoin.h b/src/engine/CartesianProductJoin.h
@@ -94,9 +94,9 @@ class CartesianProductJoin : public Operation {
   // rows to write at most. `lastTableOffset` is the offset of the last table,
   // to account for cases where the last table does not cover the whole result
   // and so index 0 of a table does not correspond to row 0 of the result.
-  CPP_template(typename R)(requires ql::ranges::random_access_range<R>) IdTable
-      writeAllColumns(R idTables, size_t offset, size_t limit,
-                      size_t lastTableOffset = 0) const;
+  template <QL_CONCEPT_OR_TYPENAME(ql::ranges::random_access_range) R>
+  IdTable writeAllColumns(R idTables, size_t offset, size_t limit,
+                          size_t lastTableOffset = 0) const;
 
   // Calculate the subresults of the children and store them into a vector. If
   // the rightmost child can produce a lazy result, it will be stored outside of
@@ -114,7 +114,7 @@ class CartesianProductJoin : public Operation {
   // `lastTableOffset` is the offset of the last table in the range. This is
   // used to handle `IdTable`s yielded by generators where the range of indices
   // they represent do not cover the whole result.
-  CPP_template(typename R)(requires ql::ranges::range<R>) Result::Generator
+  template<QL_CONCEPT_OR_TYPENAME(ql::ranges::range) R> Result::Generator
       produceTablesLazily(LocalVocab mergedVocab, R idTables, size_t offset,
                           size_t limit, size_t lastTableOffset = 0) const;