Apply trivial refactoring changes

src/engine/IndexScan.cpp

@@ -307,6 +307,7 @@ Permutation::IdTableGenerator IndexScan::lazyScanForJoinOfColumnWithScan(
     std::span<const Id> joinColumn) const {
   AD_EXPENSIVE_CHECK(std::ranges::is_sorted(joinColumn));
   AD_CORRECTNESS_CHECK(numVariables_ <= 3 && numVariables_ > 0);
+  AD_CONTRACT_CHECK(joinColumn.empty() || !joinColumn[0].isUndefined());
 
   auto metaBlocks1 = getMetadataForScan();
 

src/engine/Join.cpp

@@ -26,7 +26,7 @@ using std::string;
 // _____________________________________________________________________________
 Join::Join(QueryExecutionContext* qec, std::shared_ptr<QueryExecutionTree> t1,
            std::shared_ptr<QueryExecutionTree> t2, ColumnIndex t1JoinCol,
-           ColumnIndex t2JoinCol, bool keepJoinColumn)
+           ColumnIndex t2JoinCol)
     : Operation(qec) {
   AD_CONTRACT_CHECK(t1 && t2);
   // Currently all join algorithms require both inputs to be sorted, so we
@@ -55,7 +55,6 @@ Join::Join(QueryExecutionContext* qec, std::shared_ptr<QueryExecutionTree> t1,
   _leftJoinCol = t1JoinCol;
   _right = std::move(t2);
   _rightJoinCol = t2JoinCol;
-  _keepJoinColumn = keepJoinColumn;
   _sizeEstimate = 0;
   _sizeEstimateComputed = false;
   _multiplicities.clear();
@@ -206,8 +205,7 @@ VariableToColumnMap Join::computeVariableToColumnMap() const {
 
 // _____________________________________________________________________________
 size_t Join::getResultWidth() const {
-  size_t res = _left->getResultWidth() + _right->getResultWidth() -
-               (_keepJoinColumn ? 1 : 2);
+  size_t res = _left->getResultWidth() + _right->getResultWidth() - 1;
   AD_CONTRACT_CHECK(res > 0);
   return res;
 }

src/engine/Join.h

@@ -23,8 +23,6 @@ class Join : public Operation {
 
   Variable _joinVar{"?notSet"};
 
-  bool _keepJoinColumn;
-
   bool _sizeEstimateComputed;
   size_t _sizeEstimate;
 
@@ -33,7 +31,7 @@ class Join : public Operation {
  public:
   Join(QueryExecutionContext* qec, std::shared_ptr<QueryExecutionTree> t1,
        std::shared_ptr<QueryExecutionTree> t2, ColumnIndex t1JoinCol,
-       ColumnIndex t2JoinCol, bool keepJoinColumn = true);
+       ColumnIndex t2JoinCol);
 
   // A very explicit constructor, which initializes an invalid join object (it
   // has no subtrees, which violates class invariants). These invalid Join
@@ -108,8 +106,8 @@ class Join : public Operation {
    * @return The result is only sorted, if the bigger table is sorted.
    * Otherwise it is not sorted.
    **/
-  void hashJoin(const IdTable& dynA, ColumnIndex jc1, const IdTable& dynB,
-                ColumnIndex jc2, IdTable* dynRes);
+  static void hashJoin(const IdTable& dynA, ColumnIndex jc1,
+                       const IdTable& dynB, ColumnIndex jc2, IdTable* dynRes);
 
  protected:
   virtual string getCacheKeyImpl() const override;
@@ -134,8 +132,6 @@ class Join : public Operation {
                                               IndexScan& scan,
                                               ColumnIndex joinColScan);
 
-  using ScanMethodType = std::function<IdTable(Id)>;
-
   /*
    * @brief Combines 2 rows like in a join and inserts the result in the
    * given table.

src/util/JoinAlgorithms/JoinAlgorithms.h

@@ -20,14 +20,6 @@ namespace ad_utility {
 
 // Some helper concepts.
 
-// A predicate type `Pred` fulfills `BinaryRangePredicate<Range>` if it can be
-// called with two values of the `Range`'s `value_type` and produces a result
-// that can be converted to `bool`.
-template <typename Pred, typename Range>
-concept BinaryRangePredicate =
-    std::indirect_binary_predicate<Pred, std::ranges::iterator_t<Range>,
-                                   std::ranges::iterator_t<Range>>;
-
 // A  function `F` fulfills `UnaryIteratorFunction` if it can be called with a
 // single argument of the `Range`'s iterator type (NOT value type).
 template <typename F, typename Range>
@@ -667,14 +659,14 @@ class BlockAndSubrange {
 template <typename Iterator, typename End, typename Projection>
 struct JoinSide {
   using CurrentBlocks =
-      std::vector<detail::BlockAndSubrange<typename Iterator::value_type>>;
+      std::vector<detail::BlockAndSubrange<std::iter_value_t<Iterator>>>;
   Iterator it_;
   [[no_unique_address]] const End end_;
   const Projection& projection_;
   CurrentBlocks currentBlocks_{};
 
   // Type aliases for a single element from a block from the left/right input.
-  using value_type = std::ranges::range_value_t<typename Iterator::value_type>;
+  using value_type = std::ranges::range_value_t<std::iter_value_t<Iterator>>;
   // Type alias for the result of the projection.
   using ProjectedEl =
       std::decay_t<std::invoke_result_t<const Projection&, value_type>>;
@@ -691,7 +683,7 @@ template <typename Blocks>
 auto makeJoinSide(Blocks& blocks, const auto& projection) {
   return JoinSide{std::ranges::begin(blocks), std::ranges::end(blocks),
                   projection};
-};
+}
 
 // A concept to identify instantiations of the `JoinSide` template.
 template <typename T>
@@ -766,7 +758,7 @@ struct BlockZipperJoinImpl {
   // Create an equality comparison from the `lessThan` predicate.
   bool eq(const auto& el1, const auto& el2) {
     return !lessThan_(el1, el2) && !lessThan_(el2, el1);
-  };
+  }
 
   // Recompute the `currentEl`. It is the minimum of the last element in the
   // first block of either of the join sides.
@@ -775,7 +767,7 @@ struct BlockZipperJoinImpl {
       return side.projection_(side.currentBlocks_.front().back());
     };
     return std::min(getFirst(leftSide_), getFirst(rightSide_), lessThan_);
-  };
+  }
 
   // Fill `side.currentBlocks_` with blocks from the range `[side.it_,
   // side.end_)` and advance `side.it_` for each read buffer until all elements
@@ -823,7 +815,7 @@ struct BlockZipperJoinImpl {
     } else {
       return BlockStatus::allFilled;
     }
-  };
+  }
 
   // Remove all elements from `blocks` (either `leftSide_.currentBlocks_` or
   // `rightSide_.currentBlocks`) s.t. only elements `> lastProcessedElement`
@@ -848,7 +840,7 @@ struct BlockZipperJoinImpl {
     if (blocks.at(0).empty()) {
       blocks.clear();
     }
-  };
+  }
 
   // For one of the inputs (`leftSide_.currentBlocks_` or
   // `rightSide_.currentBlocks_`) obtain a tuple of the following elements:
@@ -860,7 +852,7 @@ struct BlockZipperJoinImpl {
     const auto& first = currentBlocks.at(0);
     auto it = std::ranges::lower_bound(first.subrange(), currentEl, lessThan_);
     return std::tuple{std::ref(first.fullBlock()), first.subrange(), it};
-  };
+  }
 
   // Call `compatibleRowAction` for all pairs of elements in the Cartesian
   // product of the blocks in `blocksLeft` and `blocksRight`.
@@ -892,7 +884,7 @@ struct BlockZipperJoinImpl {
       }
     }
     compatibleRowAction_.flush();
-  };
+  }
 
   // Return a vector of subranges of all elements in `blocks` that are equal to
   // `currentEl`. Effectively, these subranges cover all the blocks completely
@@ -907,7 +899,7 @@ struct BlockZipperJoinImpl {
     last.setSubrange(
         std::ranges::equal_range(last.subrange(), currentEl, lessThan_));
     return result;
-  };
+  }
 
   // Join the first block in `currentBlocksLeft` with the first block in
   // `currentBlocksRight`, but ignore all elements that are `>= currentEl`
@@ -949,7 +941,7 @@ struct BlockZipperJoinImpl {
     // Remove the joined elements.
     currentBlocksLeft.at(0).setSubrange(currentElItL, subrangeLeft.end());
     currentBlocksRight.at(0).setSubrange(currentElItR, subrangeRight.end());
-  };
+  }
 
   // If the `targetBuffer` is empty, read the next nonempty block from `[it,
   // end)` if there is one.
@@ -965,7 +957,7 @@ struct BlockZipperJoinImpl {
       }
       ++it;
     }
-  };
+  }
 
   // Fill both buffers (left and right) until they contain at least one block.
   // Then recompute the `currentEl()` and keep on filling the buffers until at

src/util/JoinAlgorithms/JoinColumnMapping.h

@@ -128,7 +128,7 @@ struct IdTableAndFirstCol {
   auto begin() const { return col().begin(); }
   auto end() const { return col().end(); }
 
-  bool empty() { return col().empty(); }
+  bool empty() const { return col().empty(); }
 
   const Id& operator[](size_t idx) const { return col()[idx]; }
 

test/engine/SpatialJoinTest.cpp

@@ -143,8 +143,7 @@ std::shared_ptr<QueryExecutionTree> buildJoin(
   auto varCol2 = tree2->getVariableColumns();
   size_t col1 = varCol1[joinVariable].columnIndex_;
   size_t col2 = varCol2[joinVariable].columnIndex_;
-  return ad_utility::makeExecutionTree<Join>(qec, tree1, tree2, col1, col2,
-                                             true);
+  return ad_utility::makeExecutionTree<Join>(qec, tree1, tree2, col1, col2);
 }
 
 std::shared_ptr<QueryExecutionTree> buildMediumChild(

test/engine/ValuesForTesting.h

@@ -149,7 +149,9 @@ class ValuesForTesting : public Operation {
   }
 
   size_t getResultWidth() const override {
-    return tables_.empty() ? 0 : tables_.at(0).numColumns();
+    // Assume a width of 1 if we have no tables and no other information to base
+    // it on because 0 would otherwise cause stuff to break.
+    return tables_.empty() ? 1 : tables_.at(0).numColumns();
   }
 
   vector<ColumnIndex> resultSortedOn() const override {

test/util/JoinHelpers.h

@@ -58,9 +58,8 @@ IdTable useJoinFunctionOnIdTables(const IdTableAndJoinColumn& tableA,
  *  `ad_utility::callFixedSize`.
  */
 auto makeHashJoinLambda() {
-  Join J{Join::InvalidOnlyForTestingJoinTag{}, ad_utility::testing::getQec()};
-  return [J = std::move(J)]<int A, int B, int C>(auto&&... args) mutable {
-    return J.hashJoin(AD_FWD(args)...);
+  return []<int A, int B, int C>(auto&&... args) {
+    return Join::hashJoin(AD_FWD(args)...);
   };
 }
 
@@ -70,7 +69,7 @@ auto makeHashJoinLambda() {
  */
 auto makeJoinLambda() {
   Join J{Join::InvalidOnlyForTestingJoinTag{}, ad_utility::testing::getQec()};
-  return [J = std::move(J)]<int A, int B, int C>(auto&&... args) mutable {
+  return [J = std::move(J)]<int A, int B, int C>(auto&&... args) {
     return J.join(AD_FWD(args)...);
   };
 }