From d59c13247bcda6c4ee5a58744301c51db0277dff Mon Sep 17 00:00:00 2001
From: Henning Baldersheim <balder@yahoo-inc.com>
Date: Thu, 7 Mar 2024 16:30:19 +0100
Subject: rank-profiles from different schemas can not be joined.

---
 .../search/searchchain/LocalProvider.java          | 10 +----
 .../yahoo/vespa/model/search/SearchCluster.java    | 11 -----
 .../vespa/model/search/StreamingSearchCluster.java | 49 +++++-----------------
 .../search/searchchain/MockSearchClusters.java     |  1 -
 .../com/yahoo/vespa/model/ml/MlModelsTest.java     |  2 +-
 5 files changed, 14 insertions(+), 59 deletions(-)

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/LocalProvider.java b/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/LocalProvider.java
index dfef6eac3b3..bf331df6e48 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/LocalProvider.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/LocalProvider.java
@@ -8,7 +8,6 @@ import com.yahoo.component.chain.model.ChainedComponentModel;
 import com.yahoo.prelude.fastsearch.DocumentdbInfoConfig;
 import com.yahoo.prelude.cluster.QrMonitorConfig;
 import com.yahoo.schema.derived.SchemaInfo;
-import com.yahoo.vespa.config.search.RankProfilesConfig;
 import com.yahoo.vespa.config.search.AttributesConfig;
 import com.yahoo.search.config.ClusterConfig;
 import com.yahoo.search.searchchain.model.federation.FederationOptions;
@@ -29,8 +28,8 @@ public class LocalProvider extends Provider implements
         DocumentdbInfoConfig.Producer,
         ClusterConfig.Producer,
         AttributesConfig.Producer,
-        QrMonitorConfig.Producer,
-        RankProfilesConfig.Producer {
+        QrMonitorConfig.Producer
+{
 
     private final LocalProviderSpec providerSpec;
     private volatile SearchCluster searchCluster;
@@ -46,11 +45,6 @@ public class LocalProvider extends Provider implements
             builder.cacheTimeout(convertVisibilityDelay(searchCluster.getVisibilityDelay()));
     }
 
-    @Override
-    public void getConfig(RankProfilesConfig.Builder builder) {
-        searchCluster.getConfig(builder);
-    }
-
     @Override
     public void getConfig(AttributesConfig.Builder builder) {
         searchCluster.getConfig(builder);
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/search/SearchCluster.java
index 920ec4f35fc..c0aec7ba0b4 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/search/SearchCluster.java
@@ -6,7 +6,6 @@ import com.yahoo.config.model.deploy.DeployState;
 import com.yahoo.search.config.SchemaInfoConfig;
 import com.yahoo.schema.derived.SchemaInfo;
 import com.yahoo.vespa.config.search.AttributesConfig;
-import com.yahoo.vespa.config.search.RankProfilesConfig;
 import com.yahoo.prelude.fastsearch.DocumentdbInfoConfig;
 import com.yahoo.search.config.IndexInfoConfig;
 import com.yahoo.vespa.config.search.core.ProtonConfig;
@@ -138,10 +137,6 @@ public abstract class SearchCluster extends TreeConfigProducer<AnyConfigProducer
         new Join(documentDbs).getConfig(builder);
     }
 
-    public void getConfig(RankProfilesConfig.Builder builder) {
-        new Join(documentDbs).getConfig(builder);
-    }
-
     @Override
     public String toString() { return "search-capable cluster '" + clusterName + "'"; }
 
@@ -195,12 +190,6 @@ public abstract class SearchCluster extends TreeConfigProducer<AnyConfigProducer
             }
         }
 
-        public void getConfig(RankProfilesConfig.Builder builder) {
-            for (DocumentDatabase docDb : docDbs) {
-                docDb.getConfig(builder);
-            }
-        }
-
     }
 
 }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/StreamingSearchCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/search/StreamingSearchCluster.java
index b4e09c59079..3f15bc90b8f 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/search/StreamingSearchCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/search/StreamingSearchCluster.java
@@ -72,44 +72,17 @@ public class StreamingSearchCluster extends SearchCluster implements
         ddbB.configid(attributesConfig.getConfigId()); // Temporary until fully cleaned up
     }
 
-    private DocumentDatabase db() {
-        return getDocumentDbs().get(0);
-    }
-
-    @Override
-    public void getConfig(SummaryConfig.Builder builder) {
-        db().getConfig(builder);
-    }
-
-    @Override
-    public void getConfig(OnnxModelsConfig.Builder builder) {
-        db().getConfig(builder);
-    }
-
-    @Override
-    public void getConfig(RankingConstantsConfig.Builder builder) {
-        db().getConfig(builder);
-    }
-
-    @Override
-    public void getConfig(RankingExpressionsConfig.Builder builder) {
-        db().getConfig(builder);
-    }
-
-    @Override
-    public void getConfig(JuniperrcConfig.Builder builder) {
-        db().getConfig(builder);
-    }
-
-    @Override
-    public void getConfig(VsmfieldsConfig.Builder builder) {
-        db().getConfig(builder);
-    }
-
-    @Override
-    public void getConfig(VsmsummaryConfig.Builder builder) {
-        db().getConfig(builder);
-    }
+    private DocumentDatabase db() { return getDocumentDbs().get(0); }
+
+    // These are temporary until backend uses correct config id.
+    @Override public void getConfig(SummaryConfig.Builder builder) { db().getConfig(builder); }
+    @Override public void getConfig(OnnxModelsConfig.Builder builder) { db().getConfig(builder); }
+    @Override public void getConfig(RankingConstantsConfig.Builder builder) { db().getConfig(builder); }
+    @Override public void getConfig(RankProfilesConfig.Builder builder) { db().getConfig(builder); }
+    @Override public void getConfig(RankingExpressionsConfig.Builder builder) { db().getConfig(builder); }
+    @Override public void getConfig(JuniperrcConfig.Builder builder) { db().getConfig(builder); }
+    @Override public void getConfig(VsmfieldsConfig.Builder builder) { db().getConfig(builder); }
+    @Override public void getConfig(VsmsummaryConfig.Builder builder) { db().getConfig(builder);}
 
     private class AttributesProducer extends AnyConfigProducer implements AttributesConfig.Producer {
 
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/MockSearchClusters.java b/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/MockSearchClusters.java
index 8f9102801c2..8f02cf7a6d4 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/MockSearchClusters.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/MockSearchClusters.java
@@ -31,7 +31,6 @@ public class MockSearchClusters {
         @Override public List<DocumentDatabase> getDocumentDbs() {return List.of();}
         @Override public void getConfig(AttributesConfig.Builder builder) {}
         @Override public void getConfig(DocumentdbInfoConfig.Builder builder) {}
-        @Override public void getConfig(RankProfilesConfig.Builder builder) {}
         @Override public void getConfig(IndexInfoConfig.Builder builder) {}
         @Override public void getConfig(IlscriptsConfig.Builder builder) {}
         @Override public void getConfig(SchemaInfoConfig.Builder builder) {}
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/ml/MlModelsTest.java b/config-model/src/test/java/com/yahoo/vespa/model/ml/MlModelsTest.java
index 74319cfe994..bfccff094d9 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/ml/MlModelsTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/ml/MlModelsTest.java
@@ -47,7 +47,7 @@ public class MlModelsTest {
         assertEquals(3, model.rankProfileList().getRankProfiles().size(), "Global models are created (although not used directly here)");
 
         RankProfilesConfig.Builder builder = new RankProfilesConfig.Builder();
-        model.getSearchClusters().get(0).getConfig(builder);
+        model.getConfig(builder, "test/search/cluster.test/test");
         RankProfilesConfig config = new RankProfilesConfig(builder);
         assertEquals(3, config.rankprofile().size());
         assertEquals("test", config.rankprofile(2).name());
-- 
cgit v1.2.3