This is an automated email from the ASF dual-hosted git repository. jackietien pushed a commit to branch TriggerTest in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 63f8f5674903c5c435cbf7375c40251b96f700b4 Merge: 92cf3f94a5 09f3510ce8 Author: JackieTien97 <[email protected]> AuthorDate: Tue Sep 27 15:36:28 2022 +0800 Merge remote-tracking branch 'origin/master' into TriggerTest .../iotdb/db/it/schema/IoTDBSchemaTemplateIT.java | 56 +++++++++ .../commons/executable/ExecutableManager.java | 125 +++++++++++---------- .../iotdb/commons/partition/DataPartition.java | 21 ++-- .../apache/iotdb/commons/trigger/TriggerTable.java | 4 + .../db/metadata/mtree/MTreeBelowSGMemoryImpl.java | 16 +++ .../db/metadata/mtree/traverser/Traverser.java | 4 + .../schemaregion/SchemaRegionMemoryImpl.java | 10 +- .../db/mpp/plan/analyze/cache/PartitionCache.java | 18 +-- .../config/executor/ClusterConfigTaskExecutor.java | 2 - .../scheduler/FragmentInstanceDispatcherImpl.java | 3 +- .../impl/DataNodeInternalRPCServiceImpl.java | 16 ++- .../service/thrift/impl/DataNodeRegionManager.java | 2 + .../iotdb/db/trigger/executor/TriggerExecutor.java | 8 ++ .../trigger/service/TriggerManagementService.java | 29 ++++- .../java/org/apache/iotdb/rpc/TSStatusCode.java | 3 + 15 files changed, 226 insertions(+), 91 deletions(-) diff --cc server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeInternalRPCServiceImpl.java index 417935f7cf,9670882ea4..23e2b9bab9 --- a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeInternalRPCServiceImpl.java +++ b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeInternalRPCServiceImpl.java @@@ -963,23 -962,18 +963,31 @@@ public class DataNodeInternalRPCService return new TSStatus(TSStatusCode.SUCCESS_STATUS.getStatusCode()); } + @Override + public TSStatus inactiveTriggerInstance(TInactiveTriggerInstanceReq req) throws TException { + try { + TriggerManagementService.getInstance().inactiveTrigger(req.triggerName); + } catch (Exception e) { + LOGGER.error("Error occurred during "); + return new TSStatus(TSStatusCode.EXECUTE_STATEMENT_ERROR.getStatusCode()) + .setMessage(e.getMessage()); + } + + return new TSStatus(TSStatusCode.SUCCESS_STATUS.getStatusCode()); + } + @Override public TSStatus dropTriggerInstance(TDropTriggerInstanceReq req) throws TException { - // todo: implementation + try { + TriggerManagementService.getInstance().dropTrigger(req.triggerName, req.needToDeleteJarFile); + } catch (Exception e) { + LOGGER.error( + "Error occurred during drop trigger instance for trigger: {}. The cause is {}.", + req.triggerName, + e); + return new TSStatus(TSStatusCode.DROP_TRIGGER_INSTANCE_ERROR.getStatusCode()) + .setMessage(e.getMessage()); + } return new TSStatus(TSStatusCode.SUCCESS_STATUS.getStatusCode()); }
