summaryrefslogtreecommitdiffstats
path: root/searchlib
diff options
context:
space:
mode:
authorArne Juul <arnej@verizonmedia.com>2020-02-22 08:21:38 +0000
committerArne Juul <arnej@verizonmedia.com>2020-02-22 08:55:23 +0000
commit7c3f68c15b1e429dab6c987b90d4f012fdceaaf7 (patch)
treeee8ceddd9adbaeec192e31799ea71fdcecff50b3 /searchlib
parenta2d1edf6a50faf4ec222105830acc9bd0bd67de5 (diff)
drop unneccessary passing of unused strict flag
Diffstat (limited to 'searchlib')
-rw-r--r--searchlib/src/tests/queryeval/nearest_neighbor/nearest_neighbor_test.cpp2
-rw-r--r--searchlib/src/vespa/searchlib/queryeval/nearest_neighbor_blueprint.cpp2
-rw-r--r--searchlib/src/vespa/searchlib/queryeval/nns_index_iterator.cpp2
-rw-r--r--searchlib/src/vespa/searchlib/queryeval/nns_index_iterator.h1
4 files changed, 2 insertions, 5 deletions
diff --git a/searchlib/src/tests/queryeval/nearest_neighbor/nearest_neighbor_test.cpp b/searchlib/src/tests/queryeval/nearest_neighbor/nearest_neighbor_test.cpp
index 691e80aeb9f..ee8d4b787bd 100644
--- a/searchlib/src/tests/queryeval/nearest_neighbor/nearest_neighbor_test.cpp
+++ b/searchlib/src/tests/queryeval/nearest_neighbor/nearest_neighbor_test.cpp
@@ -195,7 +195,7 @@ TEST("require that NnsIndexIterator works as expected") {
std::vector<NnsIndexIterator::Hit> hits{{2,4.0}, {3,9.0}, {5,1.0}, {8,16.0}, {9,36.0}};
auto md = MatchData::makeTestInstance(2, 2);
auto &tfmd = *(md->resolveTermField(0));
- auto search = NnsIndexIterator::create(true, tfmd, hits);
+ auto search = NnsIndexIterator::create(tfmd, hits);
uint32_t docid = 1;
search->initFullRange();
bool match = search->seek(docid);
diff --git a/searchlib/src/vespa/searchlib/queryeval/nearest_neighbor_blueprint.cpp b/searchlib/src/vespa/searchlib/queryeval/nearest_neighbor_blueprint.cpp
index f9bce4bf7d1..7f7c4d2976b 100644
--- a/searchlib/src/vespa/searchlib/queryeval/nearest_neighbor_blueprint.cpp
+++ b/searchlib/src/vespa/searchlib/queryeval/nearest_neighbor_blueprint.cpp
@@ -56,7 +56,7 @@ NearestNeighborBlueprint::createLeafSearch(const search::fef::TermFieldMatchData
assert(tfmda.size() == 1);
fef::TermFieldMatchData &tfmd = *tfmda[0]; // always search in only one field
if (strict && ! _found_hits.empty()) {
- return NnsIndexIterator::create(strict, tfmd, _found_hits);
+ return NnsIndexIterator::create(tfmd, _found_hits);
}
const vespalib::tensor::DenseTensorView &qT = *_query_tensor;
return NearestNeighborIterator::create(strict, tfmd, qT, _attr_tensor, _distance_heap);
diff --git a/searchlib/src/vespa/searchlib/queryeval/nns_index_iterator.cpp b/searchlib/src/vespa/searchlib/queryeval/nns_index_iterator.cpp
index 7ee985a0ba5..fd98cbf393d 100644
--- a/searchlib/src/vespa/searchlib/queryeval/nns_index_iterator.cpp
+++ b/searchlib/src/vespa/searchlib/queryeval/nns_index_iterator.cpp
@@ -59,11 +59,9 @@ public:
std::unique_ptr<NnsIndexIterator>
NnsIndexIterator::create(
- bool strict,
fef::TermFieldMatchData &tfmd,
const std::vector<Hit> &hits)
{
- assert(strict);
return std::make_unique<NeighborVectorIterator>(tfmd, hits);
}
diff --git a/searchlib/src/vespa/searchlib/queryeval/nns_index_iterator.h b/searchlib/src/vespa/searchlib/queryeval/nns_index_iterator.h
index 62fa49aac46..9ffd0df94eb 100644
--- a/searchlib/src/vespa/searchlib/queryeval/nns_index_iterator.h
+++ b/searchlib/src/vespa/searchlib/queryeval/nns_index_iterator.h
@@ -13,7 +13,6 @@ class NnsIndexIterator : public SearchIterator
public:
using Hit = search::tensor::NearestNeighborIndex::Neighbor;
static std::unique_ptr<NnsIndexIterator> create(
- bool strict,
fef::TermFieldMatchData &tfmd,
const std::vector<Hit> &hits);
};