also add rank properties for "constant(foo)"

* ConstantTensorTransformer was trying to handle both "foo" and "constant(foo)",
  but the latter would lookup "constant" not "foo" in the map.
* add unit test for this variation also.

2 files changed, 30 insertions, 4 deletions

diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/ConstantTensorTransformer.java b/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/ConstantTensorTransformer.java
index 6991e2b978b..c8b4c9f7e15 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/ConstantTensorTransformer.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/ConstantTensorTransformer.java
@@ -49,11 +49,17 @@ public class ConstantTensorTransformer extends ExpressionTransformer<RankProfile
     }
 
     private ExpressionNode transformConstantReference(ReferenceNode node, RankProfileTransformContext context) {
+        String constantName = node.getName();
         Reference constantReference = node.reference();
-        if ( ! FeatureNames.isConstantFeature(constantReference) && constantReference.isIdentifier())
-            constantReference = FeatureNames.asConstantFeature(node.getName());
-
-        Value value = context.constants().get(node.getName());
+        if (FeatureNames.isConstantFeature(constantReference)) {
+            constantName = constantReference.simpleArgument().orElse(null);
+        } else if (constantReference.isIdentifier()) {
+            constantReference = FeatureNames.asConstantFeature(constantName);
+        } else {
+            return node;
+        }
+        Value value = context.constants().get(constantName);
+        System.err.println("lookup constant: "+constantName+" -> "+value);
         if (value == null || value.type().rank() == 0) return node;
 
         TensorValue tensorValue = (TensorValue)value;
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithTensorTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithTensorTestCase.java
index a1231a1418b..10ba6eff169 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithTensorTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithTensorTestCase.java
@@ -33,6 +33,26 @@ public class RankingExpressionWithTensorTestCase {
     }
 
     @Test
+    public void requireConstantTensorCanBeReferredViaConstantFeature() throws ParseException {
+        RankProfileSearchFixture f = new RankProfileSearchFixture(
+                "  rank-profile my_profile {\n" +
+                "    first-phase {\n" +
+                "      expression: sum(constant(my_tensor))\n" +
+                "    }\n" +
+                "    constants {\n" +
+                "      my_tensor {\n" +
+                "        value: { {x:1,y:2}:1, {x:2,y:1}:2 }\n" +
+                "        type: tensor(x{},y{})\n" +
+                "      }\n" +
+                "    }\n" +
+                "  }");
+        f.compileRankProfile("my_profile");
+        f.assertFirstPhaseExpression("reduce(constant(my_tensor), sum)", "my_profile");
+        f.assertRankProperty("tensor(x{},y{}):{{x:1,y:2}:1.0,{x:2,y:1}:2.0}", "constant(my_tensor).value", "my_profile");
+        f.assertRankProperty("tensor(x{},y{})", "constant(my_tensor).type", "my_profile");
+    }
+
+    @Test
     public void requireThatMultiLineConstantTensorAndTypeCanBeParsed() throws ParseException {
         RankProfileSearchFixture f = new RankProfileSearchFixture(
                 "  rank-profile my_profile {\n" +