This is an automated email from the ASF dual-hosted git repository. haonan pushed a commit to branch forward_schema_validate in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit c501c0b99e7d49028a48be926abf6656ecab35e5 Author: HTHou <[email protected]> AuthorDate: Fri May 5 16:35:45 2023 +0800 clean code --- .../db/mpp/plan/planner/LogicalPlanVisitor.java | 69 +++++++++++++--------- .../plan/node/write/InsertMultiTabletsNode.java | 4 -- .../plan/planner/plan/node/write/InsertNode.java | 11 +--- .../planner/plan/node/write/InsertRowNode.java | 15 +---- .../planner/plan/node/write/InsertRowsNode.java | 5 -- .../plan/node/write/InsertRowsOfOneDeviceNode.java | 3 - .../planner/plan/node/write/InsertTabletNode.java | 3 +- .../file/UnsealedTsFileRecoverPerformerTest.java | 4 +- 8 files changed, 45 insertions(+), 69 deletions(-) diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/LogicalPlanVisitor.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/LogicalPlanVisitor.java index bc6065d039c..770db516dd2 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/LogicalPlanVisitor.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/LogicalPlanVisitor.java @@ -441,32 +441,38 @@ public class LogicalPlanVisitor extends StatementVisitor<PlanNode, MPPQueryConte public PlanNode visitInsertTablet( InsertTabletStatement insertTabletStatement, MPPQueryContext context) { // convert insert statement to insert node - return new InsertTabletNode( - context.getQueryId().genPlanNodeId(), - insertTabletStatement.getDevicePath(), - insertTabletStatement.isAligned(), - insertTabletStatement.getMeasurements(), - insertTabletStatement.getDataTypes(), - insertTabletStatement.getMeasurementSchemas(), - insertTabletStatement.getTimes(), - insertTabletStatement.getBitMaps(), - insertTabletStatement.getColumns(), - insertTabletStatement.getRowCount()); + InsertTabletNode insertNode = + new InsertTabletNode( + context.getQueryId().genPlanNodeId(), + insertTabletStatement.getDevicePath(), + insertTabletStatement.isAligned(), + insertTabletStatement.getMeasurements(), + insertTabletStatement.getDataTypes(), + insertTabletStatement.getMeasurementSchemas(), + insertTabletStatement.getTimes(), + insertTabletStatement.getBitMaps(), + insertTabletStatement.getColumns(), + insertTabletStatement.getRowCount()); + insertNode.setFailedMeasurementNumber(insertTabletStatement.getFailedMeasurementNumber()); + return insertNode; } @Override public PlanNode visitInsertRow(InsertRowStatement insertRowStatement, MPPQueryContext context) { // convert insert statement to insert node - return new InsertRowNode( - context.getQueryId().genPlanNodeId(), - insertRowStatement.getDevicePath(), - insertRowStatement.isAligned(), - insertRowStatement.getMeasurements(), - insertRowStatement.getDataTypes(), - insertRowStatement.getMeasurementSchemas(), - insertRowStatement.getTime(), - insertRowStatement.getValues(), - insertRowStatement.isNeedInferType()); + InsertRowNode insertNode = + new InsertRowNode( + context.getQueryId().genPlanNodeId(), + insertRowStatement.getDevicePath(), + insertRowStatement.isAligned(), + insertRowStatement.getMeasurements(), + insertRowStatement.getDataTypes(), + insertRowStatement.getMeasurementSchemas(), + insertRowStatement.getTime(), + insertRowStatement.getValues(), + insertRowStatement.isNeedInferType()); + insertNode.setFailedMeasurementNumber(insertRowStatement.getFailedMeasurementNumber()); + return insertNode; } @Override @@ -632,7 +638,7 @@ public class LogicalPlanVisitor extends StatementVisitor<PlanNode, MPPQueryConte for (int i = 0; i < insertRowsStatement.getInsertRowStatementList().size(); i++) { InsertRowStatement insertRowStatement = insertRowsStatement.getInsertRowStatementList().get(i); - insertRowsNode.addOneInsertRowNode( + InsertRowNode insertRowNode = new InsertRowNode( insertRowsNode.getPlanNodeId(), insertRowStatement.getDevicePath(), @@ -642,8 +648,9 @@ public class LogicalPlanVisitor extends StatementVisitor<PlanNode, MPPQueryConte insertRowStatement.getMeasurementSchemas(), insertRowStatement.getTime(), insertRowStatement.getValues(), - insertRowStatement.isNeedInferType()), - i); + insertRowStatement.isNeedInferType()); + insertRowNode.setFailedMeasurementNumber(insertRowStatement.getFailedMeasurementNumber()); + insertRowsNode.addOneInsertRowNode(insertRowNode, i); } return insertRowsNode; } @@ -657,7 +664,7 @@ public class LogicalPlanVisitor extends StatementVisitor<PlanNode, MPPQueryConte for (int i = 0; i < insertMultiTabletsStatement.getInsertTabletStatementList().size(); i++) { InsertTabletStatement insertTabletStatement = insertMultiTabletsStatement.getInsertTabletStatementList().get(i); - insertMultiTabletsNode.addInsertTabletNode( + InsertTabletNode insertTabletNode = new InsertTabletNode( insertMultiTabletsNode.getPlanNodeId(), insertTabletStatement.getDevicePath(), @@ -668,8 +675,10 @@ public class LogicalPlanVisitor extends StatementVisitor<PlanNode, MPPQueryConte insertTabletStatement.getTimes(), insertTabletStatement.getBitMaps(), insertTabletStatement.getColumns(), - insertTabletStatement.getRowCount()), - i); + insertTabletStatement.getRowCount()); + insertTabletNode.setFailedMeasurementNumber( + insertTabletStatement.getFailedMeasurementNumber()); + insertMultiTabletsNode.addInsertTabletNode(insertTabletNode, i); } return insertMultiTabletsNode; } @@ -686,7 +695,7 @@ public class LogicalPlanVisitor extends StatementVisitor<PlanNode, MPPQueryConte for (int i = 0; i < insertRowsOfOneDeviceStatement.getInsertRowStatementList().size(); i++) { InsertRowStatement insertRowStatement = insertRowsOfOneDeviceStatement.getInsertRowStatementList().get(i); - insertRowNodeList.add( + InsertRowNode insertRowNode = new InsertRowNode( insertRowsOfOneDeviceNode.getPlanNodeId(), insertRowStatement.getDevicePath(), @@ -696,7 +705,9 @@ public class LogicalPlanVisitor extends StatementVisitor<PlanNode, MPPQueryConte insertRowStatement.getMeasurementSchemas(), insertRowStatement.getTime(), insertRowStatement.getValues(), - insertRowStatement.isNeedInferType())); + insertRowStatement.isNeedInferType()); + insertRowNode.setFailedMeasurementNumber(insertRowStatement.getFailedMeasurementNumber()); + insertRowNodeList.add(insertRowNode); insertRowNodeIndexList.add(i); } diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/write/InsertMultiTabletsNode.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/write/InsertMultiTabletsNode.java index a60e0c4cd19..5a4e198b77c 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/write/InsertMultiTabletsNode.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/write/InsertMultiTabletsNode.java @@ -22,14 +22,12 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.utils.StatusUtils; import org.apache.iotdb.db.mpp.plan.analyze.Analysis; -import org.apache.iotdb.db.mpp.plan.analyze.schema.ISchemaValidation; import org.apache.iotdb.db.mpp.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.mpp.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.mpp.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.mpp.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.mpp.plan.planner.plan.node.WritePlanNode; import org.apache.iotdb.tsfile.exception.NotImplementedException; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils; import java.io.DataOutputStream; @@ -40,7 +38,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.stream.Collectors; public class InsertMultiTabletsNode extends InsertNode { @@ -266,5 +263,4 @@ public class InsertMultiTabletsNode extends InsertNode { public long getMinTime() { throw new NotImplementedException(); } - } diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/write/InsertNode.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/write/InsertNode.java index 8eaf854cd72..f5e8e3c7ae0 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/write/InsertNode.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/write/InsertNode.java @@ -236,7 +236,7 @@ public abstract class InsertNode extends WritePlanNode { // region partial insert @TestOnly - public void markFailedMeasurement(int index, Exception cause) { + public void markFailedMeasurement(int index) { throw new UnsupportedOperationException(); } @@ -249,15 +249,6 @@ public abstract class InsertNode extends WritePlanNode { return false; } - public boolean hasFailedMeasurements() { - for (Object o : measurements) { - if (o == null) { - failedMeasurementNumber++; - } - } - return failedMeasurementNumber != 0; - } - public void setFailedMeasurementNumber(int failedMeasurementNumber) { this.failedMeasurementNumber = failedMeasurementNumber; } diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/write/InsertRowNode.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/write/InsertRowNode.java index 5b0472d6504..63a6b47539e 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/write/InsertRowNode.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/write/InsertRowNode.java @@ -19,34 +19,22 @@ package org.apache.iotdb.db.mpp.plan.planner.plan.node.write; import org.apache.iotdb.common.rpc.thrift.TTimePartitionSlot; -import org.apache.iotdb.commons.conf.IoTDBConstant; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.utils.TestOnly; -import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.exception.metadata.AlignedTimeseriesException; -import org.apache.iotdb.db.exception.metadata.DataTypeMismatchException; -import org.apache.iotdb.db.exception.metadata.PathNotExistException; -import org.apache.iotdb.db.exception.query.QueryProcessException; -import org.apache.iotdb.db.exception.sql.SemanticException; -import org.apache.iotdb.db.mpp.common.schematree.IMeasurementSchemaInfo; import org.apache.iotdb.db.mpp.plan.analyze.Analysis; -import org.apache.iotdb.db.mpp.plan.analyze.schema.ISchemaValidation; import org.apache.iotdb.db.mpp.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.mpp.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.mpp.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.mpp.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.mpp.plan.planner.plan.node.WritePlanNode; -import org.apache.iotdb.db.utils.CommonUtils; import org.apache.iotdb.db.utils.TimePartitionUtils; import org.apache.iotdb.db.utils.TypeInferenceUtils; import org.apache.iotdb.db.wal.buffer.IWALByteBufferView; import org.apache.iotdb.db.wal.buffer.WALEntryValue; import org.apache.iotdb.db.wal.utils.WALWriteUtils; import org.apache.iotdb.tsfile.exception.NotImplementedException; -import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; import org.apache.iotdb.tsfile.read.TimeValuePair; import org.apache.iotdb.tsfile.utils.Binary; import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils; @@ -62,7 +50,6 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.util.Arrays; import java.util.Collections; -import java.util.HashMap; import java.util.List; import java.util.Objects; @@ -204,7 +191,7 @@ public class InsertRowNode extends InsertNode implements WALEntryValue { } @Override - public void markFailedMeasurement(int index, Exception cause) { + public void markFailedMeasurement(int index) { if (measurements[index] == null) { return; } diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/write/InsertRowsNode.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/write/InsertRowsNode.java index c043e5991b9..050839f6428 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/write/InsertRowsNode.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/write/InsertRowsNode.java @@ -22,9 +22,7 @@ import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.utils.StatusUtils; -import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.mpp.plan.analyze.Analysis; -import org.apache.iotdb.db.mpp.plan.analyze.schema.ISchemaValidation; import org.apache.iotdb.db.mpp.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.mpp.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.mpp.plan.planner.plan.node.PlanNodeType; @@ -32,7 +30,6 @@ import org.apache.iotdb.db.mpp.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.mpp.plan.planner.plan.node.WritePlanNode; import org.apache.iotdb.db.utils.TimePartitionUtils; import org.apache.iotdb.tsfile.exception.NotImplementedException; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils; import java.io.DataOutputStream; @@ -43,7 +40,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.stream.Collectors; public class InsertRowsNode extends InsertNode { @@ -244,5 +240,4 @@ public class InsertRowsNode extends InsertNode { public long getMinTime() { throw new NotImplementedException(); } - } diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/write/InsertRowsOfOneDeviceNode.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/write/InsertRowsOfOneDeviceNode.java index 4f101942688..dd788ea4db0 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/write/InsertRowsOfOneDeviceNode.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/write/InsertRowsOfOneDeviceNode.java @@ -23,9 +23,7 @@ import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.utils.StatusUtils; -import org.apache.iotdb.db.exception.query.QueryProcessException; import org.apache.iotdb.db.mpp.plan.analyze.Analysis; -import org.apache.iotdb.db.mpp.plan.analyze.schema.ISchemaValidation; import org.apache.iotdb.db.mpp.plan.planner.plan.node.PlanNode; import org.apache.iotdb.db.mpp.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.mpp.plan.planner.plan.node.PlanNodeType; @@ -47,7 +45,6 @@ import java.util.List; import java.util.Map; import java.util.Objects; import java.util.Set; -import java.util.stream.Collectors; public class InsertRowsOfOneDeviceNode extends InsertNode { 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 b60f4ffb6a3..bbfd5052edf 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 @@ -29,7 +29,6 @@ import org.apache.iotdb.db.mpp.plan.planner.plan.node.PlanNodeId; import org.apache.iotdb.db.mpp.plan.planner.plan.node.PlanNodeType; import org.apache.iotdb.db.mpp.plan.planner.plan.node.PlanVisitor; import org.apache.iotdb.db.mpp.plan.planner.plan.node.WritePlanNode; -import org.apache.iotdb.db.utils.CommonUtils; import org.apache.iotdb.db.utils.QueryDataSetUtils; import org.apache.iotdb.db.utils.TimePartitionUtils; import org.apache.iotdb.db.wal.buffer.IWALByteBufferView; @@ -335,7 +334,7 @@ public class InsertTabletNode extends InsertNode implements WALEntryValue { } @Override - public void markFailedMeasurement(int index, Exception cause) { + public void markFailedMeasurement(int index) { if (measurements[index] == null) { return; } 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 16d00c67dc3..95875118cf8 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 @@ -286,7 +286,7 @@ public class UnsealedTsFileRecoverPerformerTest { time, new Integer[] {1}, false); - insertRowNode.markFailedMeasurement(0, new Exception()); + insertRowNode.markFailedMeasurement(0); // generate InsertTabletNode with null time = 5; @@ -302,7 +302,7 @@ public class UnsealedTsFileRecoverPerformerTest { null, new Integer[] {1}, 1); - insertTabletNode.markFailedMeasurement(0, new Exception()); + insertTabletNode.markFailedMeasurement(0); int fakeMemTableId = 1; WALEntry walEntry1 = new WALInfoEntry(fakeMemTableId++, insertRowNode);
