diff options
author | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-09-21 09:16:24 -0700 |
---|---|---|
committer | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-09-21 09:16:24 -0700 |
commit | ba3882f60243e9270d17144020dc9f830eaf2411 (patch) | |
tree | cda50a39071644b38edc6ea785088a8c95910526 /config-model | |
parent | e2be7f9acc809e24903d83ba5be63806362794e3 (diff) |
Avoid the phrase 'boolean search' for predicate fields
This is to avoid any confusion with boolean search in the meaning of
combining query operators with boolean combinators.
Diffstat (limited to 'config-model')
3 files changed, 9 insertions, 8 deletions
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/BooleanIndexDefinition.java b/config-model/src/main/java/com/yahoo/searchdefinition/document/BooleanIndexDefinition.java index efe4d1ade5c..43e1f90790b 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/document/BooleanIndexDefinition.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/document/BooleanIndexDefinition.java @@ -6,13 +6,12 @@ import java.util.OptionalInt; import java.util.OptionalLong; /** - * Encapsulates values required for native implementation of boolean search. + * Encapsulates values required for predicate fields. * - * @author <a href="mailto:lesters@yahoo-inc.com">Lester Solbakken</a> - * @since 5.2 + * @author lesters */ -public final class BooleanIndexDefinition -{ +public final class BooleanIndexDefinition { + public static final int DEFAULT_ARITY = 8; public static final long DEFAULT_UPPER_BOUND = Long.MAX_VALUE; public static final long DEFAULT_LOWER_BOUND = Long.MIN_VALUE; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/IndexOperation.java b/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/IndexOperation.java index 79d99c17973..6df4ca2a6e1 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/IndexOperation.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/IndexOperation.java @@ -15,16 +15,17 @@ import java.util.OptionalInt; import java.util.OptionalLong; /** - * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a> + * @author Einar M R Rosenvinge */ public class IndexOperation implements FieldOperation { + private String indexName; private Optional<Boolean> prefix = Optional.empty(); private List<String> aliases = new LinkedList<>(); private Optional<String> stemming = Optional.empty(); private Optional<Type> type = Optional.empty(); - private OptionalInt arity = OptionalInt.empty(); // For predicate data type in boolean search + private OptionalInt arity = OptionalInt.empty(); // For predicate data type private OptionalLong lowerBound = OptionalLong.empty(); private OptionalLong upperBound = OptionalLong.empty(); private OptionalDouble densePostingListThreshold = OptionalDouble.empty(); @@ -111,4 +112,5 @@ public class IndexOperation implements FieldOperation { public void setDensePostingListThreshold(double densePostingListThreshold) { this.densePostingListThreshold = OptionalDouble.of(densePostingListThreshold); } + } diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/PredicateProcessor.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/PredicateProcessor.java index a4b64ced3c7..450c24d8e3e 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/PredicateProcessor.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/PredicateProcessor.java @@ -73,7 +73,7 @@ public class PredicateProcessor extends Processor { } else if (field.getDataType().getPrimitiveType() == DataType.PREDICATE) { fail(search, field, "Collections of predicates are not allowed."); } else if (field.getDataType() == DataType.RAW && field.doesIndexing()) { - fail(search, field, "Indexing of RAW fields are not supported. If you are using RAW fields for boolean search, use predicate data type instead."); + fail(search, field, "Indexing of RAW fields is not supported."); } else { // if field is not a predicate, disallow predicate-related index parameters for (Index index : field.getIndices().values()) { |