[iotdb] branch pipeline_flush_task updated: make it more accurate

[ja...@apache.org]

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

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


The following commit(s) were added to refs/heads/pipeline_flush_task by this push:
     new ad507c6  make it more accurate
ad507c6 is described below

commit ad507c68db4d17b00e1e292f72ba0439600cc50b
Author: JackieTien97 <Ja...@foxmail.com>
AuthorDate: Tue Jan 26 19:22:45 2021 +0800

    make it more accurate
---
 .../java/org/apache/iotdb/db/engine/flush/MemTableFlushTask.java  | 8 +++++---
 .../java/org/apache/iotdb/tsfile/write/chunk/ChunkWriterImpl.java | 5 +++++
 .../java/org/apache/iotdb/tsfile/write/chunk/IChunkWriter.java    | 3 ++-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/server/src/main/java/org/apache/iotdb/db/engine/flush/MemTableFlushTask.java b/server/src/main/java/org/apache/iotdb/db/engine/flush/MemTableFlushTask.java
index 7168a0d..b101db2 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/flush/MemTableFlushTask.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/flush/MemTableFlushTask.java
@@ -102,7 +102,7 @@ public class MemTableFlushTask {
     }
 
     noMoreEncodingTask = true;
-    LOGGER.debug(
+    LOGGER.info(
         "Storage group {} memtable {}, flushing into disk: data sort time cost {} ms.",
         storageGroup, memTable.getVersion(), sortTime);
 
@@ -199,13 +199,15 @@ public class MemTableFlushTask {
             Pair<TVList, MeasurementSchema> encodingMessage = (Pair<TVList, MeasurementSchema>) task;
             IChunkWriter seriesWriter = new ChunkWriterImpl(encodingMessage.right);
             writeOneSeries(encodingMessage.left, seriesWriter, encodingMessage.right.getType());
+            seriesWriter.sealCurrentPage();
+            seriesWriter.clearPageWriter();
             ioTaskQueue.add(seriesWriter);
             memSerializeTime += System.currentTimeMillis() - starTime;
           }
         }
       }
       noMoreIOTask = true;
-      LOGGER.debug("Storage group {}, flushing memtable {} into disk: Encoding data cost "
+      LOGGER.info("Storage group {}, flushing memtable {} into disk: Encoding data cost "
               + "{} ms.",
           storageGroup, memTable.getVersion(), memSerializeTime);
     }
@@ -254,7 +256,7 @@ public class MemTableFlushTask {
         ioTime += System.currentTimeMillis() - starTime;
       }
     }
-    LOGGER.debug("flushing a memtable {} in storage group {}, io cost {}ms", memTable.getVersion(),
+    LOGGER.info("flushing a memtable {} in storage group {}, io cost {}ms", memTable.getVersion(),
         storageGroup, ioTime);
   };
 
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 5977155..3e7d48f 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
@@ -320,6 +320,7 @@ public class ChunkWriterImpl implements IChunkWriter {
 
     // reinit this chunk writer
     pageBuffer.reset();
+    numOfPages = 0;
     this.statistics = Statistics.getStatsByType(measurementSchema.getType());
   }
 
@@ -344,6 +345,10 @@ public class ChunkWriterImpl implements IChunkWriter {
     }
   }
 
+  public void clearPageWriter() {
+    pageWriter = null;
+  }
+
   @Override
   public int getNumOfPages() {
     return numOfPages;
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 6f1ab46..38e1119 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
@@ -19,7 +19,6 @@
 package org.apache.iotdb.tsfile.write.chunk;
 
 import java.io.IOException;
-import java.math.BigDecimal;
 import java.nio.ByteBuffer;
 import org.apache.iotdb.tsfile.exception.write.PageException;
 import org.apache.iotdb.tsfile.file.header.PageHeader;
@@ -116,6 +115,8 @@ public interface IChunkWriter {
    */
   void sealCurrentPage();
 
+  void clearPageWriter();
+
   int getNumOfPages();
 
   TSDataType getDataType();