From 67cbd2f19a02f239b64d2c6891b98536e77845df Mon Sep 17 00:00:00 2001 From: liyuheng Date: Fri, 29 Dec 2023 17:02:53 +0800 Subject: [PATCH] test tdengion, good --- .../edu/tsinghua/iot/benchmark/tdengine3/TDengine.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tdengine-3.0/src/main/java/cn/edu/tsinghua/iot/benchmark/tdengine3/TDengine.java b/tdengine-3.0/src/main/java/cn/edu/tsinghua/iot/benchmark/tdengine3/TDengine.java index 29431e432..87d8e4be9 100644 --- a/tdengine-3.0/src/main/java/cn/edu/tsinghua/iot/benchmark/tdengine3/TDengine.java +++ b/tdengine-3.0/src/main/java/cn/edu/tsinghua/iot/benchmark/tdengine3/TDengine.java @@ -19,6 +19,7 @@ package cn.edu.tsinghua.iot.benchmark.tdengine3; +import cn.edu.tsinghua.iot.benchmark.client.operation.OperationController; import cn.edu.tsinghua.iot.benchmark.conf.Config; import cn.edu.tsinghua.iot.benchmark.conf.ConfigDescriptor; import cn.edu.tsinghua.iot.benchmark.entity.Batch.IBatch; @@ -180,6 +181,7 @@ public Double registerSchema(List schemaList) throws TsdbException private synchronized void initOnlyOnce() throws TsdbException, BrokenBarrierException, InterruptedException { + new OperationController(1).getNextOperationType(); if (!isInit.getAndSet(true)) { try (Statement statement = connection.createStatement()) { LOGGER.info("Create Database: {}", CREATE_DATABASE); @@ -504,23 +506,24 @@ private static String addWhereClause( return sql; } StringBuilder sqlBuilder = new StringBuilder(sql); - sqlBuilder.append(" WHERE"); + sqlBuilder.append(" WHERE "); if (timeRangeQuery != null) { String startTime = "" + timeRangeQuery.getStartTimestamp(); String endTime = "" + timeRangeQuery.getEndTimestamp(); sqlBuilder.append(" time >= ").append(startTime).append(" AND time <= ").append(endTime); } if (valueRangeFilter != null) { - if (!sqlBuilder.toString().endsWith("WHERE")) { + if (!sqlBuilder.toString().endsWith("WHERE ")) { sqlBuilder.append(" AND "); } double valueThreshold = valueRangeFilter.getMinValue(); for (Sensor sensor : valueRangeFilter.getSensors()) { sqlBuilder.append(sensor.getName()).append(" > ").append(valueThreshold).append(" AND "); } + sqlBuilder.delete(sqlBuilder.length() - 4, sqlBuilder.length()); } if (alignByDeviceTableNameFilter != null) { - if (!sqlBuilder.toString().endsWith("WHERE")) { + if (!sqlBuilder.toString().endsWith("WHERE ")) { sqlBuilder.append(" AND "); } sqlBuilder.append(" tbname in (");