diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-11-21 10:35:38 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2023-11-21 10:39:04 +0100 |
commit | 09853c28b746d3d206ab51289423a4d62a8f05ef (patch) | |
tree | a2f72ba9981ea03bd1dee4fde9d590cf5ed64fe5 /config-model/src/main/java | |
parent | ccc4d65ca958036b37a4fbbbcca443f2a873077f (diff) |
global phase have feature has been completed. No need for config control.
Diffstat (limited to 'config-model/src/main/java')
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/derived/RawRankProfile.java | 1 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java | 21 |
2 files changed, 8 insertions, 14 deletions
diff --git a/config-model/src/main/java/com/yahoo/schema/derived/RawRankProfile.java b/config-model/src/main/java/com/yahoo/schema/derived/RawRankProfile.java index 388d2627224..6a1ebb39ac8 100644 --- a/config-model/src/main/java/com/yahoo/schema/derived/RawRankProfile.java +++ b/config-model/src/main/java/com/yahoo/schema/derived/RawRankProfile.java @@ -36,7 +36,6 @@ import java.util.ListIterator; import java.util.Map; import java.util.OptionalDouble; import java.util.Set; -import java.util.stream.Collectors; /** * A rank profile derived from a search definition, containing exactly the features available natively in the server 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 31468c05b99..6e4c14bdeac 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 @@ -51,7 +51,6 @@ public class ContainerSearch extends ContainerSubsystem<SearchChains> private final ApplicationContainerCluster owningCluster; private final List<SearchCluster> searchClusters = new LinkedList<>(); private final Collection<String> schemasWithGlobalPhase; - private final boolean globalPhase; private final ApplicationPackage app; private QueryProfiles queryProfiles; @@ -60,7 +59,6 @@ public class ContainerSearch extends ContainerSubsystem<SearchChains> public ContainerSearch(DeployState deployState, ApplicationContainerCluster cluster, SearchChains chains) { super(chains); - this.globalPhase = deployState.featureFlags().enableGlobalPhase(); this.schemasWithGlobalPhase = getSchemasWithGlobalPhase(deployState); this.app = deployState.getApplicationPackage(); this.owningCluster = cluster; @@ -95,16 +93,14 @@ public class ContainerSearch extends ContainerSubsystem<SearchChains> var dispatcher = new DispatcherComponent(indexed, dispatcherClass); owningCluster.addComponent(dispatcher); } - if (globalPhase) { - for (var documentDb : searchCluster.getDocumentDbs()) { - if ( ! schemasWithGlobalPhase.contains(documentDb.getSchemaName())) continue; - var factory = new RankProfilesEvaluatorComponent(documentDb); - if ( ! owningCluster.getComponentsMap().containsKey(factory.getComponentId())) { - var onnxModels = documentDb.getDerivedConfiguration().getRankProfileList().getOnnxModels(); - onnxModels.asMap().forEach( - (__, model) -> owningCluster.onnxModelCost().registerModel(app.getFile(model.getFilePath()), model.onnxModelOptions())); - owningCluster.addComponent(factory); - } + for (var documentDb : searchCluster.getDocumentDbs()) { + if ( ! schemasWithGlobalPhase.contains(documentDb.getSchemaName())) continue; + var factory = new RankProfilesEvaluatorComponent(documentDb); + if ( ! owningCluster.getComponentsMap().containsKey(factory.getComponentId())) { + var onnxModels = documentDb.getDerivedConfiguration().getRankProfileList().getOnnxModels(); + onnxModels.asMap().forEach( + (__, model) -> owningCluster.onnxModelCost().registerModel(app.getFile(model.getFilePath()), model.onnxModelOptions())); + owningCluster.addComponent(factory); } } } @@ -176,7 +172,6 @@ public class ContainerSearch extends ContainerSubsystem<SearchChains> } scB.rankprofiles(new QrSearchersConfig.Searchcluster.Rankprofiles.Builder().configid(sys.getConfigId())); scB.indexingmode(QrSearchersConfig.Searchcluster.Indexingmode.Enum.valueOf(sys.getIndexingModeName())); - scB.globalphase(globalPhase); if ( ! (sys instanceof IndexedSearchCluster)) { scB.storagecluster(new QrSearchersConfig.Searchcluster.Storagecluster.Builder(). routespec(((StreamingSearchCluster)sys).getStorageRouteSpec())); |