This is an automated email from the ASF dual-hosted git repository. haonan pushed a commit to branch aligned_mem_cal in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit d2c000216d7cf99afacf772abd2859805cbca7f8 Merge: 06ee6aa46c 921faa061b Author: HTHou <[email protected]> AuthorDate: Thu May 11 10:00:48 2023 +0800 Merge branch 'master' of https://github.com/apache/iotdb into aligned_mem_cal .../org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4 | 22 ++ .../antlr4/org/apache/iotdb/db/qp/sql/SqlLexer.g4 | 4 + client-py/tests/test_dataframe.py | 2 + .../confignode/manager/ClusterSchemaManager.java | 13 +- consensus/pom.xml | 2 +- docs/UserGuide/Monitor-Alert/Metric-Tool.md | 8 +- docs/UserGuide/QuickStart/WayToGetIoTDB.md | 2 +- docs/UserGuide/Reference/DataNode-Config-Manual.md | 2 +- docs/zh/UserGuide/Monitor-Alert/Metric-Tool.md | 24 +- .../UserGuide/Reference/DataNode-Config-Manual.md | 2 +- .../apache/iotdb/db/it/query/IoTDBResultSetIT.java | 2 + .../db/it/schema/IoTDBAutoCreateSchemaIT.java | 17 +- .../it/schema/IoTDBCreateAlignedTimeseriesIT.java | 17 +- .../db/it/schema/IoTDBCreateStorageGroupIT.java | 18 +- .../db/it/schema/IoTDBCreateTimeseriesIT.java | 17 +- .../db/it/schema/IoTDBDeactivateTemplateIT.java | 26 +- .../it/schema/IoTDBDeleteAlignedTimeseriesIT.java | 18 +- .../db/it/schema/IoTDBDeleteStorageGroupIT.java | 17 +- .../db/it/schema/IoTDBDeleteTimeseriesIT.java | 18 +- .../iotdb/db/it/schema/IoTDBExtendTemplateIT.java | 49 +-- .../iotdb/db/it/schema/IoTDBMetadataFetchIT.java | 63 ++-- .../iotdb/db/it/schema/IoTDBSchemaTemplateIT.java | 49 +-- .../db/it/schema/IoTDBSortedShowTimeseriesIT.java | 20 +- .../apache/iotdb/db/it/schema/IoTDBTagAlterIT.java | 17 +- .../org/apache/iotdb/db/it/schema/IoTDBTagIT.java | 17 +- .../org/apache/iotdb/util/AbstractSchemaIT.java | 48 ++- .../iotdb/zeppelin/it/IoTDBInterpreterIT.java | 14 +- .../metrics/metricsets/jvm/JvmMemoryMetrics.java | 6 +- .../resources/conf/iotdb-common.properties | 4 + .../iotdb/commons/consensus/DataRegionId.java | 4 - .../org/apache/iotdb/commons/path/PartialPath.java | 4 +- .../pipe/plugin/builtin/BuiltinPipePlugin.java | 8 +- .../plugin/builtin/collector/DefaultCollector.java | 60 ++++ .../commons/pipe/task/meta/PipeStaticMeta.java | 4 +- .../node/common/AbstractMeasurementMNode.java | 4 + .../schema/node/role/IMeasurementMNode.java | 2 + .../commons/schema/node/utils/IMNodeFactory.java | 4 + .../api/exception/PipeConnectionException.java | 18 +- .../schemaregion/rocksdb/RSchemaRegion.java | 7 + .../rocksdb/mnode/RMeasurementMNode.java | 5 + .../metadata/tagSchemaRegion/TagSchemaRegion.java | 7 + .../resources/conf/iotdb-datanode.properties | 2 +- .../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 11 + .../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 4 + .../db/engine/cache/TimeSeriesMetadataCache.java | 7 +- .../CompactionMemoryNotEnoughException.java} | 9 +- .../execute/task/CrossSpaceCompactionTask.java | 6 +- .../estimator/AbstractCompactionEstimator.java | 3 +- .../ReadPointCrossCompactionEstimator.java | 6 +- .../iotdb/db/engine/storagegroup/DataRegion.java | 35 +- .../apache/iotdb/db/metadata/MetadataConstant.java | 6 + .../db/metadata/cache/DataNodeSchemaCache.java | 14 +- .../metadata/cache/DataNodeSchemaCacheMetrics.java | 17 +- .../db/metadata/cache/TimeSeriesSchemaCache.java | 3 +- .../dualkeycache/impl/DualKeyCacheBuilder.java | 18 +- .../dualkeycache/impl/DualKeyCachePolicy.java | 3 +- .../dualkeycache/impl/FIFOCacheEntryManager.java | 189 ++++++++++ .../mnode/config/factory/ConfigMNodeFactory.java | 7 + .../mnode/mem/factory/MemMNodeFactory.java | 14 + ...MeasurementMNode.java => LogicalViewMNode.java} | 30 +- .../metadata/mnode/mem/impl/LogicalViewSchema.java | 215 +++++++++++ .../metadata/mnode/mem/impl/MeasurementMNode.java | 5 + .../metadata/mnode/mem/info/LogicalViewInfo.java | 161 +++++++++ .../schemafile/factory/CacheMNodeFactory.java | 7 + .../schemafile/impl/CachedMeasurementMNode.java | 5 + .../db/metadata/mtree/MTreeBelowSGCachedImpl.java | 10 +- .../db/metadata/mtree/MTreeBelowSGMemoryImpl.java | 75 +++- .../mtree/snapshot/MemMTreeSnapshotUtil.java | 48 ++- .../plan/schemaregion/SchemaRegionPlanType.java | 2 + .../plan/schemaregion/SchemaRegionPlanVisitor.java | 5 + .../impl/SchemaRegionPlanDeserializer.java | 24 ++ .../impl/SchemaRegionPlanSerializer.java | 27 ++ .../impl/SchemaRegionPlanTxtSerializer.java | 21 ++ .../impl/write/CreateLogicalViewPlanImpl.java | 75 ++++ .../schemaregion/result/ShowTimeSeriesResult.java | 14 +- .../schemaregion/write/ICreateLogicalViewPlan.java | 66 ++++ .../metadata/query/info/ITimeSeriesSchemaInfo.java | 6 +- .../metadata/rescon/MemSchemaRegionStatistics.java | 8 +- .../db/metadata/schemaregion/ISchemaRegion.java | 5 + .../schemaregion/SchemaRegionMemoryImpl.java | 40 +++ .../schemaregion/SchemaRegionSchemaFileImpl.java | 7 + .../metadata/template/ClusterTemplateManager.java | 36 ++ .../view/viewExpression/ViewExpression.java | 318 +++++++++++++++++ .../view/viewExpression/ViewExpressionType.java | 76 ++++ .../binary/BinaryViewExpression.java | 119 +++++++ .../binary/arithmetic/AdditionViewExpression.java | 61 ++++ .../arithmetic/ArithmeticBinaryViewExpression.java | 52 +++ .../binary/arithmetic/DivisionViewExpression.java | 61 ++++ .../binary/arithmetic/ModuloViewExpression.java | 61 ++++ .../arithmetic/MultiplicationViewExpression.java | 63 ++++ .../arithmetic/SubtractionViewExpression.java | 61 ++++ .../compare/CompareBinaryViewExpression.java | 52 +++ .../binary/compare/EqualToViewExpression.java | 57 +++ .../binary/compare/GreaterEqualViewExpression.java | 57 +++ .../binary/compare/GreaterThanViewExpression.java | 57 +++ .../binary/compare/LessEqualViewExpression.java | 57 +++ .../binary/compare/LessThanViewExpression.java | 57 +++ .../binary/compare/NonEqualViewExpression.java | 57 +++ .../binary/logic/LogicAndViewExpression.java | 57 +++ .../binary/logic/LogicBinaryViewExpression.java | 52 +++ .../binary/logic/LogicOrViewExpression.java | 57 +++ .../viewExpression/leaf/ConstantViewOperand.java | 98 ++++++ .../view/viewExpression/leaf/LeafViewOperand.java} | 27 +- .../view/viewExpression/leaf/NullViewOperand.java | 61 ++++ .../viewExpression/leaf/TimeSeriesViewOperand.java | 87 +++++ .../viewExpression/leaf/TimestampViewOperand.java | 72 ++++ .../multi/FunctionViewExpression.java | 198 +++++++++++ .../ternary/BetweenViewExpression.java | 111 ++++++ .../ternary/TernaryViewExpression.java | 105 ++++++ .../viewExpression/unary/InViewExpression.java | 106 ++++++ .../viewExpression/unary/IsNullViewExpression.java | 89 +++++ .../viewExpression/unary/LikeViewExpression.java | 163 +++++++++ .../unary/LogicNotViewExpression.java | 61 ++++ .../unary/NegationViewExpression.java | 61 ++++ .../unary/RegularViewExpression.java | 105 ++++++ .../viewExpression/unary/UnaryViewExpression.java | 73 ++++ .../visitor/GetSourcePathsVisitor.java | 95 +++++ .../visitor/TransformToExpressionVisitor.java | 320 +++++++++++++++++ .../visitor/ViewExpressionVisitor.java | 219 ++++++++++++ .../metadata/visitor/SchemaExecutionVisitor.java | 22 ++ .../db/mpp/common/header/ColumnHeaderConstant.java | 6 +- .../mpp/execution/exchange/SharedTsBlockQueue.java | 12 +- .../execution/executor/RegionWriteExecutor.java | 49 +++ .../schema/source/TimeSeriesSchemaSource.java | 14 +- .../iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java | 45 +++ .../visitor/TransformToViewExpressionVisitor.java | 391 +++++++++++++++++++++ .../iotdb/db/mpp/plan/parser/ASTVisitor.java | 86 +++++ .../db/mpp/plan/planner/LogicalPlanVisitor.java | 21 ++ .../mpp/plan/planner/plan/node/PlanNodeType.java | 6 +- .../db/mpp/plan/planner/plan/node/PlanVisitor.java | 5 + .../node/metedata/write/CreateLogicalViewNode.java | 250 +++++++++++++ .../plan/planner/plan/node/write/InsertNode.java | 8 + .../iotdb/db/mpp/plan/statement/StatementType.java | 2 + .../db/mpp/plan/statement/StatementVisitor.java | 7 + .../metadata/CreateLogicalViewStatement.java | 246 +++++++++++++ .../db/pipe/agent/plugin/PipePluginAgent.java | 26 +- .../iotdb/db/pipe/agent/task/PipeTaskAgent.java | 139 ++++---- .../PipeCollectorConstant.java} | 20 +- .../PipeConnectorConstant.java} | 12 +- .../PipeProcessorConstant.java} | 12 +- .../core/collector/IoTDBDataRegionCollector.java | 85 +++++ ...> PipeHistoricalDataRegionTsFileCollector.java} | 39 +- .../realtime/PipeRealtimeDataRegionCollector.java | 21 +- ... => PipeRealtimeDataRegionHybridCollector.java} | 33 +- .../connector/PipeConnectorSubtaskLifeCycle.java | 31 +- .../connector/PipeConnectorSubtaskManager.java | 19 +- .../event/view/collector/PipeEventCollector.java | 59 +++- ...anager.java => PipeSubtaskExecutorManager.java} | 12 +- .../execution/scheduler/PipeTaskScheduler.java | 18 +- .../org/apache/iotdb/db/pipe/task/PipeBuilder.java | 66 ++++ .../org/apache/iotdb/db/pipe/task/PipeTask.java | 9 +- .../apache/iotdb/db/pipe/task/PipeTaskBuilder.java | 60 +++- .../apache/iotdb/db/pipe/task/PipeTaskManager.java | 96 +++++ .../iotdb/db/pipe/task/queue/EventSupplier.java | 25 +- .../ListenableBlockingPendingQueue.java} | 18 +- .../db/pipe/task/queue/ListenablePendingQueue.java | 159 +++++++++ .../ListenableUnblockingPendingQueue.java} | 18 +- .../PendingQueueEmptyToNotEmptyListener.java} | 9 +- .../PendingQueueFullToNotFullListener.java} | 9 +- .../PendingQueueNotEmptyToEmptyListener.java} | 9 +- .../PendingQueueNotFullToFullListener.java} | 9 +- .../db/pipe/task/stage/PipeTaskCollectorStage.java | 83 +++-- .../db/pipe/task/stage/PipeTaskConnectorStage.java | 100 +----- .../db/pipe/task/stage/PipeTaskProcessorStage.java | 105 +++++- .../iotdb/db/pipe/task/stage/PipeTaskStage.java | 95 ++++- .../db/pipe/task/subtask/PipeConnectorSubtask.java | 87 +++-- .../db/pipe/task/subtask/PipeProcessorSubtask.java | 20 +- .../iotdb/db/pipe/task/subtask/PipeSubtask.java | 6 +- .../org/apache/iotdb/db/rescon/SystemInfo.java | 20 +- .../impl/DataNodeInternalRPCServiceImpl.java | 1 + .../cache/dualkeycache/DualKeyCacheTest.java | 17 + .../metadata/view/ViewExpressionToStringTest.java | 183 ++++++++++ .../collector/CachedSchemaPatternMatcherTest.java | 48 ++- .../core/collector/PipeRealtimeCollectTest.java | 59 +++- .../executor/PipeConnectorSubtaskExecutorTest.java | 8 +- .../executor/PipeProcessorSubtaskExecutorTest.java | 10 +- 176 files changed, 7710 insertions(+), 689 deletions(-)
