Multivalue numeric fields are also numeric.

7 files changed, 45 insertions, 1 deletions

diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexInfo.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexInfo.java
index da25680ca47..ae06d34dfb8 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexInfo.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexInfo.java
@@ -161,7 +161,7 @@ public class IndexInfo extends Derived implements IndexInfoConfig.Producer {
             addUriIndexCommands(field);
         }
 
-        if (field.getDataType() instanceof NumericDataType) {
+        if (field.getDataType().getPrimitiveType() instanceof NumericDataType) {
             addIndexCommand(field, CMD_NUMERICAL);
         }
 
diff --git a/config-model/src/test/derived/arrays/index-info.cfg b/config-model/src/test/derived/arrays/index-info.cfg
index c51c927071d..64bcfcc59c0 100644
--- a/config-model/src/test/derived/arrays/index-info.cfg
+++ b/config-model/src/test/derived/arrays/index-info.cfg
@@ -24,6 +24,8 @@ indexinfo[].command[].command "multivalue"
 indexinfo[].command[].indexname "ratings"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "ratings"
+indexinfo[].command[].command "numerical"
+indexinfo[].command[].indexname "ratings"
 indexinfo[].command[].command "type Array<int>"
 indexinfo[].command[].indexname "a"
 indexinfo[].command[].command "index"
diff --git a/config-model/src/test/derived/attributeprefetch/index-info.cfg b/config-model/src/test/derived/attributeprefetch/index-info.cfg
index dcf49f787ab..dfce12f9b9f 100644
--- a/config-model/src/test/derived/attributeprefetch/index-info.cfg
+++ b/config-model/src/test/derived/attributeprefetch/index-info.cfg
@@ -18,6 +18,8 @@ indexinfo[].command[].command "multivalue"
 indexinfo[].command[].indexname "multibyte"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "multibyte"
+indexinfo[].command[].command "numerical"
+indexinfo[].command[].indexname "multibyte"
 indexinfo[].command[].command "type Array<byte>"
 indexinfo[].command[].indexname "wsbyte"
 indexinfo[].command[].command "index"
@@ -26,6 +28,8 @@ indexinfo[].command[].command "multivalue"
 indexinfo[].command[].indexname "wsbyte"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "wsbyte"
+indexinfo[].command[].command "numerical"
+indexinfo[].command[].indexname "wsbyte"
 indexinfo[].command[].command "type WeightedSet<byte>"
 indexinfo[].command[].indexname "singleint"
 indexinfo[].command[].command "index"
@@ -42,6 +46,8 @@ indexinfo[].command[].command "multivalue"
 indexinfo[].command[].indexname "multiint"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "multiint"
+indexinfo[].command[].command "numerical"
+indexinfo[].command[].indexname "multiint"
 indexinfo[].command[].command "type Array<int>"
 indexinfo[].command[].indexname "wsint"
 indexinfo[].command[].command "index"
@@ -50,6 +56,8 @@ indexinfo[].command[].command "multivalue"
 indexinfo[].command[].indexname "wsint"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "wsint"
+indexinfo[].command[].command "numerical"
+indexinfo[].command[].indexname "wsint"
 indexinfo[].command[].command "type WeightedSet<int>"
 indexinfo[].command[].indexname "singlelong"
 indexinfo[].command[].command "index"
@@ -66,6 +74,8 @@ indexinfo[].command[].command "multivalue"
 indexinfo[].command[].indexname "multilong"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "multilong"
+indexinfo[].command[].command "numerical"
+indexinfo[].command[].indexname "multilong"
 indexinfo[].command[].command "type Array<long>"
 indexinfo[].command[].indexname "wslong"
 indexinfo[].command[].command "index"
@@ -74,6 +84,8 @@ indexinfo[].command[].command "multivalue"
 indexinfo[].command[].indexname "wslong"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "wslong"
+indexinfo[].command[].command "numerical"
+indexinfo[].command[].indexname "wslong"
 indexinfo[].command[].command "type WeightedSet<long>"
 indexinfo[].command[].indexname "singlefloat"
 indexinfo[].command[].command "index"
@@ -90,6 +102,8 @@ indexinfo[].command[].command "multivalue"
 indexinfo[].command[].indexname "multifloat"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "multifloat"
+indexinfo[].command[].command "numerical"
+indexinfo[].command[].indexname "multifloat"
 indexinfo[].command[].command "type Array<float>"
 indexinfo[].command[].indexname "wsfloat"
 indexinfo[].command[].command "index"
@@ -98,6 +112,8 @@ indexinfo[].command[].command "multivalue"
 indexinfo[].command[].indexname "wsfloat"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "wsfloat"
+indexinfo[].command[].command "numerical"
+indexinfo[].command[].indexname "wsfloat"
 indexinfo[].command[].command "type WeightedSet<float>"
 indexinfo[].command[].indexname "singledouble"
 indexinfo[].command[].command "index"
@@ -114,6 +130,8 @@ indexinfo[].command[].command "multivalue"
 indexinfo[].command[].indexname "multidouble"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "multidouble"
+indexinfo[].command[].command "numerical"
+indexinfo[].command[].indexname "multidouble"
 indexinfo[].command[].command "type Array<double>"
 indexinfo[].command[].indexname "wsdouble"
 indexinfo[].command[].command "index"
@@ -122,6 +140,8 @@ indexinfo[].command[].command "multivalue"
 indexinfo[].command[].indexname "wsdouble"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "wsdouble"
+indexinfo[].command[].command "numerical"
+indexinfo[].command[].indexname "wsdouble"
 indexinfo[].command[].command "type WeightedSet<double>"
 indexinfo[].command[].indexname "singlestring"
 indexinfo[].command[].command "index"
diff --git a/config-model/src/test/derived/attributes/index-info.cfg b/config-model/src/test/derived/attributes/index-info.cfg
index aacd1baa060..77a52fa47ba 100644
--- a/config-model/src/test/derived/attributes/index-info.cfg
+++ b/config-model/src/test/derived/attributes/index-info.cfg
@@ -112,6 +112,8 @@ indexinfo[].command[].command "multivalue"
 indexinfo[].command[].indexname "b6"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "b6"
+indexinfo[].command[].command "numerical"
+indexinfo[].command[].indexname "b6"
 indexinfo[].command[].command "type Array<long>"
 indexinfo[].command[].indexname "b7"
 indexinfo[].command[].command "index"
@@ -120,6 +122,8 @@ indexinfo[].command[].command "multivalue"
 indexinfo[].command[].indexname "b7"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "b7"
+indexinfo[].command[].command "numerical"
+indexinfo[].command[].indexname "b7"
 indexinfo[].command[].command "type WeightedSet<double>"
 indexinfo[].command[].indexname "a9"
 indexinfo[].command[].command "index"
@@ -138,6 +142,8 @@ indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "a10"
 indexinfo[].command[].command "fast-search"
 indexinfo[].command[].indexname "a10"
+indexinfo[].command[].command "numerical"
+indexinfo[].command[].indexname "a10"
 indexinfo[].command[].command "type Array<int>"
 indexinfo[].command[].indexname "a11"
 indexinfo[].command[].command "index"
diff --git a/config-model/src/test/derived/importedfields/index-info.cfg b/config-model/src/test/derived/importedfields/index-info.cfg
index 76382e4fd80..ec44e4f1b11 100644
--- a/config-model/src/test/derived/importedfields/index-info.cfg
+++ b/config-model/src/test/derived/importedfields/index-info.cfg
@@ -50,6 +50,8 @@ indexinfo[].command[].command "multivalue"
 indexinfo[].command[].indexname "my_int_array_field"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "my_int_array_field"
+indexinfo[].command[].command "numerical"
+indexinfo[].command[].indexname "my_int_array_field"
 indexinfo[].command[].command "type Array<int>"
 indexinfo[].command[].indexname "my_int_wset_field"
 indexinfo[].command[].command "index"
@@ -58,6 +60,8 @@ indexinfo[].command[].command "multivalue"
 indexinfo[].command[].indexname "my_int_wset_field"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "my_int_wset_field"
+indexinfo[].command[].command "numerical"
+indexinfo[].command[].indexname "my_int_wset_field"
 indexinfo[].command[].command "type WeightedSet<int>"
 indexinfo[].command[].indexname "my_ancient_int_field"
 indexinfo[].command[].command "index"
diff --git a/config-model/src/test/derived/position_array/index-info.cfg b/config-model/src/test/derived/position_array/index-info.cfg
index c8008e9d440..efbea184232 100644
--- a/config-model/src/test/derived/position_array/index-info.cfg
+++ b/config-model/src/test/derived/position_array/index-info.cfg
@@ -32,4 +32,6 @@ indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "pos_zcurve"
 indexinfo[].command[].command "fast-search"
 indexinfo[].command[].indexname "pos_zcurve"
+indexinfo[].command[].command "numerical"
+indexinfo[].command[].indexname "pos_zcurve"
 indexinfo[].command[].command "type Array<long>"
diff --git a/config-model/src/test/derived/types/index-info.cfg b/config-model/src/test/derived/types/index-info.cfg
index cb10bb561d5..3bcf43060fc 100644
--- a/config-model/src/test/derived/types/index-info.cfg
+++ b/config-model/src/test/derived/types/index-info.cfg
@@ -42,6 +42,8 @@ indexinfo[].command[].command "multivalue"
 indexinfo[].command[].indexname "arrayfield"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "arrayfield"
+indexinfo[].command[].command "numerical"
+indexinfo[].command[].indexname "arrayfield"
 indexinfo[].command[].command "type Array<int>"
 indexinfo[].command[].indexname "setfield"
 indexinfo[].command[].command "index"
@@ -222,6 +224,8 @@ indexinfo[].command[].command "index"
 indexinfo[].command[].indexname "arraymapfield.value"
 indexinfo[].command[].command "multivalue"
 indexinfo[].command[].indexname "arraymapfield.value"
+indexinfo[].command[].command "numerical"
+indexinfo[].command[].indexname "arraymapfield.value"
 indexinfo[].command[].command "type Array<int>"
 indexinfo[].command[].indexname "arraymapfield"
 indexinfo[].command[].command "index"
@@ -252,6 +256,8 @@ indexinfo[].command[].command "index"
 indexinfo[].command[].indexname "mystructfield.bytearr"
 indexinfo[].command[].command "multivalue"
 indexinfo[].command[].indexname "mystructfield.bytearr"
+indexinfo[].command[].command "numerical"
+indexinfo[].command[].indexname "mystructfield.bytearr"
 indexinfo[].command[].command "type Array<byte>"
 indexinfo[].command[].indexname "mystructfield.mymap.key"
 indexinfo[].command[].command "index"
@@ -290,6 +296,8 @@ indexinfo[].command[].command "index"
 indexinfo[].command[].indexname "mystructmap.value.bytearr"
 indexinfo[].command[].command "multivalue"
 indexinfo[].command[].indexname "mystructmap.value.bytearr"
+indexinfo[].command[].command "numerical"
+indexinfo[].command[].indexname "mystructmap.value.bytearr"
 indexinfo[].command[].command "type Array<byte>"
 indexinfo[].command[].indexname "mystructmap.value.mymap.key"
 indexinfo[].command[].command "index"
@@ -328,6 +336,8 @@ indexinfo[].command[].command "index"
 indexinfo[].command[].indexname "mystructarr.bytearr"
 indexinfo[].command[].command "multivalue"
 indexinfo[].command[].indexname "mystructarr.bytearr"
+indexinfo[].command[].command "numerical"
+indexinfo[].command[].indexname "mystructarr.bytearr"
 indexinfo[].command[].command "type Array<byte>"
 indexinfo[].command[].indexname "mystructarr.mymap.key"
 indexinfo[].command[].command "index"