diff options
4 files changed, 6 insertions, 4 deletions
diff --git a/dependency-versions/pom.xml b/dependency-versions/pom.xml index b967bfc796a..97b3f69cf5c 100644 --- a/dependency-versions/pom.xml +++ b/dependency-versions/pom.xml @@ -130,7 +130,7 @@ <prometheus.client.vespa.version>0.16.0</prometheus.client.vespa.version> <plexus-interpolation.vespa.version>1.27</plexus-interpolation.vespa.version> <protobuf.vespa.version>3.25.2</protobuf.vespa.version> - <questdb.vespa.version>7.3.7</questdb.vespa.version> + <questdb.vespa.version>7.3.9</questdb.vespa.version> <spifly.vespa.version>1.3.7</spifly.vespa.version> <spotbugs.vespa.version>4.8.3</spotbugs.vespa.version> <!-- Must match major version in https://github.com/apache/zookeeper/blob/master/pom.xml --> <snappy.vespa.version>1.1.10.5</snappy.vespa.version> diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/QuestMetricsDb.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/QuestMetricsDb.java index 4d0bbb4e511..e9230d2c91a 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/QuestMetricsDb.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/QuestMetricsDb.java @@ -431,7 +431,7 @@ public class QuestMetricsDb extends AbstractComponent implements MetricsDb { try { issueAsync("alter table " + name + " drop partition where at < dateadd('d', -4, now());", newContext()); } - catch (SqlException e) { + catch (Exception e) { if (e.getMessage().contains("no partitions matched WHERE clause")) return; log.log(Level.WARNING, "Failed to gc old metrics data in " + dir + " table " + name, e); } diff --git a/vespajlib/src/main/java/com/yahoo/tensor/impl/Label.java b/vespajlib/src/main/java/com/yahoo/tensor/impl/Label.java index 4b832bc7dc8..7c1e8646245 100644 --- a/vespajlib/src/main/java/com/yahoo/tensor/impl/Label.java +++ b/vespajlib/src/main/java/com/yahoo/tensor/impl/Label.java @@ -1,6 +1,6 @@ +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.tensor.impl; - import com.yahoo.tensor.Tensor; import java.util.Arrays; @@ -48,7 +48,7 @@ public class Label { } private static boolean validNumericIndex(String s) { - if ((s.length() == 0) || (s.length() > 1 && s.charAt(0) == '0')) return false; + if (s.isEmpty() || ((s.length() > 1) && (s.charAt(0) == '0'))) return false; for (int i = 0; i < s.length(); i++) { char c = s.charAt(i); if ((c < '0') || (c > '9')) return false; diff --git a/vespajlib/src/test/java/com/yahoo/tensor/TensorAddressTestCase.java b/vespajlib/src/test/java/com/yahoo/tensor/TensorAddressTestCase.java index 204d5447b91..a24475a6a24 100644 --- a/vespajlib/src/test/java/com/yahoo/tensor/TensorAddressTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/tensor/TensorAddressTestCase.java @@ -33,6 +33,7 @@ public class TensorAddressTestCase { } @Test void testStringVersusNumericAddressEquality() { + equal(ofLabels("0"), of(0)); equal(ofLabels("1"), of(1)); } @Test @@ -40,6 +41,7 @@ public class TensorAddressTestCase { notEqual(ofLabels("1"), ofLabels("2")); notEqual(of(1), of(2)); notEqual(ofLabels("1"), ofLabels("01")); + notEqual(ofLabels("0"), ofLabels("00")); } @Test void testDimensionsEffectsEqualityAndHash() { |