From c9b02558e924375676a540c3fc8acae0ceafd886 Mon Sep 17 00:00:00 2001 From: Arne Juul Date: Thu, 2 Mar 2023 11:05:41 +0000 Subject: use common utility and constant --- .../src/main/java/com/yahoo/search/ranking/HitRescorer.java | 3 ++- .../src/main/java/com/yahoo/search/result/FeatureData.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'container-search') diff --git a/container-search/src/main/java/com/yahoo/search/ranking/HitRescorer.java b/container-search/src/main/java/com/yahoo/search/ranking/HitRescorer.java index ebdbbb693f1..cce6b42d323 100644 --- a/container-search/src/main/java/com/yahoo/search/ranking/HitRescorer.java +++ b/container-search/src/main/java/com/yahoo/search/ranking/HitRescorer.java @@ -3,6 +3,7 @@ package com.yahoo.search.ranking; import com.yahoo.search.result.FeatureData; import com.yahoo.search.result.Hit; +import static com.yahoo.searchlib.rankingexpression.Reference.RANKING_EXPRESSION_WRAPPER; import java.util.function.Supplier; import java.util.logging.Logger; @@ -42,7 +43,7 @@ class HitRescorer { } } - private static final String RE_PREFIX = "rankingExpression("; + private static final String RE_PREFIX = RANKING_EXPRESSION_WRAPPER + "("; private static final String RE_SUFFIX = ")"; private static final int RE_PRE_LEN = RE_PREFIX.length(); private static final int RE_SUF_LEN = RE_SUFFIX.length(); diff --git a/container-search/src/main/java/com/yahoo/search/result/FeatureData.java b/container-search/src/main/java/com/yahoo/search/result/FeatureData.java index 421f19475a6..7e9fa3f748a 100644 --- a/container-search/src/main/java/com/yahoo/search/result/FeatureData.java +++ b/container-search/src/main/java/com/yahoo/search/result/FeatureData.java @@ -11,6 +11,7 @@ import com.yahoo.io.GrowableByteBuffer; import com.yahoo.tensor.Tensor; import com.yahoo.tensor.serialization.JsonFormat; import com.yahoo.tensor.serialization.TypedBinaryFormat; +import static com.yahoo.searchlib.rankingexpression.Reference.wrapInRankingExpression; import java.nio.charset.StandardCharsets; import java.util.Collections; @@ -144,7 +145,7 @@ public class FeatureData implements Inspectable, JsonProducer { if (featureValue.valid()) return featureValue; // Try to wrap by rankingExpression(name) - return value.field("rankingExpression(" + featureName + ")"); + return value.field(wrapInRankingExpression(featureName)); } /** Returns the names of the features available in this */ -- cgit v1.2.3