This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a change to branch xingtanzjr/mpp-query-basis
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
from 74517ca Milestone: complete the basic frame of query executing state
in MPP
new e7d8a19 add some interface
new ffbcbbd mpp interface definition
The 2 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:
pom.xml | 5 ++
server/pom.xml | 4 +
.../buffer/SinkHandler.java} | 33 ++++----
.../buffer/SourceHandler.java} | 24 +++---
.../CsvSinkNode.java => mpp/common/Analysis.java} | 24 +-----
.../common/FillPolicy.java} | 23 +-----
.../common/GroupByTimeParameter.java} | 27 ++----
.../CsvSinkNode.java => mpp/common/OrderBy.java} | 27 ++----
.../common/QueryContext.java} | 29 +++----
.../CsvSinkNode.java => mpp/common/QueryId.java} | 23 ++----
.../common/QuerySession.java} | 23 +-----
.../common/TreeNode.java} | 27 +++---
.../org/apache/iotdb/db/mpp/common/TsBlock.java | 48 +++++++++++
.../iotdb/db/mpp/common/TsBlockMetadata.java | 41 +++++++++
.../common/WithoutPolicy.java} | 24 ++----
.../execution/Coordinator.java} | 29 ++++---
.../db/mpp/execution/ExecFragmentInstance.java | 57 +++++++++++++
.../iotdb/db/mpp/execution/QueryExecution.java | 96 ++++++++++++++++++++++
.../iotdb/db/mpp/execution/QueryScheduler.java | 51 ++++++++++++
.../execution/QueryStateMachine.java} | 25 ++----
.../org/apache/iotdb/db/mpp/operator/Operator.java | 91 ++++++++++++++++++++
.../operator/OperatorContext.java} | 29 ++++---
.../operator/SeriesScanOperator.java} | 21 +----
.../plan/DistributedQueryPlan.java} | 28 +++----
.../plan/DistributionPlanner.java} | 27 +++---
.../plan/FragmentInstance.java} | 25 ++----
.../plan/FragmentInstanceId.java} | 24 ++----
.../plan/LogicalPlanner.java} | 29 ++++---
.../plan/LogicalQueryPlan.java} | 28 +++----
.../plan/PlanFragment.java} | 29 ++-----
.../plan/PlanFragmentId.java} | 23 ++----
.../plan/node/PlanNode.java} | 26 +++---
.../db/{query => }/mpp/plan/node/PlanNodeId.java | 26 +++---
.../plan/node/PlanNodeIdAllocator.java} | 24 +-----
.../db/mpp/plan/node/process/DeviceMergeNode.java | 66 +++++++++++++++
.../plan/node/process/FillNode.java} | 26 +++---
.../plan/node/process/FilterNode.java} | 26 +++---
.../db/mpp/plan/node/process/GroupByLevelNode.java | 41 +++++++++
.../plan/node/process/LimitNode.java} | 25 +++---
.../plan/node/process/OffsetNode.java} | 26 +++---
.../plan/node/process/ProcessNode.java} | 23 ++----
.../node/process/RowBasedSeriesAggregateNode.java | 59 +++++++++++++
.../plan/node/process/SortNode.java} | 26 +++---
.../db/mpp/plan/node/process/TimeJoinNode.java | 67 +++++++++++++++
.../plan/node/process/WithoutNode.java} | 26 +++---
.../mpp/plan/node/sink/CsvSinkNode.java | 13 +--
.../plan/node/sink/FragmentSinkNode.java} | 21 ++---
.../{query => }/mpp/plan/node/sink/SinkNode.java | 17 ++--
.../mpp/plan/node/sink/ThriftSinkNode.java | 13 +--
.../mpp/plan/node/source/CsvSourceNode.java | 9 +-
.../mpp/plan/node/source/SeriesAggregateNode.java | 81 ++++++++++++++++++
.../db/mpp/plan/node/source/SeriesScanNode.java | 85 +++++++++++++++++++
.../mpp/plan/node/source/SourceNode.java | 11 ++-
.../plan/optimzation/PlanOptimizer.java} | 25 ++----
.../apache/iotdb/db/query/mpp/common/Analysis.java | 8 --
.../iotdb/db/query/mpp/common/FillPolicy.java | 5 --
.../db/query/mpp/common/GroupByTimeParameter.java | 10 ---
.../apache/iotdb/db/query/mpp/common/OrderBy.java | 11 ---
.../iotdb/db/query/mpp/common/QueryContext.java | 10 ---
.../apache/iotdb/db/query/mpp/common/QueryId.java | 13 ---
.../iotdb/db/query/mpp/common/QuerySession.java | 4 -
.../apache/iotdb/db/query/mpp/common/TreeNode.java | 23 ------
.../apache/iotdb/db/query/mpp/common/TsBlock.java | 30 -------
.../iotdb/db/query/mpp/common/TsBlockMetadata.java | 19 -----
.../iotdb/db/query/mpp/common/WithoutPolicy.java | 6 --
.../iotdb/db/query/mpp/exec/Coordinator.java | 28 -------
.../iotdb/db/query/mpp/exec/QueryExecution.java | 86 -------------------
.../iotdb/db/query/mpp/exec/QueryScheduler.java | 38 ---------
.../iotdb/db/query/mpp/exec/QueryStateMachine.java | 8 --
.../db/query/mpp/plan/DistributedQueryPlan.java | 16 ----
.../db/query/mpp/plan/DistributionPlanner.java | 17 ----
.../iotdb/db/query/mpp/plan/FragmentInstance.java | 11 ---
.../db/query/mpp/plan/FragmentInstanceId.java | 10 ---
.../iotdb/db/query/mpp/plan/LogicalPlanner.java | 23 ------
.../iotdb/db/query/mpp/plan/LogicalQueryPlan.java | 13 ---
.../iotdb/db/query/mpp/plan/PlanFragment.java | 13 ---
.../iotdb/db/query/mpp/plan/PlanFragmentId.java | 8 --
.../iotdb/db/query/mpp/plan/node/PlanNode.java | 17 ----
.../query/mpp/plan/node/PlanNodeIdAllocator.java | 7 --
.../mpp/plan/node/process/DeviceMergeNode.java | 47 -----------
.../db/query/mpp/plan/node/process/FillNode.java | 23 ------
.../db/query/mpp/plan/node/process/FilterNode.java | 22 -----
.../mpp/plan/node/process/GroupByLevelNode.java | 25 ------
.../db/query/mpp/plan/node/process/LimitNode.java | 22 -----
.../db/query/mpp/plan/node/process/OffsetNode.java | 22 -----
.../query/mpp/plan/node/process/ProcessNode.java | 11 ---
.../node/process/RowBasedSeriesAggregateNode.java | 37 ---------
.../db/query/mpp/plan/node/process/SortNode.java | 22 -----
.../query/mpp/plan/node/process/TimeJoinNode.java | 48 -----------
.../query/mpp/plan/node/process/WithoutNode.java | 22 -----
.../query/mpp/plan/node/sink/FragmentSinkNode.java | 19 -----
.../mpp/plan/node/source/SeriesAggregateNode.java | 63 --------------
.../query/mpp/plan/node/source/SeriesScanNode.java | 60 --------------
.../query/mpp/plan/optimzation/PlanOptimizer.java | 9 --
94 files changed, 1150 insertions(+), 1492 deletions(-)
copy
server/src/main/java/org/apache/iotdb/db/{query/mpp/plan/node/sink/ThriftSinkNode.java
=> mpp/buffer/SinkHandler.java} (51%)
copy
server/src/main/java/org/apache/iotdb/db/{query/mpp/plan/node/sink/CsvSinkNode.java
=> mpp/buffer/SourceHandler.java} (68%)
copy
server/src/main/java/org/apache/iotdb/db/{query/mpp/plan/node/sink/CsvSinkNode.java
=> mpp/common/Analysis.java} (67%)
copy
server/src/main/java/org/apache/iotdb/db/{query/mpp/plan/node/sink/CsvSinkNode.java
=> mpp/common/FillPolicy.java} (67%)
copy
server/src/main/java/org/apache/iotdb/db/{query/mpp/plan/node/sink/CsvSinkNode.java
=> mpp/common/GroupByTimeParameter.java} (66%)
copy
server/src/main/java/org/apache/iotdb/db/{query/mpp/plan/node/sink/CsvSinkNode.java
=> mpp/common/OrderBy.java} (67%)
copy
server/src/main/java/org/apache/iotdb/db/{query/mpp/plan/node/sink/CsvSinkNode.java
=> mpp/common/QueryContext.java} (67%)
copy
server/src/main/java/org/apache/iotdb/db/{query/mpp/plan/node/sink/CsvSinkNode.java
=> mpp/common/QueryId.java} (68%)
copy
server/src/main/java/org/apache/iotdb/db/{query/mpp/plan/node/sink/CsvSinkNode.java
=> mpp/common/QuerySession.java} (67%)
copy
server/src/main/java/org/apache/iotdb/db/{query/mpp/plan/node/sink/ThriftSinkNode.java
=> mpp/common/TreeNode.java} (61%)
create mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/common/TsBlock.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/common/TsBlockMetadata.java
copy
server/src/main/java/org/apache/iotdb/db/{query/mpp/plan/node/sink/CsvSinkNode.java
=> mpp/common/WithoutPolicy.java} (67%)
copy
server/src/main/java/org/apache/iotdb/db/{query/mpp/plan/node/sink/ThriftSinkNode.java
=> mpp/execution/Coordinator.java} (55%)
create mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/execution/ExecFragmentInstance.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/execution/QueryExecution.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/execution/QueryScheduler.java
copy
server/src/main/java/org/apache/iotdb/db/{query/mpp/plan/node/sink/CsvSinkNode.java
=> mpp/execution/QueryStateMachine.java} (71%)
create mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/operator/Operator.java
copy
server/src/main/java/org/apache/iotdb/db/{query/mpp/plan/node/sink/ThriftSinkNode.java
=> mpp/operator/OperatorContext.java} (58%)
copy
server/src/main/java/org/apache/iotdb/db/{query/mpp/plan/node/sink/CsvSinkNode.java
=> mpp/operator/SeriesScanOperator.java} (71%)
copy
server/src/main/java/org/apache/iotdb/db/{query/mpp/plan/node/sink/CsvSinkNode.java
=> mpp/plan/DistributedQueryPlan.java} (59%)
copy
server/src/main/java/org/apache/iotdb/db/{query/mpp/plan/node/sink/ThriftSinkNode.java
=> mpp/plan/DistributionPlanner.java} (63%)
copy
server/src/main/java/org/apache/iotdb/db/{query/mpp/plan/node/sink/CsvSinkNode.java
=> mpp/plan/FragmentInstance.java} (65%)
copy
server/src/main/java/org/apache/iotdb/db/{query/mpp/plan/node/sink/CsvSinkNode.java
=> mpp/plan/FragmentInstanceId.java} (68%)
copy
server/src/main/java/org/apache/iotdb/db/{query/mpp/plan/node/sink/CsvSinkNode.java
=> mpp/plan/LogicalPlanner.java} (54%)
copy
server/src/main/java/org/apache/iotdb/db/{query/mpp/plan/node/sink/ThriftSinkNode.java
=> mpp/plan/LogicalQueryPlan.java} (62%)
copy
server/src/main/java/org/apache/iotdb/db/{query/mpp/plan/node/sink/ThriftSinkNode.java
=> mpp/plan/PlanFragment.java} (64%)
copy
server/src/main/java/org/apache/iotdb/db/{query/mpp/plan/node/sink/CsvSinkNode.java
=> mpp/plan/PlanFragmentId.java} (68%)
copy
server/src/main/java/org/apache/iotdb/db/{query/mpp/plan/node/sink/ThriftSinkNode.java
=> mpp/plan/node/PlanNode.java} (58%)
rename server/src/main/java/org/apache/iotdb/db/{query =>
}/mpp/plan/node/PlanNodeId.java (75%)
copy
server/src/main/java/org/apache/iotdb/db/{query/mpp/plan/node/sink/CsvSinkNode.java
=> mpp/plan/node/PlanNodeIdAllocator.java} (67%)
create mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/plan/node/process/DeviceMergeNode.java
copy
server/src/main/java/org/apache/iotdb/db/{query/mpp/plan/node/sink/CsvSinkNode.java
=> mpp/plan/node/process/FillNode.java} (59%)
copy
server/src/main/java/org/apache/iotdb/db/{query/mpp/plan/node/sink/ThriftSinkNode.java
=> mpp/plan/node/process/FilterNode.java} (59%)
create mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/plan/node/process/GroupByLevelNode.java
copy
server/src/main/java/org/apache/iotdb/db/{query/mpp/plan/node/sink/ThriftSinkNode.java
=> mpp/plan/node/process/LimitNode.java} (63%)
copy
server/src/main/java/org/apache/iotdb/db/{query/mpp/plan/node/sink/ThriftSinkNode.java
=> mpp/plan/node/process/OffsetNode.java} (62%)
copy
server/src/main/java/org/apache/iotdb/db/{query/mpp/plan/node/sink/CsvSinkNode.java
=> mpp/plan/node/process/ProcessNode.java} (69%)
create mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/plan/node/process/RowBasedSeriesAggregateNode.java
copy
server/src/main/java/org/apache/iotdb/db/{query/mpp/plan/node/sink/ThriftSinkNode.java
=> mpp/plan/node/process/SortNode.java} (58%)
create mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/plan/node/process/TimeJoinNode.java
copy
server/src/main/java/org/apache/iotdb/db/{query/mpp/plan/node/sink/CsvSinkNode.java
=> mpp/plan/node/process/WithoutNode.java} (57%)
copy server/src/main/java/org/apache/iotdb/db/{query =>
}/mpp/plan/node/sink/CsvSinkNode.java (83%)
copy
server/src/main/java/org/apache/iotdb/db/{query/mpp/plan/node/sink/ThriftSinkNode.java
=> mpp/plan/node/sink/FragmentSinkNode.java} (72%)
rename server/src/main/java/org/apache/iotdb/db/{query =>
}/mpp/plan/node/sink/SinkNode.java (73%)
rename server/src/main/java/org/apache/iotdb/db/{query =>
}/mpp/plan/node/sink/ThriftSinkNode.java (83%)
rename server/src/main/java/org/apache/iotdb/db/{query =>
}/mpp/plan/node/source/CsvSourceNode.java (86%)
create mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/plan/node/source/SeriesAggregateNode.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/plan/node/source/SeriesScanNode.java
rename server/src/main/java/org/apache/iotdb/db/{query =>
}/mpp/plan/node/source/SourceNode.java (79%)
rename
server/src/main/java/org/apache/iotdb/db/{query/mpp/plan/node/sink/CsvSinkNode.java
=> mpp/plan/optimzation/PlanOptimizer.java} (67%)
delete mode 100644
server/src/main/java/org/apache/iotdb/db/query/mpp/common/Analysis.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/query/mpp/common/FillPolicy.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/query/mpp/common/GroupByTimeParameter.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/query/mpp/common/OrderBy.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/query/mpp/common/QueryContext.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/query/mpp/common/QueryId.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/query/mpp/common/QuerySession.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/query/mpp/common/TreeNode.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/query/mpp/common/TsBlock.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/query/mpp/common/TsBlockMetadata.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/query/mpp/common/WithoutPolicy.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/query/mpp/exec/Coordinator.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/query/mpp/exec/QueryExecution.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/query/mpp/exec/QueryScheduler.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/query/mpp/exec/QueryStateMachine.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/query/mpp/plan/DistributedQueryPlan.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/query/mpp/plan/DistributionPlanner.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/query/mpp/plan/FragmentInstance.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/query/mpp/plan/FragmentInstanceId.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/query/mpp/plan/LogicalPlanner.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/query/mpp/plan/LogicalQueryPlan.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/query/mpp/plan/PlanFragment.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/query/mpp/plan/PlanFragmentId.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/query/mpp/plan/node/PlanNode.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/query/mpp/plan/node/PlanNodeIdAllocator.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/query/mpp/plan/node/process/DeviceMergeNode.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/query/mpp/plan/node/process/FillNode.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/query/mpp/plan/node/process/FilterNode.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/query/mpp/plan/node/process/GroupByLevelNode.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/query/mpp/plan/node/process/LimitNode.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/query/mpp/plan/node/process/OffsetNode.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/query/mpp/plan/node/process/ProcessNode.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/query/mpp/plan/node/process/RowBasedSeriesAggregateNode.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/query/mpp/plan/node/process/SortNode.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/query/mpp/plan/node/process/TimeJoinNode.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/query/mpp/plan/node/process/WithoutNode.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/query/mpp/plan/node/sink/FragmentSinkNode.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/query/mpp/plan/node/source/SeriesAggregateNode.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/query/mpp/plan/node/source/SeriesScanNode.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/query/mpp/plan/optimzation/PlanOptimizer.java
