diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2024-03-07 16:30:19 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2024-03-07 16:30:19 +0100 |
commit | d59c13247bcda6c4ee5a58744301c51db0277dff (patch) | |
tree | 8f9600fdcf77ce30de5394ece2b5661c2dd64ba8 /config-model/src/main/java/com/yahoo | |
parent | 38a38c0e7bbd14cb6197477c127089b6dced6e83 (diff) |
rank-profiles from different schemas can not be joined.
Diffstat (limited to 'config-model/src/main/java/com/yahoo')
3 files changed, 13 insertions, 57 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; @@ -47,11 +46,6 @@ public class LocalProvider extends Provider implements } @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 { |