Merge branch 'master' into bratseth/nonfunctional-changes-4

Conflicts:
	vespajlib/src/main/java/com/yahoo/concurrent/lock/Locks.java

7 files changed, 11 insertions, 81 deletions

diff --git a/config-model/fix-from-to.sh b/config-model/fix-from-to.sh
deleted file mode 100755
index 6223465a987..00000000000
--- a/config-model/fix-from-to.sh
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/bin/sh
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
-( cat << "EOF"
-temp/id                                           src/test/derived/id
-temp/mlr                                          src/test/derived/mlr
-temp/mail                                         src/test/derived/mail
-temp/local                                        src/test/derived/local
-temp/music                                        src/test/derived/music
-temp/types                                        src/test/derived/types
-temp/arrays                                       src/test/derived/arrays
-temp/flickr                                       src/test/derived/flickr
-temp/mother                                       src/test/derived/inheritance/mother
-temp/music3                                       src/test/derived/music3
-temp/complex                                      src/test/derived/complex
-temp/deriver                                      src/test/derived/deriver
-temp/mail4_1                                      src/test/derived/mail4_1
-temp/newrank                                      src/test/derived/newrank
-temp/sorting                                      src/test/derived/sorting
-temp/advanced                                     src/test/derived/advanced
-temp/ranktypes                                    src/test/derived/ranktypes
-temp/attributes                                   src/test/derived/attributes
-temp/emptychild                                   src/test/derived/emptychild
-temp/exactmatch                                   src/test/derived/exactmatch
-temp/indexschema                                  src/test/derived/indexschema
-temp/inheritance                                  src/test/derived/inheritance
-temp/emptydefault                                 src/test/derived/emptydefault
-temp/rankprofiles                                 src/test/derived/rankprofiles
-temp/attributerank                                src/test/derived/attributerank
-temp/indexsettings                                src/test/derived/indexsettings
-temp/indexswitches                                src/test/derived/indexswitches
-temp/rankexpression                               src/test/derived/rankexpression
-temp/rankproperties                               src/test/derived/rankproperties
-temp/structanyorder                               src/test/derived/structanyorder
-temp/documentderiver                              src/test/derived/documentderiver
-temp/streamingstruct                              src/test/derived/streamingstruct
-temp/annotationssimple                            src/test/derived/annotationssimple
-temp/attributeprefetch                            src/test/derived/attributeprefetch
-temp/multiplesummaries                            src/test/derived/multiplesummaries
-temp/inheritancebadtypes                          src/test/derived/inheritancebadtypes
-temp/twostreamingstructs                          src/test/derived/twostreamingstructs
-temp/annotationsreference                         src/test/derived/annotationsreference
-temp/prefixexactattribute                         src/test/derived/prefixexactattribute
-temp/annotationspolymorphy                        src/test/derived/annotationspolymorphy
-temp/annotationsinheritance                       src/test/derived/annotationsinheritance
-temp/streamingstructdefault                       src/test/derived/streamingstructdefault
-temp/annotationsinheritance2                      src/test/derived/annotationsinheritance2
-temp/annotationsimplicitstruct                    src/test/derived/annotationsimplicitstruct
-temp/integerattributetostringindex                src/test/derived/integerattributetostringindex
-temp/combinedattributeandindexsearch              src/test/derived/combinedattributeandindexsearch
-tmp/v2/complex/search/cluster.music/tlds/tld.0                src/test/cfg/search/compare/complex/search/cluster.music/tlds/tld.0
-tmp/v2/complex/search/cluster.music/tlds/tld.1                src/test/cfg/search/compare/complex/search/cluster.music/tlds/tld.1
-tmp/v2/complex/search/cluster.rt/tlds/tld.0                   src/test/cfg/search/compare/complex/search/cluster.rt/tlds/tld.0
-tmp/v2/optionals/search/cluster.music/tlds/tld.0              src/test/cfg/search/compare/optionals/search/cluster.music/tlds/tld.0
-tmp/v2/simple/search/cluster.music/tlds/tld.0                 src/test/cfg/search/compare/simple/search/cluster.music/tlds/tld.0
-tmp/v2/twoFeedTargetClusters/search/cluster.music1/tlds/tld.0 src/test/cfg/search/compare/twoFeedTargetClusters/search/cluster.music1/tlds/tld.0
-tmp/v2/twoFeedTargetClusters/search/cluster.music2/tlds/tld.0 src/test/cfg/search/compare/twoFeedTargetClusters/search/cluster.music2/tlds/tld.0
-EOF
-) | while read from to ; do
-	echo check fromdir $from todir $to 1>&2
-        test -d $from || echo missing $from 1>&2
-        test -d $to || echo missing $to 1>&2
-	for fromfile in $from/*cfg ; do
-		base=${fromfile##*/}
-		base=${base%%.*}
-		tofile=`ls $to/${base}.*cfg 2>/dev/null`
-		if [ "$tofile" ] && [ -f "$tofile" ]; then
-			cmp -s $fromfile $tofile || echo cp $fromfile $tofile
-		fi
-	done
-done | sh -x
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()).