diff options
3 files changed, 4 insertions, 6 deletions
diff --git a/document/src/main/java/com/yahoo/document/json/TokenBuffer.java b/document/src/main/java/com/yahoo/document/json/TokenBuffer.java index 88353139b0f..9db80f3972b 100644 --- a/document/src/main/java/com/yahoo/document/json/TokenBuffer.java +++ b/document/src/main/java/com/yahoo/document/json/TokenBuffer.java @@ -29,7 +29,7 @@ public class TokenBuffer { } } - private Deque<Token> buffer; + private final Deque<Token> buffer; private int nesting = 0; public TokenBuffer() { diff --git a/node-repository/pom.xml b/node-repository/pom.xml index 05220b6977f..d2deaf51afe 100644 --- a/node-repository/pom.xml +++ b/node-repository/pom.xml @@ -75,7 +75,7 @@ <dependency> <groupId>org.questdb</groupId> <artifactId>questdb</artifactId> - <version>5.0.6</version> + <version>6.0.2</version> <scope>compile</scope> </dependency> <dependency> 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 76e24cd50ce..2c29b9cc560 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 @@ -82,9 +82,7 @@ public class QuestMetricsDb extends AbstractComponent implements MetricsDb { // silence Questdb's custom logging system IOUtils.writeFile(new File(dataDir, "quest-log.conf"), new byte[0]); - System.setProperty("questdbLog", dataDir + "/quest-log.conf"); - System.setProperty("org.jooq.no-logo", "true"); - + System.setProperty("out", dataDir + "/quest-log.conf"); CairoConfiguration configuration = new DefaultCairoConfiguration(dataDir); engine = new CairoEngine(configuration); sqlCompiler = ThreadLocal.withInitial(() -> new SqlCompiler(engine)); @@ -349,7 +347,7 @@ public class QuestMetricsDb extends AbstractComponent implements MetricsDb { DateTimeFormatter formatter = DateTimeFormatter.ISO_DATE_TIME.withZone(ZoneId.of("UTC")); String from = formatter.format(startTime).substring(0, 19) + ".000000Z"; String to = formatter.format(clock.instant()).substring(0, 19) + ".000000Z"; - String sql = "select * from " + nodeTable + " where at in('" + from + "', '" + to + "');"; + String sql = "select * from " + nodeTable + " where at between('" + from + "', '" + to + "');"; // WHERE clauses does not work: // String sql = "select * from " + tableName + " where hostname in('host1', 'host2', 'host3');"; |