diff options
Diffstat (limited to 'config-model/src')
6 files changed, 11 insertions, 10 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()) { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/NetworkMetrics.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/NetworkMetrics.java index 215e739e350..7f91a19277c 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/NetworkMetrics.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/NetworkMetrics.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.model.admin.monitoring; import com.google.common.collect.ImmutableSet; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java index 32a9158dbcf..40e997a0d81 100755 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java @@ -217,6 +217,7 @@ public final class ContainerCluster addSimpleComponent(AccessLog.class); // TODO better modelling addSimpleComponent(ThreadPoolProvider.class); + addSimpleComponent(com.yahoo.concurrent.lock.Locking.class); addSimpleComponent("com.yahoo.jdisc.http.filter.SecurityFilterInvoker"); addSimpleComponent(SIMPLE_LINGUISTICS_PROVIDER); addSimpleComponent("com.yahoo.container.jdisc.SslKeyStoreFactoryProvider"); diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java b/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java index 74e508849e9..66abf3e23cf 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java @@ -262,7 +262,6 @@ public class SearchNode extends AbstractService implements rtcspec(getConnectSpec()). httpport(getHttpPort()). partition(getNodeSpec().partitionId()). - persistenceprovider(new ProtonConfig.Persistenceprovider.Builder().port(getPersistenceProviderRpcPort())). clustername(getClusterName()). basedir(getBaseDir()). tlsspec("tcp/" + getHost().getHostName() + ":" + getTransactionLogServer().getTlsPort()). |