diff options
3 files changed, 11 insertions, 10 deletions
diff --git a/dependency-versions/pom.xml b/dependency-versions/pom.xml index c16cd8b6bf9..4d63810cd4b 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.6.1</questdb.vespa.version> + <questdb.vespa.version>6.7</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 717341b7923..b735c766cb8 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 @@ -12,6 +12,7 @@ import com.yahoo.yolean.concurrent.ConcurrentResourcePool; import io.questdb.cairo.CairoEngine; import io.questdb.cairo.CairoException; import io.questdb.cairo.DefaultCairoConfiguration; +import io.questdb.cairo.TableToken; import io.questdb.cairo.TableWriter; import io.questdb.cairo.sql.Record; import io.questdb.cairo.sql.RecordCursor; @@ -83,8 +84,8 @@ public class QuestMetricsDb extends AbstractComponent implements MetricsDb { this.dataDir = dataDir; engine = new CairoEngine(new DefaultCairoConfiguration(dataDir)); sqlCompilerPool = new ConcurrentResourcePool<>(() -> new SqlCompiler(engine())); - nodeTable = new Table(dataDir, "metrics", clock); - clusterTable = new Table(dataDir, "clusterMetrics", clock); + nodeTable = new Table(dataDir, "metrics"); + clusterTable = new Table(dataDir, "clusterMetrics"); ensureTablesExist(); } @@ -233,7 +234,7 @@ public class QuestMetricsDb extends AbstractComponent implements MetricsDb { private void ensureClusterTableIsUpdated() { try { - if (0 == engine().getStatus(newContext().getCairoSecurityContext(), new Path(), clusterTable.name)) { + if (0 == engine().getStatus(newContext().getCairoSecurityContext(), new Path(), clusterTable.token)) { // Example: clusterTable.ensureColumnExists("write_rate", "float"); } } catch (Exception e) { @@ -360,13 +361,13 @@ public class QuestMetricsDb extends AbstractComponent implements MetricsDb { private final Object writeLock = new Object(); private final String name; - private final Clock clock; + private final TableToken token; private final File dir; private long highestTimestampAdded = 0; - Table(String dataDir, String name, Clock clock) { + Table(String dataDir, String name) { this.name = name; - this.clock = clock; + this.token = engine().getTableToken(name); this.dir = new File(dataDir, name); IOUtils.createDirectory(dir.getPath()); // https://stackoverflow.com/questions/67785629/what-does-max-txn-txn-inflight-limit-reached-in-questdb-and-how-to-i-avoid-it @@ -374,11 +375,11 @@ public class QuestMetricsDb extends AbstractComponent implements MetricsDb { } boolean exists() { - return 0 == engine().getStatus(newContext().getCairoSecurityContext(), new Path(), name); + return 0 == engine().getStatus(newContext().getCairoSecurityContext(), new Path(), token); } TableWriter getWriter() { - return engine().getWriter(newContext().getCairoSecurityContext(), name, "getWriter"); + return engine().getWriter(newContext().getCairoSecurityContext(), token, "getWriter"); } void gc() { diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt index be76935c6ed..64e61410915 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.6.1 +org.questdb:questdb:6.7 org.slf4j:jcl-over-slf4j:1.7.36 org.slf4j:log4j-over-slf4j:1.7.36 org.slf4j:slf4j-api:1.7.36 |