diff options
author | Tor Egge <Tor.Egge@online.no> | 2022-11-15 22:41:03 +0100 |
---|---|---|
committer | Tor Egge <Tor.Egge@online.no> | 2022-11-15 22:41:03 +0100 |
commit | fcfe930ebc39677b66c0a75b41e7d01fd8682909 (patch) | |
tree | 89cc1c90078563d4eb23915cb8d2722c3201c31e | |
parent | 1581058d13a1e23769470302879b5f3b50483099 (diff) |
Remove unused argument to visited trackers.
5 files changed, 5 insertions, 9 deletions
diff --git a/searchlib/src/vespa/searchlib/tensor/bitvector_visited_tracker.cpp b/searchlib/src/vespa/searchlib/tensor/bitvector_visited_tracker.cpp index e456e87dc96..3cb7c92a842 100644 --- a/searchlib/src/vespa/searchlib/tensor/bitvector_visited_tracker.cpp +++ b/searchlib/src/vespa/searchlib/tensor/bitvector_visited_tracker.cpp @@ -4,7 +4,7 @@ namespace search::tensor { -BitVectorVisitedTracker::BitVectorVisitedTracker(const HnswIndex&, uint32_t nodeid_limit, uint32_t) +BitVectorVisitedTracker::BitVectorVisitedTracker(uint32_t nodeid_limit, uint32_t) : _visited(nodeid_limit) { } diff --git a/searchlib/src/vespa/searchlib/tensor/bitvector_visited_tracker.h b/searchlib/src/vespa/searchlib/tensor/bitvector_visited_tracker.h index ecdd957187f..c861da9d6fc 100644 --- a/searchlib/src/vespa/searchlib/tensor/bitvector_visited_tracker.h +++ b/searchlib/src/vespa/searchlib/tensor/bitvector_visited_tracker.h @@ -6,8 +6,6 @@ namespace search::tensor { -class HnswIndex; - /* * Tracker for visited nodes based on search::AllocatedBitVector. Best when * many nodes are visited. @@ -16,7 +14,7 @@ class BitVectorVisitedTracker { search::AllocatedBitVector _visited; public: - BitVectorVisitedTracker(const HnswIndex&, uint32_t nodeid_limit, uint32_t); + BitVectorVisitedTracker(uint32_t nodeid_limit, uint32_t); ~BitVectorVisitedTracker(); void mark(uint32_t nodeid) { _visited.setBit(nodeid); } bool try_mark(uint32_t nodeid) { diff --git a/searchlib/src/vespa/searchlib/tensor/hash_set_visited_tracker.cpp b/searchlib/src/vespa/searchlib/tensor/hash_set_visited_tracker.cpp index fb7d6413a45..b4a1cd471b9 100644 --- a/searchlib/src/vespa/searchlib/tensor/hash_set_visited_tracker.cpp +++ b/searchlib/src/vespa/searchlib/tensor/hash_set_visited_tracker.cpp @@ -4,7 +4,7 @@ namespace search::tensor { -HashSetVisitedTracker::HashSetVisitedTracker(const HnswIndex&, uint32_t, uint32_t estimated_visited_nodes) +HashSetVisitedTracker::HashSetVisitedTracker(uint32_t, uint32_t estimated_visited_nodes) : _visited(estimated_visited_nodes) { } diff --git a/searchlib/src/vespa/searchlib/tensor/hash_set_visited_tracker.h b/searchlib/src/vespa/searchlib/tensor/hash_set_visited_tracker.h index 30434d1029d..bcc8cadd151 100644 --- a/searchlib/src/vespa/searchlib/tensor/hash_set_visited_tracker.h +++ b/searchlib/src/vespa/searchlib/tensor/hash_set_visited_tracker.h @@ -6,8 +6,6 @@ namespace search::tensor { -class HnswIndex; - /* * Tracker for visited nodes based on vespalib::hash_set<uint32_t>. Best when * only a small portion of the nodes are visited. @@ -16,7 +14,7 @@ class HashSetVisitedTracker { vespalib::hash_set<uint32_t> _visited; public: - HashSetVisitedTracker(const HnswIndex&, uint32_t, uint32_t estimated_visited_nodes); + HashSetVisitedTracker(uint32_t, uint32_t estimated_visited_nodes); ~HashSetVisitedTracker(); void mark(uint32_t nodeid) { _visited.insert(nodeid); } bool try_mark(uint32_t nodeid) { diff --git a/searchlib/src/vespa/searchlib/tensor/hnsw_index.cpp b/searchlib/src/vespa/searchlib/tensor/hnsw_index.cpp index fa7eab7a4cc..7f1dd659678 100644 --- a/searchlib/src/vespa/searchlib/tensor/hnsw_index.cpp +++ b/searchlib/src/vespa/searchlib/tensor/hnsw_index.cpp @@ -264,7 +264,7 @@ HnswIndex::search_layer_helper(const TypedCells& input, uint32_t neighbors_to_fi uint32_t nodeid_limit, uint32_t estimated_visited_nodes) const { NearestPriQ candidates; - VisitedTracker visited(*this, nodeid_limit, estimated_visited_nodes); + VisitedTracker visited(nodeid_limit, estimated_visited_nodes); for (const auto &entry : best_neighbors.peek()) { if (entry.nodeid >= nodeid_limit) { continue; |