diff options
author | Jon Bratseth <bratseth@gmail.com> | 2022-06-22 19:15:36 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-06-22 19:15:36 +0200 |
commit | 1242ec5b569d86c90045151fc2def817fce6e530 (patch) | |
tree | 02598e0c2be03f16f637d4b55acacb03550ef2fb /config-model | |
parent | 31ebdd12ecef0aea384176ed882a12b611480866 (diff) | |
parent | 764071efb34fdb6a2a843a837c45d2d2ebe741c0 (diff) |
Merge pull request #23207 from vespa-engine/arnej/avoid-rankingExpression-flagv8.7.17
stop using feature flag avoidRenamingSummaryFeatures
Diffstat (limited to 'config-model')
3 files changed, 3 insertions, 14 deletions
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 3e12b5c86e3..e78343b5db0 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 @@ -74,7 +74,6 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea private boolean persistenceThrottlingOfMergeFeedOps = true; private boolean useV8GeoPositions = true; private List<String> environmentVariables = List.of(); - private boolean avoidRenamingSummaryFeatures = true; private boolean enableBitVectors = false; private boolean loadCodeAsHugePages = false; private boolean sharedStringRepoNoReclaim = false; @@ -131,7 +130,6 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea @Override public boolean persistenceThrottlingOfMergeFeedOps() { return persistenceThrottlingOfMergeFeedOps; } @Override public boolean useV8GeoPositions() { return useV8GeoPositions; } @Override public List<String> environmentVariables() { return environmentVariables; } - @Override public boolean avoidRenamingSummaryFeatures() { return this.avoidRenamingSummaryFeatures; } @Override public boolean enableBitVectors() { return this.enableBitVectors; } @Override public Architecture adminClusterArchitecture() { return adminClusterNodeResourcesArchitecture; } @Override public boolean sharedStringRepoNoReclaim() { return sharedStringRepoNoReclaim; } @@ -351,11 +349,6 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea return this; } - public TestProperties setAvoidRenamingSummaryFeatures(boolean value) { - this.avoidRenamingSummaryFeatures = value; - return this; - } - public TestProperties setEnableBitVectors(boolean value) { this.enableBitVectors = value; return this; diff --git a/config-model/src/main/java/com/yahoo/schema/derived/RawRankProfile.java b/config-model/src/main/java/com/yahoo/schema/derived/RawRankProfile.java index 66389a030af..11af3b0bf78 100644 --- a/config-model/src/main/java/com/yahoo/schema/derived/RawRankProfile.java +++ b/config-model/src/main/java/com/yahoo/schema/derived/RawRankProfile.java @@ -154,7 +154,6 @@ public class RawRankProfile implements RankProfilesConfig.Producer { private final OptionalDouble postFilterThreshold; private final OptionalDouble approximateThreshold; private final double rankScoreDropLimit; - private final boolean mapBackRankingExpressionFeatures; /** * The rank type definitions used to derive settings for the native rank features @@ -193,7 +192,6 @@ public class RawRankProfile implements RankProfilesConfig.Producer { approximateThreshold = compiled.getApproximateThreshold(); keepRankCount = compiled.getKeepRankCount(); rankScoreDropLimit = compiled.getRankScoreDropLimit(); - mapBackRankingExpressionFeatures = deployProperties.featureFlags().avoidRenamingSummaryFeatures(); ignoreDefaultRankFeatures = compiled.getIgnoreDefaultRankFeatures(); rankProperties = new ArrayList<>(compiled.getRankProperties()); @@ -274,10 +272,8 @@ public class RawRankProfile implements RankProfilesConfig.Producer { ReferenceNode backendReferenceNode = new ReferenceNode("rankingExpression(" + referenceNode.getName() + ")", referenceNode.getArguments().expressions(), referenceNode.getOutput()); - if (mapBackRankingExpressionFeatures) { - // tell backend to map back to the name the user expects: - featureRenames.put(backendReferenceNode.toString(), referenceNode.toString()); - } + // tell backend to map back to the name the user expects: + featureRenames.put(backendReferenceNode.toString(), referenceNode.toString()); functionFeatures.put(referenceNode.getName(), backendReferenceNode); i.remove(); // Will add the expanded one in next block } diff --git a/config-model/src/test/java/com/yahoo/schema/derived/ExportingTestCase.java b/config-model/src/test/java/com/yahoo/schema/derived/ExportingTestCase.java index 16a9a459dcb..dc10004a631 100644 --- a/config-model/src/test/java/com/yahoo/schema/derived/ExportingTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/derived/ExportingTestCase.java @@ -115,7 +115,7 @@ public class ExportingTestCase extends AbstractExportingTestCase { @Test public void testAvoidRenamingRankingExpression() throws IOException, ParseException { assertCorrectDeriving("renamedfeatures", "foo", - new TestProperties().setAvoidRenamingSummaryFeatures(true), + new TestProperties(), new TestableDeployLogger()); } |