[iotdb] branch rel/0.12 updated: fix deserialize page merge rate limiter (#4165)

[qiaojialin]

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

qiaojialin pushed a commit to branch rel/0.12
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/rel/0.12 by this push:
     new 2d57659  fix deserialize page merge rate limiter (#4165)
2d57659 is described below

commit 2d576595b31680e4a5f852670dfca908622e3597
Author: zhanglingzhe0820 <445073...@qq.com>
AuthorDate: Fri Oct 15 12:38:02 2021 +0800

    fix deserialize page merge rate limiter (#4165)
---
 .../org/apache/iotdb/db/engine/compaction/utils/CompactionUtils.java   | 3 ++-
 .../java/org/apache/iotdb/tsfile/write/chunk/ChunkGroupWriterImpl.java | 2 +-
 .../main/java/org/apache/iotdb/tsfile/write/chunk/ChunkWriterImpl.java | 2 +-
 .../main/java/org/apache/iotdb/tsfile/write/chunk/IChunkWriter.java    | 2 +-
 4 files changed, 5 insertions(+), 4 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 714fdc2..3a3cab9 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
@@ -213,7 +213,8 @@ public class CompactionUtils {
       targetResource.updateEndTime(device, timeValuePair.getTimestamp());
     }
     // wait for limit write
-    MergeManager.mergeRateLimiterAcquire(compactionRateLimiter, 
chunkWriter.getCurrentChunkSize());
+    MergeManager.mergeRateLimiterAcquire(
+        compactionRateLimiter, chunkWriter.estimateMaxSeriesMemSize());
     chunkWriter.writeToFileWriter(writer);
   }
 
diff --git 
a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/ChunkGroupWriterImpl.java
 
b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/ChunkGroupWriterImpl.java
index 1dbc9f5..17101b8 100644
--- 
a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/ChunkGroupWriterImpl.java
+++ 
b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/ChunkGroupWriterImpl.java
@@ -149,7 +149,7 @@ public class ChunkGroupWriterImpl implements 
IChunkGroupWriter {
   public long getCurrentChunkGroupSize() {
     long size = 0;
     for (IChunkWriter writer : chunkWriters.values()) {
-      size += writer.getCurrentChunkSize();
+      size += writer.getSerializedChunkSize();
     }
     return size;
   }
diff --git 
a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/ChunkWriterImpl.java 
b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/ChunkWriterImpl.java
index 48ff92c..d44ee88 100644
--- 
a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/ChunkWriterImpl.java
+++ 
b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/ChunkWriterImpl.java
@@ -338,7 +338,7 @@ public class ChunkWriterImpl implements IChunkWriter {
   }
 
   @Override
-  public long getCurrentChunkSize() {
+  public long getSerializedChunkSize() {
     if (pageBuffer.size() == 0) {
       return 0;
     }
diff --git 
a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/IChunkWriter.java 
b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/IChunkWriter.java
index cab9615..a6769c8 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/IChunkWriter.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/IChunkWriter.java
@@ -76,7 +76,7 @@ public interface IChunkWriter {
    * If there is no data points in the chunk, return 0 (i.e., in this case, 
the size of header is
    * not calculated, because nothing will be serialized latter)</>
    */
-  long getCurrentChunkSize();
+  long getSerializedChunkSize();
 
   /** seal the current page which may has not enough data points in force. */
   void sealCurrentPage();