This is an automated email from the ASF dual-hosted git repository. haonan pushed a commit to branch new_vector in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 38b81bc0dfb5843244c2b046f224552542d0ea89 Author: HTHou <[email protected]> AuthorDate: Mon Nov 1 11:07:39 2021 +0800 spotless --- .../iotdb/db/engine/memtable/IWritableMemChunk.java | 1 + .../db/engine/memtable/VectorWritableMemChunk.java | 1 + .../apache/iotdb/db/metadata/path/PartialPath.java | 20 +++++++++++--------- .../db/engine/memtable/MemTableFlushTaskTest.java | 18 ++++++------------ .../iotdb/db/engine/memtable/MemTableTestUtils.java | 4 +--- .../db/engine/memtable/PrimitiveMemTableTest.java | 3 +-- .../iotdb/db/qp/physical/InsertRowPlanTest.java | 3 +-- 7 files changed, 22 insertions(+), 28 deletions(-) diff --git a/server/src/main/java/org/apache/iotdb/db/engine/memtable/IWritableMemChunk.java b/server/src/main/java/org/apache/iotdb/db/engine/memtable/IWritableMemChunk.java index 8aa8b45..62850ef 100644 --- a/server/src/main/java/org/apache/iotdb/db/engine/memtable/IWritableMemChunk.java +++ b/server/src/main/java/org/apache/iotdb/db/engine/memtable/IWritableMemChunk.java @@ -24,6 +24,7 @@ import org.apache.iotdb.tsfile.utils.Binary; import org.apache.iotdb.tsfile.utils.BitMap; import org.apache.iotdb.tsfile.write.chunk.IChunkWriter; import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema; + import java.util.List; public interface IWritableMemChunk { diff --git a/server/src/main/java/org/apache/iotdb/db/engine/memtable/VectorWritableMemChunk.java b/server/src/main/java/org/apache/iotdb/db/engine/memtable/VectorWritableMemChunk.java index 61f3d35..047f048 100644 --- a/server/src/main/java/org/apache/iotdb/db/engine/memtable/VectorWritableMemChunk.java +++ b/server/src/main/java/org/apache/iotdb/db/engine/memtable/VectorWritableMemChunk.java @@ -11,6 +11,7 @@ import org.apache.iotdb.tsfile.write.chunk.IChunkWriter; import org.apache.iotdb.tsfile.write.chunk.VectorChunkWriterImpl; import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema; import org.apache.iotdb.tsfile.write.schema.VectorMeasurementSchema; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/path/PartialPath.java b/server/src/main/java/org/apache/iotdb/db/metadata/path/PartialPath.java index ec7c89b..d7ff076 100644 --- a/server/src/main/java/org/apache/iotdb/db/metadata/path/PartialPath.java +++ b/server/src/main/java/org/apache/iotdb/db/metadata/path/PartialPath.java @@ -18,15 +18,6 @@ */ package org.apache.iotdb.db.metadata.path; -import static org.apache.iotdb.db.conf.IoTDBConstant.MULTI_LEVEL_PATH_WILDCARD; -import static org.apache.iotdb.db.conf.IoTDBConstant.ONE_LEVEL_PATH_WILDCARD; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.Set; -import java.util.regex.Pattern; import org.apache.iotdb.db.engine.querycontext.QueryDataSource; import org.apache.iotdb.db.engine.storagegroup.TsFileResource; import org.apache.iotdb.db.exception.metadata.IllegalPathException; @@ -41,9 +32,20 @@ import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; import org.apache.iotdb.tsfile.read.common.Path; import org.apache.iotdb.tsfile.read.filter.basic.Filter; import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Set; +import java.util.regex.Pattern; + +import static org.apache.iotdb.db.conf.IoTDBConstant.MULTI_LEVEL_PATH_WILDCARD; +import static org.apache.iotdb.db.conf.IoTDBConstant.ONE_LEVEL_PATH_WILDCARD; + /** * A prefix path, suffix path or fullPath generated from SQL. Usually used in the IoTDB server * module diff --git a/server/src/test/java/org/apache/iotdb/db/engine/memtable/MemTableFlushTaskTest.java b/server/src/test/java/org/apache/iotdb/db/engine/memtable/MemTableFlushTaskTest.java index cc158c9..af52254 100644 --- a/server/src/test/java/org/apache/iotdb/db/engine/memtable/MemTableFlushTaskTest.java +++ b/server/src/test/java/org/apache/iotdb/db/engine/memtable/MemTableFlushTaskTest.java @@ -111,21 +111,18 @@ public class MemTableFlushTaskTest { MemTableFlushTask memTableFlushTask = new MemTableFlushTask(memTable, writer, storageGroup); assertTrue( writer - .getVisibleMetadataList( - MemTableTestUtils.deviceId0, "sensor0", TSDataType.BOOLEAN) + .getVisibleMetadataList(MemTableTestUtils.deviceId0, "sensor0", TSDataType.BOOLEAN) .isEmpty()); memTableFlushTask.syncFlushMemTable(); writer.makeMetadataVisible(); assertEquals( 1, writer - .getVisibleMetadataList( - MemTableTestUtils.deviceId0, "sensor0", TSDataType.BOOLEAN) + .getVisibleMetadataList(MemTableTestUtils.deviceId0, "sensor0", TSDataType.BOOLEAN) .size()); ChunkMetadata chunkMetaData = writer - .getVisibleMetadataList( - MemTableTestUtils.deviceId0, "sensor0", TSDataType.BOOLEAN) + .getVisibleMetadataList(MemTableTestUtils.deviceId0, "sensor0", TSDataType.BOOLEAN) .get(0); assertEquals("sensor0", chunkMetaData.getMeasurementUid()); assertEquals(startTime, chunkMetaData.getStartTime()); @@ -141,21 +138,18 @@ public class MemTableFlushTaskTest { MemTableFlushTask memTableFlushTask = new MemTableFlushTask(memTable, writer, storageGroup); assertTrue( writer - .getVisibleMetadataList( - MemTableTestUtils.deviceId0, "sensor0", TSDataType.BOOLEAN) + .getVisibleMetadataList(MemTableTestUtils.deviceId0, "sensor0", TSDataType.BOOLEAN) .isEmpty()); memTableFlushTask.syncFlushMemTable(); writer.makeMetadataVisible(); assertEquals( 1, writer - .getVisibleMetadataList( - MemTableTestUtils.deviceId0, "sensor0", TSDataType.BOOLEAN) + .getVisibleMetadataList(MemTableTestUtils.deviceId0, "sensor0", TSDataType.BOOLEAN) .size()); ChunkMetadata chunkMetaData = writer - .getVisibleMetadataList( - MemTableTestUtils.deviceId0, "sensor0", TSDataType.BOOLEAN) + .getVisibleMetadataList(MemTableTestUtils.deviceId0, "sensor0", TSDataType.BOOLEAN) .get(0); assertEquals("sensor0", chunkMetaData.getMeasurementUid()); assertEquals(startTime, chunkMetaData.getStartTime()); 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 077b111..279531f 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 @@ -30,7 +30,6 @@ import org.apache.iotdb.tsfile.utils.BitMap; import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema; import org.apache.iotdb.tsfile.write.schema.Schema; import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema; -import org.apache.iotdb.tsfile.write.schema.VectorMeasurementSchema; import java.util.ArrayList; import java.util.List; @@ -98,8 +97,7 @@ public class MemTableTestUtils { mNodes[1] = MeasurementMNode.getMeasurementMNode(null, "sensor1", schema1, null); InsertTabletPlan insertTabletPlan = - new InsertTabletPlan( - new PartialPath(deviceId0), measurements, dataTypesList); + new InsertTabletPlan(new PartialPath(deviceId0), measurements, dataTypesList); insertTabletPlan.setAligned(true); 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 65a2847..07637bf 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 @@ -354,8 +354,7 @@ public class PrimitiveMemTableTest { mNodes[1] = MeasurementMNode.getMeasurementMNode(null, "sensor1", schema1, null); InsertTabletPlan insertTabletPlan = - new InsertTabletPlan( - new PartialPath(deviceId), measurements, dataTypesList); + new InsertTabletPlan(new PartialPath(deviceId), measurements, dataTypesList); long[] times = new long[100]; Object[] columns = new Object[2]; diff --git a/server/src/test/java/org/apache/iotdb/db/qp/physical/InsertRowPlanTest.java b/server/src/test/java/org/apache/iotdb/db/qp/physical/InsertRowPlanTest.java index d716200..ccb4d68 100644 --- a/server/src/test/java/org/apache/iotdb/db/qp/physical/InsertRowPlanTest.java +++ b/server/src/test/java/org/apache/iotdb/db/qp/physical/InsertRowPlanTest.java @@ -119,8 +119,7 @@ public class InsertRowPlanTest { PlanExecutor executor = new PlanExecutor(); executor.insert(vectorRowPlan); - Assert.assertEquals( - "[s1, s2, s3]", Arrays.toString(vectorRowPlan.getMeasurementMNodes())); + Assert.assertEquals("[s1, s2, s3]", Arrays.toString(vectorRowPlan.getMeasurementMNodes())); QueryPlan queryPlan = (QueryPlan) processor.parseSQLToPhysicalPlan("select * from root.isp.d1.vector");
