From 764071efb34fdb6a2a843a837c45d2d2ebe741c0 Mon Sep 17 00:00:00 2001 From: Arne H Juul Date: Wed, 22 Jun 2022 12:17:38 +0000 Subject: stop using feature flag avoidRenamingSummaryFeatures * now always behaves like it was true. --- .../src/main/java/com/yahoo/schema/derived/RawRankProfile.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'config-model/src/main/java/com/yahoo/schema') 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 } -- cgit v1.2.3