You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by xi...@apache.org on 2022/05/04 07:13:45 UTC

[iotdb] 03/04: Merge branch 'master' into deviceMergeOperator1

This is an automated email from the ASF dual-hosted git repository.

xiangweiwei pushed a commit to branch deviceMergeOperator1
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit a0f22643ad0a38c2095489cbbf28c389649de624
Merge: 537dfc32ce 780db8361f
Author: Alima777 <wx...@gmail.com>
AuthorDate: Tue May 3 20:24:09 2022 +0800

    Merge branch 'master' into deviceMergeOperator1

 .../iotdb/commons/partition/DataPartition.java     |   5 +
 .../apache/iotdb/commons/partition/Partition.java  |   2 +
 .../iotdb/commons/partition/SchemaPartition.java   |   5 +
 .../apache/iotdb/db/client/ConfigNodeClient.java   |  16 +
 .../iotdb/db/mpp/common/header/HeaderConstant.java |   8 +
 .../iotdb/db/mpp/common/schematree/SchemaTree.java |   4 +
 .../operator/process/GroupByLevelOperator.java     |  57 ---
 .../execution/operator/process/OffsetOperator.java |  34 +-
 .../operator/process/TimeJoinOperator.java         |  44 ++-
 .../apache/iotdb/db/mpp/plan/analyze/Analysis.java |   5 +
 .../apache/iotdb/db/mpp/plan/analyze/Analyzer.java |  17 +-
 .../db/mpp/plan/execution/QueryExecution.java      |  12 +-
 .../plan/execution/config/ConfigTaskVisitor.java   |  18 +
 .../db/mpp/plan/execution/config/SetTTLTask.java   |  95 +++++
 .../execution/config/ShowStorageGroupTask.java     |   1 -
 .../db/mpp/plan/execution/config/ShowTTLTask.java  | 134 +++++++
 .../db/mpp/plan/execution/config/UnSetTTLTask.java |  29 ++
 .../iotdb/db/mpp/plan/parser/ASTVisitor.java       |  38 ++
 .../db/mpp/plan/planner/LocalExecutionPlanner.java |  10 +-
 .../db/mpp/plan/statement/StatementVisitor.java    |  16 +
 .../plan/statement/metadata/SetTTLStatement.java   |  73 ++++
 .../plan/statement/metadata/ShowTTLStatement.java  |  60 ++++
 .../plan/statement/metadata/UnSetTTLStatement.java |  37 ++
 .../mpp/execution/operator/OffsetOperatorTest.java | 391 +++++++++++++++++++++
 .../iotdb/tsfile/read/common/block/TsBlock.java    |   1 +
 25 files changed, 1028 insertions(+), 84 deletions(-)