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

Posted to commits@iotdb.apache.org by ja...@apache.org on 2020/01/14 07:44:13 UTC

[incubator-iotdb] branch new_series_reader updated (0a0a3fe -> bd4e66f)

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

jackietien pushed a change to branch new_series_reader
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.


    from 0a0a3fe  optimize aggregation
     add 1adc7a1  change disable align
     add be53447  resolve conflicts
     add 0666b76  fix bug
     add bd4e66f  Merge branch 'new_series_reader' of https://github.com/apache/incubator-iotdb into new_series_reader

No new revisions were added by this update.

Summary of changes:
 .../iotdb/jdbc/IoTDBNonAlignQueryResultSet.java    |   3 -
 .../db/query/dataset/NonAlignEngineDataSet.java    | 188 +++++++++++++--------
 .../iotdb/db/query/executor/EngineExecutor.java    |  17 +-
 .../org/apache/iotdb/db/service/TSServiceImpl.java |  76 +++------
 .../iotdb/db/integration/IoTDBDisableAlignIT.java  |   7 -
 5 files changed, 141 insertions(+), 150 deletions(-)