[iotdb] branch dynamic_compaction updated: update limiter

[ejttianyu]

This is an automated email from the ASF dual-hosted git repository.

ejttianyu pushed a commit to branch dynamic_compaction
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/dynamic_compaction by this 
push:
     new 6f3c8b8  update limiter
6f3c8b8 is described below

commit 6f3c8b836423344c80daf5d0692c5475c1462efa
Author: EJTTianyu <1653503...@qq.com>
AuthorDate: Fri Mar 12 11:24:25 2021 +0800

    update limiter
---
 .../apache/iotdb/db/engine/compaction/utils/CompactionUtils.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git 
a/server/src/main/java/org/apache/iotdb/db/engine/compaction/utils/CompactionUtils.java
 
b/server/src/main/java/org/apache/iotdb/db/engine/compaction/utils/CompactionUtils.java
index bd31319..9133777 100644
--- 
a/server/src/main/java/org/apache/iotdb/db/engine/compaction/utils/CompactionUtils.java
+++ 
b/server/src/main/java/org/apache/iotdb/db/engine/compaction/utils/CompactionUtils.java
@@ -177,8 +177,13 @@ public class CompactionUtils {
       targetResource.updateEndTime(device, timeValuePair.getTimestamp());
     }
     // wait for limit write
-    MergeManager
-        .mergeRateLimiterAcquire(compactionRateLimiter, 
chunkWriter.getCurrentChunkSize());
+    if (chunkWriter.getCurrentChunkSize() == 0) {
+      MergeManager
+          .mergeRateLimiterAcquire(compactionRateLimiter, 
chunkWriter.estimateMaxSeriesMemSize());
+    } else {
+      MergeManager
+          .mergeRateLimiterAcquire(compactionRateLimiter, 
chunkWriter.getCurrentChunkSize());
+    }
     chunkWriter.writeToFileWriter(writer);
     return maxVersion;
   }