diff options
| author | Jon Bratseth <bratseth@gmail.com> | 2022-06-15 07:39:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-15 07:39:11 +0200 |
| commit | a5bf0f4865dc0b8413af60e117c45b3230914ac9 (patch) | |
| tree | 4fcb12b66af3bc5b68be2c21c9374b6a7ab83427 /container-search | |
| parent | d54051f8ca4626cf2cf7e18d3c84cbc94cb27b22 (diff) | |
| parent | 9eed65d82e6fee81e228db9bbffcd974c572a064 (diff) | |
Merge pull request #23090 from vespa-engine/balder/gc-deprecated
GC unused and deprecated code
Diffstat (limited to 'container-search')
| -rw-r--r-- | container-search/abi-spec.json | 1 | ||||
| -rw-r--r-- | container-search/src/main/java/com/yahoo/search/searchchain/ExecutionFactory.java | 13 |
2 files changed, 0 insertions, 14 deletions
diff --git a/container-search/abi-spec.json b/container-search/abi-spec.json index 7fe1702be8f..de27e229163 100644 --- a/container-search/abi-spec.json +++ b/container-search/abi-spec.json @@ -8188,7 +8188,6 @@ "methods": [ "public void <init>(com.yahoo.container.core.ChainsConfig, com.yahoo.search.config.IndexInfoConfig, com.yahoo.search.config.SchemaInfoConfig, com.yahoo.container.QrSearchersConfig, com.yahoo.component.provider.ComponentRegistry, com.yahoo.vespa.configdefinition.SpecialtokensConfig, com.yahoo.language.Linguistics, com.yahoo.component.provider.ComponentRegistry, java.util.concurrent.Executor)", "public void <init>(com.yahoo.container.core.ChainsConfig, com.yahoo.search.config.IndexInfoConfig, com.yahoo.search.schema.SchemaInfo, com.yahoo.container.QrSearchersConfig, com.yahoo.component.provider.ComponentRegistry, com.yahoo.vespa.configdefinition.SpecialtokensConfig, com.yahoo.language.Linguistics, com.yahoo.component.provider.ComponentRegistry, java.util.concurrent.Executor)", - "public void <init>(com.yahoo.container.core.ChainsConfig, com.yahoo.search.config.IndexInfoConfig, com.yahoo.container.QrSearchersConfig, com.yahoo.component.provider.ComponentRegistry, com.yahoo.vespa.configdefinition.SpecialtokensConfig, com.yahoo.language.Linguistics, com.yahoo.component.provider.ComponentRegistry, java.util.concurrent.Executor)", "public com.yahoo.search.searchchain.Execution newExecution(com.yahoo.component.chain.Chain)", "public com.yahoo.search.searchchain.Execution newExecution(java.lang.String)", "public com.yahoo.search.searchchain.SearchChainRegistry searchChainRegistry()", diff --git a/container-search/src/main/java/com/yahoo/search/searchchain/ExecutionFactory.java b/container-search/src/main/java/com/yahoo/search/searchchain/ExecutionFactory.java index e99dafef886..bfc4219eabc 100644 --- a/container-search/src/main/java/com/yahoo/search/searchchain/ExecutionFactory.java +++ b/container-search/src/main/java/com/yahoo/search/searchchain/ExecutionFactory.java @@ -91,19 +91,6 @@ public class ExecutionFactory extends AbstractComponent { this.executor = executor != null ? executor : Executors.newSingleThreadExecutor(); } - /** @deprecated pass SchemaInfoConfig */ - @Deprecated - public ExecutionFactory(ChainsConfig chainsConfig, - IndexInfoConfig indexInfo, - QrSearchersConfig clusters, - ComponentRegistry<Searcher> searchers, - SpecialtokensConfig specialTokens, - Linguistics linguistics, - ComponentRegistry<Renderer> renderers, - Executor executor) { - this(chainsConfig, indexInfo, SchemaInfo.empty(), clusters, searchers, specialTokens, linguistics, renderers, executor); - } - private SearchChainRegistry createSearchChainRegistry(ComponentRegistry<Searcher> searchers, ChainsConfig chainsConfig) { SearchChainRegistry searchChainRegistry = new SearchChainRegistry(searchers); |