Merge pull request #26179 from vespa-engine/arnej/add-new-components-4

add new components for global-phase handling

2 files changed, 62 insertions, 3 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java b/config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java
index 86c48407775..14c25ee7452 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java
@@ -7,6 +7,7 @@ import com.yahoo.search.config.IndexInfoConfig;
 import com.yahoo.search.config.SchemaInfoConfig;
 import com.yahoo.search.pagetemplates.PageTemplatesConfig;
 import com.yahoo.search.query.profile.config.QueryProfilesConfig;
+import com.yahoo.search.ranking.RankProfilesEvaluatorFactory;
 import com.yahoo.schema.derived.SchemaInfo;
 import com.yahoo.vespa.configdefinition.IlscriptsConfig;
 import com.yahoo.vespa.model.container.ApplicationContainerCluster;
@@ -56,6 +57,8 @@ public class ContainerSearch extends ContainerSubsystem<SearchChains>
         owningCluster.addComponent(Component.fromClassAndBundle(CompiledQueryProfileRegistry.class, SEARCH_AND_DOCPROC_BUNDLE));
         owningCluster.addComponent(Component.fromClassAndBundle(com.yahoo.search.schema.SchemaInfo.class, SEARCH_AND_DOCPROC_BUNDLE));
         owningCluster.addComponent(Component.fromClassAndBundle(SearchStatusExtension.class, SEARCH_AND_DOCPROC_BUNDLE));
+        owningCluster.addComponent(Component.fromClassAndBundle(RankProfilesEvaluatorFactory.class, SEARCH_AND_DOCPROC_BUNDLE));
+        owningCluster.addComponent(Component.fromClassAndBundle(com.yahoo.search.ranking.GlobalPhaseRanker.class, SEARCH_AND_DOCPROC_BUNDLE));
         cluster.addSearchAndDocprocBundles();
     }
 
@@ -68,9 +71,16 @@ public class ContainerSearch extends ContainerSubsystem<SearchChains>
     /** Adds a Dispatcher component to the owning container cluster for each search cluster */
     private void initializeDispatchers(Collection<SearchCluster> searchClusters) {
         for (SearchCluster searchCluster : searchClusters) {
-            if ( ! ( searchCluster instanceof IndexedSearchCluster)) continue;
-            var dispatcher = new DispatcherComponent((IndexedSearchCluster)searchCluster);
-            owningCluster.addComponent(dispatcher);
+            if (searchCluster instanceof IndexedSearchCluster indexed) {
+                var dispatcher = new DispatcherComponent(indexed);
+                owningCluster.addComponent(dispatcher);
+                for (var documentDb : indexed.getDocumentDbs()) {
+                    var factory = new RankProfilesEvaluatorComponent(documentDb);
+                    if (! owningCluster.getComponentsMap().containsKey(factory.getComponentId())) {
+                        owningCluster.addComponent(factory);
+                    }
+                }
+            }
         }
     }
 
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/search/RankProfilesEvaluatorComponent.java b/config-model/src/main/java/com/yahoo/vespa/model/container/search/RankProfilesEvaluatorComponent.java
new file mode 100644
index 00000000000..75a2802ee53
--- /dev/null
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/search/RankProfilesEvaluatorComponent.java
@@ -0,0 +1,49 @@
+// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.vespa.model.container.search;
+
+import com.yahoo.config.model.producer.AnyConfigProducer;
+import com.yahoo.osgi.provider.model.ComponentModel;
+import com.yahoo.search.ranking.RankProfilesEvaluator;
+import com.yahoo.vespa.config.search.RankProfilesConfig;
+import com.yahoo.vespa.config.search.core.OnnxModelsConfig;
+import com.yahoo.vespa.config.search.core.RankingConstantsConfig;
+import com.yahoo.vespa.config.search.core.RankingExpressionsConfig;
+import com.yahoo.vespa.model.container.ContainerModelEvaluation;
+import com.yahoo.vespa.model.container.PlatformBundles;
+import com.yahoo.vespa.model.container.component.Component;
+import com.yahoo.vespa.model.search.DocumentDatabase;
+
+public class RankProfilesEvaluatorComponent
+    extends Component<AnyConfigProducer, ComponentModel>
+    implements
+        RankProfilesConfig.Producer,
+        RankingConstantsConfig.Producer,
+        RankingExpressionsConfig.Producer,
+        OnnxModelsConfig.Producer
+{
+    private final DocumentDatabase ddb;
+
+    public RankProfilesEvaluatorComponent(DocumentDatabase db) {
+        super(toComponentModel(db.getSchemaName()));
+        ddb = db;
+    }
+
+    private static ComponentModel toComponentModel(String p) {
+        String myComponentId = "ranking-expression-evaluator." + p;
+        return new ComponentModel(myComponentId,
+                                  RankProfilesEvaluator.class.getName(),
+                                  PlatformBundles.SEARCH_AND_DOCPROC_BUNDLE);
+    }
+
+    @Override
+    public void getConfig(RankProfilesConfig.Builder builder) { ddb.getConfig(builder); }
+
+    @Override
+    public void getConfig(RankingExpressionsConfig.Builder builder) { ddb.getConfig(builder); }
+
+    @Override
+    public void getConfig(RankingConstantsConfig.Builder builder) { ddb.getConfig(builder); }
+
+    @Override
+    public void getConfig(OnnxModelsConfig.Builder builder) { ddb.getConfig(builder); }
+}