You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by er...@apache.org on 2022/12/30 08:07:06 UTC
[iotdb] branch improve/iotdb-5803 updated (a9fe582d53 -> f395075c09)
This is an automated email from the ASF dual-hosted git repository.
ericpai pushed a change to branch improve/iotdb-5803
in repository https://gitbox.apache.org/repos/asf/iotdb.git
omit a9fe582d53 [lemming-5303] Refine IT config: part I
add fc8ecd0769 fix some code smells (#8660)
add bed0552fcc fix some code smells (#8658)
add 1ea16d5f6d Recover the confignode ports of docker deployment (#8670)
add 660a79870d [IOTDB-5171] Add query metrics
add 7912781019 [IOTDB-4804] Cpp Client SDK bug-fix (#8555)
add d5b0b1127a Revert "[IOTDB-4804] Cpp Client SDK bug-fix (#8555)" (#8675)
add 82ffaa3c26 [IOTDB-4816]Show queries - implement LogicPlan & DistributionPlan & Operator
add 6410ffad81 [IOTDB-4630] Implement observer pattern in LoadBalancing framework (#8483)
add 8a482cae86 [IOTDB-4816]Show queries - add user doc
add f395075c09 [lemming-5303] Refine IT config: part I
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (a9fe582d53)
\
N -- N -- N refs/heads/improve/iotdb-5803 (f395075c09)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
.../consensus/response/StorageGroupSchemaResp.java | 4 +-
.../consensus/response/TemplateSetInfoResp.java | 4 +-
.../confignode/manager/ClusterSchemaManager.java | 15 +
.../iotdb/confignode/manager/ConfigManager.java | 2 +-
.../iotdb/confignode/manager/SyncManager.java | 15 +
.../iotdb/confignode/manager/load/LoadManager.java | 35 +-
.../manager/node/heartbeat/BaseNodeCache.java | 4 +
.../observer/IEvent.java} | 4 +-
.../manager/observer/NodeStatisticsEvent.java | 22 +-
.../manager/partition/heartbeat/RegionCache.java | 2 +-
.../iotdb/confignode/persistence/TriggerInfo.java | 2 +-
.../iotdb/confignode/persistence/UDFInfo.java | 2 +-
.../persistence/partition/PartitionInfo.java | 4 +-
.../partition/maintainer/RegionMaintainTask.java | 2 +-
.../persistence/schema/TemplateTable.java | 2 +-
.../confignode/procedure/StoppableThread.java | 2 +-
.../impl/node/RemoveDataNodeProcedure.java | 2 +-
.../procedure/impl/sync/StartPipeProcedure.java | 3 +-
.../procedure/impl/sync/StopPipeProcedure.java | 3 +-
.../scheduler/SimpleProcedureScheduler.java | 2 +-
.../org/apache/iotdb/consensus/common/Peer.java | 4 +-
.../common/response/ConsensusResponse.java | 2 +-
.../consensus/iot/logdispatcher/SyncStatus.java | 2 +-
.../ratis/ApplicationStateMachineProxy.java | 2 +-
.../apache/iotdb/consensus/ratis/RatisClient.java | 13 +-
.../iotdb/consensus/ratis/RatisConsensus.java | 10 +-
.../iotdb/consensus/ratis/SnapshotStorage.java | 2 +-
.../org/apache/iotdb/consensus/ratis/Utils.java | 8 +-
docker/ReadMe.md | 6 +-
.../DockerCompose/docker-compose-cluster-1c2d.yml | 6 +-
.../DockerCompose/docker-compose-cluster-3c3d.yml | 16 +-
.../DockerCompose/docker-compose-host-3c3d.yml | 16 +-
.../DockerCompose/docker-compose-standalone.yml | 4 +-
docker/src/main/Dockerfile-0.12.6-cluster | 6 +-
docker/src/main/Dockerfile-0.13.0-cluster | 6 +-
docker/src/main/Dockerfile-1.0.0-confignode | 4 +-
docker/src/main/Dockerfile-1.0.0-datanode | 4 +-
.../Maintenance-Tools/Maintenance-Command.md | 85 +++-
docs/UserGuide/QuickStart/WayToGetIoTDB.md | 26 +-
.../Maintenance-Tools/Maintenance-Command.md | 84 +++-
docs/zh/UserGuide/QuickStart/WayToGetIoTDB.md | 24 +-
integration-test/pom.xml | 3 -
.../iotdb/it/env/cluster/MppClusterConfig.java | 8 +
.../it/env/cluster/MppSharedCommonConfig.java | 339 +++++++++++++
.../iotdb/it/env/remote/RemoteClusterConfig.java | 5 +
.../org/apache/iotdb/itbase/env/ClusterConfig.java | 18 +-
.../confignode/it/IoTDBConfigNodeSnapshotIT.java | 15 +-
.../confignode/it/IoTDBSnapshotTransferIT.java | 13 +-
.../it/cluster/IoTDBClusterNodeErrorStartUpIT.java | 6 +-
.../it/cluster/IoTDBClusterNodeGetterIT.java | 9 +-
.../it/cluster/IoTDBClusterRestartIT.java | 13 +-
.../load/IoTDBClusterRegionLeaderBalancingIT.java | 12 +-
.../it/load/IoTDBConfigNodeSwitchLeaderIT.java | 12 +-
.../partition/IoTDBAutoRegionGroupExtensionIT.java | 12 +-
.../IoTDBCustomRegionGroupExtensionIT.java | 14 +-
.../it/partition/IoTDBPartitionDurableIT.java | 12 +-
.../it/partition/IoTDBPartitionGetterIT.java | 13 +-
.../partition/IoTDBPartitionInheritPolicyIT.java | 10 +-
.../org/apache/iotdb/db/it/IOTDBLoadTsFileIT.java | 9 +-
.../org/apache/iotdb/db/it/IoTDBDeletionIT.java | 7 +-
.../java/org/apache/iotdb/db/it/IoTDBFilterIT.java | 9 +-
.../org/apache/iotdb/db/it/IoTDBMultiDeviceIT.java | 11 +-
.../org/apache/iotdb/db/it/IoTDBNestedQueryIT.java | 9 +-
.../iotdb/db/it/IoTDBPartialInsertionIT.java | 3 +-
.../it/IoTDBSameMeasurementsDifferentTypesIT.java | 9 +-
.../it/aggregation/IoTDBAggregationDeleteIT.java | 3 +-
.../aggregation/IoTDBAggregationScanOrderIT.java | 8 +-
.../aligned/IoTDBAggregationWithDeletion2IT.java | 10 +-
.../it/aligned/IoTDBAggregationWithDeletionIT.java | 9 +-
.../db/it/aligned/IoTDBAlignedDataDeletionIT.java | 8 +-
.../db/it/aligned/IoTDBAlignedLastQuery2IT.java | 10 +-
.../db/it/aligned/IoTDBAlignedLastQuery3IT.java | 10 +-
.../db/it/aligned/IoTDBAlignedLastQueryIT.java | 9 +-
.../db/it/aligned/IoTDBAlignedSeriesQuery2IT.java | 10 +-
.../db/it/aligned/IoTDBAlignedSeriesQuery3IT.java | 10 +-
.../db/it/aligned/IoTDBAlignedSeriesQueryIT.java | 9 +-
.../IoTDBAlignedSeriesQueryWithDeletionIT.java | 9 +-
.../IoTDBCountMultiTimesWithDeletionIT.java | 9 +-
.../db/it/aligned/IoTDBGroupByLevelQueryIT.java | 9 +-
...GroupByQueryWithValueFilterWithDeletion2IT.java | 10 +-
...BGroupByQueryWithValueFilterWithDeletionIT.java | 9 +-
...upByQueryWithoutValueFilterWithDeletion2IT.java | 10 +-
...oupByQueryWithoutValueFilterWithDeletionIT.java | 9 +-
.../db/it/aligned/IoTDBInsertAlignedValues2IT.java | 7 +-
.../db/it/aligned/IoTDBInsertAlignedValues3IT.java | 7 +-
.../db/it/aligned/IoTDBInsertAlignedValues4IT.java | 7 +-
.../db/it/aligned/IoTDBInsertAlignedValuesIT.java | 3 +-
.../it/aligned/IoTDBLastQueryWithDeletion2IT.java | 9 +-
.../it/aligned/IoTDBLastQueryWithDeletionIT.java | 8 +-
.../aligned/IoTDBLastQueryWithoutLastCache2IT.java | 10 +-
.../aligned/IoTDBLastQueryWithoutLastCacheIT.java | 9 +-
...DBLastQueryWithoutLastCacheWithDeletion2IT.java | 10 +-
...TDBLastQueryWithoutLastCacheWithDeletionIT.java | 9 +-
...BRawQueryWithoutValueFilterWithDeletion2IT.java | 9 +-
...DBRawQueryWithoutValueFilterWithDeletionIT.java | 8 +-
.../apache/iotdb/db/it/groupby/IOTDBGroupByIT.java | 3 +-
.../iotdb/db/it/groupby/IoTDBGroupByUnseqIT.java | 10 +-
.../apache/iotdb/db/it/groupby/IoTDBHavingIT.java | 3 +-
.../apache/iotdb/db/it/mqtt/IoTDBMQTTSinkIT.java | 3 +-
.../iotdb/db/it/query/IoTDBNullOperandIT.java | 3 +-
.../iotdb/db/it/query/IoTDBPaginationIT.java | 3 +-
.../it/schema/IoTDBDeleteAlignedTimeseriesIT.java | 3 +-
.../db/it/schema/IoTDBDeleteTimeseriesIT.java | 3 +-
.../schema/IoTDBDeleteTimeseriesSchemaFileIT.java | 3 +-
.../it/schema/IoTDBMetadataFetchSchemaFileIT.java | 3 +-
.../iotdb/db/it/selectinto/IoTDBSelectInto2IT.java | 8 +-
.../iotdb/db/it/selectinto/IoTDBSelectInto3IT.java | 7 +-
.../iotdb/db/it/selectinto/IoTDBSelectIntoIT.java | 3 +-
.../org/apache/iotdb/db/it/udf/IoTDBUDFM4IT.java | 3 +-
.../db/it/udf/IoTDBUDFOtherWindowQueryIT.java | 9 +-
.../iotdb/db/it/udf/IoTDBUDFWindowQueryIT.java | 9 +-
.../db/it/udf/IoTDBUDTFAlignByTimeQueryIT.java | 3 +-
.../iotdb/db/it/udf/IoTDBUDTFNonAlignQueryIT.java | 3 +-
.../iotdb/db/it/watermark/IoTDBWatermarkIT.java | 12 +-
.../withoutNull/IoTDBWithoutNullAllFilterIT.java | 3 +-
.../apache/iotdb/libudf/it/anomaly/AnomalyIT.java | 3 +-
.../apache/iotdb/libudf/it/dmatch/DMatchIT.java | 3 +-
.../iotdb/libudf/it/dprofile/DProfileIT.java | 3 +-
.../iotdb/libudf/it/dquality/DQualityIT.java | 3 +-
.../apache/iotdb/libudf/it/drepair/DRepairIT.java | 3 +-
.../iotdb/libudf/it/frequency/FrequencyIT.java | 3 +-
.../apache/iotdb/libudf/it/series/SeriesIT.java | 3 +-
.../apache/iotdb/libudf/it/string/StringIT.java | 3 +-
.../session/it/IoTDBSessionAlignedInsertIT.java | 3 +-
.../it/IoTDBSessionDisableMemControlIT.java | 5 +-
.../iotdb/commons/service/metric/enums/Metric.java | 14 +-
.../iotdb/commons/service/metric/enums/Tag.java | 6 +-
.../apache/iotdb/db/engine/cache/ChunkCache.java | 50 +-
.../db/engine/cache/TimeSeriesMetadataCache.java | 155 +++---
.../iotdb/db/engine/storagegroup/DataRegion.java | 9 +
.../db/engine/storagegroup/TsFileProcessor.java | 108 ++--
.../iotdb/db/mpp/aggregation/Aggregator.java | 84 ++--
.../iotdb/db/mpp/execution/driver/DataDriver.java | 39 +-
.../iotdb/db/mpp/execution/driver/Driver.java | 24 +-
.../db/mpp/execution/exchange/LocalSinkHandle.java | 36 +-
.../mpp/execution/exchange/LocalSourceHandle.java | 12 +
.../execution/exchange/MPPDataExchangeManager.java | 18 +
.../db/mpp/execution/exchange/SinkHandle.java | 71 +--
.../db/mpp/execution/exchange/SourceHandle.java | 34 +-
.../fragment/FragmentInstanceManager.java | 8 +-
.../iotdb/db/mpp/execution/operator/Operator.java | 23 +
.../db/mpp/execution/operator/OperatorContext.java | 19 +
.../operator/process/AbstractIntoOperator.java | 4 +-
.../operator/process/AggregationOperator.java | 4 +-
.../operator/process/DeviceMergeOperator.java | 6 +-
.../operator/process/DeviceViewOperator.java | 6 +-
.../execution/operator/process/FillOperator.java | 4 +-
.../operator/process/FilterAndProjectOperator.java | 4 +-
.../execution/operator/process/LimitOperator.java | 4 +-
.../operator/process/LinearFillOperator.java | 6 +-
.../operator/process/MergeSortOperator.java | 6 +-
.../execution/operator/process/OffsetOperator.java | 4 +-
.../process/RawDataAggregationOperator.java | 8 +-
.../operator/process/SingleDeviceViewOperator.java | 6 +-
.../process/SingleInputAggregationOperator.java | 2 +-
.../process/SlidingWindowAggregationOperator.java | 6 +-
.../execution/operator/process/SortOperator.java | 83 ++-
.../operator/process/TagAggregationOperator.java | 6 +-
.../operator/process/TransformOperator.java | 2 +-
.../process/join/RowBasedTimeJoinOperator.java | 6 +-
.../operator/process/join/TimeJoinOperator.java | 6 +-
.../process/join/VerticallyConcatOperator.java | 6 +-
.../process/join/merge/MergeSortComparator.java | 110 +++-
.../last/AbstractUpdateLastCacheOperator.java | 2 +-
.../last/AlignedUpdateLastCacheOperator.java | 2 +-
.../process/last/LastQueryCollectOperator.java | 6 +-
.../process/last/LastQueryMergeOperator.java | 6 +-
.../operator/process/last/LastQueryOperator.java | 6 +-
.../process/last/LastQuerySortOperator.java | 6 +-
.../process/last/UpdateLastCacheOperator.java | 2 +-
.../operator/schema/CountMergeOperator.java | 6 +-
.../schema/LevelTimeSeriesCountOperator.java | 2 +-
.../schema/NodeManageMemoryMergeOperator.java | 4 +-
.../operator/schema/NodePathsConvertOperator.java | 4 +-
.../operator/schema/NodePathsCountOperator.java | 4 +-
.../operator/schema/SchemaFetchMergeOperator.java | 6 +-
.../operator/schema/SchemaQueryMergeOperator.java | 6 +-
.../schema/SchemaQueryOrderByHeatOperator.java | 6 +-
.../operator/schema/SchemaQueryScanOperator.java | 2 +-
.../AbstractSeriesAggregationScanOperator.java | 2 +-
.../operator/source/AlignedSeriesScanUtil.java | 1 +
.../operator/source/LastCacheScanOperator.java | 2 +-
.../execution/operator/source/SeriesScanUtil.java | 357 +++++++------
.../operator/source/ShowQueriesOperator.java | 140 ++++++
.../db/mpp/execution/schedule/DriverScheduler.java | 22 +
.../db/mpp/execution/schedule/task/DriverTask.java | 19 +
.../cache => mpp/metric}/ChunkCacheMetrics.java | 6 +-
.../iotdb/db/mpp/metric/DataExchangeMetricSet.java | 195 +++++++
.../metric/DriverSchedulerMetricSet.java} | 54 +-
.../db/mpp/metric/QueryExecutionMetricSet.java | 132 +++++
.../iotdb/db/mpp/metric/QueryMetricsManager.java | 129 +++++
.../metric/QueryPlanCostMetricSet.java} | 58 +--
.../metric/QueryResourceMetricSet.java} | 49 +-
.../db/mpp/metric/SeriesScanCostMetricSet.java | 558 +++++++++++++++++++++
.../metric}/TimeSeriesMetadataCacheMetrics.java | 5 +-
.../org/apache/iotdb/db/mpp/plan/Coordinator.java | 23 +-
.../apache/iotdb/db/mpp/plan/analyze/Analysis.java | 11 +
.../iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java | 77 ++-
.../apache/iotdb/db/mpp/plan/analyze/Analyzer.java | 11 +-
.../db/mpp/plan/execution/IQueryExecution.java | 7 +
.../db/mpp/plan/execution/QueryExecution.java | 43 +-
.../mpp/plan/execution/config/ConfigExecution.java | 19 +
.../iotdb/db/mpp/plan/parser/ASTVisitor.java | 2 +
.../db/mpp/plan/parser/StatementGenerator.java | 88 ++--
.../db/mpp/plan/planner/LogicalPlanBuilder.java | 62 +++
.../db/mpp/plan/planner/LogicalPlanVisitor.java | 6 +-
.../iotdb/db/mpp/plan/planner/LogicalPlanner.java | 10 +-
.../plan/planner/MemoryDistributionCalculator.java | 7 +
.../db/mpp/plan/planner/OperatorTreeGenerator.java | 84 +++-
.../planner/distribution/DistributionPlanner.java | 4 +-
.../planner/distribution/ExchangeNodeAdder.java | 24 +
.../SimpleFragmentParallelPlanner.java | 27 +-
.../plan/planner/distribution/SourceRewriter.java | 2 +-
.../db/mpp/plan/planner/plan/PlanFragment.java | 24 +-
.../plan/planner/plan/node/PlanGraphPrinter.java | 10 +-
.../mpp/plan/planner/plan/node/PlanNodeType.java | 6 +-
.../db/mpp/plan/planner/plan/node/PlanVisitor.java | 5 +
.../plan/planner/plan/node/process/SortNode.java | 54 +-
.../ShowQueriesNode.java} | 72 +--
.../{SourceNode.java => VirtualSourceNode.java} | 18 +-
.../planner/plan/parameter/OrderByParameter.java | 10 +
.../db/mpp/plan/scheduler/ClusterScheduler.java | 8 +
.../scheduler/FragmentInstanceDispatcherImpl.java | 37 +-
.../plan/statement/sys/ShowQueriesStatement.java | 25 +
.../dag/input/TsBlockInputDataSet.java | 6 +-
.../query/reader/chunk/DiskAlignedChunkLoader.java | 38 +-
.../db/query/reader/chunk/DiskChunkLoader.java | 23 +-
.../query/reader/chunk/MemAlignedChunkLoader.java | 15 +-
.../db/query/reader/chunk/MemChunkLoader.java | 15 +-
.../metadata/DiskAlignedChunkMetadataLoader.java | 112 +++--
.../chunk/metadata/DiskChunkMetadataLoader.java | 118 +++--
.../metadata/MemAlignedChunkMetadataLoader.java | 75 +--
.../chunk/metadata/MemChunkMetadataLoader.java | 76 +--
.../db/service/metrics/DataNodeMetricsHelper.java | 14 +
.../service/thrift/impl/ClientRPCServiceImpl.java | 120 ++++-
.../org/apache/iotdb/db/utils/FileLoaderUtils.java | 267 ++++++----
.../mpp/execution/operator/FillOperatorTest.java | 4 +-
.../operator/LastQueryMergeOperatorTest.java | 8 +-
.../execution/operator/LinearFillOperatorTest.java | 14 +-
.../execution/operator/MergeSortOperatorTest.java | 243 ++++++++-
.../mpp/execution/operator/OperatorMemoryTest.java | 19 +-
.../plan/plan/node/process/SortNodeSerdeTest.java | 10 +-
242 files changed, 4426 insertions(+), 1743 deletions(-)
copy confignode/src/main/java/org/apache/iotdb/confignode/{service/ConfigNodeMBean.java => manager/observer/IEvent.java} (90%)
copy integration-test/src/main/java/org/apache/iotdb/it/env/cluster/Cluster1Env.java => confignode/src/main/java/org/apache/iotdb/confignode/manager/observer/NodeStatisticsEvent.java (55%)
create mode 100644 integration-test/src/main/java/org/apache/iotdb/it/env/cluster/MppSharedCommonConfig.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/source/ShowQueriesOperator.java
copy server/src/main/java/org/apache/iotdb/db/{engine/cache => mpp/metric}/ChunkCacheMetrics.java (94%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/metric/DataExchangeMetricSet.java
copy server/src/main/java/org/apache/iotdb/db/{engine/cache/TimeSeriesMetadataCacheMetrics.java => mpp/metric/DriverSchedulerMetricSet.java} (52%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/metric/QueryExecutionMetricSet.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/metric/QueryMetricsManager.java
copy server/src/main/java/org/apache/iotdb/db/{engine/cache/ChunkCacheMetrics.java => mpp/metric/QueryPlanCostMetricSet.java} (54%)
rename server/src/main/java/org/apache/iotdb/db/{engine/cache/ChunkCacheMetrics.java => mpp/metric/QueryResourceMetricSet.java} (58%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/metric/SeriesScanCostMetricSet.java
rename server/src/main/java/org/apache/iotdb/db/{engine/cache => mpp/metric}/TimeSeriesMetadataCacheMetrics.java (94%)
copy server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/{process/last/LastQueryCollectNode.java => source/ShowQueriesNode.java} (59%)
copy server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/source/{SourceNode.java => VirtualSourceNode.java} (67%)