You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by hu...@apache.org on 2023/02/26 01:49:32 UTC
[iotdb] branch lmh/planPushDown updated (f41eb28af9 -> c6306f396b)
This is an automated email from the ASF dual-hosted git repository.
hui pushed a change to branch lmh/planPushDown
in repository https://gitbox.apache.org/repos/asf/iotdb.git
from f41eb28af9 Merge remote-tracking branch 'origin/master' into lmh/planPushDown
add 081b44d4d6 feat(WebSite) :DocSearch Filter By Version (#9134)
add 8238428d3c [IOTDB-4005] Allow the following child pipeline to run in advance
add 753d3f29fb [IOTDB-5559] Implement metric exporters for RatisConsensus (#9099)
add 6f02e5888a Remove 0.8-0.12 docs & fix the bad urls on the master branch (#9091)
add a25af89278 Add a paper to the Publication_zh doc (#9067)
add 854e4c8b9c [IOTDB-5454] Support shuffle function of DataExchangeModule
add a3869ec324 [IOTDB-5147]Optimize compaction schedule when priority is BALANCE (#9103)
add 2f385d4067 Update nifi doc (#9051)
add 1c040f28db Fix some broken links in README (#9066)
add de6d1526bd [IOTDB-5578] Keep CacheMemoryManager monitor alive when exception (#9133)
add ce0c43263f [IOTDB-5524] Update metric docs for schema module (#9136)
add 06bb621a99 Modify Group-By UserGuide
add 468c0fbd19 [IOTDB-5542] ConfigNode counter dashboard (#9129)
add 5920e65a20 [IOTDB-5581] Missing reset of aggregators in RawDataAggregationOperator
add 8d65ee7847 Merge branch 'master' into lmh/planPushDown
add c6306f396b spotless apply
No new revisions were added by this update.
Summary of changes:
.github/workflows/site-build.yml | 4 +-
README.md | 4 +-
README_ZH.md | 4 +-
.../org/apache/iotdb/db/qp/sql/IdentifierParser.g4 | 2 +-
.../org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4 | 2 +-
.../antlr4/org/apache/iotdb/db/qp/sql/SqlLexer.g4 | 8 +-
.../iotdb/confignode/conf/ConfigNodeConstant.java | 11 +-
.../confignode/manager/ClusterSchemaManager.java | 13 +-
.../iotdb/confignode/manager/ConfigManager.java | 7 +-
.../apache/iotdb/confignode/manager/IManager.java | 1 +
.../confignode/manager/PermissionManager.java | 6 +-
.../iotdb/confignode/manager/ProcedureManager.java | 8 +-
.../iotdb/confignode/manager/SyncManager.java | 6 +-
.../iotdb/confignode/manager/TriggerManager.java | 2 +
.../manager/{ => consensus}/ConsensusManager.java | 42 +-
.../iotdb/confignode/manager/load/LoadManager.java | 35 +-
.../manager/load/LoadManagerMetrics.java | 326 --
.../iotdb/confignode/manager/node/NodeManager.java | 12 +-
.../iotdb/confignode/manager/node/NodeMetrics.java | 104 +
.../manager/partition/PartitionManager.java | 127 +-
.../manager/partition/PartitionMetrics.java | 353 ++
.../persistence/metric/PartitionInfoMetrics.java | 197 -
.../partition/DatabasePartitionTable.java | 36 +-
.../persistence/partition/PartitionInfo.java | 200 +-
.../persistence/schema/ClusterSchemaInfo.java | 100 +-
.../procedure/env/ConfigNodeProcedureEnv.java | 2 +-
.../procedure/env/DataNodeRemoveHandler.java | 13 +-
...Procedure.java => DeleteDatabaseProcedure.java} | 24 +-
.../procedure/store/ConfigProcedureStore.java | 2 +-
.../procedure/store/ProcedureFactory.java | 6 +-
.../iotdb/confignode/service/ConfigNode.java | 24 +-
.../thrift/ConfigNodeRPCServiceHandlerMetrics.java | 2 +-
.../thrift/ConfigNodeRPCServiceMetrics.java | 3 +-
.../thrift/ConfigNodeRPCServiceProcessor.java | 2 +-
.../request/ConfigPhysicalPlanSerDeTest.java | 16 +-
...eTest.java => DeleteDatabaseProcedureTest.java} | 11 +-
.../consensus/ratis/metrics/CounterProxy.java | 48 +-
.../iotdb/consensus/ratis/metrics/GaugeProxy.java | 34 +-
.../ratis/metrics/IoTDBMetricRegistry.java | 202 +
.../ratis/metrics/MetricRegistryManager.java | 98 +
.../consensus/ratis/metrics/RatisMetricSet.java | 27 +-
.../consensus/ratis/metrics/RefCountingMap.java | 97 +
.../iotdb/consensus/ratis/metrics/TimerProxy.java | 33 +-
.../org.apache.ratis.metrics.MetricRegistries | 17 +
docs/UserGuide/API/InfluxDB-Protocol.md | 2 +-
docs/UserGuide/Ecosystem-Integration/NiFi-IoTDB.md | 4 +-
docs/UserGuide/Monitor-Alert/Alerting.md | 2 +-
.../Apache-IoTDB-ConfigNode-Dashboard.json | 5186 +++++++++++++-------
docs/UserGuide/Monitor-Alert/Metric-Tool.md | 29 +-
docs/UserGuide/Operate-Metadata/Timeseries.md | 2 +-
docs/UserGuide/Query-Data/Group-By.md | 45 +-
docs/UserGuide/Query-Data/Overview.md | 4 +-
docs/UserGuide/Query-Data/Select-Expression.md | 2 +-
docs/UserGuide/Reference/Common-Config-Manual.md | 8 +
docs/zh/UserGuide/API/InfluxDB-Protocol.md | 2 +-
.../UserGuide/Ecosystem-Integration/NiFi-IoTDB.md | 4 +-
.../zh/UserGuide/IoTDB-Introduction/Publication.md | 1 +
docs/zh/UserGuide/Monitor-Alert/Alerting.md | 2 +-
docs/zh/UserGuide/Monitor-Alert/Metric-Tool.md | 29 +-
docs/zh/UserGuide/Operate-Metadata/Timeseries.md | 2 +-
docs/zh/UserGuide/Query-Data/Group-By.md | 43 +-
docs/zh/UserGuide/Query-Data/Overview.md | 4 +-
docs/zh/UserGuide/Query-Data/Select-Expression.md | 2 +-
.../zh/UserGuide/Reference/Common-Config-Manual.md | 31 +-
docs/zh/UserGuide/Write-Data/Batch-Load-Tool.md | 2 +-
.../db/it/alignbydevice/IoTDBShuffleSink1IT.java | 150 +
.../db/it/alignbydevice/IoTDBShuffleSink2IT.java | 205 +
...ySeriesIT.java => IoTDBGroupByConditionIT.java} | 67 +-
.../iotdb/db/it/groupby/IoTDBGroupBySessionIT.java | 21 +-
.../db/it/groupby/IoTDBGroupByVariationIT.java | 37 +
.../resources/conf/iotdb-common.properties | 8 +-
.../apache/iotdb/commons/cluster/NodeStatus.java | 1 +
.../org/apache/iotdb/commons/cluster/NodeType.java | 3 +-
.../iotdb/commons/cluster/RegionRoleType.java | 1 +
.../iotdb/commons/service/metric/enums/Metric.java | 16 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 11 +
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 5 +
.../compaction/schedule/CompactionScheduler.java | 6 +-
.../compaction/schedule/CompactionTaskManager.java | 13 +-
.../DefaultCompactionTaskComparatorImpl.java | 21 +-
.../impl/RewriteCrossSpaceCompactionSelector.java | 31 +-
.../impl/SizeTieredCompactionSelector.java | 24 +-
.../utils/CrossSpaceCompactionCandidate.java | 6 +-
.../mtree/store/disk/cache/CacheMemoryManager.java | 4 -
.../iotdb/db/mpp/execution/driver/Driver.java | 18 +-
.../db/mpp/execution/driver/DriverContext.java | 12 +-
.../iotdb/db/mpp/execution/driver/IDriver.java | 6 +-
.../exchange/IMPPDataExchangeManager.java | 34 +-
.../execution/exchange/MPPDataExchangeManager.java | 334 +-
.../mpp/execution/exchange/SharedTsBlockQueue.java | 33 +-
.../exchange/sink/DownStreamChannelIndex.java | 24 +-
.../exchange/sink/DownStreamChannelLocation.java | 111 +
.../exchange/{ISinkHandle.java => sink/ISink.java} | 41 +-
.../mpp/execution/exchange/sink/ISinkChannel.java | 23 +-
.../mpp/execution/exchange/sink/ISinkHandle.java | 27 +-
.../LocalSinkChannel.java} | 89 +-
.../execution/exchange/sink/ShuffleSinkHandle.java | 299 ++
.../{SinkHandle.java => sink/SinkChannel.java} | 163 +-
.../exchange/{ => source}/ISourceHandle.java | 2 +-
.../exchange/{ => source}/LocalSourceHandle.java | 24 +-
.../exchange/{ => source}/SourceHandle.java | 44 +-
.../fragment/FragmentInstanceExecution.java | 20 +-
.../fragment/FragmentInstanceManager.java | 14 +-
.../process/RawDataAggregationOperator.java | 5 +-
.../operator/sink/IdentitySinkOperator.java | 132 +
.../operator/sink/ShuffleHelperOperator.java | 134 +
.../operator/source/ExchangeOperator.java | 2 +-
.../db/mpp/execution/schedule/task/DriverTask.java | 4 +-
.../db/mpp/plan/execution/QueryExecution.java | 5 +-
.../plan/execution/memory/MemorySourceHandle.java | 2 +-
.../iotdb/db/mpp/plan/parser/ASTVisitor.java | 2 +-
.../plan/planner/LocalExecutionPlanContext.java | 10 +-
.../db/mpp/plan/planner/OperatorTreeGenerator.java | 123 +-
.../planner/distribution/DistributionPlanner.java | 138 +-
.../planner/distribution/ExchangeNodeAdder.java | 196 +-
.../planner/distribution/NodeGroupContext.java | 49 +-
.../SimpleFragmentParallelPlanner.java | 44 +-
.../db/mpp/plan/planner/plan/FragmentInstance.java | 15 -
.../plan/planner/plan/node/PlanGraphPrinter.java | 27 +-
.../mpp/plan/planner/plan/node/PlanNodeType.java | 13 +-
.../db/mpp/plan/planner/plan/node/PlanVisitor.java | 15 +-
.../planner/plan/node/process/ExchangeNode.java | 31 +-
.../plan/node/process/HorizontallyConcatNode.java | 2 +-
.../planner/plan/node/sink/FragmentSinkNode.java | 202 -
.../planner/plan/node/sink/IdentitySinkNode.java | 99 +
.../plan/node/sink/MultiChildrenSinkNode.java | 117 +
.../planner/plan/node/sink/ShuffleSinkNode.java | 105 +
.../engine/compaction/CompactionSchedulerTest.java | 2 +-
.../CompactionSchedulerWithFastPerformerTest.java | 2 +-
.../iotdb/db/mpp/execution/DataDriverTest.java | 8 +-
...nkHandleTest.java => LocalSinkChannelTest.java} | 96 +-
.../execution/exchange/LocalSourceHandleTest.java | 1 +
.../exchange/MPPDataExchangeManagerTest.java | 65 +-
.../{SinkHandleTest.java => SinkChannelTest.java} | 270 +-
.../mpp/execution/exchange/SourceHandleTest.java | 6 +
.../{StubSinkHandle.java => StubSink.java} | 10 +-
.../distribution/AggregationDistributionTest.java | 17 +-
.../plan/distribution/AlignedByDeviceTest.java | 1390 +++++-
.../read/DeviceSchemaScanNodeSerdeTest.java | 22 +-
.../NodeManagementMemoryMergeNodeSerdeTest.java | 24 +-
.../metadata/read/SchemaCountNodeSerdeTest.java | 44 +-
.../read/TimeSeriesSchemaScanNodeSerdeTest.java | 24 +-
.../plan/node/process/ExchangeNodeSerdeTest.java | 24 +-
...rdeTest.java => IdentitySinkNodeSerdeTest.java} | 45 +-
...st.java => ShuffleSinkHandleNodeSerdeTest.java} | 46 +-
site/pom.xml | 320 --
site/src/main/.vuepress/config.js | 988 +---
.../theme/components/AlgoliaSearchBox.vue | 26 +-
thrift/src/main/thrift/datanode.thrift | 4 +
149 files changed, 9123 insertions(+), 5408 deletions(-)
rename confignode/src/main/java/org/apache/iotdb/confignode/manager/{ => consensus}/ConsensusManager.java (93%)
delete mode 100644 confignode/src/main/java/org/apache/iotdb/confignode/manager/load/LoadManagerMetrics.java
create mode 100644 confignode/src/main/java/org/apache/iotdb/confignode/manager/node/NodeMetrics.java
create mode 100644 confignode/src/main/java/org/apache/iotdb/confignode/manager/partition/PartitionMetrics.java
delete mode 100644 confignode/src/main/java/org/apache/iotdb/confignode/persistence/metric/PartitionInfoMetrics.java
rename confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/{DeleteStorageGroupProcedure.java => DeleteDatabaseProcedure.java} (94%)
rename confignode/src/test/java/org/apache/iotdb/confignode/procedure/impl/{DeleteStorageGroupProcedureTest.java => DeleteDatabaseProcedureTest.java} (81%)
copy node-commons/src/main/java/org/apache/iotdb/commons/cluster/NodeType.java => consensus/src/main/java/org/apache/iotdb/consensus/ratis/metrics/CounterProxy.java (52%)
copy node-commons/src/main/java/org/apache/iotdb/commons/cluster/NodeType.java => consensus/src/main/java/org/apache/iotdb/consensus/ratis/metrics/GaugeProxy.java (55%)
create mode 100644 consensus/src/main/java/org/apache/iotdb/consensus/ratis/metrics/IoTDBMetricRegistry.java
create mode 100644 consensus/src/main/java/org/apache/iotdb/consensus/ratis/metrics/MetricRegistryManager.java
copy node-commons/src/main/java/org/apache/iotdb/commons/cluster/RegionRoleType.java => consensus/src/main/java/org/apache/iotdb/consensus/ratis/metrics/RatisMetricSet.java (58%)
create mode 100644 consensus/src/main/java/org/apache/iotdb/consensus/ratis/metrics/RefCountingMap.java
copy node-commons/src/main/java/org/apache/iotdb/commons/cluster/NodeType.java => consensus/src/main/java/org/apache/iotdb/consensus/ratis/metrics/TimerProxy.java (57%)
create mode 100644 consensus/src/main/resources/META-INF/services/org.apache.ratis.metrics.MetricRegistries
create mode 100644 integration-test/src/test/java/org/apache/iotdb/db/it/alignbydevice/IoTDBShuffleSink1IT.java
create mode 100644 integration-test/src/test/java/org/apache/iotdb/db/it/alignbydevice/IoTDBShuffleSink2IT.java
rename integration-test/src/test/java/org/apache/iotdb/db/it/groupby/{IoTDBGroupBySeriesIT.java => IoTDBGroupByConditionIT.java} (89%)
copy node-commons/src/main/java/org/apache/iotdb/commons/cluster/RegionRoleType.java => server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/sink/DownStreamChannelIndex.java (66%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/sink/DownStreamChannelLocation.java
rename server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/{ISinkHandle.java => sink/ISink.java} (59%)
copy node-commons/src/main/java/org/apache/iotdb/commons/cluster/RegionRoleType.java => server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/sink/ISinkChannel.java (68%)
copy node-commons/src/main/java/org/apache/iotdb/commons/cluster/RegionRoleType.java => server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/sink/ISinkHandle.java (58%)
rename server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/{LocalSinkHandle.java => sink/LocalSinkChannel.java} (69%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/sink/ShuffleSinkHandle.java
rename server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/{SinkHandle.java => sink/SinkChannel.java} (84%)
rename server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/{ => source}/ISourceHandle.java (98%)
rename server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/{ => source}/LocalSourceHandle.java (92%)
rename server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/{ => source}/SourceHandle.java (94%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/sink/IdentitySinkOperator.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/sink/ShuffleHelperOperator.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/sink/FragmentSinkNode.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/sink/IdentitySinkNode.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/sink/MultiChildrenSinkNode.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/sink/ShuffleSinkNode.java
rename server/src/test/java/org/apache/iotdb/db/mpp/execution/exchange/{LocalSinkHandleTest.java => LocalSinkChannelTest.java} (64%)
rename server/src/test/java/org/apache/iotdb/db/mpp/execution/exchange/{SinkHandleTest.java => SinkChannelTest.java} (73%)
rename server/src/test/java/org/apache/iotdb/db/mpp/execution/exchange/{StubSinkHandle.java => StubSink.java} (91%)
copy server/src/test/java/org/apache/iotdb/db/mpp/plan/plan/node/sink/{FragmentSinkNodeSerdeTest.java => IdentitySinkNodeSerdeTest.java} (54%)
rename server/src/test/java/org/apache/iotdb/db/mpp/plan/plan/node/sink/{FragmentSinkNodeSerdeTest.java => ShuffleSinkHandleNodeSerdeTest.java} (57%)