aboutsummaryrefslogtreecommitdiffstats
path: root/streamingvisitors
diff options
context:
space:
mode:
authorTor Egge <Tor.Egge@online.no>2024-02-06 11:04:06 +0100
committerTor Egge <Tor.Egge@online.no>2024-02-06 11:04:06 +0100
commite86cf515390baf466781456b5da0bd20c9e9e8bb (patch)
treebdf752102e3b7129016176b82a1f58d48aa3b89b /streamingvisitors
parent34a58b7c01bca060fe73c4c20f49765c113063a9 (diff)
Rename generation to config_generation in SearchEnvironmentSnapshot.
Diffstat (limited to 'streamingvisitors')
-rw-r--r--streamingvisitors/src/vespa/searchvisitor/search_environment_snapshot.cpp4
-rw-r--r--streamingvisitors/src/vespa/searchvisitor/search_environment_snapshot.h6
-rw-r--r--streamingvisitors/src/vespa/searchvisitor/searchenvironment.cpp2
3 files changed, 6 insertions, 6 deletions
diff --git a/streamingvisitors/src/vespa/searchvisitor/search_environment_snapshot.cpp b/streamingvisitors/src/vespa/searchvisitor/search_environment_snapshot.cpp
index 2e162b4e899..d6aecb790dc 100644
--- a/streamingvisitors/src/vespa/searchvisitor/search_environment_snapshot.cpp
+++ b/streamingvisitors/src/vespa/searchvisitor/search_environment_snapshot.cpp
@@ -4,11 +4,11 @@
namespace streaming {
-SearchEnvironmentSnapshot::SearchEnvironmentSnapshot(const RankManager& rank_manager, const vsm::VSMAdapter& vsm_adapter, int64_t generation)
+SearchEnvironmentSnapshot::SearchEnvironmentSnapshot(const RankManager& rank_manager, const vsm::VSMAdapter& vsm_adapter, int64_t config_generation)
: _rank_manager_snapshot(rank_manager.getSnapshot()),
_vsm_fields_cfg(vsm_adapter.getFieldsConfig()),
_docsum_tools(vsm_adapter.getDocsumTools()),
- _generation(generation)
+ _config_generation(config_generation)
{
}
diff --git a/streamingvisitors/src/vespa/searchvisitor/search_environment_snapshot.h b/streamingvisitors/src/vespa/searchvisitor/search_environment_snapshot.h
index 167a0df6671..b3e6e08f1dc 100644
--- a/streamingvisitors/src/vespa/searchvisitor/search_environment_snapshot.h
+++ b/streamingvisitors/src/vespa/searchvisitor/search_environment_snapshot.h
@@ -16,15 +16,15 @@ class SearchEnvironmentSnapshot
std::shared_ptr<const RankManager::Snapshot> _rank_manager_snapshot;
std::shared_ptr<VsmfieldsConfig> _vsm_fields_cfg;
std::shared_ptr<const vsm::DocsumTools> _docsum_tools;
- int64_t _generation;
+ int64_t _config_generation;
public:
- SearchEnvironmentSnapshot(const RankManager& rank_manager, const vsm::VSMAdapter& vsm_adapter, int64_t generation);
+ SearchEnvironmentSnapshot(const RankManager& rank_manager, const vsm::VSMAdapter& vsm_adapter, int64_t config_generation);
~SearchEnvironmentSnapshot();
const std::shared_ptr<const RankManager::Snapshot>& get_rank_manager_snapshot() const noexcept { return _rank_manager_snapshot; }
const std::shared_ptr<VsmfieldsConfig>& get_vsm_fields_config() const noexcept { return _vsm_fields_cfg; }
const std::shared_ptr<const vsm::DocsumTools>& get_docsum_tools() const noexcept { return _docsum_tools; }
- int64_t get_generation() const noexcept { return _generation; }
+ int64_t get_config_generation() const noexcept { return _config_generation; }
};
}
diff --git a/streamingvisitors/src/vespa/searchvisitor/searchenvironment.cpp b/streamingvisitors/src/vespa/searchvisitor/searchenvironment.cpp
index e051f9206e1..933aa528163 100644
--- a/streamingvisitors/src/vespa/searchvisitor/searchenvironment.cpp
+++ b/streamingvisitors/src/vespa/searchvisitor/searchenvironment.cpp
@@ -175,7 +175,7 @@ SearchEnvironment::get_oldest_config_generation()
for (auto& env : envs) {
auto snapshot = env->get_snapshot();
if (snapshot) {
- auto gen = snapshot->get_generation();
+ auto gen = snapshot->get_config_generation();
if (!oldest.has_value() || oldest.value() > gen) {
oldest = gen;
}