diff options
author | Tor Egge <Tor.Egge@broadpark.no> | 2019-06-18 15:42:36 +0200 |
---|---|---|
committer | Tor Egge <Tor.Egge@broadpark.no> | 2019-06-18 15:42:36 +0200 |
commit | 7d03f4da8fb3d2a40d32d3412e7424f2af356e6f (patch) | |
tree | 779b261c55485f6a61679412ecfc5452a173b765 /searchcore | |
parent | 57b31b5abb93497346c3ab7d77c81c2fb3c00e58 (diff) |
Track rename of cheap features to interleaved features.
Diffstat (limited to 'searchcore')
-rw-r--r-- | searchcore/src/tests/proton/matching/handle_recorder/handle_recorder_test.cpp | 26 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcore/proton/matching/handlerecorder.cpp | 6 |
2 files changed, 16 insertions, 16 deletions
diff --git a/searchcore/src/tests/proton/matching/handle_recorder/handle_recorder_test.cpp b/searchcore/src/tests/proton/matching/handle_recorder/handle_recorder_test.cpp index b935e89162d..785d4887e72 100644 --- a/searchcore/src/tests/proton/matching/handle_recorder/handle_recorder_test.cpp +++ b/searchcore/src/tests/proton/matching/handle_recorder/handle_recorder_test.cpp @@ -17,8 +17,8 @@ using namespace proton::matching; using HandleMap = HandleRecorder::HandleMap; constexpr MatchDataDetails NormalMask = MatchDataDetails::Normal; -constexpr MatchDataDetails CheapMask = MatchDataDetails::Cheap; -constexpr MatchDataDetails BothMask = static_cast<MatchDataDetails>(static_cast<int>(NormalMask) | static_cast<int>(CheapMask)); +constexpr MatchDataDetails InterleavedMask = MatchDataDetails::Interleaved; +constexpr MatchDataDetails BothMask = static_cast<MatchDataDetails>(static_cast<int>(NormalMask) | static_cast<int>(InterleavedMask)); void register_normal_handle(TermFieldHandle handle) @@ -27,22 +27,22 @@ register_normal_handle(TermFieldHandle handle) } void -register_cheap_handle(TermFieldHandle handle) +register_interleaved_features_handle(TermFieldHandle handle) { - HandleRecorder::register_handle(handle, MatchDataDetails::Cheap); + HandleRecorder::register_handle(handle, MatchDataDetails::Interleaved); } -TEST(HandleRecorderTest, can_record_both_normal_and_cheap_handles) +TEST(HandleRecorderTest, can_record_both_normal_and_interleaved_features_handles) { HandleRecorder recorder; { HandleRecorder::Binder binder(recorder); register_normal_handle(3); - register_cheap_handle(5); + register_interleaved_features_handle(5); register_normal_handle(7); } - EXPECT_EQ(HandleMap({{3, NormalMask}, {5, CheapMask}, {7, NormalMask}}), recorder.get_handles()); - EXPECT_EQ("normal: [3,7], cheap: [5]", recorder.to_string()); + EXPECT_EQ(HandleMap({{3, NormalMask}, {5, InterleavedMask}, {7, NormalMask}}), recorder.get_handles()); + EXPECT_EQ("normal: [3,7], interleaved: [5]", recorder.to_string()); } TEST(HandleRecorderTest, the_same_handle_can_be_in_both_normal_and_cheap_set) @@ -51,7 +51,7 @@ TEST(HandleRecorderTest, the_same_handle_can_be_in_both_normal_and_cheap_set) { HandleRecorder::Binder binder(recorder); register_normal_handle(3); - register_cheap_handle(3); + register_interleaved_features_handle(3); } EXPECT_EQ(HandleMap({{3, BothMask}}), recorder.get_handles()); } @@ -74,9 +74,9 @@ TEST(HandleRecorderTest, tagging_of_matchdata_works) { HandleRecorder::Binder binder(recorder); register_normal_handle(0); - register_cheap_handle(2); + register_interleaved_features_handle(2); register_normal_handle(3); - register_cheap_handle(3); + register_interleaved_features_handle(3); } auto md = MatchData::makeTestInstance(4, 4); recorder.tag_match_data(*md); @@ -88,9 +88,9 @@ TEST(HandleRecorderTest, tagging_of_matchdata_works) { HandleRecorder::Binder binder(recorder2); register_normal_handle(0); - register_cheap_handle(0); + register_interleaved_features_handle(0); register_normal_handle(1); - register_cheap_handle(3); + register_interleaved_features_handle(3); } recorder2.tag_match_data(*md); check_tagging(*md->resolveTermField(0), false, true, true); diff --git a/searchcore/src/vespa/searchcore/proton/matching/handlerecorder.cpp b/searchcore/src/vespa/searchcore/proton/matching/handlerecorder.cpp index b69a68c1cd1..566d3bae57e 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/handlerecorder.cpp +++ b/searchcore/src/vespa/searchcore/proton/matching/handlerecorder.cpp @@ -60,7 +60,7 @@ HandleRecorder::to_string() const { vespalib::asciistream os; os << "normal: [" << handles_to_string(_handles, MatchDataDetails::Normal) << "], "; - os << "cheap: [" << handles_to_string(_handles, MatchDataDetails::Cheap) << "]"; + os << "interleaved: [" << handles_to_string(_handles, MatchDataDetails::Interleaved) << "]"; return os.str(); } @@ -107,7 +107,7 @@ HandleRecorder::add(TermFieldHandle handle, { if (requested_details == MatchDataDetails::Normal || - requested_details == MatchDataDetails::Cheap) { + requested_details == MatchDataDetails::Interleaved) { _handles[handle] = static_cast<MatchDataDetails>(static_cast<int>(_handles[handle]) | static_cast<int>(requested_details)); } else { abort(); @@ -124,7 +124,7 @@ HandleRecorder::tag_match_data(MatchData &match_data) tfmd.tagAsNotNeeded(); } else { tfmd.setNeedNormalFeatures((static_cast<int>(recorded->second) & static_cast<int>(MatchDataDetails::Normal)) != 0); - tfmd.setNeedInterleavedFeatures((static_cast<int>(recorded->second) & static_cast<int>(MatchDataDetails::Cheap)) != 0); + tfmd.setNeedInterleavedFeatures((static_cast<int>(recorded->second) & static_cast<int>(MatchDataDetails::Interleaved)) != 0); } } } |