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

Posted to commits@iotdb.apache.org by ji...@apache.org on 2020/03/02 01:44:20 UTC

[incubator-iotdb] branch cluster_new updated (a81a701 -> 4c52015)

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

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


    from a81a701  fix determine sg
     add 9340de3  [IOTDB-380] Update storage group path (#853)
     add 6f80172  Revert "[IOTDB-520] Result of IBatchReader should not cross partition" (#860)
     add 4c52015  Merge branch 'master' into cluster_new

No new revisions were added by this update.

Summary of changes:
 .../SystemDesign/5-DataQuery/2-SeriesReader.md     |   2 +-
 .../5-Operation Manual/4-SQL Reference.md          |  10 +-
 .../1-DDL (Data Definition Language).md            |   2 +
 .../5-Operation Manual/4-SQL Reference.md          |  10 +-
 .../resources/conf/iotdb-engine.properties         |   4 +-
 .../org/apache/iotdb/db/qp/strategy/SqlBase.g4     | 140 ++++++++++-----------
 .../iotdb/db/qp/strategy/LogicalGenerator.java     |  16 +--
 .../reader/universal/PriorityMergeReader.java      |  26 +---
 .../iotdb/db/integration/IoTDBSeriesReaderIT.java  |   2 +-
 9 files changed, 98 insertions(+), 114 deletions(-)