Initial stuff, TODO: fix this.

ad-freiburg · Apr 17, 2024 · fb85d67 · fb85d67
1 parent 08ca01b
commit fb85d67
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 5 deletions.
diff --git a/src/engine/TransitivePathBase.h b/src/engine/TransitivePathBase.h
@@ -34,7 +34,8 @@ struct TransitivePathSide {
       os << "Id: " << std::get<Id>(value_);
     }
 
-    os << ", subColumn: " << subCol_ << "to " << outputCol_;
+    os << ", subColumn: " <<
+        subCol_ << "to " << outputCol_;
 
     if (treeAndCol_.has_value()) {
       const auto& [tree, col] = treeAndCol_.value();
@@ -266,7 +267,7 @@ class TransitivePathBase : public Operation {
 
   // The internal implementation of `bindLeftSide` and `bindRightSide` which
   // share a lot of code.
-  std::shared_ptr<TransitivePathBase> bindLeftOrRightSide(
+  virtual std::shared_ptr<TransitivePathBase> bindLeftOrRightSide(
       std::shared_ptr<QueryExecutionTree> leftOrRightOp, size_t inputCol,
       bool isLeft) const;
 };
diff --git a/src/engine/TransitivePathBinSearch.cpp b/src/engine/TransitivePathBinSearch.cpp
@@ -18,6 +18,8 @@ TransitivePathBinSearch::TransitivePathBinSearch(
                                        std::move(leftSide),
                                        std::move(rightSide), minDist, maxDist) {
   auto [startSide, targetSide] = decideDirection();
+  alternativelySortedSubtree_ = QueryExecutionTree::createSortedTree(
+      subtree_, {targetSide.subCol_, targetSide.subCol_});
   subtree_ = QueryExecutionTree::createSortedTree(
       subtree_, {startSide.subCol_, targetSide.subCol_});
 }
@@ -29,3 +31,13 @@ BinSearchMap TransitivePathBinSearch::setupEdgesMap(
   return BinSearchMap{dynSub.getColumn(startSide.subCol_),
                       dynSub.getColumn(targetSide.subCol_)};
 }
+
+// _____________________________________________________________________________
+std::vector<ColumnIndex> TransitivePathBinSearch::resultSortedOn() const {
+  if (!isBoundOrId()) {
+    AD_CORRECTNESS_CHECK(subtree_);
+    return {subtree_->resultSortedOn().at(1)};
+  } else {
+    return TransitivePathBase::resultSortedOn();
+  }
+}
diff --git a/src/engine/TransitivePathBinSearch.h b/src/engine/TransitivePathBinSearch.h
@@ -69,9 +69,19 @@ class TransitivePathBinSearch : public TransitivePathImpl<BinSearchMap> {
                           TransitivePathSide rightSide, size_t minDist,
                           size_t maxDist);
 
+
+  std::vector<ColumnIndex> resultSortedOn() const override;
+
+  // TODO<joka921> Overwrite s.t. we can do this with the alternative subtree.
+  virtual std::shared_ptr<TransitivePathBase> bindLeftOrRightSide(
+      std::shared_ptr<QueryExecutionTree> leftOrRightOp, size_t inputCol,
+      bool isLeft) const;
+
  private:
   // initialize the map from the subresult
   BinSearchMap setupEdgesMap(
       const IdTable& dynSub, const TransitivePathSide& startSide,
       const TransitivePathSide& targetSide) const override;
+
+  std::shared_ptr<QueryExecutionTree> alternativelySortedSubtree_;
 };
diff --git a/test/QueryPlannerTest.cpp b/test/QueryPlannerTest.cpp
@@ -765,9 +765,10 @@ TEST(QueryPlanner, TransitivePathBindRight) {
       h::TransitivePath(
           left, right, 0, std::numeric_limits<size_t>::max(),
           scan("?y", "<p>", "<o>"),
-          // TODO<joka921> Get rid of this sort operation
-          h::Sort(scan("?_qlever_internal_variable_query_planner_0", "<p>",
-                       "?_qlever_internal_variable_query_planner_1"))));
+          scan("?_qlever_internal_variable_query_planner_0", "<p>",
+                       "?_qlever_internal_variable_query_planner_1")),
+      ad_utility::testing::getQec("<x> <p> <o>. <x2> <p> <o2>")
+      );
 }
 
 // __________________________________________________________________________