You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by le...@apache.org on 2024/10/27 15:41:48 UTC
(iotdb) 08/31: add
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 5050b86c4884ffe200ac95648c101ecca2a8a56b
Author: Lei Rui <10...@qq.com>
AuthorDate: Mon Sep 30 20:43:17 2024 +0800
add
---
.../query/dataset/groupby/GroupByWithoutValueFilterDataSet.java | 6 ++++++
.../db/query/dataset/groupby/LocalGroupByExecutorTri_FSW.java | 2 ++
.../db/query/dataset/groupby/LocalGroupByExecutorTri_ILTS.java | 5 ++++-
.../db/query/dataset/groupby/LocalGroupByExecutorTri_LTTB.java | 6 +++++-
.../db/query/dataset/groupby/LocalGroupByExecutorTri_MinMax.java | 8 ++++++--
.../db/query/dataset/groupby/LocalGroupByExecutorTri_SC.java | 2 ++
.../query/dataset/groupby/LocalGroupByExecutorTri_SimPiece.java | 1 +
.../db/query/dataset/groupby/LocalGroupByExecutorTri_Uniform.java | 1 +
.../db/query/dataset/groupby/LocalGroupByExecutorTri_Visval.java | 2 ++
9 files changed, 29 insertions(+), 4 deletions(-)
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 ce72b2db444..b2d9e0d7473 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
@@ -368,6 +368,12 @@ public class GroupByWithoutValueFilterDataSet extends GroupByEngineDataSet {
curStartTime = endTime;
hasCachedTimeInterval = false;
+ // times = null;
+ // values = null;
+ pathExecutors.clear();
+ pathExecutors = null;
+ System.gc();
+
return record;
}
diff --git a/server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/LocalGroupByExecutorTri_FSW.java b/server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/LocalGroupByExecutorTri_FSW.java
index 699f88dd824..ad89d6b453d 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/LocalGroupByExecutorTri_FSW.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/LocalGroupByExecutorTri_FSW.java
@@ -146,6 +146,8 @@ public class LocalGroupByExecutorTri_FSW implements GroupByExecutor {
MinValueAggrResult minValueAggrResult = (MinValueAggrResult) results.get(0);
minValueAggrResult.updateResult(new MinMaxInfo<>(series.toString(), 0));
+
+ timeSeries = null;
return results;
}
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 b22a7d8d9a9..26a397ba229 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
@@ -61,7 +61,7 @@ public class LocalGroupByExecutorTri_ILTS implements GroupByExecutor {
private final List<AggregateResult> results = new ArrayList<>();
// keys: 0,1,...,(int) Math.floor((endTime * 1.0 - startTime) / interval)-1
- private final Map<Integer, List<ChunkSuit4Tri>> splitChunkList = new HashMap<>();
+ private Map<Integer, List<ChunkSuit4Tri>> splitChunkList = new HashMap<>();
private final long p1t = CONFIG.getP1t();
private final double p1v = CONFIG.getP1v();
@@ -414,6 +414,9 @@ public class LocalGroupByExecutorTri_ILTS implements GroupByExecutor {
MinValueAggrResult minValueAggrResult = (MinValueAggrResult) results.get(0);
minValueAggrResult.updateResult(new MinMaxInfo<>(series_final.toString(), 0));
+ splitChunkList.clear();
+ splitChunkList = null;
+
return results;
}
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 319067017fa..2dc9240d0ec 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
@@ -57,7 +57,7 @@ public class LocalGroupByExecutorTri_LTTB implements GroupByExecutor {
private final List<AggregateResult> results = new ArrayList<>();
// keys: 0,1,...,(int) Math.floor((endTime * 1.0 - startTime) / interval)-1
- private final Map<Integer, List<ChunkSuit4Tri>> splitChunkList = new HashMap<>();
+ private Map<Integer, List<ChunkSuit4Tri>> splitChunkList = new HashMap<>();
private final long p1t = CONFIG.getP1t();
private final double p1v = CONFIG.getP1v();
@@ -269,6 +269,10 @@ public class LocalGroupByExecutorTri_LTTB implements GroupByExecutor {
MinValueAggrResult minValueAggrResult = (MinValueAggrResult) results.get(0);
minValueAggrResult.updateResult(new MinMaxInfo<>(series.toString(), 0));
+ timeSeries = null;
+ splitChunkList.clear();
+ splitChunkList = null;
+
return results;
}
diff --git a/server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/LocalGroupByExecutorTri_MinMax.java b/server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/LocalGroupByExecutorTri_MinMax.java
index 9ac3e5c040c..1cf186a7d6a 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/LocalGroupByExecutorTri_MinMax.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/LocalGroupByExecutorTri_MinMax.java
@@ -176,8 +176,8 @@ public class LocalGroupByExecutorTri_MinMax implements GroupByExecutor {
long startTime,
long endTime,
long interval,
- List<Long> times,
- List<Double> values)
+ List<Long> times, // for MinMaxLTTB
+ List<Double> values) // for MinMaxLTTB
throws IOException {
int tmpLastReadPos = 0;
// use list without the notion of chunks
@@ -223,6 +223,8 @@ public class LocalGroupByExecutorTri_MinMax implements GroupByExecutor {
values.add(null);
}
}
+
+ timeSeries = null;
}
@Override
@@ -324,6 +326,8 @@ public class LocalGroupByExecutorTri_MinMax implements GroupByExecutor {
MinValueAggrResult minValueAggrResult = (MinValueAggrResult) results.get(0);
minValueAggrResult.updateResult(new MinMaxInfo<>(series.toString(), 0));
+ timeSeries = null;
+
return results;
}
diff --git a/server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/LocalGroupByExecutorTri_SC.java b/server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/LocalGroupByExecutorTri_SC.java
index 1cf596c7ff2..b7a601b4058 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/LocalGroupByExecutorTri_SC.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/LocalGroupByExecutorTri_SC.java
@@ -146,6 +146,8 @@ public class LocalGroupByExecutorTri_SC implements GroupByExecutor {
MinValueAggrResult minValueAggrResult = (MinValueAggrResult) results.get(0);
minValueAggrResult.updateResult(new MinMaxInfo<>(series.toString(), 0));
+
+ timeSeries = null;
return results;
}
diff --git a/server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/LocalGroupByExecutorTri_SimPiece.java b/server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/LocalGroupByExecutorTri_SimPiece.java
index 3412d022d09..abbe3e6db05 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/LocalGroupByExecutorTri_SimPiece.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/LocalGroupByExecutorTri_SimPiece.java
@@ -176,6 +176,7 @@ public class LocalGroupByExecutorTri_SimPiece implements GroupByExecutor {
MinValueAggrResult minValueAggrResult = (MinValueAggrResult) results.get(0);
minValueAggrResult.updateResult(new MinMaxInfo<>(series.toString(), 0));
+ timeSeries = null;
return results;
}
diff --git a/server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/LocalGroupByExecutorTri_Uniform.java b/server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/LocalGroupByExecutorTri_Uniform.java
index e82e3410f09..d9f05618a2e 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/LocalGroupByExecutorTri_Uniform.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/LocalGroupByExecutorTri_Uniform.java
@@ -219,6 +219,7 @@ public class LocalGroupByExecutorTri_Uniform implements GroupByExecutor {
System.out.println(
"traversed points=" + IOMonitor2.DCP_D_getAllSatisfiedPageData_traversedPointNum);
+ timeSeries = null;
return results;
}
diff --git a/server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/LocalGroupByExecutorTri_Visval.java b/server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/LocalGroupByExecutorTri_Visval.java
index 3cb801b70e7..8cb330812a6 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/LocalGroupByExecutorTri_Visval.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/LocalGroupByExecutorTri_Visval.java
@@ -143,6 +143,8 @@ public class LocalGroupByExecutorTri_Visval implements GroupByExecutor {
MinValueAggrResult minValueAggrResult = (MinValueAggrResult) results.get(0);
minValueAggrResult.updateResult(new MinMaxInfo<>(series.toString(), 0));
+
+ points = null;
return results;
}