Canonicalize features

This allows us to find the type of features referenced in
ranking expressions regardless of the form they are written in.

2 files changed, 10 insertions, 16 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 cd65c6ef761..136d09304da 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java
@@ -16,6 +16,7 @@ import com.yahoo.searchdefinition.parser.ParseException;
 import com.yahoo.searchlib.rankingexpression.ExpressionFunction;
 import com.yahoo.searchlib.rankingexpression.FeatureList;
 import com.yahoo.searchlib.rankingexpression.RankingExpression;
+import com.yahoo.searchlib.rankingexpression.evaluation.FeatureNames;
 import com.yahoo.searchlib.rankingexpression.evaluation.TensorValue;
 import com.yahoo.searchlib.rankingexpression.evaluation.TypeMapContext;
 import com.yahoo.searchlib.rankingexpression.evaluation.Value;
@@ -746,11 +747,11 @@ public class RankProfile implements Serializable, Cloneable {
         TypeMapContext context = new TypeMapContext();
 
         // Add constants
-        getConstants().forEach((k, v) -> context.setType(asConstantFeature(k), v.type()));
+        getConstants().forEach((k, v) -> context.setType(FeatureNames.asConstantFeature(k), v.type()));
 
         // Add attributes
         for (SDField field : getSearch().allConcreteFields())
-            field.getAttributes().forEach((k, a) -> context.setType(asAttributeFeature(k), a.tensorType().orElse(TensorType.empty)));
+            field.getAttributes().forEach((k, a) -> context.setType(FeatureNames.asAttributeFeature(k), a.tensorType().orElse(TensorType.empty)));
 
         // Add query features from rank profile types reached from the "default" profile
         QueryProfile profile = queryProfilesOf(getSearch().sourceApplication()).getComponent("default");
@@ -761,7 +762,7 @@ public class RankProfile implements Serializable, Cloneable {
                     if (field.getType() instanceof TensorFieldType)
                         type = ((TensorFieldType)field.getType()).type().get();
 
-                    String feature = asQueryFeature(prefix.append(field.getName()).toString());
+                    String feature = FeatureNames.asQueryFeature(prefix.append(field.getName()).toString());
                     context.setType(feature, type);
                 }
             });
@@ -776,7 +777,7 @@ public class RankProfile implements Serializable, Cloneable {
         try {
             queryProfileFiles = applicationPackage.getQueryProfileFiles();
             queryProfileTypeFiles = applicationPackage.getQueryProfileTypeFiles();
-            return new QueryProfileXMLReader().read(queryProfileFiles, queryProfileTypeFiles);
+            return new QueryProfileXMLReader().read(queryProfileTypeFiles, queryProfileFiles);
         }
         finally {
             NamedReader.closeAll(queryProfileFiles);
@@ -784,18 +785,6 @@ public class RankProfile implements Serializable, Cloneable {
         }
     }
 
-    private String asConstantFeature(String constantName) {
-        return "constant(\"" + constantName + "\")";
-    }
-
-    private String asAttributeFeature(String constantName) {
-        return "attribute(\"" + constantName + "\")";
-    }
-
-    private String asQueryFeature(String constantName) {
-        return "query(\"" + constantName + "\")";
-    }
-
     /**
      * A rank setting. The identity of a rank setting is its field name and type (not value).
      * A rank setting is immutable.
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/TensorFlowFeatureConverter.java b/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/TensorFlowFeatureConverter.java
index 9c7fd7d9f0a..da85e9f65ec 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/TensorFlowFeatureConverter.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/TensorFlowFeatureConverter.java
@@ -185,6 +185,11 @@ public class TensorFlowFeatureConverter extends ExpressionTransformer<RankProfil
                                                    "' of type " + requiredType + " but this macro is not present in " +
                                                    profile);
             TensorType actualType = macro.getRankingExpression().getRoot().type(profile.typeContext());
+            if ( actualType == null)
+                throw new IllegalArgumentException("Model refers Placeholder '" + macroName +
+                                                   "' of type " + requiredType +
+                                                   " which must be produced by a macro in the rank profile, but " +
+                                                   "this macro references a feature which is not declared");
             if ( ! actualType.isAssignableTo(requiredType))
                 throw new IllegalArgumentException("Model refers Placeholder '" + macroName +
                                                    "' of type " + requiredType +