summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2019-01-09 09:49:31 +0100
committerHenning Baldersheim <balder@yahoo-inc.com>2019-01-09 09:49:31 +0100
commit056c1982585cd80986e0f805db85ffccefd60c3f (patch)
tree32294dfe4b40bd5af27142887fbe2cab203df096
parent43abdf70ca8b20f97be487aded69080f73718f94 (diff)
Allow bool is search {} too
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/application/validation/SearchDataTypeValidator.java11
-rw-r--r--config-model/src/test/cfg/application/validation/search_alltypes/searchdefinitions/simple.sd1
2 files changed, 11 insertions, 1 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/SearchDataTypeValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/SearchDataTypeValidator.java
index 240d4f5501a..85ba75639eb 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/SearchDataTypeValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/SearchDataTypeValidator.java
@@ -2,7 +2,15 @@
package com.yahoo.vespa.model.application.validation;
import com.yahoo.config.model.deploy.DeployState;
-import com.yahoo.document.*;
+import com.yahoo.document.ArrayDataType;
+import com.yahoo.document.CollectionDataType;
+import com.yahoo.document.DataType;
+import com.yahoo.document.Field;
+import com.yahoo.document.MapDataType;
+import com.yahoo.document.ReferenceDataType;
+import com.yahoo.document.StructDataType;
+import com.yahoo.document.TensorDataType;
+import com.yahoo.document.WeightedSetDataType;
import com.yahoo.searchdefinition.document.SDDocumentType;
import com.yahoo.searchdefinition.document.SDField;
import com.yahoo.vespa.model.VespaModel;
@@ -71,6 +79,7 @@ public class SearchDataTypeValidator extends Validator {
dataType.equals(DataType.DOUBLE) ||
dataType.equals(DataType.URI) ||
dataType.equals(DataType.BYTE) ||
+ dataType.equals(DataType.BOOL) ||
dataType.equals(DataType.PREDICATE);
}
}
diff --git a/config-model/src/test/cfg/application/validation/search_alltypes/searchdefinitions/simple.sd b/config-model/src/test/cfg/application/validation/search_alltypes/searchdefinitions/simple.sd
index 2a4c4a68576..242a7493df3 100644
--- a/config-model/src/test/cfg/application/validation/search_alltypes/searchdefinitions/simple.sd
+++ b/config-model/src/test/cfg/application/validation/search_alltypes/searchdefinitions/simple.sd
@@ -10,6 +10,7 @@ search simple {
field my_double type double { indexing: summary }
field my_uri type uri { indexing: summary }
field my_byte type byte { indexing: summary }
+ field my_bool type bool { indexing: summary }
field my_predicate type predicate { indexing: summary }
field my_tensor type tensor(x{}) { indexing: summary }
field my_reference type reference<parent> { indexing: summary | attribute }