This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a change to branch ty/TableModelGrammar
in repository https://gitbox.apache.org/repos/asf/iotdb.git
from ba75cf3c06f Merge branch 'ty/TableModelGrammar' of
https://github.com/apache/iotdb into ty/TableModelGrammar
add 9a5b02a4336 Fix incorrect query result in GROUP BY LEVEL query with
logical view
add f0b21e77304 Reduce CI usage by removing JDK 11 (#12613)
add ff3d170e643 Pipe IT: Reduce CI FT runner usage (#12614)
add 9465ac242ef Implementation of device TTL (#12122)
new a6ca9254f3c resolve conflicts
The 1 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/cluster-it-1c1d.yml | 5 +-
.github/workflows/pipe-it-2cluster.yml | 7 +-
.github/workflows/unit-test.yml | 2 +-
.../it/database/IoTDBDatabaseSetAndDeleteIT.java | 8 +-
.../org/apache/iotdb/db/it/IoTDBRestServiceIT.java | 16 +-
.../iotdb/db/it/auth/IoTDBSeriesPermissionIT.java | 10 +-
.../apache/iotdb/db/it/query/IoTDBResultSetIT.java | 2 +
.../iotdb/db/it/schema/IoTDBMetadataFetchIT.java | 35 +-
.../pipe/it/autocreate/IoTDBPipeExtractorIT.java | 22 +-
.../java/org/apache/iotdb/rpc/TSStatusCode.java | 2 +
.../org/apache/iotdb/db/qp/sql/IdentifierParser.g4 | 1 +
.../org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4 | 9 +-
.../antlr4/org/apache/iotdb/db/qp/sql/SqlLexer.g4 | 4 +
.../confignode/client/DataNodeRequestType.java | 1 +
.../consensus/request/ConfigPhysicalPlanType.java | 1 +
.../ShowTTLPlan.java} | 16 +-
.../request/write/database/SetTTLPlan.java | 52 +-
.../ShowTTLResp.java} | 32 +-
.../iotdb/confignode/manager/ConfigManager.java | 35 +-
.../apache/iotdb/confignode/manager/IManager.java | 10 +
.../iotdb/confignode/manager/ProcedureManager.java | 15 +
.../iotdb/confignode/manager/TTLManager.java | 150 +++
.../iotdb/confignode/manager/node/NodeManager.java | 7 +-
.../manager/partition/PartitionManager.java | 5 +-
.../pipe/event/PipeConfigRegionSnapshotEvent.java | 9 +-
.../PipeConfigPhysicalPlanPatternParseVisitor.java | 8 +-
.../receiver/protocol/IoTDBConfigNodeReceiver.java | 6 +-
.../manager/schema/ClusterSchemaManager.java | 92 +-
.../iotdb/confignode/persistence/TTLInfo.java | 200 ++++
.../persistence/executor/ConfigPlanExecutor.java | 18 +-
.../partition/maintainer/RegionCreateTask.java | 29 +-
.../schema/CNPhysicalPlanGenerator.java | 35 +-
.../persistence/schema/CNSnapshotFileType.java | 3 +-
.../persistence/schema/ClusterSchemaInfo.java | 25 -
.../confignode/persistence/schema/ConfigMTree.java | 2 -
.../schema/ConfignodeSnapshotParser.java | 9 +
.../schema/mnode/factory/ConfigMNodeFactory.java | 10 +-
.../schema/mnode/info/ConfigDatabaseInfo.java | 10 -
.../procedure/env/ConfigNodeProcedureEnv.java | 26 +-
.../procedure/env/RegionMaintainHandler.java | 10 -
.../impl/region/CreateRegionGroupsProcedure.java | 9 -
.../procedure/impl/schema/SetTTLProcedure.java | 189 ++++
...AlterLogicalViewState.java => SetTTLState.java} | 7 +-
.../procedure/store/ProcedureFactory.java | 9 +
.../confignode/procedure/store/ProcedureType.java | 4 +
.../iotdb/confignode/service/ConfigNode.java | 16 +-
.../thrift/ConfigNodeRPCServiceProcessor.java | 15 +-
.../request/ConfigPhysicalPlanSerDeTest.java | 4 +-
...eConfigPhysicalPlanPatternParseVisitorTest.java | 2 +-
.../persistence/CNPhysicalPlanGeneratorTest.java | 117 +-
.../confignode/persistence/PartitionInfoTest.java | 2 +-
.../iotdb/confignode/persistence/TTLInfoTest.java | 256 +++++
.../persistence/schema/ClusterSchemaInfoTest.java | 1 -
.../persistence/schema/ConfigMTreeTest.java | 2 -
.../pipe/receiver/PipeEnrichedProcedureTest.java | 33 +
.../procedure/impl/schema/SetTTLProcedureTest.java | 68 ++
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 46 +
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 14 +
.../iotdb/db/protocol/client/ConfigNodeClient.java | 6 +
.../impl/DataNodeInternalRPCServiceImpl.java | 9 +-
.../thrift/impl/DataNodeRegionManager.java | 9 +-
.../common/header/ColumnHeaderConstant.java | 13 +-
.../execution/fragment/QueryContext.java | 15 -
.../operator/schema/source/DeviceSchemaSource.java | 7 +
.../execution/operator/source/SeriesScanUtil.java | 3 +-
.../queryengine/plan/analyze/AnalyzeVisitor.java | 6 +
.../plan/analyze/ExpressionAnalyzer.java | 6 +-
.../plan/analyze/GroupByLevelHelper.java | 3 +-
.../analyze/cache/schema/DataNodeTTLCache.java | 112 ++
.../config/executor/ClusterConfigTaskExecutor.java | 37 +-
.../execution/config/metadata/ShowTTLTask.java | 9 +-
.../visitor/ExpressionNormalizeVisitor.java | 17 +-
.../db/queryengine/plan/parser/ASTVisitor.java | 22 +-
.../plan/planner/LocalExecutionPlanContext.java | 10 -
.../plan/planner/OperatorTreeGenerator.java | 9 +-
.../plan/planner/distribution/SourceRewriter.java | 25 +-
.../plan/parameter/AggregationDescriptor.java | 2 +-
.../CrossSeriesAggregationDescriptor.java | 4 +
.../plan/statement/metadata/SetTTLStatement.java | 14 +-
.../statement/metadata/ShowDatabaseStatement.java | 22 +-
.../plan/statement/metadata/UnSetTTLStatement.java | 3 +-
.../schemaregion/mtree/impl/mem/MemMTreeStore.java | 9 +-
.../impl/mem/mnode/factory/MemMNodeFactory.java | 10 +-
.../mtree/impl/mem/mnode/impl/DatabaseMNode.java | 6 -
.../impl/mem/mnode/info/DatabaseDeviceInfo.java | 16 +-
.../mtree/impl/mem/mnode/info/DatabaseInfo.java | 15 +-
.../impl/mem/snapshot/MemMTreeSnapshotUtil.java | 2 +-
.../pbtree/mnode/factory/CacheMNodeFactory.java | 10 +-
.../pbtree/mnode/impl/CachedDatabaseMNode.java | 6 -
.../impl/pbtree/schemafile/MockSchemaFile.java | 16 +-
.../mtree/impl/pbtree/schemafile/SchemaFile.java | 8 +-
.../schemaregion/utils/ResourceByPathUtils.java | 19 +-
.../java/org/apache/iotdb/db/service/DataNode.java | 19 +-
.../db/service/metrics/CompactionMetrics.java | 151 +++
.../metrics/file/CompactionFileMetrics.java | 2 +-
.../iotdb/db/storageengine/StorageEngine.java | 99 +-
.../db/storageengine/dataregion/DataRegion.java | 298 +++--
.../dataregion/IDataRegionForQuery.java | 3 -
.../dataregion/VirtualDataRegion.java | 5 -
.../compaction/constant/CompactionTaskType.java | 4 +-
.../performer/impl/FastCompactionPerformer.java | 49 +-
.../execute/recover/CompactionRecoverManager.java | 129 ++-
.../execute/task/AbstractCompactionTask.java | 68 +-
.../execute/task/CompactionTaskPriorityType.java | 42 -
.../execute/task/CrossSpaceCompactionTask.java | 139 ++-
.../execute/task/InnerSpaceCompactionTask.java | 320 +++---
.../task/InsertionCrossSpaceCompactionTask.java | 9 +-
.../task/RepairUnsortedFileCompactionTask.java | 21 +-
.../execute/task/SettleCompactionTask.java | 387 +++++++
.../subtask/FastCompactionPerformerSubTask.java | 23 +-
.../execute/utils/CompactionPathUtils.java | 15 +-
.../compaction/execute/utils/CompactionUtils.java | 33 +-
.../execute/utils/MultiTsFileDeviceIterator.java | 65 +-
.../fast/AlignedSeriesCompactionExecutor.java | 5 +-
.../fast/NonAlignedSeriesCompactionExecutor.java | 5 +-
.../executor/fast/SeriesCompactionExecutor.java | 31 +-
.../fast/element/NonAlignedPageElement.java | 2 +-
.../execute/utils/log/CompactionLogger.java | 34 +
.../execute/utils/log/SimpleCompactionLogger.java | 4 +
.../schedule/CompactionScheduleSummary.java | 46 +
.../schedule/CompactionScheduleTaskManager.java | 29 +-
.../schedule/CompactionScheduleTaskWorker.java | 4 +-
.../compaction/schedule/CompactionScheduler.java | 63 +-
.../compaction/schedule/CompactionTaskManager.java | 49 +-
...cheduleTaskWorker.java => TTLScheduleTask.java} | 33 +-
.../DefaultCompactionTaskComparatorImpl.java | 56 +-
.../compaction/selector/ICompactionSelector.java | 6 +-
...nseqSpaceSelector.java => ISettleSelector.java} | 6 +-
.../selector/impl/SettleSelectorImpl.java | 327 ++++++
.../impl/SizeTieredCompactionSelector.java | 46 +-
.../dataregion/memtable/TsFileProcessor.java | 40 +-
.../dataregion/read/IQueryDataSource.java | 2 -
.../dataregion/read/QueryDataSource.java | 13 -
.../read/QueryDataSourceForRegionScan.java | 12 -
.../dataregion/tsfile/TsFileResource.java | 98 +-
.../tsfile/generator/TsFileNameGenerator.java | 45 +
.../tsfile/timeindex/ArrayDeviceTimeIndex.java | 6 +
.../dataregion/tsfile/timeindex/FileTimeIndex.java | 6 +
.../dataregion/tsfile/timeindex/ITimeIndex.java | 2 +
.../dataregion/utils/TsFileResourceUtils.java | 13 +
.../utils/validate/TsFileResourceValidator.java | 3 +-
.../db/storageengine/rescon/memory/SystemInfo.java | 14 +
.../mtree/schemafile/SchemaFileLogTest.java | 2 +-
.../metadata/mtree/schemafile/SchemaFileTest.java | 29 +-
.../schemaRegion/SchemaStatisticsTest.java | 37 +-
.../schema/SchemaQueryScanOperatorTest.java | 7 +-
.../builder/EvaluationDAGBuilderTest.java | 1 -
.../db/storageengine/dataregion/TTLQueryTest.java | 149 +++
.../iotdb/db/storageengine/dataregion/TTLTest.java | 114 +-
.../compaction/AbstractCompactionTest.java | 44 +-
.../compaction/CompactionTaskComparatorTest.java | 81 +-
.../FastCrossCompactionPerformerTest.java | 47 +-
.../ReadPointCompactionPerformerTest.java | 98 +-
.../cross/CrossSpaceCompactionExceptionTest.java | 13 +-
...eCompactionWithFastPerformerValidationTest.java | 7 +-
...actionWithReadPointPerformerValidationTest.java | 4 +-
.../RewriteCrossSpaceCompactionRecoverTest.java | 15 +-
.../inner/FastCompactionPerformerAlignedTest.java | 28 +-
.../FastCompactionPerformerNoAlignedTest.java | 28 +-
.../InnerSeqCompactionWithFastPerformerTest.java | 13 +-
...nerSeqCompactionWithReadChunkPerformerTest.java | 13 +-
.../inner/InnerSpaceCompactionExceptionTest.java | 35 +-
.../inner/InnerSpaceCompactionSelectorTest.java | 2 +-
.../InnerUnseqCompactionWithFastPerformerTest.java | 5 +-
...rUnseqCompactionWithReadPointPerformerTest.java | 5 +-
...nkCompactionPerformerWithAlignedSeriesTest.java | 49 +-
.../ReadChunkCompactionPerformerAlignedTest.java | 28 +-
.../ReadChunkCompactionPerformerNoAlignedTest.java | 40 +-
.../inner/ReadChunkCompactionPerformerOldTest.java | 5 +-
.../SizeTieredCompactionRecoverTest.java | 38 +-
.../recover/SizeTieredCompactionRecoverTest.java | 65 +-
.../settle/SettleCompactionRecoverTest.java | 1138 +++++++++++++++++++
.../settle/SettleCompactionSelectorTest.java | 1169 ++++++++++++++++++++
.../settle/SettleCompactionTaskTest.java | 478 ++++++++
.../compaction/utils/CompactionConfigRestorer.java | 2 +-
.../utils/MultiTsFileDeviceIteratorTest.java | 19 +-
.../compaction/utils/TsFileGeneratorUtils.java | 20 +-
.../iotdb/db/tools/PBTreeFileSketchTest.java | 2 +-
.../resources/conf/iotdb-common.properties | 19 +
.../iotdb/commons/concurrent/ThreadName.java | 2 -
.../apache/iotdb/commons/conf/CommonConfig.java | 11 +
.../iotdb/commons/conf/CommonDescriptor.java | 7 +
.../apache/iotdb/commons/conf/IoTDBConstant.java | 2 +
.../org/apache/iotdb/commons/path/PartialPath.java | 13 +
.../schema/node/common/AbstractDatabaseMNode.java | 10 -
.../commons/schema/node/info/IDatabaseInfo.java | 4 -
.../commons/schema/node/role/IDatabaseMNode.java | 4 +-
.../commons/schema/node/utils/IMNodeFactory.java | 4 +-
.../apache/iotdb/commons/schema/ttl/TTLCache.java | 279 +++++
.../utils/ThriftConfigNodeSerDeUtilsTest.java | 1 -
.../thrift-commons/src/main/thrift/common.thrift | 3 +-
.../src/main/thrift/confignode.thrift | 33 +-
.../src/main/thrift/datanode.thrift | 8 +-
193 files changed, 7434 insertions(+), 1890 deletions(-)
copy
iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/read/{template/GetAllSchemaTemplatePlan.java
=> ttl/ShowTTLPlan.java} (77%)
copy
iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/{database/CountDatabaseResp.java
=> ttl/ShowTTLResp.java} (62%)
create mode 100644
iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/TTLManager.java
create mode 100644
iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/TTLInfo.java
create mode 100644
iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/SetTTLProcedure.java
copy
iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/state/schema/{AlterLogicalViewState.java
=> SetTTLState.java} (90%)
create mode 100644
iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/persistence/TTLInfoTest.java
create mode 100644
iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/procedure/impl/schema/SetTTLProcedureTest.java
create mode 100644
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/cache/schema/DataNodeTTLCache.java
delete mode 100644
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/task/CompactionTaskPriorityType.java
create mode 100644
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/task/SettleCompactionTask.java
copy
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/schedule/{CompactionScheduleTaskWorker.java
=> TTLScheduleTask.java} (66%)
copy
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/selector/{IInnerUnseqSpaceSelector.java
=> ISettleSelector.java} (84%)
create mode 100644
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/selector/impl/SettleSelectorImpl.java
create mode 100644
iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/TTLQueryTest.java
create mode 100644
iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/settle/SettleCompactionRecoverTest.java
create mode 100644
iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/settle/SettleCompactionSelectorTest.java
create mode 100644
iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/settle/SettleCompactionTaskTest.java
create mode 100644
iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/ttl/TTLCache.java