aboutsummaryrefslogtreecommitdiffstats
path: root/config-model
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@oath.com>2020-04-14 19:17:56 +0200
committerGitHub <noreply@github.com>2020-04-14 19:17:56 +0200
commitb5ccc8e259f6702935daab82e4b5e4aa93258ca4 (patch)
treefebc956050870c9f22b5ccbbf495472d1108cd83 /config-model
parentd8298478feb34ba096ee1452270a92f29f178439 (diff)
parenta9bfa3b0910afb5feb465b7e3e202e0f47994001 (diff)
Merge pull request #12910 from vespa-engine/bjorncs/query-predicate-field-validation
Bjorncs/query predicate field validation
Diffstat (limited to 'config-model')
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexInfo.java2
-rw-r--r--config-model/src/test/derived/predicate_attribute/index-info.cfg2
2 files changed, 4 insertions, 0 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 a631aa19968..da25680ca47 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
@@ -43,6 +43,7 @@ public class IndexInfo extends Derived implements IndexInfoConfig.Producer {
private static final String CMD_PLAIN_TOKENS = "plain-tokens";
private static final String CMD_MULTIVALUE = "multivalue";
private static final String CMD_FAST_SEARCH = "fast-search";
+ private static final String CMD_PREDICATE = "predicate";
private static final String CMD_PREDICATE_BOUNDS = "predicate-bounds";
private static final String CMD_NUMERICAL = "numerical";
private static final String CMD_PHRASE_SEGMENTING = "phrase-segmenting";
@@ -100,6 +101,7 @@ public class IndexInfo extends Derived implements IndexInfoConfig.Producer {
protected void derive(ImmutableSDField field, Search search, boolean inPosition) {
if (field.getDataType().equals(DataType.PREDICATE)) {
+ addIndexCommand(field, CMD_PREDICATE);
Index index = field.getIndex(field.getName());
if (index != null) {
BooleanIndexDefinition options = index.getBooleanIndexDefiniton();
diff --git a/config-model/src/test/derived/predicate_attribute/index-info.cfg b/config-model/src/test/derived/predicate_attribute/index-info.cfg
index 3d9f57dd84b..4ebac65e1f5 100644
--- a/config-model/src/test/derived/predicate_attribute/index-info.cfg
+++ b/config-model/src/test/derived/predicate_attribute/index-info.cfg
@@ -4,6 +4,8 @@ indexinfo[].command[].command "index"
indexinfo[].command[].indexname "sddocname"
indexinfo[].command[].command "word"
indexinfo[].command[].indexname "some_predicate_field"
+indexinfo[].command[].command "predicate"
+indexinfo[].command[].indexname "some_predicate_field"
indexinfo[].command[].command "predicate-bounds [3..200]"
indexinfo[].command[].indexname "some_predicate_field"
indexinfo[].command[].command "index"