diff options
6 files changed, 8 insertions, 12 deletions
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/ReservedMacroNames.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/ReservedMacroNames.java index 19063b8e7f9..c2c5ca66eba 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/ReservedMacroNames.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/ReservedMacroNames.java @@ -1,5 +1,6 @@ package com.yahoo.searchdefinition.processing; +import com.google.common.collect.ImmutableSet; import com.yahoo.config.application.api.DeployLogger; import com.yahoo.searchdefinition.RankProfile; import com.yahoo.searchdefinition.RankProfileRegistry; @@ -18,6 +19,7 @@ import java.util.logging.Level; * @author lesters */ public class ReservedMacroNames extends Processor { + private static Set<String> reservedNames = getReservedNames(); public ReservedMacroNames(Search search, DeployLogger deployLogger, RankProfileRegistry rankProfileRegistry, QueryProfiles queryProfiles) { super(search, deployLogger, rankProfileRegistry, queryProfiles); @@ -25,7 +27,6 @@ public class ReservedMacroNames extends Processor { @Override public void process() { - Set<String> reservedNames = getReservedNames(); for (RankProfile rp : rankProfileRegistry.allRankProfiles()) { for (String macroName : rp.getMacros().keySet()) { if (reservedNames.contains(macroName)) { @@ -39,12 +40,12 @@ public class ReservedMacroNames extends Processor { } } - private Set<String> getReservedNames() { - Set<String> names = new HashSet<>(); + private static ImmutableSet<String> getReservedNames() { + ImmutableSet.Builder<String> names = ImmutableSet.builder(); for (String token : RankingExpressionParserConstants.tokenImage) { String tokenWithoutQuotes = token.substring(1, token.length()-1); names.add(tokenWithoutQuotes); } - return names; + return names.build(); } } diff --git a/configserver/src/main/resources/configserver-app/services.xml b/configserver/src/main/resources/configserver-app/services.xml index 9330dae2e41..7aec27a96f5 100644 --- a/configserver/src/main/resources/configserver-app/services.xml +++ b/configserver/src/main/resources/configserver-app/services.xml @@ -43,7 +43,7 @@ <preprocess:include file='config-models.xml' required='false' /> <preprocess:include file='node-repository.xml' required='false' /> <preprocess:include file='hosted-vespa/routing-status.xml' required='false' /> - <component id="com.yahoo.vespa.service.monitor.SlobrokAndConfigIntersector" bundle="orchestrator" /> + <component id="com.yahoo.vespa.service.monitor.ServiceMonitorImpl" bundle="orchestrator" /> <component id="com.yahoo.vespa.orchestrator.ServiceMonitorInstanceLookupService" bundle="orchestrator" /> <component id="com.yahoo.vespa.orchestrator.status.ZookeeperStatusService" bundle="orchestrator" /> <component id="com.yahoo.vespa.orchestrator.controller.RetryingClusterControllerClientFactory" bundle="orchestrator" /> diff --git a/documentapi/src/tests/policies/policies_test.cpp b/documentapi/src/tests/policies/policies_test.cpp index ba5064bcbae..58db3079631 100644 --- a/documentapi/src/tests/policies/policies_test.cpp +++ b/documentapi/src/tests/policies/policies_test.cpp @@ -758,7 +758,7 @@ Test::requireThatStoragePolicyIsRandomWithoutState() mbus::TestServer *srv = new mbus::TestServer( mbus::Identity(vespalib::make_string("storage/cluster.mycluster/distributor/%d", i)), mbus::RoutingSpec(), slobrok, - make_shared<DocumentProtocol>(_loadTypes, _repo)); + mbus::IProtocol::SP(new DocumentProtocol(_loadTypes, _repo))); servers.push_back(srv); srv->net.registerSession("default"); } diff --git a/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCNetworkParams.java b/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCNetworkParams.java index ae58afe6be0..0d4cee5a939 100755 --- a/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCNetworkParams.java +++ b/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCNetworkParams.java @@ -15,7 +15,6 @@ public class RPCNetworkParams { private Identity identity = new Identity(""); private String slobrokConfigId = "admin/slobrok.0"; private SlobroksConfig slobroksConfig = null; - private String oosServerPattern = ""; private int listenPort = 0; private int maxInputBufferSize = 256 * 1024; private int maxOutputBufferSize = 256 * 1024; @@ -37,7 +36,6 @@ public class RPCNetworkParams { identity = new Identity(params.identity); slobrokConfigId = params.slobrokConfigId; slobroksConfig = params.slobroksConfig; - oosServerPattern = params.oosServerPattern; listenPort = params.listenPort; connectionExpireSecs = params.connectionExpireSecs; maxInputBufferSize = params.maxInputBufferSize; diff --git a/messagebus/src/tests/oospolicy/.gitignore b/messagebus/src/tests/oospolicy/.gitignore deleted file mode 100644 index 3bd6e47e0bc..00000000000 --- a/messagebus/src/tests/oospolicy/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -.depend -Makefile -oospolicy_test @@ -932,7 +932,7 @@ <asm-debug-all.version>5.0.3</asm-debug-all.version> <!-- Athenz dependencies. Make sure these dependencies matches those in Vespa's internal repositories --> <athenz.version>1.7.28</athenz.version> - <bouncycastle.version>1.49</bouncycastle.version> + <bouncycastle.version>1.58</bouncycastle.version> <commons-lang.version>2.6</commons-lang.version> <!-- WARNING: If you change curator version, you also need to update zkfacade/src/main/java/org/apache/curator/**/package-info.java |