ohhhh

thulab · Jan 2, 2024 · 48c95e7 · 48c95e7
1 parent 9504a4c
commit 48c95e7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/configuration/conf/config.properties b/configuration/conf/config.properties
@@ -297,7 +297,7 @@
 # Q8  最近点查询 select time, v1... where device = ? and time = max(time)
 # Q9  倒序范围查询（只限制起止时间）select v1... from data where time > ? and time < ? and device in ? order by time desc
 # Q10 倒序带值过滤的范围查询 select v1... from data where time > ? and time < ? and v1 > ? and device in ? order by time desc
-# Q11 分组聚合查询，倒序；目前仅支持iotdb、influxdb v1
+# Q11 分组聚合查询，倒序；目前仅支持iotdb、tdengine-3.0、influxdb v1
 # OPERATION_PROPORTION=1:0:0:0:0:0:0:0:0:0:0:0
 
 # 最长等待写时间，单位毫秒，即如果整个写操作在指定时间内没有返回，则终止此操作
@@ -393,8 +393,8 @@
 
 # 是否align by device
 # 目前仅支持iotdb、influxdb v1、tdengine-3
-# 实测发现, iotdb对于align by device的使用有诸多限制, 推荐设置OPERATION_PROPORTION不超过范围1:1:1:0:0:0:0:0:0:1:0:0
-# td可设置1:1:1:1:1:1:1:1:1:1:1:0
+# iotdb支持OPERATION_PROPORTION=1:1:1:0:0:0:0:0:0:1:0:0
+# tdengine支持1:1:1:1:1:1:1:1:1:1:1:1
 # ALIGN_BY_DEVICE=false
 
 ################ Workload：相关参数 ######################

diff --git a/influxdb/src/main/java/cn/edu/tsinghua/iot/benchmark/influxdb/InfluxDB.java b/influxdb/src/main/java/cn/edu/tsinghua/iot/benchmark/influxdb/InfluxDB.java
@@ -302,9 +302,8 @@ private Status addTailClausesAndExecuteQueryAndGetStatus(String sql) {
     if (config.getRESULT_ROW_LIMIT() >= 0) {
       sql += " limit " + config.getRESULT_ROW_LIMIT();
     }
-    LOGGER.info("do query: {}", sql);
     if (!config.isIS_QUIET_MODE()) {
-      LOGGER.debug("{} query SQL: {}", Thread.currentThread().getName(), sql);
+      LOGGER.info("{} query SQL: {}", Thread.currentThread().getName(), sql);
     }
 
     QueryResult results = influxDbInstance.query(new Query(sql, influxDbName));