You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ma...@apache.org on 2023/05/29 09:08:07 UTC

[iotdb] branch add-level-file-metric updated (b9566a54f78 -> 9255c608f4a)

This is an automated email from the ASF dual-hosted git repository.

marklau99 pushed a change to branch add-level-file-metric
in repository https://gitbox.apache.org/repos/asf/iotdb.git


    from b9566a54f78 do some refactor
     add 4ff204f00a8 Fix memory control when creating timeseries using schema template (#9952)
     add 4b79487e049 Support insertion in logical view (#9937)
     add b7aaaf04378 Support Alter View (#9955)
     add 84780e2d3f3 [IOTDB-5723] Pipe: progress index (#9446)(#9950)
     add 634f0395421 [IOTDB-5927] Add up time metric (#9960)
     add 5307bbfd77c [IOTDB-5723] Pipe: progress index for simple consenesus (#9961)
     add 2f01f631f0b fix python ci by SimpleConsensus (#9966)
     add f4464c9441b [IOTDB-5723] Pipe progress index: fix NumberFormatException when using IoTConsensus in DataRegion (#9965)
     add 5467cfca81c [IOTDB-5928] Refactor TsFile status transition module (#9940)
     add 9255c608f4a Merge remote-tracking branch 'upstream/master' into add-level-file-metric

No new revisions were added by this update.

Summary of changes:
 .../org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4   |  10 +-
 .../pipe/runtime/PipeRuntimeCoordinator.java       |   5 +-
 .../confignode/persistence/pipe/PipeTaskInfo.java  |   9 +-
 .../runtime/PipeHandleMetaChangeProcedure.java     |  10 +-
 .../impl/pipe/task/CreatePipeProcedureV2.java      |   7 +-
 .../iotdb/confignode/service/ConfigNode.java       |   2 +
 .../request/ConfigPhysicalPlanSerDeTest.java       |   9 +-
 .../iotdb/confignode/persistence/PipeInfoTest.java |   3 +-
 .../runtime/PipeHandleMetaChangeProcedureTest.java |   7 +-
 .../request/BatchIndexedConsensusRequest.java      |   6 +-
 .../consensus/iot/IoTConsensusServerImpl.java      |  15 +-
 .../consensus/iot/logdispatcher/LogDispatcher.java |   4 +-
 docker/src/main/Dockerfile-1c1d                    |   3 +
 docs/UserGuide/Monitor-Alert/Metric-Tool.md        |   3 +-
 docs/zh/UserGuide/Monitor-Alert/Metric-Tool.md     |  13 +-
 .../src/main/thrift/iotconsensus.thrift            |   2 +-
 .../apache/iotdb/metrics/config/MetricConfig.java  |   7 +
 .../{jvm/JvmMetrics.java => UpTimeMetrics.java}    |  36 ++--
 .../index/ComparableConsensusRequest.java          |  11 +-
 .../commons/consensus/index/ProgressIndex.java     |  79 ++++++++
 .../commons/consensus/index/ProgressIndexType.java |  85 +++++++++
 .../consensus/index/impl/IoTProgressIndex.java     | 167 +++++++++++++++++
 .../consensus/index/impl/MinimumProgressIndex.java |  87 +++++++++
 .../consensus/index/impl/SimpleProgressIndex.java  | 160 ++++++++++++++++
 .../iotdb/commons/pipe/task/meta/PipeTaskMeta.java |  67 ++++---
 .../commons/schema/view/LogicalViewSchema.java     |  30 +++
 .../commons/pipe/task/meta/PipeMetaDeSerTest.java  |   7 +-
 .../IoTConsensusDataRegionStateMachine.java        |  11 +-
 .../execute/task/AbstractCompactionTask.java       |  25 ++-
 .../execute/task/CrossSpaceCompactionTask.java     |  15 +-
 .../execute/task/InnerSpaceCompactionTask.java     |  21 +--
 .../writer/AbstractCrossCompactionWriter.java      |   3 +-
 .../writer/AbstractInnerCompactionWriter.java      |   4 +-
 .../compaction/schedule/CompactionTaskManager.java |   5 +-
 .../utils/CrossSpaceCompactionCandidate.java       |   6 +-
 .../iotdb/db/engine/storagegroup/DataRegion.java   |  45 ++---
 .../db/engine/storagegroup/TsFileProcessor.java    |  11 +-
 .../db/engine/storagegroup/TsFileResource.java     | 148 +++++++++++----
 .../db/metadata/cache/DataNodeSchemaCache.java     |  22 ++-
 .../cache/DeviceUsingTemplateSchemaCache.java      |   7 +
 .../iotdb/db/metadata/cache/SchemaCacheEntry.java  |   9 +
 .../db/metadata/cache/TimeSeriesSchemaCache.java   |  70 ++++++-
 .../db/metadata/mnode/mem/info/BasicMNodeInfo.java |   2 +-
 .../db/metadata/mtree/MTreeBelowSGMemoryImpl.java  |   6 -
 .../schemaregion/SchemaRegionMemoryImpl.java       |   8 +-
 .../view/ViewPathType.java}                        |   8 +-
 .../apache/iotdb/db/metadata/view/ViewPaths.java   |  97 ++++++++++
 .../mpp/common/schematree/ClusterSchemaTree.java   |  43 +++++
 .../common/schematree/IMeasurementSchemaInfo.java  |   3 +
 .../common/schematree/MeasurementSchemaInfo.java   |   9 +
 .../schematree/node/SchemaMeasurementNode.java     |   8 +
 .../iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java  | 143 ++++++++------
 .../analyze/schema/ClusterSchemaFetchExecutor.java |  19 ++
 .../plan/analyze/schema/ISchemaComputation.java    |  39 ++++
 .../mpp/plan/analyze/schema/ISchemaValidation.java |   9 +
 .../plan/analyze/schema/NormalSchemaFetcher.java   | 206 ++++++++++++++++++---
 .../plan/execution/config/ConfigTaskVisitor.java   |  16 ++
 .../config/executor/ClusterConfigTaskExecutor.java | 163 ++++++++++++++++
 .../config/executor/IConfigTaskExecutor.java       |   8 +
 ...icalViewTask.java => AlterLogicalViewTask.java} |  14 +-
 ...calViewTask.java => RenameLogicalViewTask.java} |  15 +-
 .../iotdb/db/mpp/plan/parser/ASTVisitor.java       |  58 +++++-
 .../db/mpp/plan/planner/LogicalPlanVisitor.java    |  11 +-
 .../plan/node/write/InsertMultiTabletsNode.java    |   7 +
 .../plan/planner/plan/node/write/InsertNode.java   |  20 +-
 .../planner/plan/node/write/InsertRowsNode.java    |   7 +
 .../plan/node/write/InsertRowsOfOneDeviceNode.java |   7 +
 .../iotdb/db/mpp/plan/statement/StatementType.java |   2 +
 .../db/mpp/plan/statement/StatementVisitor.java    |  11 ++
 .../plan/statement/crud/InsertBaseStatement.java   |  93 ++++++++++
 .../crud/InsertMultiTabletsStatement.java          |  17 ++
 .../plan/statement/crud/InsertRowStatement.java    | 128 ++++++++++++-
 .../crud/InsertRowsOfOneDeviceStatement.java       |  21 +++
 .../plan/statement/crud/InsertRowsStatement.java   |  17 ++
 .../plan/statement/crud/InsertTabletStatement.java | 135 +++++++++++++-
 .../metadata/view/AlterLogicalViewStatement.java   | 115 ++++++++++++
 .../metadata/view/CreateLogicalViewStatement.java  | 120 ++++--------
 ...tement.java => RenameLogicalViewStatement.java} |  37 ++--
 .../{PipeLauncher.java => PipeAgentLauncher.java}  |   6 +-
 .../db/pipe/agent/runtime/PipeRuntimeAgent.java    |  33 ++--
 .../SimpleConsensusProgressIndexAssigner.java      | 112 +++++++++++
 .../iotdb/db/pipe/agent/task/PipeTaskAgent.java    |  41 ++--
 .../apache/iotdb/db/pipe/config/PipeConfig.java    |   6 +
 .../core/collector/IoTDBDataRegionCollector.java   |  12 +-
 .../PipeHistoricalDataRegionTsFileCollector.java   |  22 ++-
 .../realtime/PipeRealtimeDataRegionCollector.java  |  11 ++
 .../PipeRealtimeDataRegionHybridCollector.java     |  10 +-
 .../realtime/assigner/PipeDataRegionAssigner.java  |   7 +-
 .../listener/PipeInsertionDataNodeListener.java    |   7 +
 .../manager/PipeConnectorSubtaskLifeCycle.java     |   8 +-
 .../manager/PipeConnectorSubtaskManager.java       |  15 +-
 .../iotdb/db/pipe/core/event/EnrichedEvent.java    |  76 +++++++-
 .../core/event/impl/PipeTabletInsertionEvent.java  |  69 ++++---
 .../core/event/impl/PipeTsFileInsertionEvent.java  |  71 +++++--
 .../event/realtime/PipeRealtimeCollectEvent.java   |  49 +++--
 .../realtime/PipeRealtimeCollectEventFactory.java  |   4 +-
 .../event/view/collector/PipeEventCollector.java   |   6 +-
 .../executor/PipeSubtaskExecutorManager.java       |   4 +-
 .../file/PipeHardlinkFileDirStartupCleaner.java    |  59 ++++++
 .../org/apache/iotdb/db/pipe/task/PipeBuilder.java |  26 ++-
 .../org/apache/iotdb/db/pipe/task/PipeTask.java    |   7 +-
 .../apache/iotdb/db/pipe/task/PipeTaskBuilder.java |  18 +-
 .../task/queue/ListenableBlockingPendingQueue.java | 153 ++++++++++++++-
 ... => ListenableBoundedBlockingPendingQueue.java} |   5 +-
 .../db/pipe/task/queue/ListenablePendingQueue.java | 159 ----------------
 ...> ListenableUnboundedBlockingPendingQueue.java} |   9 +-
 .../db/pipe/task/stage/PipeTaskCollectorStage.java |  19 +-
 .../db/pipe/task/stage/PipeTaskConnectorStage.java |  12 +-
 .../db/pipe/task/stage/PipeTaskProcessorStage.java |  17 +-
 .../db/pipe/task/subtask/PipeConnectorSubtask.java |  22 ++-
 .../db/pipe/task/subtask/PipeProcessorSubtask.java |   4 +-
 .../iotdb/db/pipe/task/subtask/PipeSubtask.java    |  18 +-
 .../java/org/apache/iotdb/db/service/DataNode.java |   2 +-
 .../db/service/metrics/DataNodeMetricsHelper.java  |   2 +
 .../iotdb/db/engine/cache/ChunkCacheTest.java      |   4 +-
 .../engine/compaction/AbstractCompactionTest.java  |   6 +-
 .../compaction/CompactionTaskManagerTest.java      |   4 +-
 .../cross/CrossSpaceCompactionSelectorTest.java    |  12 +-
 .../CrossSpaceCompactionWithFastPerformerTest.java |   6 +-
 ...eCompactionWithFastPerformerValidationTest.java |  16 +-
 ...sSpaceCompactionWithReadPointPerformerTest.java |   6 +-
 ...actionWithReadPointPerformerValidationTest.java |  12 +-
 .../db/engine/compaction/cross/MergeTest.java      |   6 +-
 .../cross/RewriteCompactionFileSelectorTest.java   |  42 ++---
 .../inner/AbstractInnerSpaceCompactionTest.java    |   4 +-
 .../inner/InnerCompactionMoreDataTest.java         |   2 +-
 .../inner/InnerCompactionSchedulerTest.java        |   6 +-
 .../compaction/inner/InnerCompactionTest.java      |   4 +-
 .../SizeTieredCompactionSelectorTest.java          |   2 +
 .../inner/sizetiered/SizeTieredCompactionTest.java |  10 +-
 .../utils/MultiTsFileDeviceIteratorTest.java       |  12 +-
 .../db/engine/snapshot/IoTDBSnapshotTest.java      |   4 +-
 .../engine/storagegroup/FakedTsFileResource.java   |   4 +-
 .../TsFileResourceProgressIndexTest.java           | 173 +++++++++++++++++
 .../db/engine/storagegroup/TsFileResourceTest.java |   2 +-
 .../execution/operator/AlignedSeriesTestUtil.java  |   6 +-
 .../collector/CachedSchemaPatternMatcherTest.java  |  14 +-
 .../core/collector/PipeRealtimeCollectTest.java    |  14 +-
 .../executor/PipeConnectorSubtaskExecutorTest.java |   6 +-
 .../executor/PipeProcessorSubtaskExecutorTest.java |   2 +
 .../AlignedSeriesScanLimitOffsetPushDownTest.java  |  10 +-
 .../query/reader/series/SeriesReaderTestUtil.java  |   6 +-
 .../series/SeriesScanLimitOffsetPushDownTest.java  |   8 +-
 .../iotdb/db/rescon/ResourceManagerTest.java       |  12 +-
 144 files changed, 3498 insertions(+), 886 deletions(-)
 copy metrics/interface/src/main/java/org/apache/iotdb/metrics/metricsets/{jvm/JvmMetrics.java => UpTimeMetrics.java} (56%)
 copy confignode/src/main/java/org/apache/iotdb/confignode/procedure/state/pipe/plugin/CreatePipePluginState.java => node-commons/src/main/java/org/apache/iotdb/commons/consensus/index/ComparableConsensusRequest.java (81%)
 create mode 100644 node-commons/src/main/java/org/apache/iotdb/commons/consensus/index/ProgressIndex.java
 create mode 100644 node-commons/src/main/java/org/apache/iotdb/commons/consensus/index/ProgressIndexType.java
 create mode 100644 node-commons/src/main/java/org/apache/iotdb/commons/consensus/index/impl/IoTProgressIndex.java
 create mode 100644 node-commons/src/main/java/org/apache/iotdb/commons/consensus/index/impl/MinimumProgressIndex.java
 create mode 100644 node-commons/src/main/java/org/apache/iotdb/commons/consensus/index/impl/SimpleProgressIndex.java
 copy server/src/main/java/org/apache/iotdb/db/{mpp/statistics/TimeseriesStats.java => metadata/view/ViewPathType.java} (87%)
 create mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/view/ViewPaths.java
 copy server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/metadata/view/{DeleteLogicalViewTask.java => AlterLogicalViewTask.java} (74%)
 copy server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/metadata/view/{DeleteLogicalViewTask.java => RenameLogicalViewTask.java} (76%)
 create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/view/AlterLogicalViewStatement.java
 copy server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/view/{DeleteLogicalViewStatement.java => RenameLogicalViewStatement.java} (68%)
 rename server/src/main/java/org/apache/iotdb/db/pipe/agent/runtime/{PipeLauncher.java => PipeAgentLauncher.java} (98%)
 create mode 100644 server/src/main/java/org/apache/iotdb/db/pipe/agent/runtime/SimpleConsensusProgressIndexAssigner.java
 create mode 100644 server/src/main/java/org/apache/iotdb/db/pipe/resource/file/PipeHardlinkFileDirStartupCleaner.java
 copy server/src/main/java/org/apache/iotdb/db/pipe/task/queue/{ListenableBlockingPendingQueue.java => ListenableBoundedBlockingPendingQueue.java} (84%)
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/pipe/task/queue/ListenablePendingQueue.java
 rename server/src/main/java/org/apache/iotdb/db/pipe/task/queue/{ListenableUnblockingPendingQueue.java => ListenableUnboundedBlockingPendingQueue.java} (77%)
 create mode 100644 server/src/test/java/org/apache/iotdb/db/engine/storagegroup/TsFileResourceProgressIndexTest.java