Clean up some header includes to slightly improve the build time

benchmark/GroupByHashMapBenchmark.cpp

@@ -15,6 +15,7 @@
 #include "engine/sparqlExpressions/AggregateExpression.h"
 #include "engine/sparqlExpressions/GroupConcatExpression.h"
 #include "engine/sparqlExpressions/LiteralExpression.h"
+#include "global/RuntimeParameters.h"
 #include "util/Log.h"
 #include "util/Random.h"
 #include "util/TypeIdentity.h"

src/ServerMain.cpp

@@ -12,6 +12,7 @@
 #include "CompilationInfo.h"
 #include "engine/Server.h"
 #include "global/Constants.h"
+#include "global/RuntimeParameters.h"
 #include "util/MemorySize/MemorySize.h"
 #include "util/ParseableDuration.h"
 #include "util/ProgramOptionsHelpers.h"

src/engine/GroupBy.cpp

@@ -17,6 +17,7 @@
 #include "engine/sparqlExpressions/LiteralExpression.h"
 #include "engine/sparqlExpressions/SparqlExpression.h"
 #include "engine/sparqlExpressions/SparqlExpressionGenerators.h"
+#include "global/RuntimeParameters.h"
 #include "index/Index.h"
 #include "index/IndexImpl.h"
 #include "parser/Alias.h"

src/engine/GroupBy.h

@@ -6,6 +6,8 @@
 
 #pragma once
 
+#include <gtest/gtest_prod.h>
+
 #include <memory>
 #include <string>
 #include <utility>
@@ -17,7 +19,6 @@
 #include "engine/sparqlExpressions/RelationalExpressionHelpers.h"
 #include "engine/sparqlExpressions/SparqlExpressionPimpl.h"
 #include "engine/sparqlExpressions/SparqlExpressionValueGetters.h"
-#include "gtest/gtest.h"
 #include "parser/Alias.h"
 #include "parser/ParsedQuery.h"
 #include "util/TypeIdentity.h"

src/engine/Join.cpp

@@ -4,20 +4,22 @@
 //   2015-2017 Björn Buchhold ([email protected])
 //   2018-     Johannes Kalmbach ([email protected])
 
-#include <engine/AddCombinedRowToTable.h>
-#include <engine/CallFixedSize.h>
-#include <engine/IndexScan.h>
-#include <engine/Join.h>
-#include <global/Constants.h>
-#include <global/Id.h>
-#include <util/Exception.h>
-#include <util/HashMap.h>
+#include "engine/Join.h"
 
 #include <functional>
 #include <sstream>
 #include <type_traits>
 #include <vector>
 
+#include "engine/AddCombinedRowToTable.h"
+#include "engine/CallFixedSize.h"
+#include "engine/IndexScan.h"
+#include "global/Constants.h"
+#include "global/Id.h"
+#include "global/RuntimeParameters.h"
+#include "util/Exception.h"
+#include "util/HashMap.h"
+
 using std::endl;
 using std::string;
 

src/engine/OrderBy.cpp

@@ -9,10 +9,9 @@
 
 #include "engine/CallFixedSize.h"
 #include "engine/QueryExecutionTree.h"
+#include "global/RuntimeParameters.h"
 #include "global/ValueIdComparators.h"
-
-using std::endl;
-using std::string;
+#include "util/TransparentFunctors.h"
 
 // _____________________________________________________________________________
 size_t OrderBy::getResultWidth() const { return subtree_->getResultWidth(); }
@@ -32,7 +31,7 @@ OrderBy::OrderBy(QueryExecutionContext* qec,
 }
 
 // _____________________________________________________________________________
-string OrderBy::getCacheKeyImpl() const {
+std::string OrderBy::getCacheKeyImpl() const {
   std::ostringstream os;
   os << "ORDER BY on columns:";
 
@@ -47,7 +46,7 @@ string OrderBy::getCacheKeyImpl() const {
 }
 
 // _____________________________________________________________________________
-string OrderBy::getDescriptor() const {
+std::string OrderBy::getDescriptor() const {
   std::string orderByVars;
   const auto& varCols = subtree_->getVariableColumns();
   for (auto [sortIndex, isDescending] : sortIndices_) {
@@ -64,6 +63,7 @@ string OrderBy::getDescriptor() const {
 
 // _____________________________________________________________________________
 ResultTable OrderBy::computeResult() {
+  using std::endl;
   LOG(DEBUG) << "Getting sub-result for OrderBy result computation..." << endl;
   shared_ptr<const ResultTable> subRes = subtree_->getResult();
 

src/engine/Server.cpp

@@ -12,6 +12,7 @@
 
 #include "engine/ExportQueryExecutionTrees.h"
 #include "engine/QueryPlanner.h"
+#include "global/RuntimeParameters.h"
 #include "util/AsioHelpers.h"
 #include "util/MemorySize/MemorySize.h"
 #include "util/OnDestructionDontThrowDuringStackUnwinding.h"

src/engine/Sort.cpp

@@ -7,11 +7,9 @@
 
 #include <sstream>
 
-#include "CallFixedSize.h"
-#include "QueryExecutionTree.h"
-
-using std::endl;
-using std::string;
+#include "engine/CallFixedSize.h"
+#include "engine/QueryExecutionTree.h"
+#include "global/RuntimeParameters.h"
 
 // _____________________________________________________________________________
 size_t Sort::getResultWidth() const { return subtree_->getResultWidth(); }
@@ -25,7 +23,7 @@ Sort::Sort(QueryExecutionContext* qec,
       sortColumnIndices_{std::move(sortColumnIndices)} {}
 
 // _____________________________________________________________________________
-string Sort::getCacheKeyImpl() const {
+std::string Sort::getCacheKeyImpl() const {
   std::ostringstream os;
   os << "SORT(internal) on columns:";
 
@@ -37,7 +35,7 @@ string Sort::getCacheKeyImpl() const {
 }
 
 // _____________________________________________________________________________
-string Sort::getDescriptor() const {
+std::string Sort::getDescriptor() const {
   std::string orderByVars;
   const auto& varCols = subtree_->getVariableColumns();
   for (auto sortColumn : sortColumnIndices_) {
@@ -53,6 +51,7 @@ string Sort::getDescriptor() const {
 
 // _____________________________________________________________________________
 ResultTable Sort::computeResult() {
+  using std::endl;
   LOG(DEBUG) << "Getting sub-result for Sort result computation..." << endl;
   shared_ptr<const ResultTable> subRes = subtree_->getResult();
 

src/engine/VariableToColumnMap.cpp

@@ -4,6 +4,8 @@
 
 #include "engine/VariableToColumnMap.h"
 
+#include "util/TransparentFunctors.h"
+
 // _____________________________________________________________________________
 std::vector<std::pair<Variable, ColumnIndexAndTypeInfo>>
 copySortedByColumnIndex(VariableToColumnMap map) {

src/engine/VariableToColumnMap.h

@@ -7,7 +7,6 @@
 #include "global/Id.h"
 #include "parser/data/Variable.h"
 #include "util/HashMap.h"
-#include "util/TransparentFunctors.h"
 
 // Store an index of a column together with additional information about that
 // column which can be inferred from the `QueryExecutionTree` without actually

src/engine/idTable/CompressedExternalIdTable.h

@@ -5,12 +5,12 @@
 #ifndef QLEVER_COMPRESSEDEXTERNALIDTABLE_H
 #define QLEVER_COMPRESSEDEXTERNALIDTABLE_H
 
+#include <absl/strings/str_cat.h>
+
 #include <algorithm>
 #include <future>
-#include <queue>
 #include <ranges>
 
-#include "absl/strings/str_cat.h"
 #include "engine/CallFixedSize.h"
 #include "engine/idTable/IdTable.h"
 #include "util/AsyncStream.h"
@@ -19,7 +19,6 @@
 #include "util/MemorySize/MemorySize.h"
 #include "util/TransparentFunctors.h"
 #include "util/Views.h"
-#include "util/http/beast.h"
 
 namespace ad_utility {
 

src/engine/sparqlExpressions/AggregateExpression.h

@@ -8,6 +8,7 @@
 #include "engine/sparqlExpressions/RelationalExpressionHelpers.h"
 #include "engine/sparqlExpressions/SparqlExpression.h"
 #include "engine/sparqlExpressions/SparqlExpressionGenerators.h"
+#include "engine/sparqlExpressions/SparqlExpressionValueGetters.h"
 #include "global/ValueIdComparators.h"
 
 namespace sparqlExpression {

src/engine/sparqlExpressions/CMakeLists.txt

@@ -13,6 +13,8 @@ add_library(sparqlExpressions
         DateExpressions.cpp
         StringExpressions.cpp
         IsSomethingExpressions.cpp
-        ConditionalExpressions.cpp)
+        ConditionalExpressions.cpp
+        SparqlExpressionTypes.cpp
+        SparqlExpression.cpp)
 
 qlever_target_link_libraries(sparqlExpressions util index Boost::url)

src/engine/sparqlExpressions/NaryExpressionImpl.h

@@ -8,6 +8,7 @@
 
 #include "engine/sparqlExpressions/NaryExpression.h"
 #include "engine/sparqlExpressions/SparqlExpressionGenerators.h"
+#include "engine/sparqlExpressions/SparqlExpressionValueGetters.h"
 
 namespace sparqlExpression::detail {
 template <typename NaryOperation>

src/engine/sparqlExpressions/RegexExpression.cpp

@@ -6,11 +6,13 @@
 
 #include "./RegexExpression.h"
 
+#include <re2/re2.h>
+
 #include "engine/sparqlExpressions/LiteralExpression.h"
 #include "engine/sparqlExpressions/NaryExpression.h"
 #include "engine/sparqlExpressions/SparqlExpressionGenerators.h"
+#include "engine/sparqlExpressions/SparqlExpressionValueGetters.h"
 #include "global/ValueIdComparators.h"
-#include "re2/re2.h"
 
 using namespace std::literals;
 

src/engine/sparqlExpressions/SetOfIntervals.h

@@ -8,8 +8,7 @@
 #include <utility>
 #include <vector>
 
-#include "../../util/Exception.h"
-#include "../../util/TypeTraits.h"
+#include "util/Exception.h"
 
 namespace ad_utility {