[iotdb] branch master updated: Close the tsfile once the memtable is flushed into (#4821)

[haonan]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new fdf79b8  Close the tsfile once the memtable is flushed into (#4821)
fdf79b8 is described below

commit fdf79b83e6c0eb64737f983b88c417b013ebf546
Author: Jackie Tien <jackietie...@gmail.com>
AuthorDate: Sat Jan 15 19:14:10 2022 +0800

    Close the tsfile once the memtable is flushed into (#4821)
---
 .../apache/iotdb/db/integration/IoTDBNewTsFileCompactionIT.java  | 4 ++++
 server/src/assembly/resources/conf/iotdb-engine.properties       | 9 ---------
 server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java   | 6 ++----
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git 
a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBNewTsFileCompactionIT.java
 
b/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBNewTsFileCompactionIT.java
index 11b97cf..d8fa9fc 100644
--- 
a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBNewTsFileCompactionIT.java
+++ 
b/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBNewTsFileCompactionIT.java
@@ -53,6 +53,7 @@ public class IoTDBNewTsFileCompactionIT {
   private int preMaxNumberOfPointsInPage;
   private PartialPath storageGroupPath;
   private int originCompactionFileNum;
+  private long originSeqTsFileSize;
   // the unit is ns
   private static final long MAX_WAIT_TIME_FOR_MERGE = Long.MAX_VALUE;
   private static final float FLOAT_DELTA = 0.00001f;
@@ -69,7 +70,9 @@ public class IoTDBNewTsFileCompactionIT {
     TSFileDescriptor.getInstance().getConfig().setMaxNumberOfPointsInPage(1);
     originCompactionFileNum =
         
IoTDBDescriptor.getInstance().getConfig().getMaxCompactionCandidateFileNum();
+    originSeqTsFileSize = 
IoTDBDescriptor.getInstance().getConfig().getSeqTsFileSize();
     
IoTDBDescriptor.getInstance().getConfig().setMaxCompactionCandidateFileNum(2);
+    IoTDBDescriptor.getInstance().getConfig().setSeqTsFileSize(1);
     EnvironmentUtils.envSetUp();
     Class.forName(Config.JDBC_DRIVER_NAME);
 
@@ -94,6 +97,7 @@ public class IoTDBNewTsFileCompactionIT {
     TSFileDescriptor.getInstance()
         .getConfig()
         .setMaxNumberOfPointsInPage(preMaxNumberOfPointsInPage);
+    
IoTDBDescriptor.getInstance().getConfig().setSeqTsFileSize(originSeqTsFileSize);
   }
 
   /**
diff --git a/server/src/assembly/resources/conf/iotdb-engine.properties 
b/server/src/assembly/resources/conf/iotdb-engine.properties
index dfe475e..7572732 100644
--- a/server/src/assembly/resources/conf/iotdb-engine.properties
+++ b/server/src/assembly/resources/conf/iotdb-engine.properties
@@ -200,15 +200,6 @@ timestamp_precision=ms
 # Datatype: int
 # wal_buffer_size=16777216
 
-# When a unSequence TsFile's file size (in byte) exceeds this, the TsFile is 
forced closed.
-# It may cause memTable size smaller if it is a large value
-# Datatype: long
-# unseq_tsfile_size=1
-
-# When a sequence TsFile's file size (in byte) exceeds this, the TsFile is 
forced closed.
-# It may cause memTable size smaller if it is a large value
-# seq_tsfile_size=1
-
 # Size of log buffer in each metadata operation plan(in byte).
 # If the size of a metadata operation plan is larger than this parameter, then 
it will be rejected by MManager
 # If it sets a value smaller than 0, use the default value 1024*1024
diff --git a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java 
b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
index a11cfe1..f6b3483 100644
--- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
+++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
@@ -306,13 +306,11 @@ public class IoTDBConfig {
   /** index directory. */
   private String indexRootFolder = "data" + File.separator + "index";
 
-  /** When a TsFile's file size (in byte) exceed this, the TsFile is forced 
closed. Unit: byte */
-  private long tsFileSizeThreshold = 1L;
   /** When a unSequence TsFile's file size (in byte) exceed this, the TsFile 
is forced closed. */
-  private long unSeqTsFileSize = 1L;
+  private long unSeqTsFileSize = 0L;
 
   /** When a sequence TsFile's file size (in byte) exceed this, the TsFile is 
forced closed. */
-  private long seqTsFileSize = 1L;
+  private long seqTsFileSize = 0L;
 
   /** When a memTable's size (in byte) exceeds this, the memtable is flushed 
to disk. Unit: byte */
   private long memtableSizeThreshold = 1024 * 1024 * 1024L;