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 92cf3f94a50fd339314fb7450b86e200c35a8d82 Merge: b4c37fdeb4 b8e3e13f88 Author: JackieTien97 <[email protected]> AuthorDate: Tue Sep 27 10:04:32 2022 +0800 Resolve conflicts .../consensus/request/ConfigPhysicalPlan.java | 4 ++ .../consensus/request/ConfigPhysicalPlanType.java | 1 + .../request/read/GetTriggerTablePlan.java | 42 +++++++++++++ .../consensus/response/TriggerTableResp.java | 70 ++++++++++++++++++++++ .../iotdb/confignode/manager/ConfigManager.java | 9 +++ .../apache/iotdb/confignode/manager/IManager.java | 4 ++ .../iotdb/confignode/manager/TriggerManager.java | 18 ++++++ .../iotdb/confignode/manager/node/NodeManager.java | 2 +- .../iotdb/confignode/persistence/TriggerInfo.java | 7 +++ .../persistence/executor/ConfigPlanExecutor.java | 2 + .../thrift/ConfigNodeRPCServiceProcessor.java | 4 +- .../config/executor/ClusterConfigTaskExecutor.java | 6 +- .../config/metadata/ShowTriggersTask.java | 10 ++-- .../src/main/thrift/confignode.thrift | 2 +- 14 files changed, 169 insertions(+), 12 deletions(-) diff --cc confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java index 97aefa9cb2,62cbb2f2e1..213bfcb7a6 --- a/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java +++ b/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java @@@ -90,9 -87,8 +90,10 @@@ import org.apache.iotdb.confignode.rpc. import org.apache.iotdb.confignode.rpc.thrift.TDropTriggerReq; import org.apache.iotdb.confignode.rpc.thrift.TGetAllTemplatesResp; import org.apache.iotdb.confignode.rpc.thrift.TGetPathsSetTemplatesResp; +import org.apache.iotdb.confignode.rpc.thrift.TGetPipeSinkReq; +import org.apache.iotdb.confignode.rpc.thrift.TGetPipeSinkResp; import org.apache.iotdb.confignode.rpc.thrift.TGetTemplateResp; + import org.apache.iotdb.confignode.rpc.thrift.TGetTriggerTableResp; import org.apache.iotdb.confignode.rpc.thrift.TPermissionInfoResp; import org.apache.iotdb.confignode.rpc.thrift.TRegionMigrateResultReportReq; import org.apache.iotdb.confignode.rpc.thrift.TRegionRouteMapResp; diff --cc confignode/src/main/java/org/apache/iotdb/confignode/manager/IManager.java index 1f4c7fc55e,ab979eea82..64519e0770 --- a/confignode/src/main/java/org/apache/iotdb/confignode/manager/IManager.java +++ b/confignode/src/main/java/org/apache/iotdb/confignode/manager/IManager.java @@@ -51,9 -49,8 +51,10 @@@ import org.apache.iotdb.confignode.rpc. import org.apache.iotdb.confignode.rpc.thrift.TDropTriggerReq; import org.apache.iotdb.confignode.rpc.thrift.TGetAllTemplatesResp; import org.apache.iotdb.confignode.rpc.thrift.TGetPathsSetTemplatesResp; +import org.apache.iotdb.confignode.rpc.thrift.TGetPipeSinkReq; +import org.apache.iotdb.confignode.rpc.thrift.TGetPipeSinkResp; import org.apache.iotdb.confignode.rpc.thrift.TGetTemplateResp; + import org.apache.iotdb.confignode.rpc.thrift.TGetTriggerTableResp; import org.apache.iotdb.confignode.rpc.thrift.TPermissionInfoResp; import org.apache.iotdb.confignode.rpc.thrift.TRegionMigrateResultReportReq; import org.apache.iotdb.confignode.rpc.thrift.TRegionRouteMapResp; diff --cc confignode/src/main/java/org/apache/iotdb/confignode/persistence/executor/ConfigPlanExecutor.java index b39653c310,b465e66b8d..4fc66d6a81 --- a/confignode/src/main/java/org/apache/iotdb/confignode/persistence/executor/ConfigPlanExecutor.java +++ b/confignode/src/main/java/org/apache/iotdb/confignode/persistence/executor/ConfigPlanExecutor.java @@@ -168,8 -161,8 +168,10 @@@ public class ConfigPlanExecutor return clusterSchemaInfo.getPathsSetTemplate((GetPathsSetTemplatePlan) req); case GetAllTemplateSetInfo: return clusterSchemaInfo.getAllTemplateSetInfo(); + case GetPipeSink: + return syncInfo.getPipeSink((GetPipeSinkPlan) req); + case GetTriggerTable: + return triggerInfo.getTriggerTable(); default: throw new UnknownPhysicalPlanTypeException(req.getType()); } diff --cc server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/executor/ClusterConfigTaskExecutor.java index d9352cde0f,ce94ce21d5..bd03d34e86 --- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/executor/ClusterConfigTaskExecutor.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/executor/ClusterConfigTaskExecutor.java @@@ -30,7 -30,8 +30,6 @@@ import org.apache.iotdb.commons.executa import org.apache.iotdb.commons.executable.ExecutableResource; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.path.PathPatternTree; - import org.apache.iotdb.commons.trigger.TriggerTable; -import org.apache.iotdb.commons.trigger.service.TriggerClassLoader; -import org.apache.iotdb.commons.trigger.service.TriggerClassLoaderManager; import org.apache.iotdb.commons.trigger.service.TriggerExecutableManager; import org.apache.iotdb.confignode.rpc.thrift.TCountStorageGroupResp; import org.apache.iotdb.confignode.rpc.thrift.TCreateFunctionReq;
