From 64e39db4bdbb9fab7b8b99855b16b51b3ee52ea5 Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Fri, 1 Dec 2023 12:48:59 +0000 Subject: - Show what is mismatch in error message. - Show extra errors not expected. --- searchlib/src/tests/ranksetup/verify_feature/verify_feature_test.cpp | 5 +++++ searchlib/src/vespa/searchlib/attribute/postinglistsearchcontext.hpp | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/searchlib/src/tests/ranksetup/verify_feature/verify_feature_test.cpp b/searchlib/src/tests/ranksetup/verify_feature/verify_feature_test.cpp index feee5128493..4fdcc7f1d8a 100644 --- a/searchlib/src/tests/ranksetup/verify_feature/verify_feature_test.cpp +++ b/searchlib/src/tests/ranksetup/verify_feature/verify_feature_test.cpp @@ -28,6 +28,7 @@ std::ostream &operator<<(std::ostream &os, Level level) { } bool equal(const vespalib::string & a, const vespalib::string &b) { + EXPECT_EQUAL(a, b); return a == b; } @@ -53,6 +54,10 @@ struct RankFixture { EXPECT_EQUAL(errors[i].first, expected[i].second.first); EXPECT_TRUE(expected[i].first(errors[i].second, expected[i].second.second)); } + for (size_t i(expected.size()); i < errors.size(); i++) { + EXPECT_EQUAL(errors[i].first, Level::INFO); + EXPECT_EQUAL(errors[i].second, ""); + } return ok; } }; diff --git a/searchlib/src/vespa/searchlib/attribute/postinglistsearchcontext.hpp b/searchlib/src/vespa/searchlib/attribute/postinglistsearchcontext.hpp index 4436ea203ce..3ff5c749899 100644 --- a/searchlib/src/vespa/searchlib/attribute/postinglistsearchcontext.hpp +++ b/searchlib/src/vespa/searchlib/attribute/postinglistsearchcontext.hpp @@ -73,8 +73,7 @@ void PostingListSearchContextT::fillBitVector() { for (auto it(_lowerDictItr); it != _upperDictItr; ++it) { - _merger.addToBitVector(PostingListTraverser(_posting_store, - it.getData().load_acquire())); + _merger.addToBitVector(PostingListTraverser(_posting_store, it.getData().load_acquire())); } } -- cgit v1.2.3