From bc4732f2daf159a531f16cbec357ed513fb7360c Mon Sep 17 00:00:00 2001 From: Johannes Herrmann Date: Tue, 15 Oct 2024 11:53:47 +0200 Subject: [PATCH] Fixed merge and format --- src/engine/CMakeLists.txt | 4 ++-- test/QueryPlannerTest.cpp | 2 +- test/QueryPlannerTestHelpers.h | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/engine/CMakeLists.txt b/src/engine/CMakeLists.txt index 85537cee0..7540b1bba 100644 --- 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 index 95879fc0c..1a0a01dbc 100644 --- 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 index 63e6b2037..98a8db78d 100644 --- a/test/QueryPlannerTestHelpers.h +++ b/test/QueryPlannerTestHelpers.h @@ -7,9 +7,8 @@ #include #include -#include - #include +#include #include "./util/GTestHelpers.h" #include "engine/Bind.h"