This is an automated email from the ASF dual-hosted git repository. jackietien pushed a commit to branch ShowTimeseriesSort in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 16d6082583a1ca848f51f80f579a95676318c3d7 Merge: 8bea063 a7ac8c1 Author: JackieTien97 <[email protected]> AuthorDate: Wed Jun 10 15:35:29 2020 +0800 resolve conflicts twice .../apache/iotdb/db/qp/executor/PlanExecutor.java | 4 +- .../db/qp/physical/crud/AlignByDevicePlan.java | 24 +++-- .../iotdb/db/qp/strategy/PhysicalGenerator.java | 62 ++++++++--- .../db/query/dataset/AlignByDeviceDataSet.java | 11 +- .../org/apache/iotdb/db/service/TSServiceImpl.java | 2 +- .../IoTDBAggregationAlignByDeviceIT.java | 113 +++++++++++++++++++++ 6 files changed, 186 insertions(+), 30 deletions(-)
