You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ro...@apache.org on 2022/05/23 17:38:29 UTC
[iotdb] 15/18: Merge branch 'master' of github.com:apache/iotdb into iotdb-3227
This is an automated email from the ASF dual-hosted git repository.
rong pushed a commit to branch iotdb-3227
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 6fe0aff57bbf05312d936c5437bc8a404c1a05d5
Merge: 966a6d30d0 ec0ca1044d
Author: Steve Yurong Su <ro...@apache.org>
AuthorDate: Mon May 23 15:58:26 2022 +0800
Merge branch 'master' of github.com:apache/iotdb into iotdb-3227
.../controller/DatabaseConnectController.java | 2 +-
.../iotdb/web/grafana/dao/impl/BasicDaoImpl.java | 2 +-
.../mpp/plan/planner/plan/node/PlanNodeType.java | 14 +-
.../db/mpp/plan/planner/plan/node/PlanVisitor.java | 15 ++
.../plan/node/process/LastQueryMergeNode.java | 110 +++++++++++++
.../plan/node/source/AlignedLastQueryScanNode.java | 171 ++++++++++++++++++++
.../source/AlignedSeriesAggregationScanNode.java | 6 +-
.../plan/node/source/AlignedSeriesScanNode.java | 13 +-
.../plan/node/source/LastQueryScanNode.java | 173 +++++++++++++++++++++
.../node/source/SeriesAggregationScanNode.java | 6 +-
.../planner/plan/node/source/SeriesScanNode.java | 13 +-
.../mpp/plan/plan/FragmentInstanceSerdeTest.java | 9 --
.../node/process/AggregationNodeSerdeTest.java | 6 +-
.../node/process/GroupByLevelNodeSerdeTest.java | 10 +-
.../plan/plan/node/process/LimitNodeSerdeTest.java | 7 +-
.../plan/node/process/OffsetNodeSerdeTest.java | 7 +-
.../plan/plan/node/process/SortNodeSerdeTest.java | 7 +-
.../plan/node/process/TimeJoinNodeSerdeTest.java | 10 +-
.../source/SeriesAggregationScanNodeSerdeTest.java | 6 +-
.../plan/node/source/SeriesScanNodeSerdeTest.java | 7 +-
20 files changed, 498 insertions(+), 96 deletions(-)