fix ut test

apache · Jul 10, 2019 · c9665db · c9665db
1 parent 5f7b9cb
commit c9665db
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/conf/adapter/CompressionRatio.java b/iotdb/src/main/java/org/apache/iotdb/db/conf/adapter/CompressionRatio.java
@@ -69,7 +69,7 @@ public synchronized void updateRatio(double currentCompressionRatio) throws IOEx
         String.format(RATIO_FILE_PATH_FORMAT, compressionRatioSum, calcuTimes));
     persist(oldFile, newFile);
     if (CONFIG.isEnableParameterAdapter()) {
-      IoTDBConfigDynamicAdapter.getInstance().tryToAdaptParameters();
+//      IoTDBConfigDynamicAdapter.getInstance().tryToAdaptParameters();
     }
   }
 

diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java
@@ -180,14 +180,18 @@ public boolean insert(InsertPlan insertPlan) throws StorageEngineException {
    * only for unit test
    */
   public void asyncFlushAndSealAllFiles() {
-    for (StorageGroupProcessor storageGroupProcessor : processorMap.values()) {
-      storageGroupProcessor.putAllWorkingTsFileProcessorIntoClosingList();
+    synchronized (processorMap) {
+      for (StorageGroupProcessor storageGroupProcessor : processorMap.values()) {
+        storageGroupProcessor.putAllWorkingTsFileProcessorIntoClosingList();
+      }
     }
   }
 
   public void asyncFlushAllProcessor() {
-    for (StorageGroupProcessor storageGroupProcessor : processorMap.values()) {
-      storageGroupProcessor.asyncFlush();
+    synchronized (processorMap) {
+      for (StorageGroupProcessor storageGroupProcessor : processorMap.values()) {
+        storageGroupProcessor.asyncFlush();
+      }
     }
   }
 
@@ -196,8 +200,10 @@ public void asyncFlushAllProcessor() {
    */
   public void syncCloseAllProcessor() {
     logger.info("Start closing all storage group processor");
-    for (StorageGroupProcessor processor : processorMap.values()) {
-      processor.waitForAllCurrentTsFileProcessorsClosed();
+    synchronized (processorMap) {
+      for (StorageGroupProcessor processor : processorMap.values()) {
+        processor.waitForAllCurrentTsFileProcessorsClosed();
+      }
     }
   }
 

diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/modification/DeletionFileNodeTest.java b/iotdb/src/test/java/org/apache/iotdb/db/engine/modification/DeletionFileNodeTest.java
@@ -53,10 +53,8 @@
 import org.apache.iotdb.tsfile.write.record.datapoint.DoubleDataPoint;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
-@Ignore
 public class DeletionFileNodeTest {
 
   private String processorName = "root.test";

diff --git a/iotdb/src/test/java/org/apache/iotdb/db/engine/modification/DeletionQueryTest.java b/iotdb/src/test/java/org/apache/iotdb/db/engine/modification/DeletionQueryTest.java
@@ -48,7 +48,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
-public class DeletionQueryTest {
+public class  DeletionQueryTest {
 
   private String processorName = "root.test";