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 ebde5e50a671cefa29636d0a1e03d7aa9979c92c
Author: Lei Rui <1010953...@qq.com>
AuthorDate: Sun Jan 28 15:30:37 2024 +0800
add config
---
.../src/assembly/resources/conf/iotdb-engine.properties | 2 ++
.../main/java/org/apache/iotdb/db/conf/IoTDBConfig.java | 10 ++++++++++
.../java/org/apache/iotdb/db/conf/IoTDBDescriptor.java | 3 +++
.../dataset/groupby/LocalGroupByExecutorTri_ILTS.java | 17 +++++++----------
.../dataset/groupby/LocalGroupByExecutorTri_LTTB.java | 4 ----
.../apache/iotdb/db/integration/tri/MyTest_ILTS.java | 1 +
6 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/server/src/assembly/resources/conf/iotdb-engine.properties
b/server/src/assembly/resources/conf/iotdb-engine.properties
index ebc535b6422..4bbb732e4b3 100644
--- a/server/src/assembly/resources/conf/iotdb-engine.properties
+++ b/server/src/assembly/resources/conf/iotdb-engine.properties
@@ -30,6 +30,8 @@ pnv=100
rps=4
+numIterations=8
+
####################
### enable CPV
####################
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 92bb68f7f2f..9b2a255f732 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
@@ -442,6 +442,16 @@ public class IoTDBConfig {
private int rps;
+ public int getNumIterations() {
+ return numIterations;
+ }
+
+ public void setNumIterations(int numIterations) {
+ this.numIterations = numIterations;
+ }
+
+ private int numIterations = 8;
+
public long getP1t() {
return p1t;
}
diff --git a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
index f1523d8f739..7ce32d8b1be 100644
--- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
+++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
@@ -547,6 +547,9 @@ public class IoTDBDescriptor {
conf.setPnv(
Double.parseDouble(properties.getProperty("pnv",
Double.toString(conf.getPnv()))));
conf.setRps(Integer.parseInt(properties.getProperty("rps",
Integer.toString(conf.getRps()))));
+ conf.setNumIterations(
+ Integer.parseInt(
+ properties.getProperty("numIterations",
Integer.toString(conf.getNumIterations()))));
conf.setPerformanceStatDisplayInterval(
Long.parseLong(
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 73f9fd395d7..893762f5f17 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
@@ -62,10 +62,6 @@ public class LocalGroupByExecutorTri_ILTS implements
GroupByExecutor {
// Aggregate result buffer of this path
private final List<AggregateResult> results = new ArrayList<>();
- // private List<ChunkSuit4Tri> currentChunkList;
-
- // private final List<ChunkSuit4Tri> futureChunkList = new ArrayList<>();
-
// keys: 0,1,...,(int) Math.floor((endTime * 1.0 - startTime) / interval)-1
private final Map<Integer, List<ChunkSuit4Tri>> splitChunkList = new
HashMap<>();
@@ -79,7 +75,7 @@ public class LocalGroupByExecutorTri_ILTS implements
GroupByExecutor {
private final int N1; // 分桶数
- private static final int numIterations = 8;
+ private static final int numIterations = CONFIG.getNumIterations();
private Filter timeFilter;
@@ -169,9 +165,9 @@ public class LocalGroupByExecutorTri_ILTS implements
GroupByExecutor {
long[] lastIter_t = new long[N1]; // N1不包括全局首尾点
double[] lastIter_v = new double[N1]; // N1不包括全局首尾点
for (int num = 0; num < numIterations; num++) {
- StringBuilder series = new StringBuilder();
+ // StringBuilder series = new StringBuilder();
// 全局首点
- series.append(p1v).append("[").append(p1t).append("]").append(",");
+ //
series.append(p1v).append("[").append(p1t).append("]").append(",");
// 遍历分桶 Assume no empty buckets
for (int b = 0; b < N1; b++) {
long rt = 0; // must initialize as zero, because may be used as sum
for average
@@ -273,7 +269,7 @@ public class LocalGroupByExecutorTri_ILTS implements
GroupByExecutor {
}
}
// 记录结果
-
series.append(select_v).append("[").append(select_t).append("]").append(",");
+ //
series.append(select_v).append("[").append(select_t).append("]").append(",");
// 更新lt,lv
// 下一个桶自然地以select_t, select_v作为左桶固定点
@@ -283,10 +279,11 @@ public class LocalGroupByExecutorTri_ILTS implements
GroupByExecutor {
lastIter_t[b] = select_t;
lastIter_v[b] = select_v;
} // 遍历分桶结束
+
// 全局尾点
- series.append(pnv).append("[").append(pnt).append("]").append(",");
+ //
series.append(pnv).append("[").append(pnt).append("]").append(",");
+ // System.out.println(series);
- System.out.println(series);
} // end Iterations
// 全局首点
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 be84be70c38..f273f1d3b43 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
@@ -62,10 +62,6 @@ public class LocalGroupByExecutorTri_LTTB implements
GroupByExecutor {
// Aggregate result buffer of this path
private final List<AggregateResult> results = new ArrayList<>();
- // private List<ChunkSuit4Tri> currentChunkList;
-
- // private final List<ChunkSuit4Tri> futureChunkList = new ArrayList<>();
-
// keys: 0,1,...,(int) Math.floor((endTime * 1.0 - startTime) / interval)-1
private final Map<Integer, List<ChunkSuit4Tri>> splitChunkList = new
HashMap<>();
diff --git
a/server/src/test/java/org/apache/iotdb/db/integration/tri/MyTest_ILTS.java
b/server/src/test/java/org/apache/iotdb/db/integration/tri/MyTest_ILTS.java
index d2381e6fa75..fe93192c09e 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/tri/MyTest_ILTS.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/tri/MyTest_ILTS.java
@@ -73,6 +73,7 @@ public class MyTest_ILTS {
config.setCompactionStrategy(CompactionStrategy.NO_COMPACTION);
config.setEnableTri("ILTS");
+ config.setNumIterations(4);
config.setEnableCPV(false);
TSFileDescriptor.getInstance().getConfig().setEnableMinMaxLSM(false);
