Fixed merge and format

ad-freiburg · Oct 15, 2024 · bc4732f · bc4732f
1 parent 290a89d
commit bc4732f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/src/engine/CMakeLists.txt b/src/engine/CMakeLists.txt
@@ -12,7 +12,7 @@ add_library(engine
         Values.cpp Bind.cpp Minus.cpp RuntimeInformation.cpp CheckUsePatternTrick.cpp
         VariableToColumnMap.cpp ExportQueryExecutionTrees.cpp
         CartesianProductJoin.cpp TextIndexScanForWord.cpp TextIndexScanForEntity.cpp
-        TextLimit.cpp LocalVocabEntry.cpp LazyGroupBy.cpp GroupByHashMapOptimization.cpp
-        SpatialJoin.cpp CountConnectedSubgraphs.cpp PathSearch.cpp)
+        TextLimit.cpp LazyGroupBy.cpp GroupByHashMapOptimization.cpp SpatialJoin.cpp
+        CountConnectedSubgraphs.cpp PathSearch.cpp)
 
 qlever_target_link_libraries(engine util index parser sparqlExpressions http SortPerformanceEstimator Boost::iostreams s2)
diff --git a/test/QueryPlannerTest.cpp b/test/QueryPlannerTest.cpp
@@ -6,8 +6,8 @@
 
 #include "QueryPlannerTestHelpers.h"
 #include "engine/QueryPlanner.h"
-#include "parser/GraphPatternOperation.h"
 #include "engine/SpatialJoin.h"
+#include "parser/GraphPatternOperation.h"
 #include "parser/SparqlParser.h"
 #include "parser/data/Variable.h"
 #include "util/TripleComponentTestHelpers.h"

diff --git a/test/QueryPlannerTestHelpers.h b/test/QueryPlannerTestHelpers.h
@@ -7,9 +7,8 @@
 #include <gmock/gmock-matchers.h>
 #include <gmock/gmock.h>
 
-#include <variant>
-
 #include <optional>
+#include <variant>
 
 #include "./util/GTestHelpers.h"
 #include "engine/Bind.h"