[incubator-iotdb] branch rel/0.9 updated: Fix bug IOTDB-159

[leirui]

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

leirui pushed a commit to branch rel/0.9
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git


The following commit(s) were added to refs/heads/rel/0.9 by this push:
     new df2a97d  Fix bug IOTDB-159
df2a97d is described below

commit df2a97dc1afdc52176eb80947d5dcd31a8f6a151
Author: Lei Rui <1010953...@qq.com>
AuthorDate: Mon Dec 30 14:46:03 2019 +0800

    Fix bug IOTDB-159
    
    (cherry picked from commit 867a0ae7a9893b317136b5de39f6e87ef7474f91)
---
 .../org/apache/iotdb/db/writelog/recover/SeqTsFileRecoverTest.java   | 5 ++++-
 .../org/apache/iotdb/db/writelog/recover/UnseqTsFileRecoverTest.java | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git 
a/server/src/test/java/org/apache/iotdb/db/writelog/recover/SeqTsFileRecoverTest.java
 
b/server/src/test/java/org/apache/iotdb/db/writelog/recover/SeqTsFileRecoverTest.java
index c269d64..41ae6aa 100644
--- 
a/server/src/test/java/org/apache/iotdb/db/writelog/recover/SeqTsFileRecoverTest.java
+++ 
b/server/src/test/java/org/apache/iotdb/db/writelog/recover/SeqTsFileRecoverTest.java
@@ -27,6 +27,7 @@ import java.util.ArrayList;
 import java.util.List;
 import org.apache.commons.io.FileUtils;
 import org.apache.iotdb.db.engine.fileSystem.SystemFileFactory;
+import org.apache.iotdb.db.engine.flush.pool.FlushSubTaskPoolManager;
 import org.apache.iotdb.db.engine.storagegroup.TsFileResource;
 import org.apache.iotdb.db.engine.version.VersionController;
 import 
org.apache.iotdb.db.exception.storageGroup.StorageGroupProcessorException;
@@ -77,7 +78,8 @@ public class SeqTsFileRecoverTest {
 
   @Before
   public void setup() throws IOException, WriteProcessException {
-    tsF = SystemFileFactory.INSTANCE.getFile("temp", "test.ts");
+    FlushSubTaskPoolManager.getInstance().start();
+    tsF = SystemFileFactory.INSTANCE.getFile(logNodePrefix, "test.ts");
     tsF.getParentFile().mkdirs();
 
     schema = new Schema();
@@ -129,6 +131,7 @@ public class SeqTsFileRecoverTest {
     FileUtils.deleteDirectory(tsF.getParentFile());
     resource.close();
     node.delete();
+    FlushSubTaskPoolManager.getInstance().stop();
   }
 
   @Test
diff --git 
a/server/src/test/java/org/apache/iotdb/db/writelog/recover/UnseqTsFileRecoverTest.java
 
b/server/src/test/java/org/apache/iotdb/db/writelog/recover/UnseqTsFileRecoverTest.java
index 591d590..b3fd273 100644
--- 
a/server/src/test/java/org/apache/iotdb/db/writelog/recover/UnseqTsFileRecoverTest.java
+++ 
b/server/src/test/java/org/apache/iotdb/db/writelog/recover/UnseqTsFileRecoverTest.java
@@ -25,6 +25,7 @@ import java.io.File;
 import java.io.IOException;
 import org.apache.commons.io.FileUtils;
 import org.apache.iotdb.db.engine.fileSystem.SystemFileFactory;
+import org.apache.iotdb.db.engine.flush.pool.FlushSubTaskPoolManager;
 import org.apache.iotdb.db.engine.storagegroup.TsFileResource;
 import org.apache.iotdb.db.engine.version.VersionController;
 import 
org.apache.iotdb.db.exception.storageGroup.StorageGroupProcessorException;
@@ -80,7 +81,8 @@ public class UnseqTsFileRecoverTest {
 
   @Before
   public void setup() throws IOException, WriteProcessException {
-    tsF = SystemFileFactory.INSTANCE.getFile("temp", "test.ts");
+    FlushSubTaskPoolManager.getInstance().start();
+    tsF = SystemFileFactory.INSTANCE.getFile(logNodePrefix, "test.ts");
     tsF.getParentFile().mkdirs();
 
     schema = new Schema();
@@ -138,6 +140,7 @@ public class UnseqTsFileRecoverTest {
   public void tearDown() throws IOException {
     FileUtils.deleteDirectory(tsF.getParentFile());
     node.delete();
+    FlushSubTaskPoolManager.getInstance().stop();
   }
 
   @Test