Add a rank feature that will use the distribution key to provide a globally unique number.

unique = (docId << 16 | distributionKey)

3 files changed, 7 insertions, 3 deletions

diff --git a/streamingvisitors/src/vespa/searchvisitor/indexenvironment.h b/streamingvisitors/src/vespa/searchvisitor/indexenvironment.h
index 5d684c4fea4..ac6836b08c5 100644
--- a/streamingvisitors/src/vespa/searchvisitor/indexenvironment.h
+++ b/streamingvisitors/src/vespa/searchvisitor/indexenvironment.h
@@ -81,6 +81,9 @@ public:
 
     const std::set<vespalib::string> & getHintedDumpAttributes() const { return _dumpAttributes; }
 
+    //TODO Wire in proper distribution key
+    uint32_t getDistributionKey() const override { return 0; }
+
 };
 
 } // namespace streaming
diff --git a/streamingvisitors/src/vespa/searchvisitor/rankmanager.cpp b/streamingvisitors/src/vespa/searchvisitor/rankmanager.cpp
index 8dbbbba98cf..2c5f5eeb1b7 100644
--- a/streamingvisitors/src/vespa/searchvisitor/rankmanager.cpp
+++ b/streamingvisitors/src/vespa/searchvisitor/rankmanager.cpp
@@ -176,7 +176,8 @@ RankManager::Snapshot::setup(const RankManager & rm, const RankProfilesConfig &
     return setup(rm);
 }
 
-void RankManager::notify(const vsm::VSMConfigSnapshot & snap)
+void
+RankManager::notify(const vsm::VSMConfigSnapshot & snap)
 {
     configureRankProfiles(*snap.getConfig<RankProfilesConfig>());
 }
@@ -187,7 +188,7 @@ RankManager::configureRankProfiles(const RankProfilesConfig & cfg)
 {
     LOG(debug, "configureRankProfiles(): Size of cfg rankprofiles: %zd", cfg.rankprofile.size());
 
-    std::unique_ptr<Snapshot> snapshot(new Snapshot());
+    auto snapshot = std::make_unique<Snapshot>();
     if (snapshot->setup(*this, cfg)) {
         _snapshot.set(snapshot.release());
         _snapshot.latch(); // switch to the new config object
diff --git a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp
index cc48ad09aa6..76ef0f23dd2 100644
--- a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp
+++ b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp
@@ -357,7 +357,7 @@ SearchVisitorFactory::SearchVisitorFactory(const config::ConfigUri & configUri)
 VisitorEnvironment::UP
 SearchVisitorFactory::makeVisitorEnvironment(StorageComponent&)
 {
-    return VisitorEnvironment::UP(new SearchEnvironment(_configUri));
+    return std::make_unique<SearchEnvironment>(_configUri);
 }
 
 storage::Visitor*