diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2021-05-25 20:20:08 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2021-05-25 20:20:08 +0200 |
commit | e0ed9f0481a50afbb11a88713d65507e2bd08979 (patch) | |
tree | 0493a2dc40f7a0914d10c4cfcbbf297617bfdbd4 | |
parent | b419ca923a7a3dd05087d2d28c7481cf144024a5 (diff) |
Use underscore as separator as dot has semantic meaning.
3 files changed, 3 insertions, 4 deletions
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java b/config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java index fbfaa5c288a..3e2b0e865e0 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java @@ -375,7 +375,7 @@ public class RankProfile implements Cloneable { } public String getUniqueExpressionName(String name) { - return getName() + "." + name; + return getName() + "_" + name; } public String getFirstPhaseFile() { String name = FIRST_PHASE; diff --git a/config-model/src/test/derived/rankexpression/rank-profiles.cfg b/config-model/src/test/derived/rankexpression/rank-profiles.cfg index e3f99f1f89e..d678f87a168 100644 --- a/config-model/src/test/derived/rankexpression/rank-profiles.cfg +++ b/config-model/src/test/derived/rankexpression/rank-profiles.cfg @@ -58,7 +58,7 @@ rankprofile[].name "static" rankprofile[].fef.property[].name "vespa.rank.firstphase" rankprofile[].fef.property[].value "attribute" rankprofile[].fef.property[].name "vespa.rank.secondphase" -rankprofile[].fef.property[].value "rankingExpression(static.secondphase)" +rankprofile[].fef.property[].value "rankingExpression(static_secondphase)" rankprofile[].fef.property[].name "vespa.summary.feature" rankprofile[].fef.property[].value "attribute(foo1).out" rankprofile[].fef.property[].name "vespa.summary.feature" @@ -77,7 +77,7 @@ rankprofile[].fef.property[].name "vespa.summary.feature" rankprofile[].fef.property[].value "attribute(bar4).out" rankprofile[].name "overflow" rankprofile[].fef.property[].name "vespa.rank.firstphase" -rankprofile[].fef.property[].value "rankingExpression(overflow.firstphase)" +rankprofile[].fef.property[].value "rankingExpression(overflow_firstphase)" rankprofile[].fef.property[].name "vespa.rank.secondphase" rankprofile[].fef.property[].value "rankingExpression(secondphase)" rankprofile[].fef.property[].name "rankingExpression(secondphase).rankingScript" diff --git a/model-evaluation/src/main/java/ai/vespa/models/evaluation/ModelsEvaluator.java b/model-evaluation/src/main/java/ai/vespa/models/evaluation/ModelsEvaluator.java index 1cb1093ccf1..2d1a0d069a8 100644 --- a/model-evaluation/src/main/java/ai/vespa/models/evaluation/ModelsEvaluator.java +++ b/model-evaluation/src/main/java/ai/vespa/models/evaluation/ModelsEvaluator.java @@ -12,7 +12,6 @@ import com.yahoo.vespa.config.search.core.RankingConstantsConfig; import com.yahoo.vespa.config.search.core.RankingExpressionsConfig; import java.util.Map; -import java.util.stream.Collectors; /** * Evaluates machine-learned models added to Vespa applications and available as config form. |