You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2020/05/22 03:39:33 UTC
[incubator-iotdb] branch master updated: fix OOM for merge
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new ec70de6 fix OOM for merge
ec70de6 is described below
commit ec70de692d3920825f06b1942c391b533a5d09d9
Author: EJTTianyu <16...@qq.com>
AuthorDate: Wed May 20 20:18:45 2020 +0800
fix OOM for merge
---
.../java/org/apache/iotdb/db/engine/merge/manage/MergeResource.java | 4 ++++
.../org/apache/iotdb/db/engine/merge/task/MergeMultiChunkTask.java | 1 +
2 files changed, 5 insertions(+)
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/merge/manage/MergeResource.java b/server/src/main/java/org/apache/iotdb/db/engine/merge/manage/MergeResource.java
index 492e6f3..5f932bf 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/merge/manage/MergeResource.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/merge/manage/MergeResource.java
@@ -255,4 +255,8 @@ public class MergeResource {
this.measurementSchemaMap = measurementSchemaMap;
}
+ public void clearChunkWriterCache() {
+ this.chunkWriterCache.clear();
+ }
+
}
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/merge/task/MergeMultiChunkTask.java b/server/src/main/java/org/apache/iotdb/db/engine/merge/task/MergeMultiChunkTask.java
index 286b229..f63a5cc 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/merge/task/MergeMultiChunkTask.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/merge/task/MergeMultiChunkTask.java
@@ -109,6 +109,7 @@ class MergeMultiChunkTask {
while (pathSelector.hasNext()) {
currMergingPaths = pathSelector.next();
mergePaths();
+ resource.clearChunkWriterCache();
mergedSeriesCnt += currMergingPaths.size();
logMergeProgress();
}