cleanup

ad-freiburg · Mar 3, 2025 · deddf9d · deddf9d
1 parent 545de6b
commit deddf9d
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/src/engine/ExportQueryExecutionTrees.cpp b/src/engine/ExportQueryExecutionTrees.cpp
@@ -918,7 +918,8 @@ ExportQueryExecutionTrees::computeResultAsQLeverJSON(
 
   nlohmann::json jsonPrefix;
 
-  jsonPrefix["query"] = ad_utility::truncateOperation(query._originalString);
+  jsonPrefix["query"] =
+      ad_utility::truncateOperationString(query._originalString);
   jsonPrefix["status"] = "OK";
   jsonPrefix["warnings"] = qet.collectWarnings();
   if (query.hasSelectClause()) {

diff --git a/src/engine/GraphStoreProtocol.h b/src/engine/GraphStoreProtocol.h
@@ -88,7 +88,7 @@ class GraphStoreProtocol {
     res._clause = parsedQuery::UpdateClause{std::move(up)};
     // Graph store protocol POST requests might have a very large body. Limit
     // the length used for the string representation.
-    string_view body = ad_utility::truncateOperation(rawRequest.body());
+    string_view body = ad_utility::truncateOperationString(rawRequest.body());
     res._originalString = absl::StrCat("Graph Store POST Operation\n", body);
     return res;
   }

diff --git a/src/engine/Server.cpp b/src/engine/Server.cpp
@@ -259,7 +259,8 @@ auto Server::prepareOperation(
   LOG(INFO) << "Processing the following " << operationName << ":"
             << (pinResult ? " [pin result]" : "")
             << (pinSubtrees ? " [pin subresults]" : "") << "\n"
-            << ad_utility::truncateOperation(operationSPARQL) << std::endl;
+            << ad_utility::truncateOperationString(operationSPARQL)
+            << std::endl;
   QueryExecutionContext qec(index_, &cache_, allocator_,
                             sortPerformanceEstimator_, std::ref(messageSender),
                             pinSubtrees, pinResult);
@@ -581,13 +582,13 @@ json Server::composeErrorResponseJson(
     const std::optional<ExceptionMetadata>& metadata) {
   json j;
   using ad_utility::Timer;
+  j["query"] = ad_utility::truncateOperationString(query);
   j["status"] = "ERROR";
   j["resultsize"] = 0;
   j["time"]["total"] = requestTimer.msecs().count();
   j["time"]["computeResult"] = requestTimer.msecs().count();
   j["exception"] = errorMsg;
 
-  j["query"] = ad_utility::truncateOperation(query);
   // If the error location is truncated don't send it's location.
   if (metadata.has_value() &&
       metadata.value().stopIndex_ < MAX_LENGTH_OPERATION_ECHO) {
@@ -825,8 +826,8 @@ json Server::createResponseMetadataForUpdate(
   };
 
   json response;
-  response["update"] =
-      ad_utility::truncateOperation(plannedQuery.parsedQuery_._originalString);
+  response["update"] = ad_utility::truncateOperationString(
+      plannedQuery.parsedQuery_._originalString);
   response["status"] = "OK";
   auto warnings = qet.collectWarnings();
   warnings.emplace(warnings.begin(),

diff --git a/src/util/StringUtils.cpp b/src/util/StringUtils.cpp
@@ -202,7 +202,7 @@ std::string addIndentation(std::string_view str,
 }
 
 // ___________________________________________________________________________
-std::string truncateOperation(std::string_view operation) {
+std::string truncateOperationString(std::string_view operation) {
   static_assert(MAX_LENGTH_OPERATION_ECHO >= 3);
   if (operation.length() <= MAX_LENGTH_OPERATION_ECHO) {
     return std::string{operation};

diff --git a/src/util/StringUtils.h b/src/util/StringUtils.h
@@ -277,10 +277,9 @@ constexpr std::string_view constexprStrCat() {
   return {b.data(), b.size() - 1};
 }
 
-// TODO: make this a general truncate operation
 // Truncates the operation string to a maximum length of
 // `MAX_LENGTH_OPERATION_ECHO`.
-std::string truncateOperation(std::string_view operation);
+std::string truncateOperationString(std::string_view operation);
 }  // namespace ad_utility
 
 // A helper function for the `operator+` overloads below.