[iotdb] 02/04: fix error in DataLogApplierTest.java

[hx...@apache.org]

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

hxd pushed a commit to branch cluster-
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit 90905196b9fdc18bde507b8d91eeb9d8c57ff9d3
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Thu Aug 19 10:43:31 2021 +0800

    fix error in DataLogApplierTest.java
---
 .../cluster/log/manage/FilePartitionedSnapshotLogManager.java    | 2 ++
 .../org/apache/iotdb/cluster/log/applier/DataLogApplierTest.java | 9 +++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/log/manage/FilePartitionedSnapshotLogManager.java b/cluster/src/main/java/org/apache/iotdb/cluster/log/manage/FilePartitionedSnapshotLogManager.java
index 39dbab8..d7a68d6 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/log/manage/FilePartitionedSnapshotLogManager.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/log/manage/FilePartitionedSnapshotLogManager.java
@@ -52,6 +52,8 @@ import java.util.Map.Entry;
  * Different from PartitionedSnapshotLogManager, FilePartitionedSnapshotLogManager does not store
  * the committed in memory after snapshots, it considers the logs are contained in the TsFiles so it
  * will record every TsFiles in the slot instead.
+ *
+ * <p>FilePartitionedSnapshotLogManager is used for dataGroup
  */
 public class FilePartitionedSnapshotLogManager extends PartitionedSnapshotLogManager<FileSnapshot> {
 
diff --git a/cluster/src/test/java/org/apache/iotdb/cluster/log/applier/DataLogApplierTest.java b/cluster/src/test/java/org/apache/iotdb/cluster/log/applier/DataLogApplierTest.java
index 122b7c5..45881f0 100644
--- a/cluster/src/test/java/org/apache/iotdb/cluster/log/applier/DataLogApplierTest.java
+++ b/cluster/src/test/java/org/apache/iotdb/cluster/log/applier/DataLogApplierTest.java
@@ -54,6 +54,7 @@ import org.apache.iotdb.db.engine.storagegroup.StorageGroupProcessor;
 import org.apache.iotdb.db.exception.StorageEngineException;
 import org.apache.iotdb.db.exception.metadata.IllegalPathException;
 import org.apache.iotdb.db.exception.metadata.MetadataException;
+import org.apache.iotdb.db.exception.metadata.StorageGroupAlreadySetException;
 import org.apache.iotdb.db.exception.metadata.StorageGroupNotSetException;
 import org.apache.iotdb.db.exception.query.QueryProcessException;
 import org.apache.iotdb.db.metadata.PartialPath;
@@ -91,7 +92,10 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 public class DataLogApplierTest extends IoTDBTest {
 
@@ -105,6 +109,8 @@ public class DataLogApplierTest extends IoTDBTest {
           try {
             // for testApplyCreateMultiTimeseiresWithPulling()
             IoTDB.metaManager.setStorageGroup(new PartialPath("root.sg2"));
+          } catch (StorageGroupAlreadySetException e) {
+            logger.warn("[may ignore me in tests] {}", e.getMessage(), e);
           } catch (MetadataException e) {
             logger.error("Cannot set sg for test", e);
           }
@@ -266,7 +272,6 @@ public class DataLogApplierTest extends IoTDBTest {
     // this series is already created
     insertPlan.setPrefixPath(new PartialPath(TestUtils.getTestSg(1)));
     insertPlan.setTime(1);
-    insertPlan.setNeedInferType(true);
     insertPlan.setMeasurements(new String[] {TestUtils.getTestMeasurement(0)});
     insertPlan.setDataTypes(new TSDataType[insertPlan.getMeasurements().length]);
     insertPlan.setValues(new Object[] {"1.0"});