summaryrefslogtreecommitdiffstats
path: root/searchcore
diff options
context:
space:
mode:
authorTor Egge <Tor.Egge@broadpark.no>2019-06-18 15:22:26 +0200
committerTor Egge <Tor.Egge@broadpark.no>2019-06-18 15:22:26 +0200
commit57b31b5abb93497346c3ab7d77c81c2fb3c00e58 (patch)
tree758948c4e6585b347977923a5992d3edf6e3fade /searchcore
parent8d007e3adfe822499b20806a2a92ca55dbda3131 (diff)
Rename cheap features to interleaved features.
Diffstat (limited to 'searchcore')
-rw-r--r--searchcore/src/tests/proton/matching/handle_recorder/handle_recorder_test.cpp4
-rw-r--r--searchcore/src/vespa/searchcore/proton/matching/handlerecorder.cpp2
2 files changed, 3 insertions, 3 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 b384f126f05..b935e89162d 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
@@ -59,11 +59,11 @@ TEST(HandleRecorderTest, the_same_handle_can_be_in_both_normal_and_cheap_set)
namespace {
void check_tagging(const TermFieldMatchData &tfmd, bool exp_not_needed,
- bool exp_needs_normal_features, bool exp_needs_cheap_features)
+ bool exp_needs_normal_features, bool exp_needs_interleaved_features)
{
EXPECT_EQ(tfmd.isNotNeeded(), exp_not_needed);
EXPECT_EQ(tfmd.needs_normal_features(), exp_needs_normal_features);
- EXPECT_EQ(tfmd.needs_cheap_features(), exp_needs_cheap_features);
+ EXPECT_EQ(tfmd.needs_interleaved_features(), exp_needs_interleaved_features);
}
}
diff --git a/searchcore/src/vespa/searchcore/proton/matching/handlerecorder.cpp b/searchcore/src/vespa/searchcore/proton/matching/handlerecorder.cpp
index 5f1e328be7a..b69a68c1cd1 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/handlerecorder.cpp
+++ b/searchcore/src/vespa/searchcore/proton/matching/handlerecorder.cpp
@@ -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.setNeedCheapFeatures((static_cast<int>(recorded->second) & static_cast<int>(MatchDataDetails::Cheap)) != 0);
+ tfmd.setNeedInterleavedFeatures((static_cast<int>(recorded->second) & static_cast<int>(MatchDataDetails::Cheap)) != 0);
}
}
}