This is an automated email from the ASF dual-hosted git repository. haonan pushed a commit to branch IOTDB-3337 in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 6f2c3bfa575cc50fa9c04b9af173f455cd8cba5c Merge: fae9e89e08 48256e44f3 Author: HTHou <[email protected]> AuthorDate: Tue May 31 13:22:40 2022 +0800 [IOTDB-3337] return error which insert wrong type of data .../confignode/client/AsyncDataNodeClientPool.java | 19 +++- ...Handler.java => FunctionManagementHandler.java} | 6 +- .../consensus/request/ConfigRequest.java | 4 + .../consensus/request/ConfigRequestType.java | 1 + .../consensus/request/write/DropFunctionReq.java | 56 ++++++++++ .../iotdb/confignode/manager/ConfigManager.java | 8 ++ .../apache/iotdb/confignode/manager/Manager.java | 2 + .../iotdb/confignode/manager/UDFManager.java | 59 +++++++++-- .../iotdb/confignode/persistence/UDFInfo.java | 25 ++++- .../executor/ConfigRequestExecutor.java | 3 + .../thrift/ConfigNodeRPCServiceProcessor.java | 6 ++ .../db/integration/sync/IoTDBSyncReceiverIT.java | 5 +- .../apache/iotdb/commons/conf/IoTDBConstant.java | 1 - .../service/AbstractThriftServiceThread.java | 38 +------ .../udf/service/UDFRegistrationService.java | 8 +- .../apache/iotdb/db/client/ConfigNodeClient.java | 17 ++++ .../apache/iotdb/db/engine/StorageEngineV2.java | 11 +- .../iotdb/db/engine/memtable/AbstractMemTable.java | 7 +- .../iotdb/db/engine/storagegroup/DataRegion.java | 5 +- .../db/engine/storagegroup/TsFileProcessor.java | 2 +- .../SmoothQueueSlidingWindowAggregator.java | 1 + .../iotdb/db/mpp/common/header/HeaderConstant.java | 4 +- .../execution/operator/process/FilterOperator.java | 80 +++++++-------- .../operator/process/LinearFillOperator.java | 3 +- .../operator/process/TransformOperator.java | 70 +++++++------ .../operator/process/UpdateLastCacheOperator.java | 5 + .../operator/process/merge/SingleColumnMerger.java | 4 +- .../plan/execution/config/ConfigTaskVisitor.java | 7 ++ .../plan/execution/config/DropFunctionTask.java | 99 ++++++++++++++++++ .../execution/config/ShowStorageGroupTask.java | 7 +- .../db/mpp/plan/execution/config/ShowTTLTask.java | 5 +- .../iotdb/db/mpp/plan/parser/ASTVisitor.java | 8 ++ .../db/mpp/plan/planner/LocalExecutionPlanner.java | 6 +- .../db/mpp/plan/statement/StatementVisitor.java | 5 + .../db/mpp/plan/statement/crud/QueryStatement.java | 4 + .../statement/metadata/DropFunctionStatement.java | 60 +++++++++++ .../query/reader/chunk/MemAlignedPageReader.java | 10 +- .../java/org/apache/iotdb/db/service/DataNode.java | 9 +- .../java/org/apache/iotdb/db/service/IoTDB.java | 9 +- .../thrift/impl/DataNodeTSIServiceImpl.java | 24 ++--- .../service/thrift/impl/InternalServiceImpl.java | 12 +++ .../db/sync/sender/service/TransportHandler.java | 5 +- .../db/sync/transport/client/TransportClient.java | 21 ++-- .../db/tools/validate/TsFileValidationTool.java | 13 ++- .../java/org/apache/iotdb/db/wal/WALManager.java | 15 ++- .../allocation/AbstractNodeAllocationStrategy.java | 9 ++ .../db/wal/allocation/FirstCreateStrategy.java | 4 +- .../iotdb/db/wal/buffer/AbstractWALBuffer.java | 4 +- .../org/apache/iotdb/db/wal/buffer/WALBuffer.java | 7 +- .../iotdb/db/wal/checkpoint/CheckpointManager.java | 40 +++++--- .../iotdb/db/wal/checkpoint/MemTableInfo.java | 1 - .../apache/iotdb/db/wal/io/CheckpointReader.java | 22 ++-- .../java/org/apache/iotdb/db/wal/node/WALNode.java | 7 +- .../db/wal/recover/CheckpointRecoverUtils.java | 32 +++++- .../iotdb/db/wal/recover/WALNodeRecoverTask.java | 34 ++++++- .../iotdb/db/wal/utils/CheckpointFileUtils.java | 3 +- .../apache/iotdb/db/wal/utils/WALFileUtils.java | 30 +++--- .../iotdb/db/engine/StorageEngineV2Test.java | 71 +++++++++++++ .../execution/operator/LinearFillOperatorTest.java | 113 ++++++++++++++++++++- .../db/sync/transport/TransportServiceTest.java | 8 +- .../db/wal/allocation/FirstCreateStrategyTest.java | 2 +- .../db/wal/checkpoint/CheckpointManagerTest.java | 6 +- .../apache/iotdb/db/wal/io/CheckpointFileTest.java | 12 ++- .../iotdb/db/wal/node/ConsensusReqReaderTest.java | 14 +-- .../org/apache/iotdb/db/wal/node/WALNodeTest.java | 2 +- .../src/main/thrift/confignode.thrift | 8 +- thrift/src/main/thrift/mpp.thrift | 11 ++ .../iotdb/tsfile/read/common/block/TsBlock.java | 3 +- 68 files changed, 927 insertions(+), 285 deletions(-) diff --cc server/src/main/java/org/apache/iotdb/db/engine/StorageEngineV2.java index a67248bc93,dfe4824466..a3fc388024 --- a/server/src/main/java/org/apache/iotdb/db/engine/StorageEngineV2.java +++ b/server/src/main/java/org/apache/iotdb/db/engine/StorageEngineV2.java @@@ -521,8 -520,8 +520,8 @@@ public class StorageEngineV2 implement /** insert an InsertTabletNode to a storage group */ // TODO:(New insert) - public void insertTablet(ConsensusGroupId dataRegionId, InsertTabletNode insertTabletNode) + public void insertTablet(DataRegionId dataRegionId, InsertTabletNode insertTabletNode) - throws StorageEngineException, BatchProcessException { + throws StorageEngineException, BatchProcessException, WriteProcessException { if (enableMemControl) { try { blockInsertionIfReject(null);
