Optimize additional includes

ad-freiburg · Feb 10, 2025 · 1722daa · 1722daa
1 parent 4fb267f
commit 1722daa
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 25 deletions.
diff --git a/src/engine/OptionalJoin.h b/src/engine/OptionalJoin.h
@@ -58,14 +58,8 @@ class OptionalJoin : public Operation {
     return {_left.get(), _right.get()};
   }
 
-  /**
-   * @brief Joins two result tables on any number of columns, inserting the
-   *        special value ID_NO_VALUE for any entries marked as optional.
-   * @param a
-   * @param b
-   * @param joinColumns
-   * @param result
-   */
+  // Joins two result tables on any number of columns, inserting the special
+  // value `Id::makeUndefined()` for any entries marked as optional.
   void optionalJoin(
       const IdTable& left, const IdTable& right,
       const std::vector<std::array<ColumnIndex, 2>>& joinColumns,

diff --git a/src/engine/QueryExecutionContext.h b/src/engine/QueryExecutionContext.h
@@ -5,8 +5,6 @@
 
 #pragma once
 
-#include <global/RuntimeParameters.h>
-
 #include <memory>
 #include <string>
 
@@ -15,11 +13,11 @@
 #include "engine/RuntimeInformation.h"
 #include "engine/SortPerformanceEstimator.h"
 #include "global/Id.h"
+#include "global/RuntimeParameters.h"
 #include "index/DeltaTriples.h"
 #include "index/Index.h"
 #include "util/Cache.h"
 #include "util/ConcurrentCache.h"
-#include "util/Synchronized.h"
 
 // The value of the `QueryResultCache` below. It consists of a `Result` together
 // with its `RuntimeInfo`.

diff --git a/src/global/Id.h b/src/global/Id.h
@@ -3,16 +3,12 @@
 // Author: Björn Buchhold ([email protected])
 #pragma once
 
-#include <absl/strings/str_cat.h>
-
 #include <cstdint>
-#include <limits>
 
 #include "global/ValueId.h"
-#include "util/Exception.h"
 
 using Id = ValueId;
-typedef uint16_t Score;
+using Score = uint16_t;
 
 // TODO<joka921> Make the following ID and index types strong.
 using ColumnIndex = uint64_t;

diff --git a/src/index/VocabularyMerger.h b/src/index/VocabularyMerger.h
@@ -68,8 +68,8 @@ struct VocabularyMetaData {
     bool contains(Id id) const { return begin_ <= id && id < end_; }
 
    private:
-    Id begin_ = ID_NO_VALUE;
-    Id end_ = ID_NO_VALUE;
+    Id begin_ = Id::makeUndefined();
+    Id end_ = Id::makeUndefined();
     std::string prefix_;
     bool beginWasSeen_ = false;
   };

diff --git a/src/util/AllocatorWithLimit.h b/src/util/AllocatorWithLimit.h
@@ -7,7 +7,6 @@
 
 #include <absl/strings/str_cat.h>
 
-#include <atomic>
 #include <functional>
 #include <memory>
 

diff --git a/test/GroupByTest.cpp b/test/GroupByTest.cpp
@@ -263,9 +263,9 @@ TEST_F(GroupByTest, doGroupBy) {
   ASSERT_EQ(123u, outTable._data[1][9]);
   ASSERT_EQ(0u, outTable._data[2][9]);
 
-  ASSERT_EQ(ID_NO_VALUE, outTable._data[0][10]);
-  ASSERT_EQ(ID_NO_VALUE, outTable._data[1][10]);
-  ASSERT_EQ(ID_NO_VALUE, outTable._data[2][10]);
+  ASSERT_EQ(Id::makeUndefined(), outTable._data[0][10]);
+  ASSERT_EQ(Id::makeUndefined(), outTable._data[1][10]);
+  ASSERT_EQ(Id::makeUndefined(), outTable._data[2][10]);
 
   std::memcpy(&buffer, &outTable._data[0][11], sizeof(float));
   ASSERT_FLOAT_EQ(-3, buffer);
@@ -283,9 +283,9 @@ TEST_F(GroupByTest, doGroupBy) {
   ASSERT_EQ(41223u, outTable._data[1][13]);
   ASSERT_EQ(41223u, outTable._data[2][13]);
 
-  ASSERT_EQ(ID_NO_VALUE, outTable._data[0][14]);
-  ASSERT_EQ(ID_NO_VALUE, outTable._data[1][14]);
-  ASSERT_EQ(ID_NO_VALUE, outTable._data[2][14]);
+  ASSERT_EQ(Id::makeUndefined(), outTable._data[0][14]);
+  ASSERT_EQ(Id::makeUndefined(), outTable._data[1][14]);
+  ASSERT_EQ(Id::makeUndefined(), outTable._data[2][14]);
 
   std::memcpy(&buffer, &outTable._data[0][15], sizeof(float));
   ASSERT_FLOAT_EQ(2, buffer);