diff options
7 files changed, 19 insertions, 15 deletions
diff --git a/container-apache-http-client-bundle/pom.xml b/container-apache-http-client-bundle/pom.xml index 48a8131b73d..e580364a51a 100644 --- a/container-apache-http-client-bundle/pom.xml +++ b/container-apache-http-client-bundle/pom.xml @@ -77,7 +77,15 @@ <Bundle-Version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</Bundle-Version> <Export-Package>org.apache.hc.*;version=1.0.0;-noimport:=true,org.apache.http.*;version=1.0.0;-noimport:=true</Export-Package> <Embed-Dependency>*;scope=compile;type=!pom;inline=true</Embed-Dependency> - <Import-Package>!javax.servlet,javax.*,org.slf4j,org.ietf.jgss</Import-Package> + <Import-Package> + !javax.servlet, + javax.*, + org.slf4j, + org.slf4j.spi, + org.slf4j.helpers, + org.slf4j.event, + org.ietf.jgss + </Import-Package> <Embed-Transitive>true</Embed-Transitive> <_nouses>true</_nouses> </instructions> diff --git a/dependency-versions/pom.xml b/dependency-versions/pom.xml index c2de751fb75..29ac69f40a0 100644 --- a/dependency-versions/pom.xml +++ b/dependency-versions/pom.xml @@ -33,7 +33,7 @@ <!-- DO NOT UPGRADE THESE TO A NEW MAJOR VERSION WITHOUT CHECKING FOR BINARY COMPATIBILITY --> <aopalliance.vespa.version>1.0</aopalliance.vespa.version> - <commons-logging.vespa.version>1.3.0</commons-logging.vespa.version> <!-- This version is exported by jdisc via jcl-over-slf4j. --> + <commons-logging.vespa.version>1.2</commons-logging.vespa.version> <!-- This version is exported by jdisc via jcl-over-slf4j. --> <error-prone-annotations.vespa.version>2.23.0</error-prone-annotations.vespa.version> <guava.vespa.version>32.1.3-jre</guava.vespa.version> <guice.vespa.version>6.0.0</guice.vespa.version> @@ -152,7 +152,7 @@ <maven-assembly-plugin.vespa.version>3.6.0</maven-assembly-plugin.vespa.version> <maven-bundle-plugin.vespa.version>5.1.9</maven-bundle-plugin.vespa.version> <maven-compiler-plugin.vespa.version>3.11.0</maven-compiler-plugin.vespa.version> - <maven-core.vespa.version>3.9.5</maven-core.vespa.version> + <maven-core.vespa.version>3.9.6</maven-core.vespa.version> <maven-dependency-plugin.vespa.version>3.6.1</maven-dependency-plugin.vespa.version> <maven-deploy-plugin.vespa.version>3.1.1</maven-deploy-plugin.vespa.version> <maven-enforcer-plugin.vespa.version>3.4.1</maven-enforcer-plugin.vespa.version> diff --git a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java index 95dc1cac9f2..fa7772d752a 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java @@ -210,7 +210,7 @@ public class Flags { public static final UnboundIntFlag MAX_ACTIVATION_INHIBITED_OUT_OF_SYNC_GROUPS = defineIntFlag( "max-activation-inhibited-out-of-sync-groups", 0, - List.of("vekterli"), "2021-02-19", "2023-12-01", + List.of("vekterli"), "2021-02-19", "2024-03-01", "Allows replicas in up to N content groups to not be activated " + "for query visibility if they are out of sync with a majority of other replicas", "Takes effect at redeployment", @@ -218,7 +218,7 @@ public class Flags { public static final UnboundDoubleFlag MIN_NODE_RATIO_PER_GROUP = defineDoubleFlag( "min-node-ratio-per-group", 0.0, - List.of("geirst", "vekterli"), "2021-07-16", "2023-12-01", + List.of("geirst", "vekterli"), "2021-07-16", "2024-03-01", "Minimum ratio of nodes that have to be available (i.e. not Down) in any hierarchic content cluster group for the group to be Up", "Takes effect at redeployment", INSTANCE_ID); diff --git a/streamingvisitors/src/vespa/vsm/searcher/floatfieldsearcher.cpp b/streamingvisitors/src/vespa/vsm/searcher/floatfieldsearcher.cpp index 95ebdfe9a90..7dd40348f47 100644 --- a/streamingvisitors/src/vespa/vsm/searcher/floatfieldsearcher.cpp +++ b/streamingvisitors/src/vespa/vsm/searcher/floatfieldsearcher.cpp @@ -39,10 +39,8 @@ void FloatFieldSearcherT<T>::prepare(search::streaming::QueryTermList& qtl, for (auto qt : qtl) { size_t sz(qt->termLen()); if (sz) { - double low; - double high; - bool valid = qt->getAsDoubleTerm(low, high); - _floatTerm.push_back(FloatInfo(low, high, valid)); + auto range = qt->getRange<T>(); + _floatTerm.emplace_back(range.low, range.high, range.valid); } } } diff --git a/streamingvisitors/src/vespa/vsm/searcher/floatfieldsearcher.h b/streamingvisitors/src/vespa/vsm/searcher/floatfieldsearcher.h index 877050a3276..07b3f6e1c5f 100644 --- a/streamingvisitors/src/vespa/vsm/searcher/floatfieldsearcher.h +++ b/streamingvisitors/src/vespa/vsm/searcher/floatfieldsearcher.h @@ -20,7 +20,7 @@ protected: class FloatInfo { public: - FloatInfo(T low, T high, bool v) : _lower(low), _upper(high), _valid(v) { if (low > high) { _lower = high; _upper = low; } } + FloatInfo(T low, T high, bool v) noexcept : _lower(low), _upper(high), _valid(v) { } bool cmp(T key) const; bool valid() const { return _valid; } void setValid(bool v) { _valid = v; } diff --git a/streamingvisitors/src/vespa/vsm/searcher/intfieldsearcher.cpp b/streamingvisitors/src/vespa/vsm/searcher/intfieldsearcher.cpp index 4a941cecb83..e73c7f5c1a7 100644 --- a/streamingvisitors/src/vespa/vsm/searcher/intfieldsearcher.cpp +++ b/streamingvisitors/src/vespa/vsm/searcher/intfieldsearcher.cpp @@ -29,10 +29,8 @@ void IntFieldSearcher::prepare(search::streaming::QueryTermList& qtl, for (auto qt : qtl) { size_t sz(qt->termLen()); if (sz) { - int64_t low; - int64_t high; - bool valid = qt->getAsIntegerTerm(low, high); - _intTerm.push_back(IntInfo(low, high, valid)); + auto range = qt->getRange<int64_t>(); + _intTerm.emplace_back(range.low, range.high, range.valid); } } } diff --git a/streamingvisitors/src/vespa/vsm/searcher/intfieldsearcher.h b/streamingvisitors/src/vespa/vsm/searcher/intfieldsearcher.h index bf143a4d06b..47b83c1538d 100644 --- a/streamingvisitors/src/vespa/vsm/searcher/intfieldsearcher.h +++ b/streamingvisitors/src/vespa/vsm/searcher/intfieldsearcher.h @@ -20,7 +20,7 @@ protected: class IntInfo { public: - IntInfo(int64_t low, int64_t high, bool v) : _lower(low), _upper(high), _valid(v) { if (low > high) { _lower = high; _upper = low; } } + IntInfo(int64_t low, int64_t high, bool v) noexcept : _lower(low), _upper(high), _valid(v) { } bool cmp(int64_t key) const { return (_lower <= key) && (key <= _upper); } bool valid() const { return _valid; } private: |