This is an automated email from the ASF dual-hosted git repository.
haonan pushed a change to branch wincppfix
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
from 80d8e05 try
add 27f2b96 [IOTDB-2713] Generate Analysis for query statement (#5343)
add 4a70fba [IOTDB-2658] Generate logical plan for query statement (#5356)
add bcd53d7 [IOTDB-2810] Design and implementation of TsBlock and its
builder (#5362)
add 0acb906 Demo for integration of ConfigNode and ratis-consensus (#5361)
add b017eae [IOTDB-2784] Add unit tests for FragmentInstanceTask
scheduling (#5337)
add 4050490 Connect the Query Plan stage from SQL to DistributionPlan
with UT and mock interfaces (#5364)
add 9c5fdd5 [IOTDB-2768] Add UT for SeriesScanOperator, TimeJoinOperator
and LimitOperator (#5365)
add bfe585d Add getSchedulePriority for FragmentInstanceManager (#5371)
add 96f919a [IOTDB-2820]Update Userguide SQL about Trigger (#5372)
new 6e4bee1 Merge branch 'master' of https://github.com/apache/iotdb into
wincppfix
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:
.../iotdb/confignode/conf/ConfigNodeConf.java | 2 +-
.../confignode/conf/ConfigNodeDescriptor.java | 2 +-
.../RatisConsensusDemo.java} | 64 ++--
.../iotdb/consensus/common}/ConsensusType.java | 2 +-
docs/UserGuide/Process-Data/Alerting.md | 2 +-
docs/zh/UserGuide/Process-Data/Alerting.md | 2 +-
.../commons/partition/DataRegionReplicaSet.java | 8 +
pom.xml | 10 +
.../apache/iotdb/db/mpp/buffer/ISinkHandle.java | 2 +-
.../apache/iotdb/db/mpp/buffer/ISourceHandle.java | 2 +-
.../apache/iotdb/db/mpp/buffer/SourceHandle.java | 2 +-
.../db/mpp/common/schematree/PathPatternNode.java | 68 +++-
.../db/mpp/common/schematree/PathPatternTree.java | 104 +++++-
.../iotdb/db/mpp/common/schematree/SchemaTree.java | 56 ++-
.../db/mpp/execution/FragmentInstanceContext.java | 4 +
.../iotdb/db/mpp/execution/QueryExecution.java | 18 +-
.../org/apache/iotdb/db/mpp/operator/Operator.java | 2 +-
.../db/mpp/operator/process/AggregateOperator.java | 2 +-
.../mpp/operator/process/DeviceMergeOperator.java | 2 +-
.../db/mpp/operator/process/FillOperator.java | 2 +-
.../mpp/operator/process/FilterNullOperator.java | 2 +-
.../mpp/operator/process/GroupByLevelOperator.java | 2 +-
.../db/mpp/operator/process/LimitOperator.java | 8 +-
.../db/mpp/operator/process/OffsetOperator.java | 2 +-
.../db/mpp/operator/process/SortOperator.java | 2 +-
.../db/mpp/operator/process/TimeJoinOperator.java | 41 +-
.../db/mpp/operator/sink/FragmentSinkOperator.java | 2 +-
.../iotdb/db/mpp/operator/sink/SinkOperator.java | 2 +-
.../operator/source/AlignedSeriesScanUtil.java} | 57 +--
.../source/SeriesAggregateScanOperator.java | 2 +-
.../db/mpp/operator/source/SeriesScanOperator.java | 4 +-
.../db/mpp/operator/source/SeriesScanUtil.java | 60 +--
.../db/mpp/schedule/FragmentInstanceManager.java | 82 +++-
.../db/mpp/schedule/IFragmentInstanceManager.java | 12 +-
.../iotdb/db/mpp/schedule/ITaskScheduler.java | 2 +-
.../mpp/schedule/queue/IndexedBlockingQueue.java | 13 +
.../db/mpp/schedule/queue/L1PriorityQueue.java | 5 +
.../db/mpp/schedule/queue/L2PriorityQueue.java | 6 +
.../db/mpp/schedule/task/FragmentInstanceTask.java | 6 +-
.../apache/iotdb/db/mpp/sql/analyze/Analysis.java | 25 +-
.../apache/iotdb/db/mpp/sql/analyze/Analyzer.java | 54 ++-
.../db/mpp/sql/analyze/ClusterSchemaFetcher.java | 11 -
.../mpp/sql/analyze/FakePartitionFetcherImpl.java | 107 ++++++
.../sql/analyze/FakeSchemaFetcherImpl.java} | 10 +-
.../iotdb/db/mpp/sql/analyze/ISchemaFetcher.java | 8 -
.../mpp/sql/analyze/StandaloneSchemaFetcher.java | 11 -
.../apache/iotdb/db/mpp/sql/parser/ASTVisitor.java | 19 +-
.../db/mpp/sql/planner/DistributionPlanner.java | 18 +-
.../db/mpp/sql/planner/LocalExecutionPlanner.java | 26 +-
.../iotdb/db/mpp/sql/planner/LogicalPlanner.java | 179 ++++++++-
.../db/mpp/sql/planner/plan/FragmentInstance.java | 1 -
.../db/mpp/sql/planner/plan/PlanFragment.java | 2 +-
.../plan/SimpleFragmentParallelPlanner.java | 3 +-
.../db/mpp/sql/planner/plan/node/PlanNode.java | 30 +-
.../sql/planner/plan/node/PlanNodeIdAllocator.java | 7 +
.../db/mpp/sql/planner/plan/node/PlanNodeUtil.java | 52 ++-
.../db/mpp/sql/planner/plan/node/PlanVisitor.java | 4 +
.../plan/node/metedata/read/ShowDevicesNode.java | 9 +-
.../node/metedata/write/AlterTimeSeriesNode.java | 9 +-
.../write/CreateAlignedTimeSeriesNode.java | 9 +-
.../node/metedata/write/CreateTimeSeriesNode.java | 9 +-
.../planner/plan/node/process/AggregateNode.java | 11 +-
.../planner/plan/node/process/DeviceMergeNode.java | 37 +-
.../planner/plan/node/process/ExchangeNode.java | 22 +-
.../sql/planner/plan/node/process/FillNode.java | 35 +-
.../sql/planner/plan/node/process/FilterNode.java | 40 +-
.../planner/plan/node/process/FilterNullNode.java | 43 ++-
.../plan/node/process/GroupByLevelNode.java | 32 +-
.../sql/planner/plan/node/process/LimitNode.java | 21 +-
.../sql/planner/plan/node/process/OffsetNode.java | 31 +-
.../sql/planner/plan/node/process/SortNode.java | 35 +-
.../planner/plan/node/process/TimeJoinNode.java | 33 +-
.../sql/planner/plan/node/sink/CsvSinkNode.java | 67 ----
.../planner/plan/node/sink/FragmentSinkNode.java | 13 +-
.../sql/planner/plan/node/sink/ThriftSinkNode.java | 69 ----
.../planner/plan/node/source/CsvSourceNode.java | 80 ----
.../plan/node/source/SeriesAggregateScanNode.java | 30 +-
.../planner/plan/node/source/SeriesScanNode.java | 52 ++-
.../sql/planner/plan/node/source/SourceNode.java | 22 ++
.../plan/node/write/InsertMultiTabletNode.java | 9 +-
.../sql/planner/plan/node/write/InsertRowNode.java | 9 +-
.../planner/plan/node/write/InsertRowsNode.java | 9 +-
.../plan/node/write/InsertRowsOfOneDeviceNode.java | 9 +-
.../planner/plan/node/write/InsertTabletNode.java | 9 +-
.../sql/rewriter/ColumnPaginationController.java | 101 +++++
.../db/mpp/sql/rewriter/ConcatPathRewriter.java | 309 +++-------------
.../db/mpp/sql/rewriter/IStatementRewriter.java | 33 --
.../db/mpp/sql/rewriter/WildcardsRemover.java | 339 ++++++++++++++---
.../iotdb/db/mpp/sql/statement/StatementNode.java | 2 -
.../sql/{tree => statement}/StatementVisitor.java | 4 +-
.../statement/component}/FillPolicy.java | 2 +-
.../statement/component/FilterNullComponent.java | 8 +-
.../statement/component}/FilterNullPolicy.java | 2 +-
.../statement/component/GroupByLevelComponent.java | 6 +
.../component/GroupByLevelController.java | 10 +-
.../mpp/sql/statement/component/ResultColumn.java | 11 +-
.../sql/statement/component/SelectComponent.java | 21 +-
.../db/mpp/sql/statement/crud/InsertStatement.java | 2 +-
.../db/mpp/sql/statement/crud/QueryStatement.java | 2 +-
.../mpp/sql/statement/crud/UDAFQueryStatement.java | 2 +-
.../metadata/AlterTimeSeriesStatement.java | 2 +-
.../metadata/CreateAlignedTimeSeriesStatement.java | 2 +-
.../metadata/CreateTimeSeriesStatement.java | 2 +-
.../apache/iotdb/db/mpp/sql/tree/Expression.java | 21 --
.../iotdb/db/qp/logical/crud/SelectComponent.java | 4 +-
.../db/qp/logical/crud/UDAFQueryOperator.java | 4 +-
.../iotdb/db/qp/utils/GroupByLevelController.java | 4 +-
.../iotdb/db/query/expression/Expression.java | 12 +-
.../query/expression/binary/BinaryExpression.java | 25 +-
.../db/query/expression/unary/ConstantOperand.java | 15 +
.../query/expression/unary/FunctionExpression.java | 56 ++-
.../query/expression/unary/LogicNotExpression.java | 21 +-
.../query/expression/unary/NegationExpression.java | 21 +-
.../query/expression/unary/TimeSeriesOperand.java | 23 +-
.../query/reader/chunk/MemAlignedPageReader.java | 39 +-
.../iotdb/db/query/reader/chunk/MemPageReader.java | 119 ++++--
.../iotdb/db/mpp/common/PathPatternTreeTest.java | 131 +++++++
.../iotdb/db/mpp/operator/LimitOperatorTest.java | 170 +++++++++
.../db/mpp/operator/SeriesScanOperatorTest.java | 125 +++++++
.../db/mpp/operator/TimeJoinOperatorTest.java | 156 ++++++++
.../db/mpp/schedule/DefaultTaskSchedulerTest.java | 411 +++++++++++++++++++++
.../mpp/schedule/FragmentInstanceManagerTest.java | 134 +++++++
.../FragmentInstanceTimeoutSentinelTest.java | 283 ++++++++++++++
.../db/mpp/schedule/queue/L1PriorityQueueTest.java | 26 ++
.../db/mpp/schedule/queue/L2PriorityQueueTest.java | 28 +-
.../db/mpp/sql/plan/DistributionPlannerTest.java | 27 +-
.../iotdb/db/mpp/sql/plan/LogicalPlanPrinter.java | 219 +++++++++++
.../iotdb/db/mpp/sql/plan/LogicalPlannerTest.java | 79 +++-
.../iotdb/db/mpp/sql/plan/QueryPlannerTest.java | 61 +++
.../reader/series/SeriesAggregateReaderTest.java | 3 +-
.../reader/series/SeriesReaderByTimestampTest.java | 3 +-
.../db/query/reader/series/SeriesReaderTest.java | 3 +-
.../query/reader/series/SeriesReaderTestUtil.java | 27 +-
tsfile/pom.xml | 8 +
.../apache/iotdb/tsfile/read/common/Column.java | 21 --
.../iotdb/tsfile/read/common/TimeColumn.java | 21 --
.../apache/iotdb/tsfile/read/common/TsBlock.java | 175 ---------
.../iotdb/tsfile/read/common/block/TsBlock.java | 317 ++++++++++++++++
.../tsfile/read/common/block/TsBlockBuilder.java | 295 +++++++++++++++
.../read/common/block/TsBlockBuilderStatus.java | 75 ++++
.../read/common/{ => block}/TsBlockMetadata.java | 2 +-
.../read/common/block/column/BinaryColumn.java | 110 ++++++
.../common/block/column/BinaryColumnBuilder.java | 148 ++++++++
.../read/common/block/column/BooleanColumn.java | 109 ++++++
.../common/block/column/BooleanColumnBuilder.java | 150 ++++++++
.../tsfile/read/common/block/column/Column.java | 87 +++++
.../read/common/block/column/ColumnBuilder.java | 81 ++++
.../common/block/column/ColumnBuilderStatus.java | 88 +++++
.../read/common/block/column/ColumnUtil.java | 97 +++++
.../read/common/block/column/DoubleColumn.java | 109 ++++++
.../common/block/column/DoubleColumnBuilder.java | 150 ++++++++
.../read/common/block/column/FloatColumn.java | 108 ++++++
.../common/block/column/FloatColumnBuilder.java | 150 ++++++++
.../tsfile/read/common/block/column/IntColumn.java | 108 ++++++
.../read/common/block/column/IntColumnBuilder.java | 150 ++++++++
.../read/common/block/column/LongColumn.java | 108 ++++++
.../common/block/column/LongColumnBuilder.java | 150 ++++++++
.../block/column/RunLengthEncodedColumn.java | 133 +++++++
.../read/common/block/column/TimeColumn.java | 95 +++++
.../common/block/column/TimeColumnBuilder.java | 126 +++++++
.../iotdb/tsfile/read/reader/IPageReader.java | 2 +-
.../tsfile/read/reader/page/AlignedPageReader.java | 43 ++-
.../iotdb/tsfile/read/reader/page/PageReader.java | 87 +++--
.../iotdb/tsfile/common/block/TsBlockTest.java | 317 ++++++++++++++++
164 files changed, 7386 insertions(+), 1331 deletions(-)
copy
confignode/src/test/java/org/apache/iotdb/confignode/{manager/ConfigManagerManualTest.java
=> consensus/RatisConsensusDemo.java} (65%)
rename {confignode/src/main/java/org/apache/iotdb/confignode/consensus =>
consensus/src/main/java/org/apache/iotdb/consensus/common}/ConsensusType.java
(97%)
copy
server/src/main/java/org/apache/iotdb/db/{query/reader/series/AlignedSeriesReader.java
=> mpp/operator/source/AlignedSeriesScanUtil.java} (71%)
create mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/sql/analyze/FakePartitionFetcherImpl.java
copy server/src/main/java/org/apache/iotdb/db/{query/udf/builtin/UDTFCeil.java
=> mpp/sql/analyze/FakeSchemaFetcherImpl.java} (71%)
delete mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/node/sink/CsvSinkNode.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/node/sink/ThriftSinkNode.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/node/source/CsvSourceNode.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/sql/rewriter/ColumnPaginationController.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/sql/rewriter/IStatementRewriter.java
rename server/src/main/java/org/apache/iotdb/db/mpp/sql/{tree =>
statement}/StatementVisitor.java (95%)
rename server/src/main/java/org/apache/iotdb/db/mpp/{common =>
sql/statement/component}/FillPolicy.java (93%)
rename server/src/main/java/org/apache/iotdb/db/mpp/{common =>
sql/statement/component}/FilterNullPolicy.java (93%)
delete mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/sql/tree/Expression.java
create mode 100644
server/src/test/java/org/apache/iotdb/db/mpp/common/PathPatternTreeTest.java
create mode 100644
server/src/test/java/org/apache/iotdb/db/mpp/operator/LimitOperatorTest.java
create mode 100644
server/src/test/java/org/apache/iotdb/db/mpp/operator/SeriesScanOperatorTest.java
create mode 100644
server/src/test/java/org/apache/iotdb/db/mpp/operator/TimeJoinOperatorTest.java
create mode 100644
server/src/test/java/org/apache/iotdb/db/mpp/schedule/DefaultTaskSchedulerTest.java
create mode 100644
server/src/test/java/org/apache/iotdb/db/mpp/schedule/FragmentInstanceManagerTest.java
create mode 100644
server/src/test/java/org/apache/iotdb/db/mpp/schedule/FragmentInstanceTimeoutSentinelTest.java
create mode 100644
server/src/test/java/org/apache/iotdb/db/mpp/sql/plan/LogicalPlanPrinter.java
create mode 100644
server/src/test/java/org/apache/iotdb/db/mpp/sql/plan/QueryPlannerTest.java
delete mode 100644
tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/Column.java
delete mode 100644
tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/TimeColumn.java
delete mode 100644
tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/TsBlock.java
create mode 100644
tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/TsBlock.java
create mode 100644
tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/TsBlockBuilder.java
create mode 100644
tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/TsBlockBuilderStatus.java
rename tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/{ =>
block}/TsBlockMetadata.java (97%)
create mode 100644
tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/BinaryColumn.java
create mode 100644
tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/BinaryColumnBuilder.java
create mode 100644
tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/BooleanColumn.java
create mode 100644
tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/BooleanColumnBuilder.java
create mode 100644
tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/Column.java
create mode 100644
tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/ColumnBuilder.java
create mode 100644
tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/ColumnBuilderStatus.java
create mode 100644
tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/ColumnUtil.java
create mode 100644
tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/DoubleColumn.java
create mode 100644
tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/DoubleColumnBuilder.java
create mode 100644
tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/FloatColumn.java
create mode 100644
tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/FloatColumnBuilder.java
create mode 100644
tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/IntColumn.java
create mode 100644
tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/IntColumnBuilder.java
create mode 100644
tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/LongColumn.java
create mode 100644
tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/LongColumnBuilder.java
create mode 100644
tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/RunLengthEncodedColumn.java
create mode 100644
tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/TimeColumn.java
create mode 100644
tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/TimeColumnBuilder.java
create mode 100644
tsfile/src/test/java/org/apache/iotdb/tsfile/common/block/TsBlockTest.java
