summaryrefslogtreecommitdiffstats
path: root/container-search
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@oath.com>2018-06-20 13:03:36 +0200
committerJon Bratseth <bratseth@oath.com>2018-06-20 13:03:36 +0200
commit03c8064cb0000c05058b72e61438718aa84bd6ae (patch)
tree863c7deaad5764a89fc36888c9bcf3e5469450da /container-search
parentc06085ac45f67409efce6911de13c555fc5456a7 (diff)
Nonfunctional changes
Diffstat (limited to 'container-search')
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java3
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/fastsearch/ClusterParams.java13
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/fastsearch/VespaBackEndSearcher.java4
3 files changed, 3 insertions, 17 deletions
diff --git a/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java b/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java
index b1399c6cc8d..0d9534457e9 100644
--- a/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java
+++ b/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java
@@ -192,8 +192,7 @@ public class ClusterSearcher extends Searcher {
private static ClusterParams makeClusterParams(int searchclusterIndex,
LegacyEmulationConfig emulConfig,
int dispatchIndex) {
- return new ClusterParams(searchclusterIndex,
- "sc" + searchclusterIndex + ".num" + dispatchIndex,
+ return new ClusterParams("sc" + searchclusterIndex + ".num" + dispatchIndex,
emulConfig);
}
diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/ClusterParams.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/ClusterParams.java
index f95f303e87c..3dfa506a967 100644
--- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/ClusterParams.java
+++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/ClusterParams.java
@@ -11,29 +11,20 @@ import com.yahoo.container.search.LegacyEmulationConfig;
*/
public class ClusterParams {
- public final int clusterNumber;
public final String searcherName;
public final LegacyEmulationConfig emulation;
/**
- * For compatibility
- */
- public ClusterParams(int number, String name) {
- this(number, name, new LegacyEmulationConfig(new LegacyEmulationConfig.Builder()));
- }
-
- /**
* For testcases only
*/
public ClusterParams(String name) {
- this(0, name);
+ this(name, new LegacyEmulationConfig(new LegacyEmulationConfig.Builder()));
}
/**
* Make up full ClusterParams
*/
- public ClusterParams(int number, String name, LegacyEmulationConfig cfg) {
- this.clusterNumber = number;
+ public ClusterParams(String name, LegacyEmulationConfig cfg) {
this.searcherName = name;
this.emulation = cfg;
}
diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/VespaBackEndSearcher.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/VespaBackEndSearcher.java
index 3abd97d814e..34e8390892d 100644
--- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/VespaBackEndSearcher.java
+++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/VespaBackEndSearcher.java
@@ -75,9 +75,6 @@ public abstract class VespaBackEndSearcher extends PingableSearcher {
/** Cache wrapper */
protected CacheControl cacheControl = null;
- /** Searchcluster number */
- private int sourceNumber;
-
protected final String getName() { return name; }
protected final String getDefaultDocsumClass() { return defaultDocsumClass; }
@@ -168,7 +165,6 @@ public abstract class VespaBackEndSearcher extends PingableSearcher {
public final void init(SummaryParameters docSumParams, ClusterParams clusterParams, CacheParams cacheParams,
DocumentdbInfoConfig documentdbInfoConfig) {
this.name = clusterParams.searcherName;
- this.sourceNumber = clusterParams.clusterNumber;
Validator.ensureNotNull("Name of Vespa backend integration", getName());