diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2024-02-12 22:27:30 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-02-12 22:27:30 +0100 |
commit | d62af325866a049d7eb97b6e3226b6f97c22b70d (patch) | |
tree | 1529f44b56111d3f27222ba26ac6fd3aadd0476c | |
parent | 98fba492d4a51e2eaba59790256fc526f32203a9 (diff) | |
parent | abb2f599c5743dd9c4b02a104ca0735e817ed1f5 (diff) |
Merge pull request #30246 from vespa-engine/balder/summary-features-are-never-cached
vespa.summaryFeatures.cached is always 0.0 (false)
5 files changed, 1 insertions, 9 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.cpp b/searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.cpp index d7fa55d537e..d6cccf47b18 100644 --- a/searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.cpp +++ b/searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.cpp @@ -120,7 +120,6 @@ DocsumContext::fillSummaryFeatures(search::docsummary::GetDocsumsState& state) if (_matcher->canProduceSummaryFeatures()) { state._summaryFeatures = _matcher->getSummaryFeatures(_request, _searchCtx, _attrCtx, _sessionMgr); } - state._summaryFeaturesCached = false; } void diff --git a/searchsummary/src/vespa/searchsummary/docsummary/docsumstate.cpp b/searchsummary/src/vespa/searchsummary/docsummary/docsumstate.cpp index c0a0c79c0ca..af21b7e1e7e 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/docsumstate.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/docsumstate.cpp @@ -47,7 +47,6 @@ GetDocsumsState::GetDocsumsState(GetDocsumsStateCallback &callback) _fieldWriterStates(), _parsedLocations(), _summaryFeatures(nullptr), - _summaryFeaturesCached(false), _omit_summary_features(false), _rankFeatures(nullptr), _matching_elements() diff --git a/searchsummary/src/vespa/searchsummary/docsummary/docsumstate.h b/searchsummary/src/vespa/searchsummary/docsummary/docsumstate.h index c01309961ed..b7259ab9fbd 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/docsumstate.h +++ b/searchsummary/src/vespa/searchsummary/docsummary/docsumstate.h @@ -80,7 +80,6 @@ public: // used by SummaryFeaturesDFW std::shared_ptr<FeatureSet> _summaryFeatures; - bool _summaryFeaturesCached; bool _omit_summary_features; // used by RankFeaturesDFW diff --git a/searchsummary/src/vespa/searchsummary/docsummary/summaryfeaturesdfw.cpp b/searchsummary/src/vespa/searchsummary/docsummary/summaryfeaturesdfw.cpp index be0c056c2f1..e23cb20ef37 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/summaryfeaturesdfw.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/summaryfeaturesdfw.cpp @@ -41,11 +41,7 @@ SummaryFeaturesDFW::insertField(uint32_t docid, GetDocsumsState& state, vespalib obj.setDouble(name, values[i].as_double()); } } - if (state._summaryFeaturesCached) { - obj.setDouble(_M_cached, 1.0); - } else { - obj.setDouble(_M_cached, 0.0); - } + obj.setDouble(_M_cached, 0.0); // TODO Remove, has not been cached for many years } } diff --git a/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.cpp b/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.cpp index 1720fb0b3d1..e17ca40e5f1 100644 --- a/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.cpp +++ b/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.cpp @@ -29,7 +29,6 @@ void GetDocsumsStateCallback::fillSummaryFeatures(GetDocsumsState& state) { if (_summaryFeatures) { // set the summary features to write to the docsum state._summaryFeatures = _summaryFeatures; - state._summaryFeaturesCached = true; } } |