This is an automated email from the ASF dual-hosted git repository. lta pushed a commit to branch feature_async_close_tsfile in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 1d099e7963b0f63c2432108b0b0510ae7b02f028 Author: lta <[email protected]> AuthorDate: Fri Jun 28 17:40:38 2019 +0800 fix MemTableFlushTaskV2Test bug --- .../iotdb/db/engine/filenodeV2/FileNodeProcessorV2Test.java | 1 + .../org/apache/iotdb/db/engine/memtable/ChunkBufferPoolTest.java | 9 ++++++--- .../apache/iotdb/db/engine/memtable/MemTableFlushTaskV2Test.java | 4 ++-- .../org/apache/iotdb/db/engine/memtable/MemTablePoolTest.java | 7 ++++++- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/filenodeV2/FileNodeProcessorV2Test.java b/iotdb/src/test/java/org/apache/iotdb/db/engine/filenodeV2/FileNodeProcessorV2Test.java index e53c351..3f2ec2b 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/engine/filenodeV2/FileNodeProcessorV2Test.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/engine/filenodeV2/FileNodeProcessorV2Test.java @@ -49,6 +49,7 @@ public class FileNodeProcessorV2Test { @After public void tearDown() throws Exception { EnvironmentUtils.cleanEnv(); + EnvironmentUtils.cleanDir("data"); } diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/memtable/ChunkBufferPoolTest.java b/iotdb/src/test/java/org/apache/iotdb/db/engine/memtable/ChunkBufferPoolTest.java index c71bb85..1efc9bb 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/engine/memtable/ChunkBufferPoolTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/engine/memtable/ChunkBufferPoolTest.java @@ -31,15 +31,17 @@ import org.junit.Test; public class ChunkBufferPoolTest { private ConcurrentLinkedQueue<ChunkBuffer> chunkBuffers; + private Thread thread = new ReturnThread(); @Before public void setUp() throws Exception { chunkBuffers = new ConcurrentLinkedQueue(); - new ReturnThread().start(); + thread.start(); } @After public void tearDown() throws Exception { + thread.interrupt(); } @Test @@ -57,19 +59,20 @@ public class ChunkBufferPoolTest { @Override public void run() { while (true) { + if(isInterrupted()){ + break; + } ChunkBuffer chunkBuffer = chunkBuffers.poll(); if (chunkBuffer == null) { try { Thread.sleep(10); } catch (InterruptedException e) { - e.printStackTrace(); } continue; } try { Thread.sleep(100); } catch (InterruptedException e) { - e.printStackTrace(); } chunkBuffers.remove(chunkBuffer); ChunkBufferPool.getInstance().putBack(chunkBuffer, "test case"); diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/memtable/MemTableFlushTaskV2Test.java b/iotdb/src/test/java/org/apache/iotdb/db/engine/memtable/MemTableFlushTaskV2Test.java index e552a42..8d9ef4a 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/engine/memtable/MemTableFlushTaskV2Test.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/engine/memtable/MemTableFlushTaskV2Test.java @@ -35,7 +35,7 @@ public class MemTableFlushTaskV2Test { private NativeRestorableIOWriter writer; private String storageGroup = "storage_group1"; - private String filePath = "testUnsealedTsFileProcessor.tsfile"; + private String filePath = "data/testUnsealedTsFileProcessor.tsfile"; private IMemTable memTable; private long startTime = 1; private long endTime = 100; @@ -53,7 +53,7 @@ public class MemTableFlushTaskV2Test { @After public void tearDown() throws Exception { EnvironmentUtils.cleanEnv(); - EnvironmentUtils.cleanDir(filePath); + EnvironmentUtils.cleanDir("data"); } @Test diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/memtable/MemTablePoolTest.java b/iotdb/src/test/java/org/apache/iotdb/db/engine/memtable/MemTablePoolTest.java index 3dbf681..d43f68e 100644 --- a/iotdb/src/test/java/org/apache/iotdb/db/engine/memtable/MemTablePoolTest.java +++ b/iotdb/src/test/java/org/apache/iotdb/db/engine/memtable/MemTablePoolTest.java @@ -27,15 +27,17 @@ import org.junit.Test; public class MemTablePoolTest { private ConcurrentLinkedQueue<IMemTable> memTables; + private Thread thread = new ReturnThread(); @Before public void setUp() throws Exception { memTables = new ConcurrentLinkedQueue(); - new ReturnThread().start(); + thread.start(); } @After public void tearDown() throws Exception { + thread.interrupt(); } @Test @@ -66,6 +68,9 @@ public class MemTablePoolTest { @Override public void run() { while (true) { + if(isInterrupted()){ + break; + } IMemTable memTable = memTables.poll(); if (memTable == null) { try {
