You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2022/10/22 06:07:59 UTC
[iotdb] branch 1c1d_dockertest updated (d41f2f020a -> 3339bc24b8)
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a change to branch 1c1d_dockertest
in repository https://gitbox.apache.org/repos/asf/iotdb.git
from d41f2f020a test
add 40571eb259 [IOTDB-4698]Implement interface of getLocationOfStatefulTrigger (#7663)
add d0d2ec30a8 Disable StandaloneMppIT (#7667)
add 66e01dfcfc [IOTDB-4699] Override peer's equals and hashcode
add a12f45e42e [IOTDB-4669] Scheduled task for checking trigger-table of DataNode (#7660)
add 8303f187b6 [IOTDB-4694] Make sure memTable snapshot is made before flush operation (#7662)
add e489286abe [github-7180] refactor seriesNumberMonitor and additional properties, cherry pick from rel/0.13 (#7661)
add 895ab3bc8c [IOTDB-4532] Add ITs for Trigger Management (#7671)
add d89fbfaa48 [IOTDB-4535] Chinese vesion of Trigger user doc (#7680)
add 63768fb039 Grafana plugin Modify pluginId and readme files (#7679)
add 22c07901f7 Disable the IT of the original standalone architecture (#7681)
add 3cfa037755 update website about release-0.13.3 (#7686)
add 0396163fcf [IOTDB-4685] Refactor ConfigNode Consensus heartbeat statistics (#7642)
add e6fb0a51d9 [IOTDB-4705] English version of Trigger user doc (#7688)
add aabb052dca [IOTDB-4711] Bind DataNodeInternalService to correct address (#7683)
add 30bf896095 [IOTDB-4706] Call Trigger.restore() when recovering trigger instances
add 81237589e8 New distribution package structure (#7672)
new eea53813c3 Merge branch 'master' of https://github.com/apache/iotdb into 1c1d_dockertest
new 3339bc24b8 update
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/main-unix.yml | 2 +-
.github/workflows/main-win.yml | 2 +-
.github/workflows/standalone-it-for-mpp.yml | 160 ++-
confignode/src/assembly/confignode.xml | 10 +-
.../resources/conf/iotdb-confignode.properties | 12 +-
.../conf/{logback.xml => logback-confignode.xml} | 20 +-
.../assembly/resources/sbin/remove-confignode.bat | 2 +-
.../assembly/resources/sbin/remove-confignode.sh | 2 +-
.../assembly/resources/sbin/start-confignode.bat | 2 +-
.../assembly/resources/sbin/start-confignode.sh | 2 +-
.../heartbeat/DataNodeHeartbeatHandler.java | 34 +-
.../iotdb/confignode/conf/ConfigNodeConstant.java | 4 +-
.../consensus/request/ConfigPhysicalPlan.java | 22 +-
.../consensus/request/ConfigPhysicalPlanType.java | 4 +-
.../GetTriggerLocationPlan.java} | 18 +-
.../write/{ => datanode}/RegisterDataNodePlan.java | 20 +-
.../write/{ => datanode}/RemoveDataNodePlan.java | 27 +-
.../write/{ => function}/CreateFunctionPlan.java | 2 +-
.../write/{ => function}/DropFunctionPlan.java | 2 +-
.../{ => partition}/UpdateRegionLocationPlan.java | 2 +-
.../write/{ => procedure}/DeleteProcedurePlan.java | 2 +-
.../write/{ => procedure}/UpdateProcedurePlan.java | 2 +-
.../write/region/OfferRegionMaintainTasksPlan.java | 2 +-
.../write/statistics/UpdateLoadStatisticsPlan.java | 125 +++
...ssionInfoResp.java => TriggerLocationResp.java} | 31 +-
.../statemachine/PartitionRegionStateMachine.java | 1 +
.../iotdb/confignode/manager/ConfigManager.java | 15 +-
.../apache/iotdb/confignode/manager/IManager.java | 8 +-
.../iotdb/confignode/manager/ProcedureManager.java | 2 +-
.../iotdb/confignode/manager/TriggerManager.java | 16 +-
.../iotdb/confignode/manager/UDFManager.java | 4 +-
.../iotdb/confignode/manager/load/LoadManager.java | 106 +-
.../manager/load/balancer/router/LeaderRouter.java | 11 +-
.../balancer/router/LoadScoreGreedyRouter.java | 11 +-
.../confignode/manager/node/BaseNodeCache.java | 48 +-
.../manager/node/ConfigNodeHeartbeatCache.java | 49 +-
.../manager/node/DataNodeHeartbeatCache.java | 44 +-
.../iotdb/confignode/manager/node/NodeManager.java | 67 +-
.../manager/partition/PartitionManager.java | 51 +-
.../confignode/manager/partition/RegionCache.java | 35 +-
.../manager/partition/RegionGroupCache.java | 114 +-
.../manager/partition/RegionHeartbeatSample.java | 12 +-
.../confignode/persistence/ProcedureInfo.java | 4 +-
.../iotdb/confignode/persistence/TriggerInfo.java | 17 +
.../iotdb/confignode/persistence/UDFInfo.java | 4 +-
.../persistence/executor/ConfigPlanExecutor.java | 26 +-
.../persistence/metric/NodeInfoMetrics.java | 2 +-
.../persistence/{ => node}/NodeInfo.java | 148 +--
.../persistence/node/NodeStatistics.java | 134 +++
.../persistence/partition/PartitionInfo.java | 65 +-
.../persistence/partition/RegionGroup.java | 3 +
.../partition/StorageGroupPartitionTable.java | 2 +-
.../{ => maintainer}/RegionCreateTask.java | 2 +-
.../{ => maintainer}/RegionDeleteTask.java | 2 +-
.../{ => maintainer}/RegionMaintainTask.java | 2 +-
.../{ => maintainer}/RegionMaintainType.java | 2 +-
.../statistics/RegionGroupStatistics.java | 145 +++
.../partition/statistics/RegionStatistics.java | 111 ++
.../procedure/env/ConfigNodeProcedureEnv.java | 6 +-
.../procedure/env/DataNodeRemoveHandler.java | 6 +-
.../statemachine/CreateRegionGroupsProcedure.java | 4 +-
.../statemachine/DeleteStorageGroupProcedure.java | 2 +-
.../procedure/store/ConfigProcedureStore.java | 4 +-
.../thrift/ConfigNodeRPCServiceProcessor.java | 8 +-
.../request/ConfigPhysicalPlanSerDeTest.java | 82 +-
.../request/write/RemoveDataNodePlanTest.java | 173 ---
.../load/balancer/router/LeaderRouterTest.java | 148 +--
.../balancer/router/LoadScoreGreedyRouterTest.java | 2 +-
.../manager/partition/RegionGroupCacheTest.java | 81 +-
.../iotdb/confignode/persistence/NodeInfoTest.java | 69 +-
.../confignode/persistence/PartitionInfoTest.java | 45 +-
.../node/NodeStatisticsTest.java} | 33 +-
.../statistics/RegionGroupStatisticsTest.java | 56 +
.../statistics/RegionStatisticsTest.java} | 33 +-
.../org/apache/iotdb/consensus/common/Peer.java | 16 +-
distribution/src/assembly/all.xml | 44 +-
distribution/src/assembly/confignode.xml | 10 +-
distribution/src/assembly/datanode.xml | 8 +-
docker/src/main/DockerCompose/start-1c1d.sh | 4 +-
docker/src/main/Dockerfile-1c1d | 16 +-
docs/Download/README.md | 28 +-
docs/UserGuide/Alert/Alerting.md | 123 ++-
docs/UserGuide/Alert/Triggers.md | 1162 ++++++--------------
docs/zh/Download/README.md | 28 +-
docs/zh/UserGuide/Alert/Alerting.md | 108 +-
docs/zh/UserGuide/Alert/Triggers.md | 1128 ++++++-------------
.../iotdb/external/api/IPropertiesLoader.java | 12 +-
...sNumerLimiter.java => ISeriesNumerMonitor.java} | 8 +-
.../iotdb/flink/tsfile/util/TSFileConfigUtil.java | 1 +
.../util/TSFileConfigUtilCompletenessTest.java | 12 +-
grafana-plugin/README.md | 363 +++++-
grafana-plugin/src/plugin.json | 4 +-
integration-test/import-control.xml | 1 +
.../java/org/apache/iotdb/it/env/AbstractEnv.java | 45 +-
.../org/apache/iotdb/it/env/ConfigNodeWrapper.java | 2 +-
.../org/apache/iotdb/it/env/DataNodeWrapper.java | 2 +-
.../org/apache/iotdb/it/env/RemoteServerEnv.java | 5 +
.../org/apache/iotdb/itbase/env/BaseConfig.java | 4 +
.../java/org/apache/iotdb/itbase/env/BaseEnv.java | 6 +-
.../confignode/it/IoTDBClusterPartitionIT.java | 23 +-
.../iotdb/confignode/it/IoTDBClusterRestartIT.java | 5 +-
.../iotdb/confignode/it/IoTDBConfigNodeIT.java | 9 +-
.../confignode/it/IoTDBConfigNodeSnapshotIT.java | 13 +-
.../it/IoTDBConfigNodeSwitchLeaderIT.java | 236 ++++
.../iotdb/confignode/it/IoTDBStorageGroupIT.java | 5 +-
.../org/apache/iotdb/db/it/env/StandaloneEnv.java | 6 +
.../db/it/trigger/IoTDBTriggerManagementIT.java | 486 ++++++++
metrics/dropwizard-metrics/pom.xml | 6 -
...otdb-metric.yml => iotdb-confignode-metric.yml} | 0
...{iotdb-metric.yml => iotdb-datanode-metric.yml} | 0
.../metrics/config/MetricConfigDescriptor.java | 31 +-
.../iotdb/metrics/config/MetricConstant.java | 4 +-
.../apache/iotdb/commons/cluster/NodeStatus.java | 2 +-
.../apache/iotdb/commons/conf/IoTDBConstant.java | 7 +-
.../apache/iotdb/commons/trigger/TriggerTable.java | 5 +
.../resources/conf/iotdb-datanode.properties | 51 +-
.../conf/{logback.xml => logback-datanode.xml} | 52 +-
.../assembly/resources/sbin/remove-datanode.bat | 2 +-
.../src/assembly/resources/sbin/remove-datanode.sh | 2 +-
.../src/assembly/resources/sbin/start-datanode.bat | 2 +-
.../src/assembly/resources/sbin/start-datanode.sh | 2 +-
.../assembly/resources/sbin/start-new-server.bat | 2 +-
.../assembly/resources/sbin/start-new-server.sh | 2 +-
.../src/assembly/resources/sbin/start-server.bat | 2 +-
server/src/assembly/resources/sbin/start-server.sh | 2 +-
server/src/assembly/server.xml | 10 +-
.../apache/iotdb/db/client/ConfigNodeClient.java | 2 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 42 +-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 73 +-
.../db/engine/storagegroup/TsFileProcessor.java | 9 +-
.../db/metadata/schemaregion/SchemaEngine.java | 46 +-
.../schemaregion/SchemaRegionMemoryImpl.java | 38 +-
.../schemaregion/SchemaRegionSchemaFileImpl.java | 34 +-
.../execution/config/metadata/ShowClusterTask.java | 4 +-
.../db/protocol/mqtt/PayloadFormatManager.java | 5 +-
.../java/org/apache/iotdb/db/service/DataNode.java | 15 +-
.../db/service/DataNodeInternalRPCService.java | 2 +-
.../java/org/apache/iotdb/db/service/IoTDB.java | 4 -
.../java/org/apache/iotdb/db/service/NewIoTDB.java | 3 -
.../iotdb/db/trigger/executor/TriggerExecutor.java | 14 +-
.../db/trigger/executor/TriggerFireVisitor.java | 42 +-
.../trigger/service/TriggerInformationUpdater.java | 104 ++
.../trigger/service/TriggerManagementService.java | 19 +-
.../FilesUtils.java} | 39 +-
.../org/apache/iotdb/db/utils/JarLoaderUtil.java | 150 ---
.../java/org/apache/iotdb/db/wal/node/WALNode.java | 70 +-
.../src/main/thrift/confignode.thrift | 2 +-
.../iotdb/tsfile/common/conf/TSFileConfig.java | 12 +
.../iotdb/tsfile/common/conf/TSFileDescriptor.java | 4 +-
149 files changed, 4020 insertions(+), 3346 deletions(-)
rename confignode/src/assembly/resources/conf/{logback.xml => logback-confignode.xml} (86%)
copy confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/{write/trigger/DeleteTriggerInTablePlan.java => read/GetTriggerLocationPlan.java} (76%)
rename confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/{ => datanode}/RegisterDataNodePlan.java (74%)
rename confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/{ => datanode}/RemoveDataNodePlan.java (82%)
rename confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/{ => function}/CreateFunctionPlan.java (97%)
rename confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/{ => function}/DropFunctionPlan.java (96%)
rename confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/{ => partition}/UpdateRegionLocationPlan.java (97%)
rename confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/{ => procedure}/DeleteProcedurePlan.java (96%)
rename confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/{ => procedure}/UpdateProcedurePlan.java (97%)
create mode 100644 confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/statistics/UpdateLoadStatisticsPlan.java
copy confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/{PermissionInfoResp.java => TriggerLocationResp.java} (63%)
rename confignode/src/main/java/org/apache/iotdb/confignode/persistence/{ => node}/NodeInfo.java (81%)
create mode 100644 confignode/src/main/java/org/apache/iotdb/confignode/persistence/node/NodeStatistics.java
rename confignode/src/main/java/org/apache/iotdb/confignode/persistence/partition/{ => maintainer}/RegionCreateTask.java (98%)
rename confignode/src/main/java/org/apache/iotdb/confignode/persistence/partition/{ => maintainer}/RegionDeleteTask.java (97%)
rename confignode/src/main/java/org/apache/iotdb/confignode/persistence/partition/{ => maintainer}/RegionMaintainTask.java (98%)
rename confignode/src/main/java/org/apache/iotdb/confignode/persistence/partition/{ => maintainer}/RegionMaintainType.java (92%)
create mode 100644 confignode/src/main/java/org/apache/iotdb/confignode/persistence/partition/statistics/RegionGroupStatistics.java
create mode 100644 confignode/src/main/java/org/apache/iotdb/confignode/persistence/partition/statistics/RegionStatistics.java
delete mode 100644 confignode/src/test/java/org/apache/iotdb/confignode/consensus/request/write/RemoveDataNodePlanTest.java
copy confignode/src/test/java/org/apache/iotdb/confignode/{procedure/impl/DropTriggerProcedureTest.java => persistence/node/NodeStatisticsTest.java} (60%)
create mode 100644 confignode/src/test/java/org/apache/iotdb/confignode/persistence/partition/statistics/RegionGroupStatisticsTest.java
copy confignode/src/test/java/org/apache/iotdb/confignode/{procedure/impl/DropTriggerProcedureTest.java => persistence/partition/statistics/RegionStatisticsTest.java} (60%)
rename external-api/src/main/java/org/apache/iotdb/external/api/{ISeriesNumerLimiter.java => ISeriesNumerMonitor.java} (82%)
create mode 100644 integration-test/src/test/java/org/apache/iotdb/confignode/it/IoTDBConfigNodeSwitchLeaderIT.java
create mode 100644 integration-test/src/test/java/org/apache/iotdb/db/it/trigger/IoTDBTriggerManagementIT.java
copy metrics/interface/src/main/assembly/resources/conf/{iotdb-metric.yml => iotdb-confignode-metric.yml} (100%)
rename metrics/interface/src/main/assembly/resources/conf/{iotdb-metric.yml => iotdb-datanode-metric.yml} (100%)
rename server/src/assembly/resources/conf/{logback.xml => logback-datanode.xml} (84%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/trigger/service/TriggerInformationUpdater.java
copy server/src/main/java/org/apache/iotdb/db/{protocol/mqtt/PayloadFormatter.java => utils/FilesUtils.java} (54%)
delete mode 100644 server/src/main/java/org/apache/iotdb/db/utils/JarLoaderUtil.java
[iotdb] 01/02: Merge branch 'master' of https://github.com/apache/iotdb into 1c1d_dockertest
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch 1c1d_dockertest
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit eea53813c3f1069a046cb04f795dbb544197c770
Merge: d41f2f020a 81237589e8
Author: HTHou <hh...@outlook.com>
AuthorDate: Sat Oct 22 14:05:07 2022 +0800
Merge branch 'master' of https://github.com/apache/iotdb into 1c1d_dockertest
.github/workflows/main-unix.yml | 2 +-
.github/workflows/main-win.yml | 2 +-
.github/workflows/standalone-it-for-mpp.yml | 160 ++-
confignode/src/assembly/confignode.xml | 10 +-
.../resources/conf/iotdb-confignode.properties | 12 +-
.../conf/{logback.xml => logback-confignode.xml} | 20 +-
.../assembly/resources/sbin/remove-confignode.bat | 2 +-
.../assembly/resources/sbin/remove-confignode.sh | 2 +-
.../assembly/resources/sbin/start-confignode.bat | 2 +-
.../assembly/resources/sbin/start-confignode.sh | 2 +-
.../heartbeat/DataNodeHeartbeatHandler.java | 34 +-
.../iotdb/confignode/conf/ConfigNodeConstant.java | 4 +-
.../consensus/request/ConfigPhysicalPlan.java | 22 +-
.../consensus/request/ConfigPhysicalPlanType.java | 4 +-
.../GetTriggerLocationPlan.java} | 31 +-
.../write/{ => datanode}/RegisterDataNodePlan.java | 20 +-
.../write/{ => datanode}/RemoveDataNodePlan.java | 27 +-
.../write/{ => function}/CreateFunctionPlan.java | 2 +-
.../write/{ => function}/DropFunctionPlan.java | 2 +-
.../{ => partition}/UpdateRegionLocationPlan.java | 2 +-
.../write/{ => procedure}/DeleteProcedurePlan.java | 2 +-
.../write/{ => procedure}/UpdateProcedurePlan.java | 2 +-
.../write/region/OfferRegionMaintainTasksPlan.java | 2 +-
.../write/statistics/UpdateLoadStatisticsPlan.java | 125 +++
.../consensus/response/TriggerLocationResp.java | 49 +
.../statemachine/PartitionRegionStateMachine.java | 1 +
.../iotdb/confignode/manager/ConfigManager.java | 15 +-
.../apache/iotdb/confignode/manager/IManager.java | 8 +-
.../iotdb/confignode/manager/ProcedureManager.java | 2 +-
.../iotdb/confignode/manager/TriggerManager.java | 16 +-
.../iotdb/confignode/manager/UDFManager.java | 4 +-
.../iotdb/confignode/manager/load/LoadManager.java | 106 +-
.../manager/load/balancer/router/LeaderRouter.java | 11 +-
.../balancer/router/LoadScoreGreedyRouter.java | 11 +-
.../confignode/manager/node/BaseNodeCache.java | 48 +-
.../manager/node/ConfigNodeHeartbeatCache.java | 49 +-
.../manager/node/DataNodeHeartbeatCache.java | 44 +-
.../iotdb/confignode/manager/node/NodeManager.java | 67 +-
.../manager/partition/PartitionManager.java | 51 +-
.../confignode/manager/partition/RegionCache.java | 35 +-
.../manager/partition/RegionGroupCache.java | 114 +-
.../manager/partition/RegionHeartbeatSample.java | 12 +-
.../confignode/persistence/ProcedureInfo.java | 4 +-
.../iotdb/confignode/persistence/TriggerInfo.java | 17 +
.../iotdb/confignode/persistence/UDFInfo.java | 4 +-
.../persistence/executor/ConfigPlanExecutor.java | 26 +-
.../persistence/metric/NodeInfoMetrics.java | 2 +-
.../persistence/{ => node}/NodeInfo.java | 148 +--
.../persistence/node/NodeStatistics.java | 134 +++
.../persistence/partition/PartitionInfo.java | 65 +-
.../persistence/partition/RegionGroup.java | 3 +
.../partition/StorageGroupPartitionTable.java | 2 +-
.../{ => maintainer}/RegionCreateTask.java | 2 +-
.../{ => maintainer}/RegionDeleteTask.java | 2 +-
.../{ => maintainer}/RegionMaintainTask.java | 2 +-
.../{ => maintainer}/RegionMaintainType.java | 2 +-
.../statistics/RegionGroupStatistics.java | 145 +++
.../partition/statistics/RegionStatistics.java | 111 ++
.../procedure/env/ConfigNodeProcedureEnv.java | 6 +-
.../procedure/env/DataNodeRemoveHandler.java | 6 +-
.../statemachine/CreateRegionGroupsProcedure.java | 4 +-
.../statemachine/DeleteStorageGroupProcedure.java | 2 +-
.../procedure/store/ConfigProcedureStore.java | 4 +-
.../thrift/ConfigNodeRPCServiceProcessor.java | 8 +-
.../request/ConfigPhysicalPlanSerDeTest.java | 82 +-
.../request/write/RemoveDataNodePlanTest.java | 173 ---
.../load/balancer/router/LeaderRouterTest.java | 148 +--
.../balancer/router/LoadScoreGreedyRouterTest.java | 2 +-
.../manager/partition/RegionGroupCacheTest.java | 81 +-
.../iotdb/confignode/persistence/NodeInfoTest.java | 69 +-
.../confignode/persistence/PartitionInfoTest.java | 45 +-
.../persistence/node/NodeStatisticsTest.java | 48 +
.../statistics/RegionGroupStatisticsTest.java | 56 +
.../partition/statistics/RegionStatisticsTest.java | 48 +
.../org/apache/iotdb/consensus/common/Peer.java | 16 +-
distribution/src/assembly/all.xml | 44 +-
distribution/src/assembly/confignode.xml | 10 +-
distribution/src/assembly/datanode.xml | 8 +-
docs/Download/README.md | 28 +-
docs/UserGuide/Alert/Alerting.md | 123 ++-
docs/UserGuide/Alert/Triggers.md | 1162 ++++++--------------
docs/zh/Download/README.md | 28 +-
docs/zh/UserGuide/Alert/Alerting.md | 108 +-
docs/zh/UserGuide/Alert/Triggers.md | 1128 ++++++-------------
.../iotdb/external/api/IPropertiesLoader.java | 12 +-
...sNumerLimiter.java => ISeriesNumerMonitor.java} | 8 +-
.../iotdb/flink/tsfile/util/TSFileConfigUtil.java | 1 +
.../util/TSFileConfigUtilCompletenessTest.java | 12 +-
grafana-plugin/README.md | 363 +++++-
grafana-plugin/src/plugin.json | 4 +-
integration-test/import-control.xml | 1 +
.../java/org/apache/iotdb/it/env/AbstractEnv.java | 45 +-
.../org/apache/iotdb/it/env/ConfigNodeWrapper.java | 2 +-
.../org/apache/iotdb/it/env/DataNodeWrapper.java | 2 +-
.../org/apache/iotdb/it/env/RemoteServerEnv.java | 5 +
.../org/apache/iotdb/itbase/env/BaseConfig.java | 4 +
.../java/org/apache/iotdb/itbase/env/BaseEnv.java | 6 +-
.../confignode/it/IoTDBClusterPartitionIT.java | 23 +-
.../iotdb/confignode/it/IoTDBClusterRestartIT.java | 5 +-
.../iotdb/confignode/it/IoTDBConfigNodeIT.java | 9 +-
.../confignode/it/IoTDBConfigNodeSnapshotIT.java | 13 +-
.../it/IoTDBConfigNodeSwitchLeaderIT.java | 236 ++++
.../iotdb/confignode/it/IoTDBStorageGroupIT.java | 5 +-
.../org/apache/iotdb/db/it/env/StandaloneEnv.java | 6 +
.../db/it/trigger/IoTDBTriggerManagementIT.java | 486 ++++++++
metrics/dropwizard-metrics/pom.xml | 6 -
...otdb-metric.yml => iotdb-confignode-metric.yml} | 0
...{iotdb-metric.yml => iotdb-datanode-metric.yml} | 0
.../metrics/config/MetricConfigDescriptor.java | 31 +-
.../iotdb/metrics/config/MetricConstant.java | 4 +-
.../apache/iotdb/commons/cluster/NodeStatus.java | 2 +-
.../apache/iotdb/commons/conf/IoTDBConstant.java | 7 +-
.../apache/iotdb/commons/trigger/TriggerTable.java | 5 +
.../resources/conf/iotdb-datanode.properties | 51 +-
.../conf/{logback.xml => logback-datanode.xml} | 52 +-
.../assembly/resources/sbin/remove-datanode.bat | 2 +-
.../src/assembly/resources/sbin/remove-datanode.sh | 2 +-
.../src/assembly/resources/sbin/start-datanode.bat | 2 +-
.../src/assembly/resources/sbin/start-datanode.sh | 2 +-
.../assembly/resources/sbin/start-new-server.bat | 2 +-
.../assembly/resources/sbin/start-new-server.sh | 2 +-
.../src/assembly/resources/sbin/start-server.bat | 2 +-
server/src/assembly/resources/sbin/start-server.sh | 2 +-
server/src/assembly/server.xml | 10 +-
.../apache/iotdb/db/client/ConfigNodeClient.java | 2 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 42 +-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 73 +-
.../db/engine/storagegroup/TsFileProcessor.java | 9 +-
.../db/metadata/schemaregion/SchemaEngine.java | 46 +-
.../schemaregion/SchemaRegionMemoryImpl.java | 38 +-
.../schemaregion/SchemaRegionSchemaFileImpl.java | 34 +-
.../execution/config/metadata/ShowClusterTask.java | 4 +-
.../db/protocol/mqtt/PayloadFormatManager.java | 5 +-
.../java/org/apache/iotdb/db/service/DataNode.java | 15 +-
.../db/service/DataNodeInternalRPCService.java | 2 +-
.../java/org/apache/iotdb/db/service/IoTDB.java | 4 -
.../java/org/apache/iotdb/db/service/NewIoTDB.java | 3 -
.../iotdb/db/trigger/executor/TriggerExecutor.java | 14 +-
.../db/trigger/executor/TriggerFireVisitor.java | 42 +-
.../trigger/service/TriggerInformationUpdater.java | 104 ++
.../trigger/service/TriggerManagementService.java | 19 +-
.../java/org/apache/iotdb/db/utils/FilesUtils.java | 43 +
.../org/apache/iotdb/db/utils/JarLoaderUtil.java | 150 ---
.../java/org/apache/iotdb/db/wal/node/WALNode.java | 70 +-
.../src/main/thrift/confignode.thrift | 2 +-
.../iotdb/tsfile/common/conf/TSFileConfig.java | 12 +
.../iotdb/tsfile/common/conf/TSFileDescriptor.java | 4 +-
147 files changed, 4152 insertions(+), 3259 deletions(-)
[iotdb] 02/02: update
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch 1c1d_dockertest
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 3339bc24b8b8b9e8729ce1219e0092880915c4d0
Author: HTHou <hh...@outlook.com>
AuthorDate: Sat Oct 22 14:07:14 2022 +0800
update
---
docker/src/main/DockerCompose/start-1c1d.sh | 4 ++--
docker/src/main/Dockerfile-1c1d | 16 +++++++---------
2 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/docker/src/main/DockerCompose/start-1c1d.sh b/docker/src/main/DockerCompose/start-1c1d.sh
index fcab98857b..816713c2e3 100755
--- a/docker/src/main/DockerCompose/start-1c1d.sh
+++ b/docker/src/main/DockerCompose/start-1c1d.sh
@@ -17,5 +17,5 @@
# specific language governing permissions and limitations
# under the License.
#
-./confignode/sbin/start-confignode.sh &
-./datanode/sbin/start-datanode.sh &
\ No newline at end of file
+./sbin/start-confignode.sh &
+./sbin/start-datanode.sh &
\ No newline at end of file
diff --git a/docker/src/main/Dockerfile-1c1d b/docker/src/main/Dockerfile-1c1d
index e223642408..e5e34d1d0c 100644
--- a/docker/src/main/Dockerfile-1c1d
+++ b/docker/src/main/Dockerfile-1c1d
@@ -35,10 +35,10 @@ RUN apt update \
&& apt purge --auto-remove -y \
&& apt clean -y \
RUN dos2unix /iotdb/start-1c1d.sh
-RUN dos2unix /iotdb/confignode/sbin/start-confignode.sh
-RUN dos2unix /iotdb/confignode/sbin/../conf/confignode-env.sh
-RUN dos2unix /iotdb/datanode/sbin/start-datanode.sh
-RUN dos2unix /iotdb/datanode/sbin/../conf/datanode-env.sh
+RUN dos2unix /iotdb/sbin/start-confignode.sh
+RUN dos2unix /iotdb/sbin/../conf/confignode-env.sh
+RUN dos2unix /iotdb/sbin/start-datanode.sh
+RUN dos2unix /iotdb/sbin/../conf/datanode-env.sh
EXPOSE 6667
EXPOSE 31999
EXPOSE 5555
@@ -50,9 +50,7 @@ EXPOSE 8777
EXPOSE 9003
EXPOSE 40010
EXPOSE 50010
-VOLUME /iotdb/datanode/data
-VOLUME /iotdb/datanode/logs
-VOLUME /iotdb/confignode/data
-VOLUME /iotdb/confignode/logs
-ENV PATH="/iotdb/:/iotdb/datanode/sbin/:/iotdb/confignode/sbin/:/iotdb/tools/:${PATH}"
+VOLUME /iotdb/data
+VOLUME /iotdb/logs
+ENV PATH="/iotdb/:/iotdb/sbin/:/iotdb/tools/:${PATH}"
ENTRYPOINT ["/iotdb/start-1c1d.sh"]