You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2022/11/08 07:36:23 UTC
[iotdb] 04/06: fix all tests
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch remove_storage_engine_old
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 9c487aa37ab9d2de19acdabb1d2ec04c68ece934
Author: HTHou <hh...@outlook.com>
AuthorDate: Tue Nov 8 15:02:52 2022 +0800
fix all tests
---
.../planner/plan/node/write/InsertTabletNode.java | 2 +-
.../db/engine/memtable/MemTableTestUtils.java | 30 +++-----
.../db/engine/memtable/PrimitiveMemTableTest.java | 21 +++---
.../iotdb/db/engine/storagegroup/TTLTest.java | 44 ++++++------
.../iotdb/db/query/dataset/SingleDataSetTest.java | 25 +------
.../org/apache/iotdb/db/tools/WalCheckerTest.java | 1 -
.../apache/iotdb/db/utils/EnvironmentUtils.java | 9 ++-
.../iotdb/db/wal/buffer/WALBufferCommonTest.java | 21 +++---
.../org/apache/iotdb/db/wal/io/WALFileTest.java | 35 ++++-----
.../org/apache/iotdb/db/wal/node/WALNodeTest.java | 35 ++++-----
.../db/wal/recover/WALRecoverManagerTest.java | 41 ++++++-----
.../db/wal/recover/file/TsFilePlanRedoerTest.java | 83 ++++++++++++----------
.../file/UnsealedTsFileRecoverPerformerTest.java | 7 +-
13 files changed, 165 insertions(+), 189 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/write/InsertTabletNode.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/write/InsertTabletNode.java
index 29f563dd20..606ee5dd93 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/write/InsertTabletNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/write/InsertTabletNode.java
@@ -1010,7 +1010,7 @@ public class InsertTabletNode extends InsertNode implements WALEntryValue {
int result = Objects.hash(super.hashCode(), rowCount, range);
result = 31 * result + Arrays.hashCode(times);
result = 31 * result + Arrays.hashCode(bitMaps);
- result = 31 * result + Arrays.hashCode(columns);
+ result = 31 * result + Arrays.deepHashCode(columns);
return result;
}
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/memtable/MemTableTestUtils.java b/server/src/test/java/org/apache/iotdb/db/engine/memtable/MemTableTestUtils.java
index 6273d602ab..0c88249821 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/memtable/MemTableTestUtils.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/memtable/MemTableTestUtils.java
@@ -22,23 +22,16 @@ import org.apache.iotdb.commons.exception.IllegalPathException;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.db.exception.WriteProcessException;
import org.apache.iotdb.db.metadata.idtable.entry.DeviceIDFactory;
-import org.apache.iotdb.db.metadata.mnode.IMeasurementMNode;
-import org.apache.iotdb.db.metadata.mnode.MeasurementMNode;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.PlanNodeId;
-import org.apache.iotdb.db.mpp.plan.planner.plan.node.write.InsertRowNode;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.write.InsertTabletNode;
-import org.apache.iotdb.db.qp.physical.crud.InsertTabletPlan;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding;
import org.apache.iotdb.tsfile.read.common.Path;
import org.apache.iotdb.tsfile.utils.BitMap;
-import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema;
import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.apache.iotdb.tsfile.write.schema.Schema;
-import java.util.ArrayList;
import java.util.Collections;
-import java.util.List;
public class MemTableTestUtils {
@@ -104,20 +97,19 @@ public class MemTableTestUtils {
MeasurementSchema[] schemas = new MeasurementSchema[2];
schemas[0] = new MeasurementSchema(measurements[0], dataTypes[0], encodings[0]);
schemas[1] = new MeasurementSchema(measurements[1], dataTypes[1], encodings[1]);
- InsertTabletNode node = new InsertTabletNode(
- new PlanNodeId("0"),
- new PartialPath(deviceId0),
- true,
- measurements,
- dataTypes,
- times,
- null,
- columns,
- times.length
- );
+ InsertTabletNode node =
+ new InsertTabletNode(
+ new PlanNodeId("0"),
+ new PartialPath(deviceId0),
+ true,
+ measurements,
+ dataTypes,
+ times,
+ null,
+ columns,
+ times.length);
node.setMeasurementSchemas(schemas);
return node;
-
}
public static void produceNullableVectorData(IMemTable iMemTable)
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/memtable/PrimitiveMemTableTest.java b/server/src/test/java/org/apache/iotdb/db/engine/memtable/PrimitiveMemTableTest.java
index aa1a1a19f7..59a4a4046c 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/memtable/PrimitiveMemTableTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/memtable/PrimitiveMemTableTest.java
@@ -523,16 +523,17 @@ public class PrimitiveMemTableTest {
schemas[0] = new MeasurementSchema(measurements[0], dataTypes[0], encodings[0]);
schemas[1] = new MeasurementSchema(measurements[1], dataTypes[1], encodings[1]);
- InsertTabletNode node = new InsertTabletNode(
- new PlanNodeId("0"),
- new PartialPath(deviceId),
- true,
- measurements,
- dataTypes,
- times,
- null,
- columns,
- times.length);
+ InsertTabletNode node =
+ new InsertTabletNode(
+ new PlanNodeId("0"),
+ new PartialPath(deviceId),
+ true,
+ measurements,
+ dataTypes,
+ times,
+ null,
+ columns,
+ times.length);
node.setMeasurementSchemas(schemas);
return node;
}
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/storagegroup/TTLTest.java b/server/src/test/java/org/apache/iotdb/db/engine/storagegroup/TTLTest.java
index 04ab818bc9..8f96c9223d 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/storagegroup/TTLTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/storagegroup/TTLTest.java
@@ -56,7 +56,6 @@ import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import java.io.File;
@@ -144,16 +143,16 @@ public class TTLTest {
public void testTTLWrite()
throws WriteProcessException, QueryProcessException, IllegalPathException,
TriggerExecutionException {
- InsertRowNode node = new InsertRowNode(
- new PlanNodeId("0"),
- new PartialPath(sg1),
- false,
- new String[] {"s1"},
- new TSDataType[] {TSDataType.INT64},
- System.currentTimeMillis(),
- new Object[] {1L},
- false
- );
+ InsertRowNode node =
+ new InsertRowNode(
+ new PlanNodeId("0"),
+ new PartialPath(sg1),
+ false,
+ new String[] {"s1"},
+ new TSDataType[] {TSDataType.INT64},
+ System.currentTimeMillis(),
+ new Object[] {1L},
+ false);
node.setMeasurementSchemas(
new MeasurementSchema[] {new MeasurementSchema("s1", TSDataType.INT64, TSEncoding.PLAIN)});
@@ -175,18 +174,17 @@ public class TTLTest {
}
private void prepareData()
- throws WriteProcessException, IllegalPathException,
- TriggerExecutionException {
- InsertRowNode node = new InsertRowNode(
- new PlanNodeId("0"),
- new PartialPath(sg1),
- false,
- new String[] {"s1"},
- new TSDataType[] {TSDataType.INT64},
- System.currentTimeMillis(),
- new Object[] {1L},
- false
- );
+ throws WriteProcessException, IllegalPathException, TriggerExecutionException {
+ InsertRowNode node =
+ new InsertRowNode(
+ new PlanNodeId("0"),
+ new PartialPath(sg1),
+ false,
+ new String[] {"s1"},
+ new TSDataType[] {TSDataType.INT64},
+ System.currentTimeMillis(),
+ new Object[] {1L},
+ false);
node.setMeasurementSchemas(
new MeasurementSchema[] {new MeasurementSchema("s1", TSDataType.INT64, TSEncoding.PLAIN)});
diff --git a/server/src/test/java/org/apache/iotdb/db/query/dataset/SingleDataSetTest.java b/server/src/test/java/org/apache/iotdb/db/query/dataset/SingleDataSetTest.java
index e48ef519a6..047f1dbb95 100644
--- a/server/src/test/java/org/apache/iotdb/db/query/dataset/SingleDataSetTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/query/dataset/SingleDataSetTest.java
@@ -18,28 +18,7 @@
*/
package org.apache.iotdb.db.query.dataset;
-import org.apache.iotdb.commons.exception.MetadataException;
-import org.apache.iotdb.db.exception.StorageEngineException;
-import org.apache.iotdb.db.exception.query.QueryProcessException;
-import org.apache.iotdb.db.qp.Planner;
-import org.apache.iotdb.db.qp.executor.IPlanExecutor;
-import org.apache.iotdb.db.qp.executor.PlanExecutor;
-import org.apache.iotdb.db.qp.physical.PhysicalPlan;
-import org.apache.iotdb.db.utils.EnvironmentUtils;
-import org.apache.iotdb.tsfile.exception.filter.QueryFilterOptimizationException;
-import org.apache.iotdb.tsfile.read.common.RowRecord;
-import org.apache.iotdb.tsfile.read.query.dataset.QueryDataSet;
-
-import org.apache.thrift.TException;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.io.IOException;
-import java.sql.SQLException;
-
-//public class SingleDataSetTest {
+// public class SingleDataSetTest {
// private final IPlanExecutor queryExecutor = new PlanExecutor();
// private final Planner processor = new Planner();
//
@@ -127,4 +106,4 @@ import java.sql.SQLException;
// Assert.assertEquals("0\t2", record.toString());
// }
// }
-//}
+// }
diff --git a/server/src/test/java/org/apache/iotdb/db/tools/WalCheckerTest.java b/server/src/test/java/org/apache/iotdb/db/tools/WalCheckerTest.java
index 6efef0297b..2019dbe99b 100644
--- a/server/src/test/java/org/apache/iotdb/db/tools/WalCheckerTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/tools/WalCheckerTest.java
@@ -23,7 +23,6 @@ import org.apache.iotdb.commons.exception.IllegalPathException;
import org.apache.iotdb.db.constant.TestConstant;
import org.apache.iotdb.db.exception.SystemCheckException;
import org.apache.iotdb.db.wal.buffer.WALEntry;
-import org.apache.iotdb.db.wal.buffer.WALEntryType;
import org.apache.iotdb.db.wal.buffer.WALInfoEntry;
import org.apache.iotdb.db.wal.io.ILogWriter;
import org.apache.iotdb.db.wal.io.WALFileTest;
diff --git a/server/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java b/server/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java
index ee3e2807c3..b26c9b3d37 100644
--- a/server/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java
+++ b/server/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java
@@ -28,7 +28,6 @@ import org.apache.iotdb.db.conf.IoTDBConfig;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.conf.directories.DirectoryManager;
import org.apache.iotdb.db.constant.TestConstant;
-import org.apache.iotdb.db.engine.StorageEngine;
import org.apache.iotdb.db.engine.StorageEngineV2;
import org.apache.iotdb.db.engine.cache.BloomFilterCache;
import org.apache.iotdb.db.engine.cache.ChunkCache;
@@ -150,10 +149,10 @@ public class EnvironmentUtils {
StorageEngineV2.getInstance().stop();
// clean storage group manager
-// if (!StorageEngine.getInstance().deleteAll()) {
-// logger.error("Can't close the storage group manager in EnvironmentUtils");
-// fail();
-// }
+ // if (!StorageEngine.getInstance().deleteAll()) {
+ // logger.error("Can't close the storage group manager in EnvironmentUtils");
+ // fail();
+ // }
CommonDescriptor.getInstance().getConfig().setNodeStatus(NodeStatus.Running);
// We must disable MQTT service as it will cost a lot of time to be shutdown, which may slow our
diff --git a/server/src/test/java/org/apache/iotdb/db/wal/buffer/WALBufferCommonTest.java b/server/src/test/java/org/apache/iotdb/db/wal/buffer/WALBufferCommonTest.java
index 71cd5e8511..4054ca796b 100644
--- a/server/src/test/java/org/apache/iotdb/db/wal/buffer/WALBufferCommonTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/wal/buffer/WALBufferCommonTest.java
@@ -29,9 +29,9 @@ import org.apache.iotdb.db.mpp.plan.planner.plan.node.write.InsertRowNode;
import org.apache.iotdb.db.wal.io.WALReader;
import org.apache.iotdb.db.wal.utils.WALFileUtils;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
-
import org.apache.iotdb.tsfile.utils.Binary;
import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -146,15 +146,16 @@ public abstract class WALBufferCommonTest {
columns[4] = false;
columns[5] = new Binary("hh" + 0);
- InsertRowNode node = new InsertRowNode(
- new PlanNodeId(""),
- new PartialPath(devicePath),
- false,
- new String[] {"s1", "s2", "s3", "s4", "s5", "s6"},
- dataTypes,
- time,
- columns,
- false);
+ InsertRowNode node =
+ new InsertRowNode(
+ new PlanNodeId(""),
+ new PartialPath(devicePath),
+ false,
+ new String[] {"s1", "s2", "s3", "s4", "s5", "s6"},
+ dataTypes,
+ time,
+ columns,
+ false);
MeasurementSchema[] schemas = new MeasurementSchema[6];
for (int i = 0; i < 6; i++) {
schemas[i] = new MeasurementSchema("s" + (i + 1), dataTypes[i]);
diff --git a/server/src/test/java/org/apache/iotdb/db/wal/io/WALFileTest.java b/server/src/test/java/org/apache/iotdb/db/wal/io/WALFileTest.java
index fa3fec5498..bb696fdda8 100644
--- a/server/src/test/java/org/apache/iotdb/db/wal/io/WALFileTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/wal/io/WALFileTest.java
@@ -26,7 +26,6 @@ import org.apache.iotdb.db.mpp.plan.planner.plan.node.PlanNodeId;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.write.DeleteDataNode;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.write.InsertRowNode;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.write.InsertTabletNode;
-import org.apache.iotdb.db.utils.EnvironmentUtils;
import org.apache.iotdb.db.wal.buffer.WALEntry;
import org.apache.iotdb.db.wal.buffer.WALEntryType;
import org.apache.iotdb.db.wal.buffer.WALInfoEntry;
@@ -187,14 +186,15 @@ public class WALFileTest {
columns,
false);
- MeasurementSchema[] schemas = new MeasurementSchema[] {
- new MeasurementSchema("s1", dataTypes[0]),
- new MeasurementSchema("s2", dataTypes[1]),
- new MeasurementSchema("s3", dataTypes[2]),
- new MeasurementSchema("s4", dataTypes[3]),
- new MeasurementSchema("s5", dataTypes[4]),
- new MeasurementSchema("s6", dataTypes[5]),
- };
+ MeasurementSchema[] schemas =
+ new MeasurementSchema[] {
+ new MeasurementSchema("s1", dataTypes[0]),
+ new MeasurementSchema("s2", dataTypes[1]),
+ new MeasurementSchema("s3", dataTypes[2]),
+ new MeasurementSchema("s4", dataTypes[3]),
+ new MeasurementSchema("s5", dataTypes[4]),
+ new MeasurementSchema("s6", dataTypes[5]),
+ };
insertRowNode.setMeasurementSchemas(schemas);
return insertRowNode;
}
@@ -248,14 +248,15 @@ public class WALFileTest {
bitMaps,
columns,
times.length);
- MeasurementSchema[] schemas = new MeasurementSchema[] {
- new MeasurementSchema("s1", dataTypes[0]),
- new MeasurementSchema("s2", dataTypes[1]),
- new MeasurementSchema("s3", dataTypes[2]),
- new MeasurementSchema("s4", dataTypes[3]),
- new MeasurementSchema("s5", dataTypes[4]),
- new MeasurementSchema("s6", dataTypes[5]),
- };
+ MeasurementSchema[] schemas =
+ new MeasurementSchema[] {
+ new MeasurementSchema("s1", dataTypes[0]),
+ new MeasurementSchema("s2", dataTypes[1]),
+ new MeasurementSchema("s3", dataTypes[2]),
+ new MeasurementSchema("s4", dataTypes[3]),
+ new MeasurementSchema("s5", dataTypes[4]),
+ new MeasurementSchema("s6", dataTypes[5]),
+ };
insertTabletNode.setMeasurementSchemas(schemas);
return insertTabletNode;
diff --git a/server/src/test/java/org/apache/iotdb/db/wal/node/WALNodeTest.java b/server/src/test/java/org/apache/iotdb/db/wal/node/WALNodeTest.java
index eafd4390a9..8542c817ef 100644
--- a/server/src/test/java/org/apache/iotdb/db/wal/node/WALNodeTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/wal/node/WALNodeTest.java
@@ -39,8 +39,8 @@ import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding;
import org.apache.iotdb.tsfile.utils.Binary;
import org.apache.iotdb.tsfile.utils.BitMap;
-
import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -99,13 +99,13 @@ public class WALNodeTest {
ExecutorService executorService = Executors.newFixedThreadPool(threadsNum);
List<Future<Void>> futures = new ArrayList<>();
List<WALFlushListener> walFlushListeners = Collections.synchronizedList(new ArrayList<>());
- Set<InsertTabletNode> expectedInsertTabletPlans = ConcurrentHashMap.newKeySet();
+ Set<InsertTabletNode> expectedInsertTabletNodes = ConcurrentHashMap.newKeySet();
for (int i = 0; i < threadsNum; ++i) {
int memTableId = i;
Callable<Void> writeTask =
() -> {
try {
- writeInsertTabletPlan(memTableId, expectedInsertTabletPlans, walFlushListeners);
+ writeInsertTabletNode(memTableId, expectedInsertTabletNodes, walFlushListeners);
} catch (IllegalPathException e) {
fail();
}
@@ -135,7 +135,7 @@ public class WALNodeTest {
}
}
}
- assertEquals(expectedInsertTabletPlans, actualInsertTabletNodes);
+ assertEquals(expectedInsertTabletNodes, actualInsertTabletNodes);
// check flush listeners
try {
for (WALFlushListener walFlushListener : walFlushListeners) {
@@ -146,15 +146,15 @@ public class WALNodeTest {
}
}
- private void writeInsertTabletPlan(
+ private void writeInsertTabletNode(
int memTableId,
- Set<InsertTabletNode> expectedInsertTabletPlans,
+ Set<InsertTabletNode> expectedInsertTabletNodes,
List<WALFlushListener> walFlushListeners)
throws IllegalPathException {
for (int i = 0; i < 100; ++i) {
InsertTabletNode insertTabletNode =
getInsertTabletNode(devicePath + memTableId, new long[] {i});
- expectedInsertTabletPlans.add(insertTabletNode);
+ expectedInsertTabletNodes.add(insertTabletNode);
WALFlushListener walFlushListener =
walNode.log(memTableId, insertTabletNode, 0, insertTabletNode.getRowCount());
walFlushListeners.add(walFlushListener);
@@ -197,16 +197,17 @@ public class WALNodeTest {
bitMaps[i].mark(i % times.length);
}
- InsertTabletNode insertTabletNode = new InsertTabletNode(
- new PlanNodeId(""),
- new PartialPath(devicePath),
- false,
- measurements,
- dataTypes,
- times,
- bitMaps,
- columns,
- times.length);
+ InsertTabletNode insertTabletNode =
+ new InsertTabletNode(
+ new PlanNodeId(""),
+ new PartialPath(devicePath),
+ false,
+ measurements,
+ dataTypes,
+ times,
+ bitMaps,
+ columns,
+ times.length);
MeasurementSchema[] schemas = new MeasurementSchema[6];
for (int i = 0; i < 6; i++) {
schemas[i] = new MeasurementSchema(measurements[i], dataTypes[i], TSEncoding.PLAIN);
diff --git a/server/src/test/java/org/apache/iotdb/db/wal/recover/WALRecoverManagerTest.java b/server/src/test/java/org/apache/iotdb/db/wal/recover/WALRecoverManagerTest.java
index 9628aa949c..208a05d5ba 100644
--- a/server/src/test/java/org/apache/iotdb/db/wal/recover/WALRecoverManagerTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/wal/recover/WALRecoverManagerTest.java
@@ -362,14 +362,13 @@ public class WALRecoverManagerTest {
insertRowNode.setMeasurementSchemas(
new MeasurementSchema[] {
- new MeasurementSchema("s1", TSDataType.FLOAT),
- new MeasurementSchema("s2", TSDataType.DOUBLE)
+ new MeasurementSchema("s1", TSDataType.FLOAT),
+ new MeasurementSchema("s2", TSDataType.DOUBLE)
});
return insertRowNode;
}
- private InsertTabletNode getInsertTabletNode(String devicePath)
- throws IllegalPathException {
+ private InsertTabletNode getInsertTabletNode(String devicePath) throws IllegalPathException {
long[] times = new long[] {110L, 111L, 112L, 113L};
List<TSDataType> dataTypes = new ArrayList<>();
dataTypes.add(TSDataType.DOUBLE);
@@ -404,25 +403,25 @@ public class WALRecoverManagerTest {
bitMaps[i].mark(i % times.length);
}
-
- InsertTabletNode insertTabletNode = new InsertTabletNode(
- new PlanNodeId(""),
- new PartialPath(devicePath),
- true,
- new String[] {"s1", "s2", "s3", "s4", "s5", "s6"},
- dataTypes.toArray(new TSDataType[0]),
- times,
- bitMaps,
- columns,
- times.length);
+ InsertTabletNode insertTabletNode =
+ new InsertTabletNode(
+ new PlanNodeId(""),
+ new PartialPath(devicePath),
+ true,
+ new String[] {"s1", "s2", "s3", "s4", "s5", "s6"},
+ dataTypes.toArray(new TSDataType[0]),
+ times,
+ bitMaps,
+ columns,
+ times.length);
insertTabletNode.setMeasurementSchemas(
new MeasurementSchema[] {
- new MeasurementSchema("s1", TSDataType.DOUBLE),
- new MeasurementSchema("s2", TSDataType.FLOAT),
- new MeasurementSchema("s3", TSDataType.INT64),
- new MeasurementSchema("s4", TSDataType.INT32),
- new MeasurementSchema("s5", TSDataType.BOOLEAN),
- new MeasurementSchema("s6", TSDataType.TEXT)
+ new MeasurementSchema("s1", TSDataType.DOUBLE),
+ new MeasurementSchema("s2", TSDataType.FLOAT),
+ new MeasurementSchema("s3", TSDataType.INT64),
+ new MeasurementSchema("s4", TSDataType.INT32),
+ new MeasurementSchema("s5", TSDataType.BOOLEAN),
+ new MeasurementSchema("s6", TSDataType.TEXT)
});
return insertTabletNode;
}
diff --git a/server/src/test/java/org/apache/iotdb/db/wal/recover/file/TsFilePlanRedoerTest.java b/server/src/test/java/org/apache/iotdb/db/wal/recover/file/TsFilePlanRedoerTest.java
index 47c269809f..b0197a7a3b 100644
--- a/server/src/test/java/org/apache/iotdb/db/wal/recover/file/TsFilePlanRedoerTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/wal/recover/file/TsFilePlanRedoerTest.java
@@ -90,7 +90,7 @@ public class TsFilePlanRedoerTest {
// set recover config, avoid creating deleted time series when recovering wal
prevIsAutoCreateSchemaEnabled =
IoTDBDescriptor.getInstance().getConfig().isAutoCreateSchemaEnabled();
-// IoTDBDescriptor.getInstance().getConfig().setAutoCreateSchemaEnabled(false);
+ // IoTDBDescriptor.getInstance().getConfig().setAutoCreateSchemaEnabled(false);
prevIsEnablePartialInsert = IoTDBDescriptor.getInstance().getConfig().isEnablePartialInsert();
IoTDBDescriptor.getInstance().getConfig().setEnablePartialInsert(true);
compressionType = TSFileDescriptor.getInstance().getConfig().getCompressor();
@@ -146,9 +146,9 @@ public class TsFilePlanRedoerTest {
IoTDBDescriptor.getInstance().getConfig().setClusterMode(prevIsCluster);
EnvironmentUtils.cleanEnv();
// reset config
-// IoTDBDescriptor.getInstance()
-// .getConfig()
-// .setAutoCreateSchemaEnabled(prevIsAutoCreateSchemaEnabled);
+ // IoTDBDescriptor.getInstance()
+ // .getConfig()
+ // .setAutoCreateSchemaEnabled(prevIsAutoCreateSchemaEnabled);
IoTDBDescriptor.getInstance().getConfig().setEnablePartialInsert(prevIsEnablePartialInsert);
}
@@ -177,10 +177,11 @@ public class TsFilePlanRedoerTest {
time,
columns,
false);
- insertRowNode.setMeasurementSchemas(new MeasurementSchema[] {
- new MeasurementSchema("s1", TSDataType.FLOAT),
- new MeasurementSchema("s2", TSDataType.DOUBLE),
- });
+ insertRowNode.setMeasurementSchemas(
+ new MeasurementSchema[] {
+ new MeasurementSchema("s1", TSDataType.FLOAT),
+ new MeasurementSchema("s2", TSDataType.DOUBLE),
+ });
// redo InsertTabletPlan, vsg processor is used to test IdTable, don't test IdTable here
TsFilePlanRedoer planRedoer = new TsFilePlanRedoer(tsFileResource, true, null);
@@ -245,13 +246,14 @@ public class TsFilePlanRedoerTest {
time,
columns,
false);
- insertRowNode.setMeasurementSchemas(new MeasurementSchema[] {
- new MeasurementSchema("s1", TSDataType.INT32),
- new MeasurementSchema("s2", TSDataType.INT64),
- new MeasurementSchema("s3", TSDataType.BOOLEAN),
- new MeasurementSchema("s4", TSDataType.FLOAT),
- new MeasurementSchema("s5", TSDataType.TEXT),
- });
+ insertRowNode.setMeasurementSchemas(
+ new MeasurementSchema[] {
+ new MeasurementSchema("s1", TSDataType.INT32),
+ new MeasurementSchema("s2", TSDataType.INT64),
+ new MeasurementSchema("s3", TSDataType.BOOLEAN),
+ new MeasurementSchema("s4", TSDataType.FLOAT),
+ new MeasurementSchema("s5", TSDataType.TEXT),
+ });
// redo InsertTabletPlan, vsg processor is used to test IdTable, don't test IdTable here
TsFilePlanRedoer planRedoer = new TsFilePlanRedoer(tsFileResource, true, null);
@@ -332,10 +334,11 @@ public class TsFilePlanRedoerTest {
bitMaps,
columns,
times.length);
- insertTabletNode.setMeasurementSchemas(new MeasurementSchema[] {
- new MeasurementSchema("s1", TSDataType.INT32),
- new MeasurementSchema("s2", TSDataType.INT64),
- });
+ insertTabletNode.setMeasurementSchemas(
+ new MeasurementSchema[] {
+ new MeasurementSchema("s1", TSDataType.INT32),
+ new MeasurementSchema("s2", TSDataType.INT64),
+ });
// redo InsertTabletPlan, vsg processor is used to test IdTable, don't test IdTable here
TsFilePlanRedoer planRedoer = new TsFilePlanRedoer(tsFileResource, true, null);
@@ -432,14 +435,14 @@ public class TsFilePlanRedoerTest {
bitMaps,
columns,
times.length);
- insertTabletNode.setMeasurementSchemas(new MeasurementSchema[] {
- new MeasurementSchema("s1", TSDataType.INT32),
- new MeasurementSchema("s2", TSDataType.INT64),
- new MeasurementSchema("s3", TSDataType.BOOLEAN),
- new MeasurementSchema("s4", TSDataType.FLOAT),
- new MeasurementSchema("s5", TSDataType.TEXT),
- });
-
+ insertTabletNode.setMeasurementSchemas(
+ new MeasurementSchema[] {
+ new MeasurementSchema("s1", TSDataType.INT32),
+ new MeasurementSchema("s2", TSDataType.INT64),
+ new MeasurementSchema("s3", TSDataType.BOOLEAN),
+ new MeasurementSchema("s4", TSDataType.FLOAT),
+ new MeasurementSchema("s5", TSDataType.TEXT),
+ });
// redo InsertTabletPlan, vsg processor is used to test IdTable, don't test IdTable here
TsFilePlanRedoer planRedoer = new TsFilePlanRedoer(tsFileResource, true, null);
@@ -560,10 +563,11 @@ public class TsFilePlanRedoerTest {
null,
columns,
times.length);
- insertTabletNode.setMeasurementSchemas(new MeasurementSchema[] {
- new MeasurementSchema("s1", TSDataType.INT32),
- new MeasurementSchema("s2", TSDataType.INT64),
- });
+ insertTabletNode.setMeasurementSchemas(
+ new MeasurementSchema[] {
+ new MeasurementSchema("s1", TSDataType.INT32),
+ new MeasurementSchema("s2", TSDataType.INT64),
+ });
// redo InsertTabletPlan, vsg processor is used to test IdTable, don't test IdTable here
TsFilePlanRedoer planRedoer = new TsFilePlanRedoer(tsFileResource, false, null);
@@ -677,7 +681,7 @@ public class TsFilePlanRedoerTest {
new PlanNodeId(""),
new PartialPath(DEVICE3_NAME),
true,
- new String[] {"s1", "s2", "s3", "s4", "s5"},
+ new String[] {null, "s2", "s3", "s4", null},
new TSDataType[] {
TSDataType.INT32,
TSDataType.INT64,
@@ -691,13 +695,14 @@ public class TsFilePlanRedoerTest {
times.length);
// redo InsertTabletPlan, data region is used to test IdTable, don't test IdTable here
TsFilePlanRedoer planRedoer = new TsFilePlanRedoer(tsFileResource, true, null);
- MeasurementSchema[] schemas = new MeasurementSchema[] {
- null,
- new MeasurementSchema("s2", TSDataType.INT64),
- new MeasurementSchema("s3", TSDataType.BOOLEAN),
- new MeasurementSchema("s4", TSDataType.FLOAT),
- null
- };
+ MeasurementSchema[] schemas =
+ new MeasurementSchema[] {
+ null,
+ new MeasurementSchema("s2", TSDataType.INT64),
+ new MeasurementSchema("s3", TSDataType.BOOLEAN),
+ new MeasurementSchema("s4", TSDataType.FLOAT),
+ null
+ };
insertTabletNode.setMeasurementSchemas(schemas);
planRedoer.redoInsert(insertTabletNode);
diff --git a/server/src/test/java/org/apache/iotdb/db/wal/recover/file/UnsealedTsFileRecoverPerformerTest.java b/server/src/test/java/org/apache/iotdb/db/wal/recover/file/UnsealedTsFileRecoverPerformerTest.java
index c5a39585e8..d41f896c6a 100644
--- a/server/src/test/java/org/apache/iotdb/db/wal/recover/file/UnsealedTsFileRecoverPerformerTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/wal/recover/file/UnsealedTsFileRecoverPerformerTest.java
@@ -143,8 +143,8 @@ public class UnsealedTsFileRecoverPerformerTest {
false);
insertRowNode.setMeasurementSchemas(
new MeasurementSchema[] {
- new MeasurementSchema("s1", TSDataType.FLOAT),
- new MeasurementSchema("s2", TSDataType.DOUBLE)
+ new MeasurementSchema("s1", TSDataType.FLOAT),
+ new MeasurementSchema("s2", TSDataType.DOUBLE)
});
int fakeMemTableId = 1;
WALEntry walEntry = new WALInfoEntry(fakeMemTableId, insertRowNode);
@@ -203,7 +203,8 @@ public class UnsealedTsFileRecoverPerformerTest {
new DeleteDataNode(
new PlanNodeId("0"),
Collections.singletonList(new PartialPath(DEVICE2_NAME)),
- Long.MIN_VALUE, Long.MAX_VALUE);
+ Long.MIN_VALUE,
+ Long.MAX_VALUE);
int fakeMemTableId = 1;
WALEntry walEntry = new WALInfoEntry(fakeMemTableId, deleteDataNode);
// recover