diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2021-05-25 22:14:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-25 22:14:24 +0200 |
| commit | 87835fa8f2eadf23b962444e99c06a01d5ca3a64 (patch) | |
| tree | 30e476cf1928a0ab6002b002ec8ec0e37606c0fe /node-repository | |
| parent | 6248f53f594530c5c272c5ca280573aef297522d (diff) | |
| parent | dc0044c55a8cc2b0e08582cabecaeeea231647c8 (diff) | |
Merge pull request #17974 from vespa-engine/bratseth/questdb-6
Upgrade to QuestDb 6.0.2
Diffstat (limited to 'node-repository')
| -rw-r--r-- | node-repository/pom.xml | 2 | ||||
| -rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/QuestMetricsDb.java | 6 |
2 files changed, 3 insertions, 5 deletions
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');"; |