summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2021-01-09 12:15:14 +0100
committerHarald Musum <musum@verizonmedia.com>2021-01-09 12:15:14 +0100
commit7af9ce991a514bcb0439e268b5d438ed4113bc8e (patch)
treee5664effdcf98c1f14565753b26a485f822f71a7
parent6d60d82bebd617880b2737d9f549b8402a1e1f24 (diff)
Remove unused methods
-rw-r--r--config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java4
-rw-r--r--config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java8
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java6
3 files changed, 4 insertions, 14 deletions
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java
index 313cdadc257..18dcba02dff 100644
--- a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java
+++ b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java
@@ -71,7 +71,6 @@ public interface ModelContext {
@ModelFeatureFlag(owners = {"baldersheim"}, comment = "Revisit in May or June 2020") default double defaultTermwiseLimit() { throw new UnsupportedOperationException("TODO specify default value"); }
@ModelFeatureFlag(owners = {"vekterli"}) default boolean useThreePhaseUpdates() { throw new UnsupportedOperationException("TODO specify default value"); }
@ModelFeatureFlag(owners = {"geirst"}, comment = "Remove when 7.336 is no longer in use") default boolean useDirectStorageApiRpc() { return true; }
- @ModelFeatureFlag(owners = {"geirst"}, comment = "Remove when 7.328 is no longer in use") default boolean useFastValueTensorImplementation() { return true; }
@ModelFeatureFlag(owners = {"baldersheim"}, comment = "Select sequencer type use while feeding") default String feedSequencerType() { throw new UnsupportedOperationException("TODO specify default value"); }
@ModelFeatureFlag(owners = {"baldersheim"}) default String responseSequencerType() { throw new UnsupportedOperationException("TODO specify default value"); }
@ModelFeatureFlag(owners = {"baldersheim"}) default int defaultNumResponseThreads() { return 2; }
@@ -116,7 +115,7 @@ public interface ModelContext {
// TODO(somebody): Only needed for LbServicesProducerTest
default boolean useDedicatedNodeForLogserver() { return true; }
- // NOTE: Use FeatureFlags interface above instead of non-permament flags
+ // NOTE: Use FeatureFlags interface above instead of non-permanent flags
@Deprecated double defaultTermwiseLimit();
@Deprecated default int defaultNumResponseThreads() { return 2; }
@Deprecated String feedSequencerType();
@@ -130,7 +129,6 @@ public interface ModelContext {
@Deprecated double feedConcurrency();
@Deprecated boolean useThreePhaseUpdates();
@Deprecated default boolean useDirectStorageApiRpc() { return true; }
- @Deprecated default boolean useFastValueTensorImplementation() { return true; }
@Deprecated default boolean useAccessControlTlsHandshakeClientAuth() { return false; }
}
diff --git a/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java b/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java
index c2478e097e3..521b8f6998d 100644
--- a/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java
+++ b/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java
@@ -37,12 +37,11 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea
private final Set<ContainerEndpoint> endpoints = Collections.emptySet();
private boolean useDedicatedNodeForLogserver = false;
private boolean useThreePhaseUpdates = false;
- private boolean useFastValueTensorImplementation = true;
private double defaultTermwiseLimit = 1.0;
private String jvmGCOptions = null;
private String sequencerType = "LATENCY";
private String responseSequencerType = "ADAPTIVE";
- private int reponseNumThreads = 2;
+ private int responseNumThreads = 2;
private Optional<EndpointCertificateSecrets> endpointCertificateSecrets = Optional.empty();
private AthenzDomain athenzDomain;
private ApplicationRoles applicationRoles;
@@ -74,11 +73,10 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea
@Override public double defaultTermwiseLimit() { return defaultTermwiseLimit; }
@Override public boolean useThreePhaseUpdates() { return useThreePhaseUpdates; }
@Override public boolean useDirectStorageApiRpc() { return true; }
- @Override public boolean useFastValueTensorImplementation() { return useFastValueTensorImplementation; }
@Override public Optional<AthenzDomain> athenzDomain() { return Optional.ofNullable(athenzDomain); }
@Override public Optional<ApplicationRoles> applicationRoles() { return Optional.ofNullable(applicationRoles); }
@Override public String responseSequencerType() { return responseSequencerType; }
- @Override public int defaultNumResponseThreads() { return reponseNumThreads; }
+ @Override public int defaultNumResponseThreads() { return responseNumThreads; }
@Override public boolean skipCommunicationManagerThread() { return false; }
@Override public boolean skipMbusRequestThread() { return false; }
@Override public boolean skipMbusReplyThread() { return false; }
@@ -123,7 +121,7 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea
return this;
}
public TestProperties setResponseNumThreads(int numThreads) {
- reponseNumThreads = numThreads;
+ responseNumThreads = numThreads;
return this;
}
public TestProperties setDefaultTermwiseLimit(double limit) {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java
index 574465ff541..40fbfe9ece8 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java
@@ -151,7 +151,6 @@ public class ModelContextImpl implements ModelContext {
private final double reindexerWindowSizeIncrement;
private final double defaultTermwiseLimit;
private final boolean useThreePhaseUpdates;
- private final boolean useFastValueTensorImplementation;
private final String feedSequencer;
private final String responseSequencer;
private final int numResponseThreads;
@@ -170,7 +169,6 @@ public class ModelContextImpl implements ModelContext {
this.reindexerWindowSizeIncrement = flagValue(source, appId, Flags.REINDEXER_WINDOW_SIZE_INCREMENT);
this.defaultTermwiseLimit = flagValue(source, appId, Flags.DEFAULT_TERM_WISE_LIMIT);
this.useThreePhaseUpdates = flagValue(source, appId, Flags.USE_THREE_PHASE_UPDATES);
- this.useFastValueTensorImplementation = flagValue(source, appId, Flags.USE_FAST_VALUE_TENSOR_IMPLEMENTATION);
this.feedSequencer = flagValue(source, appId, Flags.FEED_SEQUENCER_TYPE);
this.responseSequencer = flagValue(source, appId, Flags.RESPONSE_SEQUENCER_TYPE);
this.numResponseThreads = flagValue(source, appId, Flags.RESPONSE_NUM_THREADS);
@@ -189,7 +187,6 @@ public class ModelContextImpl implements ModelContext {
@Override public double reindexerWindowSizeIncrement() { return reindexerWindowSizeIncrement; }
@Override public double defaultTermwiseLimit() { return defaultTermwiseLimit; }
@Override public boolean useThreePhaseUpdates() { return useThreePhaseUpdates; }
- @Override public boolean useFastValueTensorImplementation() { return useFastValueTensorImplementation; }
@Override public String feedSequencerType() { return feedSequencer; }
@Override public String responseSequencerType() { return responseSequencer; }
@Override public int defaultNumResponseThreads() { return numResponseThreads; }
@@ -236,7 +233,6 @@ public class ModelContextImpl implements ModelContext {
// Old non-permanent feature flags. Use ModelContext.FeatureFlag instead
private final double defaultTermwiseLimit;
private final boolean useThreePhaseUpdates;
- private final boolean useFastValueTensorImplementation;
private final String feedSequencer;
private final String responseSequencer;
private final int numResponseThreads;
@@ -282,7 +278,6 @@ public class ModelContextImpl implements ModelContext {
// Old non-permanent feature flags. Use ModelContext.FeatureFlag instead
defaultTermwiseLimit = flagValue(flagSource, applicationId, Flags.DEFAULT_TERM_WISE_LIMIT);
useThreePhaseUpdates = flagValue(flagSource, applicationId, Flags.USE_THREE_PHASE_UPDATES);
- useFastValueTensorImplementation = flagValue(flagSource, applicationId, Flags.USE_FAST_VALUE_TENSOR_IMPLEMENTATION);
feedSequencer = flagValue(flagSource, applicationId, Flags.FEED_SEQUENCER_TYPE);
responseSequencer = flagValue(flagSource, applicationId, Flags.RESPONSE_SEQUENCER_TYPE);
numResponseThreads = flagValue(flagSource, applicationId, Flags.RESPONSE_NUM_THREADS);
@@ -353,7 +348,6 @@ public class ModelContextImpl implements ModelContext {
// Old non-permanent feature flags. Use ModelContext.FeatureFlag instead
@Override public double defaultTermwiseLimit() { return defaultTermwiseLimit; }
@Override public boolean useThreePhaseUpdates() { return useThreePhaseUpdates; }
- @Override public boolean useFastValueTensorImplementation() { return useFastValueTensorImplementation; }
@Override public String feedSequencerType() { return feedSequencer; }
@Override public String responseSequencerType() { return responseSequencer; }
@Override public int defaultNumResponseThreads() { return numResponseThreads; }