Swap out vector with hash set

ad-freiburg · Nov 21, 2024 · f78f64d · f78f64d
1 parent d53d4f9
commit f78f64d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/src/engine/LocalVocab.cpp b/src/engine/LocalVocab.cpp
@@ -5,8 +5,6 @@
 
 #include "engine/LocalVocab.h"
 
-#include "absl/strings/str_cat.h"
-#include "global/Id.h"
 #include "global/ValueId.h"
 #include "util/TransparentFunctors.h"
 

diff --git a/src/engine/LocalVocab.h b/src/engine/LocalVocab.h
@@ -5,6 +5,9 @@
 
 #pragma once
 
+#include <absl/container/flat_hash_set.h>
+#include <absl/container/node_hash_set.h>
+
 #include <algorithm>
 #include <cstdlib>
 #include <memory>
@@ -13,9 +16,7 @@
 #include <string>
 #include <vector>
 
-#include "absl/container/node_hash_set.h"
-#include "global/Id.h"
-#include "parser/LiteralOrIri.h"
+#include "index/LocalVocabEntry.h"
 #include "util/BlankNodeManager.h"
 #include "util/Exception.h"
 
@@ -43,7 +44,7 @@ class LocalVocab {
   std::shared_ptr<Set> primaryWordSet_ = std::make_shared<Set>();
 
   // The other sets of `LocalVocabEntry`s, which are static.
-  std::vector<std::shared_ptr<const Set>> otherWordSets_;
+  absl::flat_hash_set<std::shared_ptr<const Set>> otherWordSets_;
 
   // The number of words (so that we can compute `size()` in constant time).
   size_t size_ = 0;
@@ -111,11 +112,11 @@ class LocalVocab {
   // primary set of this `LocalVocab` remains unchanged.
   template <std::ranges::range R>
   void mergeWith(const R& vocabs) {
-    auto inserter = std::back_inserter(otherWordSets_);
     using std::views::filter;
     for (const auto& vocab : vocabs | filter(std::not_fn(&LocalVocab::empty))) {
-      std::ranges::copy(vocab.otherWordSets_, inserter);
-      *inserter = vocab.primaryWordSet_;
+      otherWordSets_.insert(vocab.otherWordSets_.begin(),
+                            vocab.otherWordSets_.end());
+      otherWordSets_.insert(vocab.primaryWordSet_);
       size_ += vocab.size_;
     }
 

diff --git a/src/parser/LiteralOrIri.h b/src/parser/LiteralOrIri.h
@@ -4,13 +4,10 @@
 
 #pragma once
 
-#include <absl/strings/str_cat.h>
-
 #include <variant>
 
 #include "parser/Iri.h"
 #include "parser/Literal.h"
-#include "util/Exception.h"
 
 namespace ad_utility::triple_component {
 static constexpr char literalPrefixChar = '"';