diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-08-31 17:43:32 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2023-08-31 18:19:21 +0200 |
commit | 3a434180ab6acf7a8b882c978f4048e9a1c75f9e (patch) | |
tree | b6b729147432189641741a6c9f27b49569700edd | |
parent | 17b93b6ef0d7225723394def1e832ef37a517231 (diff) |
6.6.1
3 files changed, 3 insertions, 6 deletions
diff --git a/dependency-versions/pom.xml b/dependency-versions/pom.xml index cdfbff75911..c16cd8b6bf9 100644 --- a/dependency-versions/pom.xml +++ b/dependency-versions/pom.xml @@ -121,7 +121,7 @@ <org.lz4.vespa.version>1.8.0</org.lz4.vespa.version> <prometheus.client.vespa.version>0.16.0</prometheus.client.vespa.version> <protobuf.vespa.version>3.24.2</protobuf.vespa.version> - <questdb.vespa.version>6.3.1</questdb.vespa.version> + <questdb.vespa.version>6.6.1</questdb.vespa.version> <spifly.vespa.version>1.3.6</spifly.vespa.version> <snappy.vespa.version>1.1.10.3</snappy.vespa.version> <surefire.vespa.version>3.1.2</surefire.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 e0199b5ddaf..717341b7923 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 @@ -8,7 +8,6 @@ import com.yahoo.component.AbstractComponent; import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.ClusterSpec; import com.yahoo.io.IOUtils; -import com.yahoo.vespa.defaults.Defaults; import com.yahoo.yolean.concurrent.ConcurrentResourcePool; import io.questdb.cairo.CairoEngine; import io.questdb.cairo.CairoException; @@ -18,7 +17,6 @@ import io.questdb.cairo.sql.Record; import io.questdb.cairo.sql.RecordCursor; import io.questdb.cairo.sql.RecordCursorFactory; import io.questdb.griffin.CompiledQuery; -import io.questdb.griffin.QueryFuture; import io.questdb.griffin.SqlCompiler; import io.questdb.griffin.SqlException; import io.questdb.griffin.SqlExecutionContext; @@ -40,7 +38,6 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.stream.Collectors; import static com.yahoo.vespa.defaults.Defaults.getDefaults; @@ -349,7 +346,7 @@ public class QuestMetricsDb extends AbstractComponent implements MetricsDb { * Needs to be done for some queries, e.g. 'alter table' queries, see https://github.com/questdb/questdb/issues/1846 */ private void issueAsync(String sql, SqlExecutionContext context) throws SqlException { - try (QueryFuture future = issue(sql, context).execute(null)) { + try (var future = issue(sql, context).execute(null)) { future.await(); } } diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt index 27b9ac62a54..be76935c6ed 100644 --- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt +++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt @@ -203,7 +203,7 @@ org.ow2.asm:asm-analysis:9.5 org.ow2.asm:asm-commons:9.5 org.ow2.asm:asm-tree:9.5 org.ow2.asm:asm-util:9.5 -org.questdb:questdb:6.3.1 +org.questdb:questdb:6.6.1 org.slf4j:jcl-over-slf4j:1.7.36 org.slf4j:log4j-over-slf4j:1.7.36 org.slf4j:slf4j-api:1.7.36 |