diff options
author | Harald Musum <musum@verizonmedia.com> | 2022-03-31 10:57:24 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-31 10:57:24 +0200 |
commit | 03f7456c08b38812dd830998de02b9019ec2e3e4 (patch) | |
tree | 927351e73ce15db016824fbff5e40c2161759b49 /configserver | |
parent | d85c7cccc0935709639e8c8391446a6195ca0916 (diff) | |
parent | f386a98d22e503582ef7a0eabec4f51711579018 (diff) |
Merge pull request #21896 from vespa-engine/bjorncs/cleanup
Remove feature flag 'merge-grouping-result-in-search-invoker'
Diffstat (limited to 'configserver')
-rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java | 3 |
1 files changed, 0 insertions, 3 deletions
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 940801cec79..0ee9bc84ff7 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 @@ -210,7 +210,6 @@ public class ModelContextImpl implements ModelContext { private final boolean inhibitDefaultMergesWhenGlobalMergesPending; private final boolean useQrserverServiceName; private final boolean avoidRenamingSummaryFeatures; - private final boolean mergeGroupingResultInSearchInvoker; private final boolean experimentalSdParsing; private final Architecture adminClusterNodeResourcesArchitecture; @@ -260,7 +259,6 @@ public class ModelContextImpl implements ModelContext { this.inhibitDefaultMergesWhenGlobalMergesPending = flagValue(source, appId, version, Flags.INHIBIT_DEFAULT_MERGES_WHEN_GLOBAL_MERGES_PENDING); this.useQrserverServiceName = flagValue(source, appId, version, Flags.USE_QRSERVER_SERVICE_NAME); this.avoidRenamingSummaryFeatures = flagValue(source, appId, version, Flags.AVOID_RENAMING_SUMMARY_FEATURES); - this.mergeGroupingResultInSearchInvoker = flagValue(source, appId, version, Flags.MERGE_GROUPING_RESULT_IN_SEARCH_INVOKER); this.experimentalSdParsing = flagValue(source, appId, version, Flags.EXPERIMENTAL_SD_PARSING); this.adminClusterNodeResourcesArchitecture = Architecture.valueOf(flagValue(source, appId, version, PermanentFlags.ADMIN_CLUSTER_NODE_ARCHITECTURE)); } @@ -312,7 +310,6 @@ public class ModelContextImpl implements ModelContext { @Override public boolean inhibitDefaultMergesWhenGlobalMergesPending() { return inhibitDefaultMergesWhenGlobalMergesPending; } @Override public boolean useQrserverServiceName() { return useQrserverServiceName; } @Override public boolean avoidRenamingSummaryFeatures() { return avoidRenamingSummaryFeatures; } - @Override public boolean mergeGroupingResultInSearchInvoker() { return mergeGroupingResultInSearchInvoker; } @Override public boolean experimentalSdParsing() { return experimentalSdParsing; } @Override public String adminClusterNodeArchitecture() { return adminClusterArchitecture().name(); } @Override public Architecture adminClusterArchitecture() { return adminClusterNodeResourcesArchitecture; } |