Detect integer fields in fieldsets.

3 files changed, 12 insertions, 0 deletions

diff --git a/config-model/src/main/java/com/yahoo/schema/derived/IndexInfo.java b/config-model/src/main/java/com/yahoo/schema/derived/IndexInfo.java
index 7afa2b46693..96c64ff1a1c 100644
--- a/config-model/src/main/java/com/yahoo/schema/derived/IndexInfo.java
+++ b/config-model/src/main/java/com/yahoo/schema/derived/IndexInfo.java
@@ -351,6 +351,7 @@ public class IndexInfo extends Derived implements IndexInfoConfig.Producer {
         boolean anyStemming = false;
         boolean anyNormalizing = false;
         boolean anyString = false;
+        boolean anyInteger = false;
         String phraseSegmentingCommand = null;
         String stemmingCommand = null;
         Matching fieldSetMatching = fieldSet.getMatching(); // null if no explicit matching
@@ -382,6 +383,10 @@ public class IndexInfo extends Derived implements IndexInfoConfig.Producer {
             if (explicitPhraseSegmentingCommand.isPresent()) {
                 phraseSegmentingCommand = explicitPhraseSegmentingCommand.get();
             }
+            if (isTypeOrNested(field, DataType.INT) || isTypeOrNested(field, DataType.LONG) ||
+                    isTypeOrNested(field, DataType.BYTE)) {
+                anyInteger = true;
+            }
         }
         if (anyIndexing && anyAttributing && fieldSet.getMatching() == null) {
             // We have both attributes and indexes and no explicit match setting ->
@@ -445,6 +450,9 @@ public class IndexInfo extends Derived implements IndexInfoConfig.Producer {
         if (anyString) {
             addIndexCommand(iiB, fieldSet.getName(), CMD_STRING);
         }
+        if (anyInteger) {
+            addIndexCommand(iiB, fieldSet.getName(), CMD_INTEGER);
+        }
         if (fieldSetMatching != null) {
             // Explicit matching set on fieldset
             if (fieldSetMatching.getType().equals(MatchType.EXACT)) {
diff --git a/config-model/src/test/derived/importedfields/index-info.cfg b/config-model/src/test/derived/importedfields/index-info.cfg
index 830249b94db..749e8b71a30 100644
--- a/config-model/src/test/derived/importedfields/index-info.cfg
+++ b/config-model/src/test/derived/importedfields/index-info.cfg
@@ -76,4 +76,6 @@ indexinfo[].command[].command "index"
 indexinfo[].command[].indexname "myfieldset"
 indexinfo[].command[].command "string"
 indexinfo[].command[].indexname "myfieldset"
+indexinfo[].command[].command "integer"
+indexinfo[].command[].indexname "myfieldset"
 indexinfo[].command[].command "word"
diff --git a/config-model/src/test/derived/indexschema/index-info.cfg b/config-model/src/test/derived/indexschema/index-info.cfg
index 3de7adcb930..8c2349e37ea 100644
--- a/config-model/src/test/derived/indexschema/index-info.cfg
+++ b/config-model/src/test/derived/indexschema/index-info.cfg
@@ -365,6 +365,8 @@ indexinfo[].command[].indexname "fs3"
 indexinfo[].command[].command "attribute"
 indexinfo[].command[].indexname "fs3"
 indexinfo[].command[].command "index"
+indexinfo[].command[].indexname "fs3"
+indexinfo[].command[].command "integer"
 indexinfo[].command[].indexname "fs4"
 indexinfo[].command[].command "lowercase"
 indexinfo[].command[].indexname "fs4"