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 2021/05/25 16:09:05 UTC

[iotdb] 03/06: Fix conclicts

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

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

commit 09a6378d0825eb96ce6e6f15d6fce638319c10e7
Merge: ad89e3a e6216ad
Author: Alima777 <wx...@gmail.com>
AuthorDate: Wed May 19 21:16:58 2021 +0800

    Fix conclicts

 .../cluster/query/ClusterPhysicalGenerator.java    |  4 ++--
 server/pom.xml                                     |  6 ------
 .../org/apache/iotdb/db/metadata/MManager.java     |  3 ---
 .../org/apache/iotdb/db/metadata/PartialPath.java  | 14 --------------
 .../iotdb/db/qp/physical/crud/AggregationPlan.java |  6 +-----
 .../iotdb/db/qp/physical/crud/LastQueryPlan.java   | 22 +++++++++++-----------
 .../iotdb/db/qp/physical/crud/QueryPlan.java       |  8 ++------
 .../apache/iotdb/db/qp/utils/WildcardsRemover.java | 14 --------------
 .../query/expression/unary/TimeSeriesOperand.java  | 10 ++--------
 9 files changed, 18 insertions(+), 69 deletions(-)