[iotdb] branch draft_serial_flush_task updated: change to the same code

[ja...@apache.org]

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

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


The following commit(s) were added to refs/heads/draft_serial_flush_task by this push:
     new 04fb695  change to the same code
04fb695 is described below

commit 04fb6951743bf53f96eff16352e540ba5f2450f0
Author: JackieTien97 <Ja...@foxmail.com>
AuthorDate: Wed Jan 27 11:52:07 2021 +0800

    change to the same code
---
 .../java/org/apache/iotdb/db/engine/flush/MemTableFlushTask.java   | 2 ++
 .../java/org/apache/iotdb/tsfile/write/chunk/ChunkWriterImpl.java  | 7 ++++++-
 .../java/org/apache/iotdb/tsfile/write/chunk/IChunkWriter.java     | 3 ++-
 3 files changed, 10 insertions(+), 2 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 155110d..22360ff 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
@@ -96,6 +96,8 @@ public class MemTableFlushTask {
           //start flush
           IChunkWriter seriesWriter = new ChunkWriterImpl(desc);
           writeOneSeries(tvList, seriesWriter, desc.getType());
+          seriesWriter.sealCurrentPage();
+          seriesWriter.clearPageWriter();
           seriesWriter.writeToFileWriter(this.writer);
         }
         this.writer.setMinPlanIndex(memTable.getMinPlanIndex());
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..d441962 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());
   }
 
@@ -339,11 +340,15 @@ public class ChunkWriterImpl implements IChunkWriter {
 
   @Override
   public void sealCurrentPage() {
-    if (pageWriter.getPointNumber() > 0) {
+    if (pageWriter != null && pageWriter.getPointNumber() > 0) {
       writePageToPageBuffer();
     }
   }
 
+  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();