move payloadvariables to parser

ad-freiburg · Dec 5, 2024 · 218b109 · 218b109
1 parent 33e3c7b
commit 218b109
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 8 deletions.
diff --git a/src/engine/CMakeLists.txt b/src/engine/CMakeLists.txt
@@ -10,7 +10,7 @@ add_library(engine
         Union.cpp MultiColumnJoin.cpp TransitivePathBase.cpp
         TransitivePathHashMap.cpp TransitivePathBinSearch.cpp Service.cpp
         Values.cpp Bind.cpp Minus.cpp RuntimeInformation.cpp CheckUsePatternTrick.cpp
-        VariableToColumnMap.cpp ExportQueryExecutionTrees.cpp PayloadVariables.cpp
+        VariableToColumnMap.cpp ExportQueryExecutionTrees.cpp
         CartesianProductJoin.cpp TextIndexScanForWord.cpp TextIndexScanForEntity.cpp
         TextLimit.cpp LazyGroupBy.cpp GroupByHashMapOptimization.cpp SpatialJoin.cpp
         CountConnectedSubgraphs.cpp SpatialJoinAlgorithms.cpp PathSearch.cpp ExecuteUpdate.cpp)

diff --git a/src/engine/SpatialJoin.h b/src/engine/SpatialJoin.h
@@ -10,8 +10,8 @@
 #include <variant>
 
 #include "engine/Operation.h"
-#include "engine/PayloadVariables.h"
 #include "global/Id.h"
+#include "parser/PayloadVariables.h"
 #include "parser/data/Variable.h"
 
 // A nearest neighbor search with optionally a maximum distance.

diff --git a/src/parser/CMakeLists.txt b/src/parser/CMakeLists.txt
@@ -20,6 +20,7 @@ add_library(parser
         MagicServiceQuery.cpp
         PathQuery.cpp
         SpatialQuery.cpp
+        PayloadVariables.cpp
         PropertyPath.cpp
         data/SparqlFilter.cpp
         SelectClause.cpp

diff --git a/src/engine/PayloadVariables.cpp → src/parser/PayloadVariables.cpp b/src/engine/PayloadVariables.cpp → src/parser/PayloadVariables.cpp
@@ -2,7 +2,7 @@
 // Chair of Algorithms and Data Structures.
 // Author: Christoph Ullinger <[email protected]>
 
-#include "engine/PayloadVariables.h"
+#include "parser/PayloadVariables.h"
 
 // ____________________________________________________________________________
 PayloadVariables::PayloadVariables(std::vector<Variable> variables)

diff --git a/src/engine/PayloadVariables.h → src/parser/PayloadVariables.h b/src/engine/PayloadVariables.h → src/parser/PayloadVariables.h
diff --git a/src/parser/SpatialQuery.cpp b/src/parser/SpatialQuery.cpp
@@ -7,9 +7,9 @@
 #include <type_traits>
 #include <variant>
 
-#include "engine/PayloadVariables.h"
 #include "engine/SpatialJoin.h"
 #include "parser/MagicServiceIriConstants.h"
+#include "parser/PayloadVariables.h"
 #include "parser/data/Variable.h"
 
 namespace parsedQuery {

diff --git a/src/parser/SpatialQuery.h b/src/parser/SpatialQuery.h
@@ -4,9 +4,9 @@
 
 #pragma once
 
-#include "engine/PayloadVariables.h"
 #include "parser/GraphPattern.h"
 #include "parser/MagicServiceQuery.h"
+#include "parser/PayloadVariables.h"
 
 namespace parsedQuery {
 

diff --git a/test/QueryPlannerTest.cpp b/test/QueryPlannerTest.cpp
@@ -7,11 +7,11 @@
 
 #include "./printers/PayloadVariablePrinters.h"
 #include "QueryPlannerTestHelpers.h"
-#include "engine/PayloadVariables.h"
 #include "engine/QueryPlanner.h"
 #include "engine/SpatialJoin.h"
 #include "parser/GraphPatternOperation.h"
 #include "parser/MagicServiceQuery.h"
+#include "parser/PayloadVariables.h"
 #include "parser/SparqlParser.h"
 #include "parser/SpatialQuery.h"
 #include "parser/data/Variable.h"

diff --git a/test/engine/PayloadVariablesTest.cpp b/test/engine/PayloadVariablesTest.cpp
@@ -6,8 +6,8 @@
 
 #include "../printers/PayloadVariablePrinters.h"
 #include "../util/GTestHelpers.h"
-#include "engine/PayloadVariables.h"
 #include "gmock/gmock.h"
+#include "parser/PayloadVariables.h"
 #include "parser/data/Variable.h"
 
 namespace {  // anonymous namespace to avoid linker problems

diff --git a/test/printers/PayloadVariablePrinters.h b/test/printers/PayloadVariablePrinters.h
@@ -4,7 +4,7 @@
 
 #pragma once
 #include "./VariablePrinters.h"
-#include "engine/PayloadVariables.h"
+#include "parser/PayloadVariables.h"
 
 // _____________________________________________________________
 inline void PrintTo(const PayloadVariables& pv, std::ostream* os) {