Merge pull request #23656 from vespa-engine/balder/split-verification-and-app

- Split rank setup verification code and the binary [run-systemtest]

1 files changed, 4 insertions, 3 deletions

diff --git a/streamingvisitors/src/vespa/searchvisitor/rankmanager.cpp b/streamingvisitors/src/vespa/searchvisitor/rankmanager.cpp
index 13e5ad1c84b..706325a0f7a 100644
--- a/streamingvisitors/src/vespa/searchvisitor/rankmanager.cpp
+++ b/streamingvisitors/src/vespa/searchvisitor/rankmanager.cpp
@@ -21,6 +21,7 @@ using search::fef::RankSetup;
 using vsm::VsmfieldsHandle;
 using vsm::VSMAdapter;
 using vsm::FieldIdTList;
+using vespalib::make_string_short::fmt;
 
 namespace streaming {
 
@@ -115,10 +116,10 @@ RankManager::Snapshot::initRankSetup(const BlueprintFactory & factory)
     for (uint32_t i = 0; i < _indexEnv.size(); ++i) {
         IndexEnvironment & ie = _indexEnv[i];
 
-        RankSetup::SP rs(new RankSetup(factory, ie));
+        auto rs = std::make_shared<RankSetup>(factory, ie);
         rs->configure(); // reads config values from the property map
         if (!rs->compile()) {
-            LOG(warning, "Could not compile rank setup for rank profile '%u'.", i);
+            LOG(warning, "Could not compile rank setup for rank profile '%u'. Errors = %s", i, rs->getJoinedWarnings().c_str());
             return false;
         }
         _rankSetup.push_back(rs);
@@ -127,7 +128,7 @@ RankManager::Snapshot::initRankSetup(const BlueprintFactory & factory)
     LOG(debug, "Number of index environments and rank setups: %u", (uint32_t)_indexEnv.size());
     LOG_ASSERT(_properties.size() == _rankSetup.size());
     for (uint32_t i = 0; i < _properties.size(); ++i) {
-        vespalib::string number = vespalib::make_string("%u", i);
+        vespalib::string number = fmt("%u", i);
         _rpmap[number] = i;
     }
     for (uint32_t i = 0; i < _properties.size(); ++i) {