diff options
5 files changed, 5 insertions, 8 deletions
diff --git a/config-model/src/test/derived/rankingexpression/rank-profiles.cfg b/config-model/src/test/derived/rankingexpression/rank-profiles.cfg index 6bad0434ac3..cf59ae9c326 100644 --- a/config-model/src/test/derived/rankingexpression/rank-profiles.cfg +++ b/config-model/src/test/derived/rankingexpression/rank-profiles.cfg @@ -365,9 +365,9 @@ rankprofile[].fef.property[].name "vespa.type.attribute.t1" rankprofile[].fef.property[].value "tensor(m{},v[3])" rankprofile[].name "withboolean" rankprofile[].fef.property[].name "rankingExpression(mytrue).rankingScript" -rankprofile[].fef.property[].value "1.0" +rankprofile[].fef.property[].value "true" rankprofile[].fef.property[].name "rankingExpression(myfalse).rankingScript" -rankprofile[].fef.property[].value "0.0" +rankprofile[].fef.property[].value "false" rankprofile[].fef.property[].name "rankingExpression(mybooleanexpression).rankingScript" rankprofile[].fef.property[].value "5.0" rankprofile[].fef.property[].name "vespa.type.attribute.t1" diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/parser/IntermediateParserTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/parser/IntermediateParserTestCase.java index 4e212ccd574..cbdc8a24b5c 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/parser/IntermediateParserTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/parser/IntermediateParserTestCase.java @@ -174,7 +174,7 @@ public class IntermediateParserTestCase { checkFileParses("src/test/derived/position_summary/position_summary.sd"); checkFileParses("src/test/derived/predicate_attribute/predicate_attribute.sd"); checkFileParses("src/test/derived/prefixexactattribute/prefixexactattribute.sd"); - checkFileParses("src/test/derived/rankexpression/rankexpression.sd"); + checkFileParses("src/test/derived/rankingexpression/rankexpression.sd"); checkFileParses("src/test/derived/rankprofileinheritance/child.sd"); checkFileParses("src/test/derived/rankprofileinheritance/parent1.sd"); checkFileParses("src/test/derived/rankprofileinheritance/parent2.sd"); diff --git a/container-search/src/main/java/com/yahoo/search/grouping/vespa/ResultBuilder.java b/container-search/src/main/java/com/yahoo/search/grouping/vespa/ResultBuilder.java index c52e36986be..d7592d4f97a 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/vespa/ResultBuilder.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/vespa/ResultBuilder.java @@ -274,7 +274,6 @@ class ResultBuilder { return count; } - HitList newHitList(int listIdx, int tag, HitsAggregationResult execResult) { HitList hitList = new HitList(transform.getLabel(tag)); List<Hit> hits = execResult.getHits(); diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/ConstantNode.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/ConstantNode.java index 2cfe20d8131..a305c9c76af 100755 --- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/ConstantNode.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/ConstantNode.java @@ -40,8 +40,6 @@ public final class ConstantNode extends ExpressionNode { @Override public StringBuilder toString(StringBuilder string, SerializationContext context, Deque<String> path, CompositeNode parent) { - if (value instanceof BooleanValue) // Convert booleans to floats - return string.append(value.asBoolean() ? "1.0" : "0.0"); return string.append(value.toString()); } diff --git a/searchlib/src/tests/rankingexpression/rankingexpressionlist b/searchlib/src/tests/rankingexpression/rankingexpressionlist index 970505e25aa..c032ffd1a01 100644 --- a/searchlib/src/tests/rankingexpression/rankingexpressionlist +++ b/searchlib/src/tests/rankingexpression/rankingexpressionlist @@ -165,5 +165,5 @@ if(1.09999~=1.1,2,3); if (1.09999 ~= 1.1, 2, 3) 1 && 0 || 1 !a && (a || a) 10 ^ 3 -true; 1.0 -false; 0.0 +true +false |