This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a change to branch clean_package
in repository https://gitbox.apache.org/repos/asf/iotdb.git
from 3c0df44df5 resolve conflict
add f6abf3d1da move columnToTsBlockIndexMap from LogicalPlanner to
DistributionPlanner (#5733)
add 9eb9aabb16 resolve conflict
No new revisions were added by this update.
Summary of changes:
.../apache/iotdb/db/mpp/plan/planner/DistributionPlanner.java | 10 +++++++++-
.../org/apache/iotdb/db/mpp/plan/planner/LogicalPlanner.java | 2 --
2 files changed, 9 insertions(+), 3 deletions(-)
