Merge remote-tracking branch 'ad-freiburg/master' into refactor-resul…

…t-table
ad-freiburg · Jun 6, 2024 · 000af28 · 000af28
2 parents 389f3f1 + ccf592e
commit 000af28
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 13 deletions.
diff --git a/src/engine/QueryPlanner.cpp b/src/engine/QueryPlanner.cpp
@@ -153,7 +153,8 @@ std::vector<QueryPlanner::SubtreePlan> QueryPlanner::createExecutionTrees(
   vector<SubtreePlan>& lastRow = plans.back();
 
   for (auto& plan : lastRow) {
-    if (plan._qet->getRootOperation()->supportsLimit(false) || plan._qet->getRootOperation()->supportsLimit(true)) {
+    if (plan._qet->getRootOperation()->supportsLimit(false) ||
+        plan._qet->getRootOperation()->supportsLimit(true)) {
       plan._qet->getRootOperation()->setLimit(pq._limitOffset);
     }
   }

diff --git a/src/engine/Server.cpp b/src/engine/Server.cpp
@@ -690,8 +690,8 @@ boost::asio::awaitable<void> Server::processQuery(
     auto [cancellationHandle, cancelTimeoutOnDestruction] =
         setupCancellationHandle(messageSender.getQueryId(), timeLimit);
 
-    plannedQuery = co_await parseAndPlan(query, qec, cancellationHandle,
-                                         timeLimit, maxSend);
+    plannedQuery =
+        co_await parseAndPlan(query, qec, cancellationHandle, timeLimit);
     AD_CORRECTNESS_CHECK(plannedQuery.has_value());
     auto& qet = plannedQuery.value().queryExecutionTree_;
     qet.isRoot() = true;  // allow pinning of the final result
@@ -842,8 +842,7 @@ Awaitable<T> Server::computeInNewThread(Function function,
 // _____________________________________________________________________________
 net::awaitable<std::optional<Server::PlannedQuery>> Server::parseAndPlan(
     const std::string& query, QueryExecutionContext& qec,
-    SharedCancellationHandle handle, TimeLimit timeLimit,
-    std::optional<uint64_t> maxSend) {
+    SharedCancellationHandle handle, TimeLimit timeLimit) {
   auto handleCopy = handle;
 
   // The usage of an `optional` here is required because of a limitation in
@@ -853,13 +852,9 @@ net::awaitable<std::optional<Server::PlannedQuery>> Server::parseAndPlan(
   // probably related to issues in GCC's coroutine implementation.
   return computeInNewThread(
       [&query, &qec, enablePatternTrick = enablePatternTrick_,
-       handle = std::move(handle), timeLimit,
-       maxSend]() mutable -> std::optional<PlannedQuery> {
+       handle = std::move(handle),
+       timeLimit]() mutable -> std::optional<PlannedQuery> {
         auto pq = SparqlParser::parseQuery(query);
-        if (maxSend.has_value()) {
-          pq._limitOffset._limit =
-              std::min(maxSend.value(), pq._limitOffset.limitOrDefault());
-        }
         handle->throwIfCancelled();
         QueryPlanner qp(&qec, handle);
         qp.setEnablePatternTrick(enablePatternTrick);

diff --git a/src/engine/Server.h b/src/engine/Server.h
@@ -183,8 +183,7 @@ class Server {
   /// technical reasons that are described in the definition of this function.
   net::awaitable<std::optional<PlannedQuery>> parseAndPlan(
       const std::string& query, QueryExecutionContext& qec,
-      SharedCancellationHandle handle, TimeLimit timeLimit,
-      std::optional<uint64_t> maxSend);
+      SharedCancellationHandle handle, TimeLimit timeLimit);
 
   /// Acquire the `CancellationHandle` for the given `QueryId`, start the
   /// watchdog and call `cancelAfterDeadline` to set the timeout after