This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a change to branch bug/countBug
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from f92c380 resolve conflicts
add 7fdc6d5 rename some fields
No new revisions were added by this update.
Summary of changes:
.../db/qp/physical/crud/AlignByDevicePlan.java | 25 ++++++------
.../iotdb/db/qp/strategy/PhysicalGenerator.java | 46 ++++++++++++++++------
.../db/query/dataset/AlignByDeviceDataSet.java | 2 +-
.../org/apache/iotdb/db/service/TSServiceImpl.java | 2 +-
4 files changed, 48 insertions(+), 27 deletions(-)
