From ac0fdddfe264774b0671a4262d3ee7440c4563c3 Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Thu, 21 Mar 2024 18:46:19 +0100 Subject: - GC unused code. - GC unused id parameter. --- .../search/federation/FederationSearcher.java | 29 ++++++++-------------- .../federation/selection/TargetSelector.java | 3 +-- .../search/federation/DuplicateSourceTestCase.java | 3 +-- .../federation/FederationSearcherTestCase.java | 28 +-------------------- .../yahoo/search/federation/FederationTester.java | 2 +- .../searchchain/test/FutureDataTestCase.java | 10 ++++---- 6 files changed, 20 insertions(+), 55 deletions(-) (limited to 'container-search/src') diff --git a/container-search/src/main/java/com/yahoo/search/federation/FederationSearcher.java b/container-search/src/main/java/com/yahoo/search/federation/FederationSearcher.java index f40caac1562..000fef9b14b 100644 --- a/container-search/src/main/java/com/yahoo/search/federation/FederationSearcher.java +++ b/container-search/src/main/java/com/yahoo/search/federation/FederationSearcher.java @@ -42,7 +42,6 @@ import com.yahoo.search.searchchain.model.federation.FederationOptions; import java.time.Clock; import java.util.ArrayList; import java.util.Collection; -import java.util.Collections; import java.util.HashMap; import java.util.IdentityHashMap; import java.util.Iterator; @@ -95,7 +94,7 @@ public class FederationSearcher extends ForkingSearcher { } // for testing - public FederationSearcher(ComponentId id, SearchChainResolver searchChainResolver, + public FederationSearcher(SearchChainResolver searchChainResolver, Map> schema2Clusters) { this(searchChainResolver, VirtualSourceResolver.of(), null, schema2Clusters); } @@ -151,7 +150,9 @@ public class FederationSearcher extends ForkingSearcher { } private static void addSearchChain(SearchChainResolver.Builder builder, - FederationConfig.Target target, FederationConfig.Target.SearchChain searchChain) { + FederationConfig.Target target, + FederationConfig.Target.SearchChain searchChain) + { if (!target.id().equals(searchChain.searchChainId())) throw new RuntimeException("Invalid federation config, " + target.id() + " != " + searchChain.searchChainId()); @@ -160,7 +161,8 @@ public class FederationSearcher extends ForkingSearcher { } private static void addSourceForProvider(SearchChainResolver.Builder builder, FederationConfig.Target target, - FederationConfig.Target.SearchChain searchChain, boolean isDefaultProvider) { + FederationConfig.Target.SearchChain searchChain, boolean isDefaultProvider) + { builder.addSourceForProvider( ComponentId.fromString(target.id()), ComponentId.fromString(searchChain.providerId()), @@ -181,14 +183,12 @@ public class FederationSearcher extends ForkingSearcher { public Result search(Query query, Execution execution) { Result mergedResults = execution.search(query); - Results targets = - getTargets(query.getModel().getSources(), query.properties()); + var targets = getTargets(query.getModel().getSources(), query.properties()); warnIfUnresolvedSearchChains(targets.errors(), mergedResults.hits()); - Collection prunedTargets = - pruneTargetsWithoutDocumentTypes(query.getModel().getRestrict(), targets.data()); + var prunedTargets = pruneTargetsWithoutDocumentTypes(query.getModel().getRestrict(), targets.data()); - Results regularTargetHandlers = resolveSearchChains(prunedTargets, execution.searchChainRegistry()); + var regularTargetHandlers = resolveSearchChains(prunedTargets, execution.searchChainRegistry()); query.errors().addAll(regularTargetHandlers.errors()); Set targetHandlers = new LinkedHashSet<>(regularTargetHandlers.data()); @@ -359,8 +359,7 @@ public class FederationSearcher extends ForkingSearcher { public void fill(Result result, String summaryClass, Execution execution) { UniqueExecutionsToResults uniqueExecutionsToResults = new UniqueExecutionsToResults(); addResultsToFill(result.hits(), result, summaryClass, uniqueExecutionsToResults); - Set, Map>> resultsForAllChains = - uniqueExecutionsToResults.resultsToFill.entrySet(); + var resultsForAllChains = uniqueExecutionsToResults.resultsToFill.entrySet(); int numberOfCallsToFillNeeded = 0; for (Entry, Map> resultsToFillForAChain : resultsForAllChains) { @@ -563,7 +562,7 @@ public class FederationSearcher extends ForkingSearcher { } private static List getAdditionalTargets(Query query, Execution execution, TargetSelector targetSelector) { - if (targetSelector == null) return Collections.emptyList(); + if (targetSelector == null) return List.of(); ArrayList result = new ArrayList<>(); for (FederationTarget target: targetSelector.getTargets(query, execution.searchChainRegistry())) @@ -708,12 +707,6 @@ public class FederationSearcher extends ForkingSearcher { private record Window(int hits, int offset) { - public Integer get(CompoundName parameterName) { - if (parameterName.equals(Query.HITS)) return hits; - if (parameterName.equals(Query.OFFSET)) return offset; - return null; - } - public static Window from(Query query) { return new Window(query.getHits(), query.getOffset()); } diff --git a/container-search/src/main/java/com/yahoo/search/federation/selection/TargetSelector.java b/container-search/src/main/java/com/yahoo/search/federation/selection/TargetSelector.java index c23be6bad14..be42ef1ee0e 100644 --- a/container-search/src/main/java/com/yahoo/search/federation/selection/TargetSelector.java +++ b/container-search/src/main/java/com/yahoo/search/federation/selection/TargetSelector.java @@ -5,7 +5,6 @@ import com.yahoo.processing.execution.chain.ChainRegistry; import com.yahoo.search.Query; import com.yahoo.search.Result; import com.yahoo.search.Searcher; -import com.yahoo.search.federation.selection.FederationTarget; import java.util.Collection; @@ -25,7 +24,7 @@ public interface TargetSelector { Collection> getTargets(Query query, ChainRegistry searcherChainRegistry); /** - * For modifying the query before sending it to a the target + * For modifying the query before sending it to the target */ void modifyTargetQuery(FederationTarget target, Query query); diff --git a/container-search/src/test/java/com/yahoo/search/federation/DuplicateSourceTestCase.java b/container-search/src/test/java/com/yahoo/search/federation/DuplicateSourceTestCase.java index 514a087bed1..f911e215867 100644 --- a/container-search/src/test/java/com/yahoo/search/federation/DuplicateSourceTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/federation/DuplicateSourceTestCase.java @@ -37,8 +37,7 @@ public class DuplicateSourceTestCase { SearchChainResolver resolver = new SearchChainResolver.Builder() .addSearchChain(new ComponentId(chain1), List.of(schema1, schema2)) .build(); - FederationSearcher searcher = new FederationSearcher(new ComponentId("test"), resolver, - Map.of(schema1, List.of(chain1), schema2, List.of(chain1))); + var searcher = new FederationSearcher(resolver, Map.of(schema1, List.of(chain1), schema2, List.of(chain1))); Result result = searcher.search(new Query("?query=test&sources=doc1%2cdoc2"), new Execution(Execution.Context.createContextStub(searchChains))); diff --git a/container-search/src/test/java/com/yahoo/search/federation/FederationSearcherTestCase.java b/container-search/src/test/java/com/yahoo/search/federation/FederationSearcherTestCase.java index af0e0ef69a8..5d2e19d02a3 100644 --- a/container-search/src/test/java/com/yahoo/search/federation/FederationSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/federation/FederationSearcherTestCase.java @@ -284,7 +284,7 @@ public class FederationSearcherTestCase { builder.addSourceForProvider(news, provider1, provider1, true, options, List.of()); builder.addSourceForProvider(news, provider2, provider2, false, options, List.of()); - return new FederationSearcher(new ComponentId("federation"), builder.build(), Map.of()); + return new FederationSearcher(builder.build(), Map.of()); } private static class MockProvider extends Searcher { @@ -304,30 +304,4 @@ public class FederationSearcherTestCase { } - private static class QueryCheckSearcher extends Searcher { - - private static final String STATUS = "status"; - public static final String FEDERATION_SEARCHER_HAS_CLONED_THE_QUERY = "FederationSearcher has cloned the query."; - public static final String OK = "Got the correct query."; - private final Query query; - - QueryCheckSearcher(Query query) { - this.query = query; - } - - @Override - public Result search(Query query, Execution execution) { - Result result = new Result(query); - if (query != this.query) { - result.hits().addError(ErrorMessage - .createErrorInPluginSearcher(FEDERATION_SEARCHER_HAS_CLONED_THE_QUERY)); - } else { - final Hit h = new Hit("QueryCheckSearcher status hit"); - h.setField(STATUS, OK); - result.hits().add(h); - } - return result; - } - } - } diff --git a/container-search/src/test/java/com/yahoo/search/federation/FederationTester.java b/container-search/src/test/java/com/yahoo/search/federation/FederationTester.java index ec540e43dfd..6016e85bc17 100644 --- a/container-search/src/test/java/com/yahoo/search/federation/FederationTester.java +++ b/container-search/src/test/java/com/yahoo/search/federation/FederationTester.java @@ -47,7 +47,7 @@ class FederationTester { } FederationSearcher buildFederationSearcher() { - return new FederationSearcher(ComponentId.fromString("federation"), builder.build(), Map.of()); + return new FederationSearcher(builder.build(), Map.of()); } public Result search() { diff --git a/container-search/src/test/java/com/yahoo/search/searchchain/test/FutureDataTestCase.java b/container-search/src/test/java/com/yahoo/search/searchchain/test/FutureDataTestCase.java index 36c80e852d1..bfcde54d65b 100644 --- a/container-search/src/test/java/com/yahoo/search/searchchain/test/FutureDataTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/searchchain/test/FutureDataTestCase.java @@ -39,11 +39,11 @@ public class FutureDataTestCase { Searcher syncProviderSearcher = new SyncProviderSearcher(); Chain asyncSource = new Chain<>(new ComponentId("async"), asyncProviderSearcher); Chain syncSource = new Chain<>(new ComponentId("sync"), syncProviderSearcher); - SearchChainResolver searchChainResolver = - new SearchChainResolver.Builder().addSearchChain(new ComponentId("sync"), new FederationOptions().setUseByDefault(true)). - addSearchChain(new ComponentId("async"), new FederationOptions().setUseByDefault(true)). - build(); - Chain main = new Chain<>(new FederationSearcher(new ComponentId("federator"), searchChainResolver, Map.of())); + var searchChainResolver = new SearchChainResolver.Builder() + .addSearchChain(new ComponentId("sync"), new FederationOptions().setUseByDefault(true)) + .addSearchChain(new ComponentId("async"), new FederationOptions().setUseByDefault(true)) + .build(); + Chain main = new Chain<>(new FederationSearcher(searchChainResolver, Map.of())); SearchChainRegistry searchChainRegistry = new SearchChainRegistry(); searchChainRegistry.register(main); searchChainRegistry.register(syncSource); -- cgit v1.2.3