This is an automated email from the ASF dual-hosted git repository. leirui pushed a commit to branch research/LTS-visualization in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit c1d5405c568b13e149f870626e2e30f240c2d119 Author: Lei Rui <[email protected]> AuthorDate: Mon Jan 29 20:32:25 2024 +0800 fix --- server/src/assembly/resources/conf/iotdb-engine.properties | 2 +- server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java | 2 +- .../db/query/dataset/groupby/GroupByWithoutValueFilterDataSet.java | 3 +++ .../iotdb/db/query/dataset/groupby/LocalGroupByExecutorTri_ILTS.java | 3 +++ .../db/query/dataset/groupby/LocalGroupByExecutorTri_ILTS_noacc.java | 3 +++ .../iotdb/db/query/dataset/groupby/LocalGroupByExecutorTri_LTTB.java | 3 +++ 6 files changed, 14 insertions(+), 2 deletions(-) diff --git a/server/src/assembly/resources/conf/iotdb-engine.properties b/server/src/assembly/resources/conf/iotdb-engine.properties index ddc789dba73..7ec63153d1c 100644 --- a/server/src/assembly/resources/conf/iotdb-engine.properties +++ b/server/src/assembly/resources/conf/iotdb-engine.properties @@ -30,7 +30,7 @@ pnt=100 pnv=100 #for MinMaxLTTB -rps=2 +#rps=2 #for ILTS numIterations=4 diff --git a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java index 5ef77660ae4..583c6debd53 100644 --- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java +++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java @@ -440,7 +440,7 @@ public class IoTDBConfig { private long pnt; private double pnv; - private int rps = 2; + private int rps = 2; // fixed public int getNumIterations() { return numIterations; diff --git a/server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByWithoutValueFilterDataSet.java b/server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByWithoutValueFilterDataSet.java index d2a44f5ce0c..0bfdd58c8af 100644 --- a/server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByWithoutValueFilterDataSet.java +++ b/server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByWithoutValueFilterDataSet.java @@ -294,6 +294,9 @@ public class GroupByWithoutValueFilterDataSet extends GroupByEngineDataSet { cnt++; } } + if (cnt == 0) { + throw new IOException("Empty bucket!"); + } rt = rt / cnt; rv = rv / cnt; diff --git a/server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/LocalGroupByExecutorTri_ILTS.java b/server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/LocalGroupByExecutorTri_ILTS.java index 6261aae416a..0f0f324d335 100644 --- a/server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/LocalGroupByExecutorTri_ILTS.java +++ b/server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/LocalGroupByExecutorTri_ILTS.java @@ -235,6 +235,9 @@ public class LocalGroupByExecutorTri_ILTS implements GroupByExecutor { } } } + if (cnt == 0) { + throw new IOException("Empty bucket!"); + } rt = rt / cnt; rv = rv / cnt; } else { // 不是第一次迭代也不是最后一个桶的话，就使用上一轮迭代右边桶的采样点 diff --git a/server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/LocalGroupByExecutorTri_ILTS_noacc.java b/server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/LocalGroupByExecutorTri_ILTS_noacc.java index 2ad917909d0..b3c66d33bae 100644 --- a/server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/LocalGroupByExecutorTri_ILTS_noacc.java +++ b/server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/LocalGroupByExecutorTri_ILTS_noacc.java @@ -218,6 +218,9 @@ public class LocalGroupByExecutorTri_ILTS_noacc implements GroupByExecutor { } } } + if (cnt == 0) { + throw new IOException("Empty bucket!"); + } rt = rt / cnt; rv = rv / cnt; } else { // 不是第一次迭代也不是最后一个桶的话，就使用上一轮迭代右边桶的采样点 diff --git a/server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/LocalGroupByExecutorTri_LTTB.java b/server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/LocalGroupByExecutorTri_LTTB.java index f273f1d3b43..474ae0330e3 100644 --- a/server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/LocalGroupByExecutorTri_LTTB.java +++ b/server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/LocalGroupByExecutorTri_LTTB.java @@ -212,6 +212,9 @@ public class LocalGroupByExecutorTri_LTTB implements GroupByExecutor { } } } + if (cnt == 0) { + throw new IOException("Empty bucket!"); + } rt = rt / cnt; rv = rv / cnt; }
