diff options
| author | Jon Bratseth <bratseth@verizonmedia.com> | 2020-01-24 10:48:14 +0100 |
|---|---|---|
| committer | Jon Bratseth <bratseth@verizonmedia.com> | 2020-01-24 10:48:14 +0100 |
| commit | fcc1f6ade1a8d98dce66a6d4c88dfb1a59c1d064 (patch) | |
| tree | 85f13ab85635d46f2f1b65ca8c07d42e9f17bb4f /config-model/src/main/java/com/yahoo | |
| parent | 80594edb1dcc831f2cd48ca812dccf4e60dcd7f8 (diff) | |
Don't warn if query profile type is resolved later
Diffstat (limited to 'config-model/src/main/java/com/yahoo')
3 files changed, 4 insertions, 3 deletions
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/MapEvaluationTypeContext.java b/config-model/src/main/java/com/yahoo/searchdefinition/MapEvaluationTypeContext.java index 172e538d708..6de7c985326 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/MapEvaluationTypeContext.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/MapEvaluationTypeContext.java @@ -70,6 +70,7 @@ public class MapEvaluationTypeContext extends FunctionReferenceContext implement public void setType(Reference reference, TensorType type) { featureTypes.put(reference, type); + queryFeaturesNotDeclared.remove(reference); } @Override 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 f6aed1e5abc..fa196cd3bbf 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java @@ -776,7 +776,7 @@ public class RankProfile implements Cloneable { getConstants().forEach((k, v) -> context.setType(FeatureNames.asConstantFeature(k), v.type())); rankingConstants().asMap().forEach((k, v) -> context.setType(FeatureNames.asConstantFeature(k), v.getTensorType())); - // Add query features from rank profile types reached from the "default" profile + // Add query features from all rank profile types for (QueryProfileType queryProfileType : queryProfiles.getTypeRegistry().allComponents()) { for (FieldDescription field : queryProfileType.declaredFields().values()) { TensorType type = field.getType().asTensorType(); diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/RankingExpressionTypeResolver.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/RankingExpressionTypeResolver.java index 2d0998864f1..9a9e9bbba5f 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/RankingExpressionTypeResolver.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/RankingExpressionTypeResolver.java @@ -85,8 +85,8 @@ public class RankingExpressionTypeResolver extends Processor { ensureValidDouble(profile.getSecondPhaseRanking(), "second-phase expression", context); if ( context.tensorsAreUsed() && ! context.queryFeaturesNotDeclared().isEmpty()) { deployLogger.log(Level.WARNING, "The following query features are not declared in query profile " + - "types and will be interpreted as scalars, not tensors: " + - context.queryFeaturesNotDeclared()); + "types and will be interpreted as scalars, not tensors: " + + context.queryFeaturesNotDeclared()); } } } |