This is an automated email from the ASF dual-hosted git repository.
haonan pushed a change to branch Wal_mem_control
in repository https://gitbox.apache.org/repos/asf/iotdb.git
from 1d8f1974b0e Merge branch 'master' of github.com:apache/iotdb into
Wal_mem_control
add c789ba8e555 fix addRemotePeer data inconsistency (#14332)
add 695d3be5ccd [remove datanode] Fix concurrent modification when
removing fails and rollback #14333
add 903c3599c42 [remove datanode X IoTV2] Fix concurrent modification when
removing fails and rollback #14336
add 16f71c8b632 Support show-queries and kill-query
add 9493f7dcc80 Enable tolerating any exceptions and not block cluster
initialization during schema region recover
add 8dbcac0c861 Merge branch 'master' of github.com:apache/iotdb into
Wal_mem_control
add 8369f9f99c4 fix concurrent issue
No new revisions were added by this update.
Summary of changes:
.../apache/iotdb/itbase/constant/TestConstant.java | 2 +-
.../it/partition/IoTDBTimePartitionIT.java | 2 +-
.../IoTDBRegionMigrateReliabilityITFramework.java | 2 +-
.../IoTDBRemoveDataNodeITFramework.java | 2 +-
.../org/apache/iotdb/db/it/IoTDBExampleIT.java | 2 +-
.../apache/iotdb/db/it/IoTDBExecuteBatchIT.java | 2 +-
.../apache/iotdb/db/it/IoTDBFilterBetweenIT.java | 2 +-
.../org/apache/iotdb/db/it/IoTDBFilterNullIT.java | 2 +-
.../org/apache/iotdb/db/it/IoTDBInsertNaNIT.java | 2 +-
.../org/apache/iotdb/db/it/IoTDBLoadTsFileIT.java | 2 +-
.../org/apache/iotdb/db/it/IoTDBNestedQueryIT.java | 2 +-
.../org/apache/iotdb/db/it/IoTDBRestServiceIT.java | 4 +-
.../org/apache/iotdb/db/it/IoTDBSimpleQueryIT.java | 2 +-
.../db/it/IoTDBSyntaxConventionIdentifierIT.java | 2 +-
.../it/IoTDBSyntaxConventionStringLiteralIT.java | 2 +-
.../it/aggregation/IoTDBAggregationByLevelIT.java | 2 +-
.../db/it/aligned/IoTDBAlignedLastQueryIT.java | 2 +-
.../db/it/aligned/IoTDBAlignedSeriesQueryIT.java | 2 +-
.../org/apache/iotdb/db/it/auth/IoTDBAuthIT.java | 2 +-
.../iotdb/db/it/auth/IoTDBClusterAuthorityIT.java | 2 +-
.../iotdb/db/it/auth/IoTDBSeriesPermissionIT.java | 22 +-
.../db/it/auth/IoTDBTemplatePermissionIT.java | 4 +-
.../it/last/IoTDBLastQueryWithLimitOffsetIT.java | 2 +-
.../iotdb/db/it/last/IoTDBLastWithTTLIT.java | 2 +-
.../apache/iotdb/db/it/query/IoTDBResultSetIT.java | 2 +-
.../db/it/schema/IoTDBAutoCreateSchemaIT.java | 2 +-
.../it/schema/IoTDBCreateAlignedTimeseriesIT.java | 2 +-
.../db/it/schema/IoTDBCreateStorageGroupIT.java | 2 +-
.../db/it/schema/IoTDBCreateTimeseriesIT.java | 2 +-
.../it/schema/IoTDBDeleteAlignedTimeseriesIT.java | 2 +-
.../iotdb/db/it/schema/IoTDBSchemaTemplateIT.java | 2 +-
.../db/it/schema/IoTDBSortedShowTimeseriesIT.java | 2 +-
.../apache/iotdb/db/it/schema/IoTDBTagAlterIT.java | 2 +-
.../org/apache/iotdb/db/it/schema/IoTDBTagIT.java | 2 +-
.../apache/iotdb/db/it/schema/IoTDBTagLimitIT.java | 2 +-
.../db/it/strangepath/IoTDBStrangePathIT.java | 2 +-
.../db/it/trigger/IoTDBTriggerManagementIT.java | 2 +-
.../iotdb/db/it/udaf/IoTDBUDAFGroupByLevelIT.java | 2 +-
.../iotdb/db/it/udf/IoTDBUDTFHybridQueryIT.java | 2 +-
.../pipe/it/autocreate/IoTDBPipeAutoDropIT.java | 2 +-
.../pipe/it/manual/IoTDBPipeMetaHistoricalIT.java | 2 +-
.../it/query/old/IoTDBSimpleQueryTableIT.java | 2 +-
.../aligned/IoTDBAlignedSeriesQueryTableIT.java | 2 +-
.../it/query/old/query/IoTDBResultSetTableIT.java | 2 +-
.../relational/it/schema/IoTDBDatabaseIT.java | 4 +-
.../iotdb/relational/it/schema/IoTDBTableIT.java | 6 +-
.../it/session/IoTDBTableModelSessionIT.java | 2 +-
.../session/pool/IoTDBTableModelSessionPoolIT.java | 2 +-
.../org/apache/iotdb/util/AbstractSchemaIT.java | 2 +-
.../apache/iotdb/tool/data/AbstractDataTool.java | 2 +-
.../payload/PipeTransferConfigSnapshotSealReq.java | 2 +-
.../receiver/protocol/IoTDBConfigNodeReceiver.java | 2 +-
.../iotdb/confignode/persistence/AuthorInfo.java | 2 +-
.../apache/iotdb/consensus/iot/IoTConsensus.java | 6 +-
.../apache/iotdb/consensus/pipe/PipeConsensus.java | 19 +-
.../consensus/pipe/PipeConsensusServerImpl.java | 47 ++-
.../pipe/consensuspipe/ConsensusPipeManager.java | 72 ++--
.../service/PipeConsensusRPCServiceProcessor.java | 6 +-
.../org/apache/iotdb/db/auth/AuthorityChecker.java | 6 +-
.../request/PipeTransferSchemaSnapshotSealReq.java | 2 +-
...oricalDataRegionTsFileAndDeletionExtractor.java | 20 +-
.../protocol/thrift/IoTDBDataNodeReceiver.java | 2 +-
.../protocol/thrift/impl/ClientRPCServiceImpl.java | 2 +-
.../queryengine/common/header/DatasetHeader.java | 1 +
.../common/header/DatasetHeaderFactory.java | 2 +
.../operator/process/DeviceViewIntoOperator.java | 4 +-
.../execution/operator/process/IntoOperator.java | 4 +-
.../schema/NodeManageMemoryMergeOperator.java | 4 +-
.../operator/schema/NodePathsConvertOperator.java | 4 +-
.../operator/schema/NodePathsCountOperator.java | 4 +-
.../schema/SchemaQueryOrderByHeatOperator.java | 4 +-
.../operator/schema/SchemaQueryScanOperator.java | 2 +-
.../schema/source/DeviceAttributeUpdater.java | 2 +-
.../schema/source/DeviceBlackListConstructor.java | 2 +-
.../schema/source/DevicePredicateFilter.java | 2 +-
.../schema/source/DevicePredicateHandler.java | 2 +-
.../operator/schema/source/DeviceSchemaSource.java | 4 +-
.../operator/schema/source/DeviceUpdater.java | 2 +-
.../operator/schema/source/ISchemaSource.java | 2 +-
.../schema/source/LogicalViewSchemaSource.java | 4 +-
.../operator/schema/source/NodeSchemaSource.java | 4 +-
.../schema/source/PathsUsingTemplateSource.java | 4 +-
.../schema/source/SchemaSourceFactory.java | 2 +-
.../schema/source/TableDeviceFetchSource.java | 2 +-
.../schema/source/TableDeviceQuerySource.java | 2 +-
.../schema/source/TimeSeriesSchemaSource.java | 4 +-
.../source/ActiveDeviceRegionScanOperator.java | 4 +-
.../source/ActiveTimeSeriesRegionScanOperator.java | 4 +-
.../InformationSchemaContentSupplierFactory.java | 91 +++++
.../InformationSchemaTableScanOperator.java} | 41 ++-
.../iotdb/db/queryengine/plan/Coordinator.java | 25 +-
.../queryengine/plan/analyze/AnalyzeVisitor.java | 8 +-
.../plan/analyze/ExpressionAnalyzer.java | 2 +-
.../plan/analyze/TemplatedAggregationAnalyze.java | 2 +-
.../plan/execution/IQueryExecution.java | 2 +
.../queryengine/plan/execution/QueryExecution.java | 5 +
.../plan/execution/config/ConfigExecution.java | 5 +
.../execution/config/TableConfigTaskVisitor.java | 10 +
.../config/metadata/CountDatabaseTask.java | 2 +-
.../config/metadata/CountTimeSlotListTask.java | 4 +-
.../execution/config/metadata/GetRegionIdTask.java | 4 +-
.../config/metadata/GetSeriesSlotListTask.java | 4 +-
.../config/metadata/GetTimeSlotListTask.java | 4 +-
.../execution/config/metadata/ShowAINodesTask.java | 4 +-
.../config/metadata/ShowClusterDetailsTask.java | 10 +-
.../config/metadata/ShowClusterIdTask.java | 4 +-
.../execution/config/metadata/ShowClusterTask.java | 10 +-
.../config/metadata/ShowConfigNodesTask.java | 4 +-
.../config/metadata/ShowContinuousQueriesTask.java | 4 +-
.../config/metadata/ShowDataNodesTask.java | 4 +-
.../config/metadata/ShowFunctionsTask.java | 4 +-
.../config/metadata/ShowPipePluginsTask.java | 4 +-
.../execution/config/metadata/ShowRegionTask.java | 4 +-
.../execution/config/metadata/ShowTTLTask.java | 4 +-
.../config/metadata/ShowTriggersTask.java | 4 +-
.../config/metadata/ShowVariablesTask.java | 4 +-
.../config/metadata/model/ShowModelsTask.java | 4 +-
.../metadata/relational/DeleteDeviceTask.java | 2 +-
.../relational/DescribeTableDetailsTask.java | 4 +-
.../metadata/relational/DescribeTableTask.java | 4 +-
.../metadata/relational/ShowAINodesTask.java | 4 +-
.../metadata/relational/ShowConfigNodesTask.java | 4 +-
.../config/metadata/relational/ShowDBTask.java | 4 +-
.../metadata/relational/ShowDataNodesTask.java | 4 +-
.../metadata/relational/ShowTablesDetailsTask.java | 4 +-
.../config/metadata/relational/ShowTablesTask.java | 4 +-
.../template/ShowNodesInSchemaTemplateTask.java | 4 +-
.../metadata/template/ShowPathSetTemplateTask.java | 4 +-
.../metadata/template/ShowSchemaTemplateTask.java | 4 +-
.../config/session/ShowCurrentDatabaseTask.java | 4 +-
.../config/session/ShowCurrentSqlDialectTask.java | 4 +-
.../config/session/ShowCurrentUserTask.java | 4 +-
.../plan/execution/config/sys/KillQueryTask.java | 5 +
.../execution/config/sys/TestConnectionTask.java | 4 +-
.../execution/config/sys/pipe/ShowPipeTask.java | 4 +-
.../config/sys/quota/ShowSpaceQuotaTask.java | 4 +-
.../config/sys/quota/ShowThrottleQuotaTask.java | 4 +-
.../sys/subscription/ShowSubscriptionsTask.java | 4 +-
.../config/sys/subscription/ShowTopicsTask.java | 4 +-
.../memory/StatementMemorySourceVisitor.java | 4 +-
.../TableModelStatementMemorySourceVisitor.java | 5 +-
.../BindTypeForTimeSeriesOperandVisitor.java | 2 +-
.../plan/optimization/AggregationPushDown.java | 2 +-
.../db/queryengine/plan/parser/ASTVisitor.java | 2 +-
.../plan/planner/LogicalPlanBuilder.java | 6 +-
.../plan/planner/LogicalPlanVisitor.java | 4 +-
.../plan/planner/TableOperatorGenerator.java | 32 +-
.../plan/planner/TemplatedLogicalPlan.java | 4 +-
.../plan/planner/TemplatedLogicalPlanBuilder.java | 2 +-
.../plan/planner/plan/PlanFragment.java | 14 +
.../plan/planner/plan/node/ExplainAnalyzeNode.java | 2 +-
.../plan/planner/plan/node/PlanGraphPrinter.java | 28 +-
.../plan/planner/plan/node/PlanNodeType.java | 9 +-
.../plan/planner/plan/node/PlanVisitor.java | 12 +-
.../plan/node/metadata/read/DevicesCountNode.java | 4 +-
.../node/metadata/read/DevicesSchemaScanNode.java | 4 +-
.../metadata/read/LevelTimeSeriesCountNode.java | 4 +-
.../metadata/read/LogicalViewSchemaScanNode.java | 4 +-
.../metadata/read/NodePathsSchemaScanNode.java | 4 +-
.../metadata/read/PathsUsingTemplateScanNode.java | 4 +-
.../metadata/read/SchemaQueryOrderByHeatNode.java | 2 +-
.../node/metadata/read/TableDeviceSourceNode.java | 2 +-
.../node/metadata/read/TimeSeriesCountNode.java | 4 +-
.../metadata/read/TimeSeriesSchemaScanNode.java | 4 +-
.../node/process/ActiveRegionScanMergeNode.java | 4 +-
.../planner/plan/node/process/AggregationNode.java | 2 +-
.../plan/node/process/DeviceViewIntoNode.java | 4 +-
.../plan/planner/plan/node/process/IntoNode.java | 4 +-
.../plan/node/process/RawDataAggregationNode.java | 2 +-
.../node/process/SlidingWindowAggregationNode.java | 2 +-
.../plan/node/source/DeviceRegionScanNode.java | 4 +-
.../plan/node/source/LastQueryScanNode.java | 2 +-
.../node/source/SeriesAggregationSourceNode.java | 2 +-
.../planner/plan/node/source/ShowQueriesNode.java | 2 +-
.../plan/node/source/TimeseriesRegionScanNode.java | 4 +-
.../plan/relational/analyzer/Analysis.java | 5 +-
.../plan/relational/analyzer/Analyzer.java | 24 +-
.../relational/metadata/TableMetadataImpl.java | 14 +-
.../metadata/fetcher/TableDeviceSchemaFetcher.java | 2 +-
.../plan/relational/planner/RelationPlanner.java | 18 +-
.../relational/planner/TableLogicalPlanner.java | 4 +-
.../plan/relational/planner/TableModelPlanner.java | 19 +-
.../distribute/TableDistributedPlanGenerator.java | 99 ++++--
.../distribute/TableDistributedPlanner.java | 15 +-
.../distribute/TableModelQueryFragmentPlanner.java | 2 +-
.../rule/EliminateLimitProjectWithTableScan.java | 9 +-
.../rule/EliminateLimitWithTableScan.java | 9 +-
.../iterative/rule/PruneTableScanColumns.java | 61 ++--
.../planner/node/AggregationTableScanNode.java | 6 +-
...TableScanNode.java => DeviceTableScanNode.java} | 222 ++----------
.../node/InformationSchemaTableScanNode.java | 212 ++++++++++++
.../relational/planner/node/TableScanNode.java | 298 +---------------
.../node/schema/AbstractTableDeviceQueryNode.java | 2 +-
.../schema/TableDeviceAttributeUpdateNode.java | 2 +-
.../planner/node/schema/TableDeviceFetchNode.java | 2 +-
.../node/schema/TableDeviceQueryCountNode.java | 2 +-
.../node/schema/TableDeviceQueryScanNode.java | 2 +-
.../DataNodeLocationSupplierFactory.java | 90 +++++
.../PushAggregationIntoTableScan.java | 20 +-
.../PushLimitOffsetIntoTableScan.java | 42 ++-
.../optimizations/PushPredicateIntoTableScan.java | 28 +-
.../planner/optimizations/SortElimination.java | 8 +-
.../TransformAggregationToStreamable.java | 4 +-
.../optimizations/TransformSortToStreamSort.java | 24 +-
.../optimizations/UnaliasSymbolReferences.java | 35 +-
.../sql/ast/AbstractQueryDeviceWithCache.java | 2 +-
.../relational/sql/ast/AbstractTraverseDevice.java | 2 +-
.../plan/relational/sql/ast/AstVisitor.java | 8 +
.../plan/relational/sql/ast/CountDevice.java | 2 +-
.../plan/relational/sql/ast/DeleteDevice.java | 2 +-
.../sql/ast/{Parameter.java => KillQuery.java} | 47 ++-
.../plan/relational/sql/ast/ShowDevice.java | 2 +-
.../ast/{CreateIndex.java => ShowStatement.java} | 80 +++--
.../plan/relational/sql/parser/AstBuilder.java | 35 +-
.../plan/relational/sql/rewrite/ShowRewrite.java | 102 ++++++
.../relational/sql/rewrite/StatementRewrite.java | 67 ++++
.../sql/rewrite/StatementRewriteFactory.java | 21 +-
.../statement/metadata/ShowDatabaseStatement.java | 4 +-
.../schemaregion/impl/SchemaRegionMemoryImpl.java | 34 +-
.../dataregion/wal/buffer/WALBuffer.java | 1 -
.../dataregion/wal/utils/WALEntryQueue.java | 20 +-
.../SlidingTimeColumnGeneratorParameter.java | 2 +-
.../SchemaRegionSimpleRecoverTest.java | 2 +-
.../queryengine/execution/ConfigExecutionTest.java | 2 +-
.../operator/MergeTreeSortOperatorTest.java | 6 +
.../schema/SchemaQueryScanOperatorTest.java | 4 +-
.../db/queryengine/plan/analyze/AnalyzeTest.java | 4 +-
.../plan/optimization/TestPlanBuilder.java | 2 +-
.../logical/DataQueryLogicalPlannerTest.java | 2 +-
.../plan/relational/analyzer/AnalyzerTest.java | 373 +++++++++++----------
.../plan/relational/analyzer/AuthTest.java | 4 +
.../plan/relational/analyzer/JoinTest.java | 85 ++---
.../analyzer/LimitOffsetPushDownTest.java | 189 ++++++-----
.../analyzer/MockTableModelDataPartition.java | 2 +-
.../plan/relational/analyzer/ShowQueriesTest.java | 105 ++++++
.../plan/relational/analyzer/SortTest.java | 215 ++++++------
.../plan/relational/analyzer/SubQueryTest.java | 143 ++++----
.../plan/relational/analyzer/TestMatadata.java | 23 ++
.../plan/relational/analyzer/TestPlanBuilder.java | 6 +-
.../plan/relational/analyzer/TestUtils.java | 30 +-
.../fetcher/cache/TableDeviceSchemaCacheTest.java | 2 +-
.../plan/relational/planner/PlanTester.java | 24 +-
...java => AggregationDeviceTableScanMatcher.java} | 4 +-
.../planner/assertions/ColumnReference.java | 10 +-
...setMatcher.java => DeviceTableScanMatcher.java} | 41 ++-
.../InformationSchemaTableScanMatcher.java | 82 +++++
.../planner/assertions/PlanMatchPattern.java | 24 +-
.../planner/assertions/SymbolAliases.java | 2 +-
.../planner/assertions/TableScanMatcher.java | 19 +-
.../config/constant/PipeExtractorConstant.java | 2 -
.../iotdb/commons/schema/column}/ColumnHeader.java | 2 +-
.../schema/column}/ColumnHeaderConstant.java | 7 +-
.../schema/table/InformationSchemaTable.java | 96 ++++++
.../apache/iotdb/commons/schema/table/TsTable.java | 8 +
.../src/main/thrift/pipeconsensus.thrift | 2 -
255 files changed, 2504 insertions(+), 1682 deletions(-)
create mode 100644
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/InformationSchemaContentSupplierFactory.java
copy
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/{LastCacheScanOperator.java
=> relational/InformationSchemaTableScanOperator.java} (71%)
copy
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/{TableScanNode.java
=> DeviceTableScanNode.java} (63%)
create mode 100644
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/InformationSchemaTableScanNode.java
create mode 100644
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/DataNodeLocationSupplierFactory.java
copy
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/{Parameter.java
=> KillQuery.java} (69%)
copy
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/{CreateIndex.java
=> ShowStatement.java} (52%)
create mode 100644
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/rewrite/ShowRewrite.java
create mode 100644
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/rewrite/StatementRewrite.java
copy
integration-test/src/test/java/org/apache/iotdb/subscription/it/DisplayName.java
=>
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/rewrite/StatementRewriteFactory.java
(61%)
create mode 100644
iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ShowQueriesTest.java
rename
iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/{AggregationTableScanMatcher.java
=> AggregationDeviceTableScanMatcher.java} (98%)
copy
iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/{OffsetMatcher.java
=> DeviceTableScanMatcher.java} (55%)
create mode 100644
iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/InformationSchemaTableScanMatcher.java
rename
iotdb-core/{datanode/src/main/java/org/apache/iotdb/db/queryengine/common/header
=>
node-commons/src/main/java/org/apache/iotdb/commons/schema/column}/ColumnHeader.java
(98%)
rename
iotdb-core/{datanode/src/main/java/org/apache/iotdb/db/queryengine/common/header
=>
node-commons/src/main/java/org/apache/iotdb/commons/schema/column}/ColumnHeaderConstant.java
(98%)
create mode 100644
iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/table/InformationSchemaTable.java
