You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@iotdb.apache.org by hu...@apache.org on 2022/10/19 11:13:03 UTC

[iotdb] 02/12: Merge branch 'lmh/mppSelectInto' into lmh/intoOperator

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

hui pushed a commit to branch lmh/intoOperator
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit fbc3c41ece91f1507956233de2f0ba180c7dee5f
Merge: 2293ea4ca4 3e50f56e3e
Author: Minghui Liu <li...@foxmail.com>
AuthorDate: Mon Oct 17 21:48:06 2022 +0800

    Merge branch 'lmh/mppSelectInto' into lmh/intoOperator
    
    # Conflicts:
    #       server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java
    #       server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/parameter/DeviceViewIntoPathDescriptor.java
    #       server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/parameter/IntoPathDescriptor.java
    #       server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/QueryStatement.java

 .../iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java  |   7 +-
 .../parameter/DeviceViewIntoPathDescriptor.java    | 177 ++++++++++++++++++---
 .../planner/plan/parameter/IntoPathDescriptor.java | 132 +++++++++++++--
 .../db/mpp/plan/statement/crud/QueryStatement.java |   3 +
 .../iotdb/db/mpp/plan/analyze/AnalyzeTest.java     | 169 ++++++++++++++++++++
 5 files changed, 449 insertions(+), 39 deletions(-)