This is an automated email from the ASF dual-hosted git repository. haonan pushed a commit to branch insertValidate in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit aca688baab77e763444bcc71985ae4176fb8ccb4 Author: HTHou <[email protected]> AuthorDate: Tue Jun 14 16:55:34 2022 +0800 [IOTDB-3485] Insert with wrong type didn't return error massage --- .../apache/iotdb/db/it/aligned/IoTDBInsertAlignedValuesIT.java | 9 ++------- .../java/org/apache/iotdb/db/engine/storagegroup/DataRegion.java | 1 - .../db/mpp/plan/scheduler/FragmentInstanceDispatcherImpl.java | 3 ++- .../apache/iotdb/db/service/thrift/impl/InternalServiceImpl.java | 6 ++++-- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBInsertAlignedValuesIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBInsertAlignedValuesIT.java index 11d0d1b646..3840230cb5 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBInsertAlignedValuesIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBInsertAlignedValuesIT.java @@ -240,19 +240,14 @@ public class IoTDBInsertAlignedValuesIT { } } - // TODO remove Ignore annotation while fixing this bug - @Ignore - @Test - public void testInsertWithWrongType() { + @Test(expected = Exception.class) + public void testInsertWithWrongType() throws SQLException { try (Connection connection = EnvFactory.getEnv().getConnection(); Statement statement = connection.createStatement()) { statement.execute( "CREATE ALIGNED TIMESERIES root.lz.dev.GPS(latitude INT32 encoding=PLAIN compressor=SNAPPY, longitude INT32 encoding=PLAIN compressor=SNAPPY) "); statement.execute( "insert into root.lz.dev.GPS(time,latitude,longitude) aligned values(1,1.3,6.7)"); - fail(); - } catch (SQLException e) { - assertEquals(313, e.getErrorCode()); } } diff --git a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/DataRegion.java b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/DataRegion.java index 2d5a4a8e16..4ce9ab0064 100755 --- a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/DataRegion.java +++ b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/DataRegion.java @@ -65,7 +65,6 @@ import org.apache.iotdb.db.metadata.idtable.IDTable; import org.apache.iotdb.db.metadata.idtable.IDTableManager; import org.apache.iotdb.db.metadata.mnode.IMeasurementMNode; import org.apache.iotdb.db.mpp.plan.planner.plan.node.write.InsertMultiTabletsNode; -import org.apache.iotdb.db.mpp.plan.planner.plan.node.write.InsertNode; import org.apache.iotdb.db.mpp.plan.planner.plan.node.write.InsertRowNode; import org.apache.iotdb.db.mpp.plan.planner.plan.node.write.InsertRowsNode; import org.apache.iotdb.db.mpp.plan.planner.plan.node.write.InsertRowsOfOneDeviceNode; diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/FragmentInstanceDispatcherImpl.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/FragmentInstanceDispatcherImpl.java index 4ac3e83aa8..f994366f3f 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/FragmentInstanceDispatcherImpl.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/FragmentInstanceDispatcherImpl.java @@ -223,7 +223,8 @@ public class FragmentInstanceDispatcherImpl implements IFragInstanceDispatcher { } else { writeResponse = SchemaRegionConsensusImpl.getInstance().write(groupId, planNode); } - return !hasFailedMeasurement && TSStatusCode.SUCCESS_STATUS.getStatusCode() == writeResponse.getStatus().getCode(); + return !hasFailedMeasurement + && TSStatusCode.SUCCESS_STATUS.getStatusCode() == writeResponse.getStatus().getCode(); } throw new UnsupportedOperationException( String.format("unknown query type [%s]", instance.getType())); diff --git a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/InternalServiceImpl.java b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/InternalServiceImpl.java index 7c5999addc..17efadbf68 100644 --- a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/InternalServiceImpl.java +++ b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/InternalServiceImpl.java @@ -169,8 +169,10 @@ public class InternalServiceImpl implements InternalService.Iface { } // TODO need consider more status if (writeResponse.getStatus() != null) { - response.setAccepted(!hasFailedMeasurement && - TSStatusCode.SUCCESS_STATUS.getStatusCode() == writeResponse.getStatus().getCode()); + response.setAccepted( + !hasFailedMeasurement + && TSStatusCode.SUCCESS_STATUS.getStatusCode() + == writeResponse.getStatus().getCode()); response.setMessage(writeResponse.getStatus().message); } else { LOGGER.error(
