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/03/22 02:10:55 UTC
[iotdb] branch new_mpp updated (406d006 -> 9240762)
This is an automated email from the ASF dual-hosted git repository.
ericpai pushed a change to branch new_mpp
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
discard 406d006 Optimize code in MemoryPool
discard face7e0 Fix set error
discard d3e773f Optimize coding styles
discard f70ecaf Add double check when submitting instances
discard 4b14c13 Use query id
discard 92b4ad2 Add comments for IDIndexedAccessible
discard 9305226 Fix compile error
discard 87accb7 [To_new_mpp] data block manager interface (#5280)
discard 0b5356f Implement phase 1
discard 4da5757 Sync with master
discard 8fb27a2 Fragment schedule develop
discard 93722e8 [To_new_mpp] add IDataBlockManager (#5240)
discard 333c9f0 [To_new_mpp] add common classes & thrift files (#5239)
discard 199930b [To_new_mpp] Basic query memory control (#5216)
discard 736bd02 Basic implementation of FragmentInstanceManager
add 537069e [IoTDB-2660] Implement the basic functionalities for DistributionPlanner (#5291)
add 684c75d add write node and metadata node (#5296)
add d47a2e3 Fix windows CI failed (#5293)
add a2953b7 [IOTDB-2503] Import a Status for TsFileResource (#5198)
add 1ec318b [IOTDB-2761] Data node internal thrift service for config node (#5289)
add bf5af68 [IOTDB-2713] Generate Analyzed AST from statement for MPP query - A framework (#5302)
add be307cc [IOTDB-2702] correct CQ windows's explaination in cust-doc (#5300)
add b9b32e1 [IOTDB-2777][metrics] Fix NPE and sample frequency (#5304)
add 0bcadd4 [IOTDB-2739] Update v0.13 upgrade user guide (#5307)
add 8b394ec Basic implementation of FragmentInstanceManager
add 6ef8864 [To_new_mpp] Basic query memory control (#5216)
add 50a564f [To_new_mpp] add common classes & thrift files (#5239)
add 6ac9de5 [To_new_mpp] add IDataBlockManager (#5240)
add f29771d Fragment schedule develop
add 6939e8d Sync with master
add 6d64bca Implement phase 1
add 1e465bb [To_new_mpp] data block manager interface (#5280)
add ac53836 Fix compile error
add 0538769 Add comments for IDIndexedAccessible
add 0459775 Use query id
add e2f0395 Add double check when submitting instances
add abfe68f Optimize coding styles
add 9dee782 Fix set error
add 15d1aab Optimize code in MemoryPool
add 9240762 Fix by comments
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 (406d006)
\
N -- N -- N refs/heads/new_mpp (9240762)
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:
.../apache/iotdb/cluster/RemoteTsFileResource.java | 5 +-
docs/Download/README.md | 2 +
docs/UserGuide/Process-Data/Continuous-Query.md | 4 +-
docs/zh/Download/README.md | 2 +
docs/zh/UserGuide/Process-Data/Continuous-Query.md | 4 +-
.../main/assembly/resources/conf/iotdb-metric.yml | 2 +-
pom.xml | 4 +-
.../cross/AbstractCrossSpaceCompactionTask.java | 16 +-
.../CrossSpaceCompactionExceptionHandler.java | 5 +-
.../task/RewriteCrossCompactionRecoverTask.java | 5 +-
.../task/RewriteCrossSpaceCompactionTask.java | 13 +-
.../inner/AbstractInnerSpaceCompactionTask.java | 15 +-
.../SizeTieredCompactionRecoverTask.java | 5 +-
.../sizetiered/SizeTieredCompactionSelector.java | 4 +-
.../inner/sizetiered/SizeTieredCompactionTask.java | 14 +-
.../inner/utils/InnerSpaceCompactionUtils.java | 3 +-
.../db/engine/storagegroup/TsFileResource.java | 89 +++--
.../storagegroup/TsFileResourceStatus.java} | 13 +-
.../storagegroup/VirtualStorageGroupProcessor.java | 9 +-
.../sql/SemanticException.java} | 8 +-
.../exception/sql/StatementAnalyzeException.java | 2 +-
.../micrometer/registry/IoTDBRegistryConfig.java | 18 +-
.../org/apache/iotdb/db/mpp/common/Analysis.java | 33 --
.../org/apache/iotdb/db/mpp/common/DataRegion.java | 58 +++
.../common/DataRegionTimeSlice.java} | 10 +-
.../iotdb/db/mpp/common/FilterNullPolicy.java | 1 +
.../{QueryContext.java => MPPQueryContext.java} | 2 +-
.../common/SchemaRegion.java} | 20 +-
.../common}/filter/BasicFilterType.java | 6 +-
.../common}/filter/BasicFunctionFilter.java | 6 +-
.../common}/filter/FunctionFilter.java | 4 +-
.../statement => mpp/common}/filter/InFilter.java | 4 +-
.../common}/filter/LikeFilter.java | 4 +-
.../common}/filter/QueryFilter.java | 6 +-
.../common}/filter/RegexpFilter.java | 4 +-
.../iotdb/db/mpp/execution/QueryExecution.java | 10 +-
.../iotdb/db/mpp/operator/sink/SinkOperator.java | 2 +-
.../db/mpp/schedule/queue/L2PriorityQueue.java | 3 +-
.../apache/iotdb/db/mpp/sql/analyze/Analysis.java | 73 ++++
.../analyze/AnalysisContext.java} | 11 +-
.../db/mpp/sql/analyze/StatementAnalyzer.java | 115 ++++++
.../db/{ => mpp}/sql/constant/FilterConstant.java | 2 +-
.../db/{ => mpp}/sql/constant/StatementType.java | 2 +-
.../sql/metadata/IMetadataFetcher.java} | 12 +-
.../{planner => }/optimization/PlanOptimizer.java | 6 +-
.../iotdb/db/{ => mpp}/sql/parser/ASTVisitor.java | 370 ++++++++++++++++---
.../{ => mpp}/sql/parser/StatementGenerator.java | 65 +++-
.../mpp/sql/planner/plan/DistributedQueryPlan.java | 4 +-
.../mpp/sql/planner/plan/DistributionPlanner.java | 221 +++++++++++-
.../db/mpp/sql/planner/plan/LogicalPlanner.java | 11 +-
.../db/mpp/sql/planner/plan/LogicalQueryPlan.java | 17 +-
.../db/mpp/sql/planner/plan/node/PlanNode.java | 4 +
.../db/mpp/sql/planner/plan/node/PlanNodeId.java | 11 +
.../sql/planner/plan/node/PlanNodeIdAllocator.java | 13 +-
.../node/{PlanNodeId.java => PlanNodeUtil.java} | 25 +-
...SourceNode.java => SimplePlanNodeRewriter.java} | 34 +-
.../read/ShowDevicesNode.java} | 17 +-
.../planner/plan/node/metedata/read/ShowNode.java} | 17 +-
.../node/metedata/write/CreateTimeSeriesNode.java} | 38 +-
.../planner/plan/node/process/AggregateNode.java | 10 +
.../planner/plan/node/process/DeviceMergeNode.java | 12 +-
.../process/{FilterNode.java => ExchangeNode.java} | 57 +--
.../sql/planner/plan/node/process/FillNode.java | 10 +
.../sql/planner/plan/node/process/FilterNode.java | 10 +
.../planner/plan/node/process/FilterNullNode.java | 10 +
.../plan/node/process/GroupByLevelNode.java | 10 +
.../sql/planner/plan/node/process/LimitNode.java | 31 +-
.../sql/planner/plan/node/process/OffsetNode.java | 12 +-
.../sql/planner/plan/node/process/SortNode.java | 12 +-
.../planner/plan/node/process/TimeJoinNode.java | 32 +-
.../sql/planner/plan/node/sink/CsvSinkNode.java | 10 +
.../planner/plan/node/sink/FragmentSinkNode.java | 10 +
.../sql/planner/plan/node/sink/ThriftSinkNode.java | 10 +
.../planner/plan/node/source/CsvSourceNode.java | 10 +
.../plan/node/source/SeriesAggregateScanNode.java | 18 +
.../planner/plan/node/source/SeriesScanNode.java | 43 ++-
.../InsertMultiTabletNode.java} | 23 +-
.../sql/planner/plan/node/write/InsertNode.java | 66 ++++
.../InsertRowNode.java} | 28 +-
.../InsertRowsNode.java} | 23 +-
.../InsertRowsOfOneDeviceNode.java} | 23 +-
.../InsertTabletNode.java} | 23 +-
.../db/mpp/sql/rewriter/ConcatPathRewriter.java | 395 +++++++++++++++++++++
.../db/mpp/sql/rewriter/DnfFilterOptimizer.java | 163 +++++++++
.../sql/rewriter/IFilterOptimizer.java} | 19 +-
.../sql/rewriter/IStatementRewriter.java} | 21 +-
.../sql/rewriter/MergeSingleFilterOptimizer.java | 179 ++++++++++
.../db/mpp/sql/rewriter/RemoveNotOptimizer.java | 103 ++++++
.../db/mpp/sql/rewriter/WildcardsRemover.java | 142 ++++++++
.../db/{ => mpp}/sql/statement/Statement.java | 8 +-
.../sql/statement/StatementNode.java} | 25 +-
.../sql/statement/component/FillComponent.java | 5 +-
.../statement/component/FilterNullComponent.java} | 21 +-
.../sql/statement/component/FromComponent.java | 5 +-
.../statement/component/GroupByLevelComponent.java | 6 +-
.../component/GroupByLevelController.java | 221 ++++++++++++
.../statement/component/GroupByTimeComponent.java | 6 +-
.../{ => mpp}/sql/statement/component/OrderBy.java | 2 +-
.../sql/statement/component/ResultColumn.java | 25 +-
.../sql/statement/component/ResultSetFormat.java | 2 +-
.../sql/statement/component/SelectComponent.java | 45 ++-
.../sql/statement/component/WhereCondition.java | 7 +-
.../statement/crud/AggregationQueryStatement.java | 90 +++++
.../mpp/sql/statement/crud/FillQueryStatement.java | 73 ++++
.../statement/crud}/GroupByFillQueryStatement.java | 4 +-
.../sql/statement/crud}/GroupByQueryStatement.java | 4 +-
.../db/mpp/sql/statement/crud/InsertStatement.java | 89 +++++
.../sql/statement/crud}/LastQueryStatement.java | 27 +-
.../sql/statement/crud}/QueryStatement.java | 96 ++++-
.../mpp/sql/statement/crud/UDAFQueryStatement.java | 91 +++++
.../sql/statement/crud}/UDTFQueryStatement.java | 2 +-
.../metadata/CreateAlignedTimeSeriesStatement.java | 167 +++++++++
.../metadata/CreateTimeSeriesStatement.java | 124 +++++++
.../statement/metadata/ShowDevicesStatement.java} | 33 +-
.../sql/statement/metadata/ShowStatement.java} | 22 +-
.../metadata/ShowTimeSeriesStatement.java | 81 +++++
.../iotdb/db/mpp/sql/tree/StatementVisitor.java | 73 ++++
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 3 +-
.../iotdb/db/query/expression/Expression.java | 9 +-
.../query/expression/binary/BinaryExpression.java | 17 +-
.../db/query/expression/unary/ConstantOperand.java | 9 +-
.../query/expression/unary/FunctionExpression.java | 14 +-
.../query/expression/unary/NegationExpression.java | 15 +-
.../query/expression/unary/TimeSeriesOperand.java | 13 +-
.../java/org/apache/iotdb/db/service/IoTDB.java | 2 +-
.../sql/statement/AggregationQueryStatement.java | 49 ---
.../apache/iotdb/db/tools/TsFileRewriteTool.java | 3 +-
.../org/apache/iotdb/db/tools/TsFileSplitTool.java | 3 +-
.../db/tools/settle/TsFileAndModSettleTool.java | 9 +-
.../org/apache/iotdb/db/utils/FileLoaderUtils.java | 3 +-
.../org/apache/iotdb/db/utils/UpgradeUtils.java | 3 +-
.../iotdb/db/engine/cache/ChunkCacheTest.java | 5 +-
.../engine/compaction/AbstractCompactionTest.java | 3 +-
.../compaction/CompactionTaskManagerTest.java | 1 +
.../compaction/cross/CrossSpaceCompactionTest.java | 7 +-
.../db/engine/compaction/cross/MergeTest.java | 7 +-
.../cross/RewriteCompactionFileSelectorTest.java | 46 +--
.../cross/RewriteCrossSpaceCompactionTest.java | 2 +
.../inner/AbstractInnerSpaceCompactionTest.java | 5 +-
.../inner/InnerCompactionMoreDataTest.java | 7 +-
.../inner/InnerCompactionSchedulerTest.java | 4 +-
.../compaction/inner/InnerCompactionTest.java | 11 +-
.../inner/sizetiered/SizeTieredCompactionTest.java | 11 +-
.../engine/storagegroup/FakedTsFileResource.java | 20 +-
.../db/mpp/sql/plan/DistributionPlannerTest.java | 128 +++++++
.../org/apache/iotdb/db/qp/sql/ASTVisitorTest.java | 2 +-
.../query/reader/series/SeriesReaderTestUtil.java | 7 +-
.../iotdb/db/rescon/ResourceManagerTest.java | 15 +-
.../iotdb/db/{qp => }/sql/ASTVisitorTest.java | 4 +-
.../iotdb/db/sql/StatementGeneratorTest.java | 6 +-
thrift-datanode/pom.xml | 67 ++++
thrift-datanode/src/main/thrift/datanode.thrift | 92 +++++
152 files changed, 4307 insertions(+), 647 deletions(-)
copy server/src/main/java/org/apache/iotdb/db/{sql/statement/component/OrderBy.java => engine/storagegroup/TsFileResourceStatus.java} (83%)
rename server/src/main/java/org/apache/iotdb/db/{sql/statement/UDAFQueryStatement.java => exception/sql/SemanticException.java} (80%)
delete mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/common/Analysis.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/common/DataRegion.java
copy server/src/main/java/org/apache/iotdb/db/{sql/statement/component/OrderBy.java => mpp/common/DataRegionTimeSlice.java} (80%)
rename server/src/main/java/org/apache/iotdb/db/mpp/common/{QueryContext.java => MPPQueryContext.java} (97%)
copy server/src/main/java/org/apache/iotdb/db/{sql/statement/LastQueryStatement.java => mpp/common/SchemaRegion.java} (69%)
rename server/src/main/java/org/apache/iotdb/db/{sql/statement => mpp/common}/filter/BasicFilterType.java (96%)
rename server/src/main/java/org/apache/iotdb/db/{sql/statement => mpp/common}/filter/BasicFunctionFilter.java (96%)
rename server/src/main/java/org/apache/iotdb/db/{sql/statement => mpp/common}/filter/FunctionFilter.java (92%)
rename server/src/main/java/org/apache/iotdb/db/{sql/statement => mpp/common}/filter/InFilter.java (98%)
rename server/src/main/java/org/apache/iotdb/db/{sql/statement => mpp/common}/filter/LikeFilter.java (97%)
rename server/src/main/java/org/apache/iotdb/db/{sql/statement => mpp/common}/filter/QueryFilter.java (98%)
rename server/src/main/java/org/apache/iotdb/db/{sql/statement => mpp/common}/filter/RegexpFilter.java (97%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/Analysis.java
rename server/src/main/java/org/apache/iotdb/db/mpp/{common/OrderBy.java => sql/analyze/AnalysisContext.java} (80%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/StatementAnalyzer.java
rename server/src/main/java/org/apache/iotdb/db/{ => mpp}/sql/constant/FilterConstant.java (98%)
rename server/src/main/java/org/apache/iotdb/db/{ => mpp}/sql/constant/StatementType.java (98%)
copy server/src/main/java/org/apache/iotdb/db/{sql/statement/component/ResultSetFormat.java => mpp/sql/metadata/IMetadataFetcher.java} (81%)
rename server/src/main/java/org/apache/iotdb/db/mpp/sql/{planner => }/optimization/PlanOptimizer.java (84%)
rename server/src/main/java/org/apache/iotdb/db/{ => mpp}/sql/parser/ASTVisitor.java (76%)
rename server/src/main/java/org/apache/iotdb/db/{ => mpp}/sql/parser/StatementGenerator.java (70%)
copy server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/node/{PlanNodeId.java => PlanNodeUtil.java} (61%)
copy server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/node/{source/CsvSourceNode.java => SimplePlanNodeRewriter.java} (56%)
copy server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/node/{source/CsvSourceNode.java => metedata/read/ShowDevicesNode.java} (79%)
copy server/src/main/java/org/apache/iotdb/db/{sql/statement/ShowDevicesStatement.java => mpp/sql/planner/plan/node/metedata/read/ShowNode.java} (73%)
copy server/src/main/java/org/apache/iotdb/db/{sql/statement/component/FillComponent.java => mpp/sql/planner/plan/node/metedata/write/CreateTimeSeriesNode.java} (59%)
copy server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/node/process/{FilterNode.java => ExchangeNode.java} (54%)
copy server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/node/{source/CsvSourceNode.java => write/InsertMultiTabletNode.java} (72%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/node/write/InsertNode.java
copy server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/node/{sink/ThriftSinkNode.java => write/InsertRowNode.java} (69%)
copy server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/node/{sink/ThriftSinkNode.java => write/InsertRowsNode.java} (72%)
copy server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/node/{source/CsvSourceNode.java => write/InsertRowsOfOneDeviceNode.java} (71%)
copy server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/node/{sink/ThriftSinkNode.java => write/InsertTabletNode.java} (72%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/sql/rewriter/ConcatPathRewriter.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/sql/rewriter/DnfFilterOptimizer.java
copy server/src/main/java/org/apache/iotdb/db/{sql/statement/ShowTimeSeriesStatement.java => mpp/sql/rewriter/IFilterOptimizer.java} (69%)
rename server/src/main/java/org/apache/iotdb/db/{sql/statement/ShowDevicesStatement.java => mpp/sql/rewriter/IStatementRewriter.java} (60%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/sql/rewriter/MergeSingleFilterOptimizer.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/sql/rewriter/RemoveNotOptimizer.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/sql/rewriter/WildcardsRemover.java
rename server/src/main/java/org/apache/iotdb/db/{ => mpp}/sql/statement/Statement.java (87%)
rename server/src/main/java/org/apache/iotdb/db/{sql/statement/FillQueryStatement.java => mpp/sql/statement/StatementNode.java} (63%)
rename server/src/main/java/org/apache/iotdb/db/{ => mpp}/sql/statement/component/FillComponent.java (89%)
rename server/src/main/java/org/apache/iotdb/db/{sql/statement/component/WithoutPolicy.java => mpp/sql/statement/component/FilterNullComponent.java} (73%)
copy server/src/main/java/org/apache/iotdb/db/{ => mpp}/sql/statement/component/FromComponent.java (88%)
rename server/src/main/java/org/apache/iotdb/db/{ => mpp}/sql/statement/component/GroupByLevelComponent.java (88%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/sql/statement/component/GroupByLevelController.java
rename server/src/main/java/org/apache/iotdb/db/{ => mpp}/sql/statement/component/GroupByTimeComponent.java (93%)
rename server/src/main/java/org/apache/iotdb/db/{ => mpp}/sql/statement/component/OrderBy.java (94%)
rename server/src/main/java/org/apache/iotdb/db/{ => mpp}/sql/statement/component/ResultColumn.java (82%)
rename server/src/main/java/org/apache/iotdb/db/{ => mpp}/sql/statement/component/ResultSetFormat.java (94%)
rename server/src/main/java/org/apache/iotdb/db/{ => mpp}/sql/statement/component/SelectComponent.java (63%)
rename server/src/main/java/org/apache/iotdb/db/{ => mpp}/sql/statement/component/WhereCondition.java (84%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/sql/statement/crud/AggregationQueryStatement.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/sql/statement/crud/FillQueryStatement.java
rename server/src/main/java/org/apache/iotdb/db/{sql/statement => mpp/sql/statement/crud}/GroupByFillQueryStatement.java (91%)
rename server/src/main/java/org/apache/iotdb/db/{sql/statement => mpp/sql/statement/crud}/GroupByQueryStatement.java (91%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/sql/statement/crud/InsertStatement.java
rename server/src/main/java/org/apache/iotdb/db/{sql/statement => mpp/sql/statement/crud}/LastQueryStatement.java (52%)
rename server/src/main/java/org/apache/iotdb/db/{sql/statement => mpp/sql/statement/crud}/QueryStatement.java (63%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/sql/statement/crud/UDAFQueryStatement.java
rename server/src/main/java/org/apache/iotdb/db/{sql/statement => mpp/sql/statement/crud}/UDTFQueryStatement.java (94%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/sql/statement/metadata/CreateAlignedTimeSeriesStatement.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/sql/statement/metadata/CreateTimeSeriesStatement.java
rename server/src/main/java/org/apache/iotdb/db/{sql/statement/component/FromComponent.java => mpp/sql/statement/metadata/ShowDevicesStatement.java} (57%)
rename server/src/main/java/org/apache/iotdb/db/{sql/statement/ShowTimeSeriesStatement.java => mpp/sql/statement/metadata/ShowStatement.java} (69%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/sql/statement/metadata/ShowTimeSeriesStatement.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/sql/tree/StatementVisitor.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/sql/statement/AggregationQueryStatement.java
create mode 100644 server/src/test/java/org/apache/iotdb/db/mpp/sql/plan/DistributionPlannerTest.java
copy server/src/test/java/org/apache/iotdb/db/{qp => }/sql/ASTVisitorTest.java (92%)
create mode 100644 thrift-datanode/pom.xml
create mode 100644 thrift-datanode/src/main/thrift/datanode.thrift