You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by xu...@apache.org on 2020/02/27 09:04:32 UTC
[incubator-iotdb] branch IOTDB-479&IOTDB-328 updated (302ba2c -> bd2d423)

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

xuekaifeng pushed a change to branch IOTDB-479&IOTDB-328
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.


    from 302ba2c  fix bugs
     add 9fef008  [IOTDB-444] Enhanced wildcard query on device path (#837)
     add 83b88d0  [IOTDB-444] Fix enhanced wildcard query on device path (#844)
     add 8fdf9f8  [IOTDB-524] Fix file order (#842)
     add 2b8b154  [IOTDB-520] Result of IBatchReader should not cross partition (#845)
     add e8fde6b  [IOTDB-446] Can not create or query time series whose path starts with a digit but has strings (#843)
     add 612b288  Fix avg merge (#847)
     add bcd6c22  [IOTDB-429] return empty dataset instead of throw exception (#838)
     add bd2d423  Merge branch 'master' of https://github.com/apache/incubator-iotdb into IOTDB-479&IOTDB-328

No new revisions were added by this update.

Summary of changes:
 .../SystemDesign/5-DataQuery/2-SeriesReader.md     |  2 +-
 .../2-DML (Data Manipulation Language).md          | 23 +++++++-
 .../5-Operation Manual/4-SQL Reference.md          | 25 +++++----
 .../2-DML (Data Manipulation Language).md          | 19 ++++++-
 .../5-Operation Manual/4-SQL Reference.md          | 12 ++--
 .../main/java/org/apache/iotdb/JDBCExample.java    |  2 +-
 .../org/apache/iotdb/jdbc/IoTDBResultMetadata.java |  7 +--
 .../apache/iotdb/jdbc/IoTDBResultMetadataTest.java | 30 +++++-----
 .../org/apache/iotdb/db/qp/strategy/SqlBase.g4     | 33 ++---------
 .../engine/storagegroup/StorageGroupProcessor.java | 37 ++++++++-----
 .../org/apache/iotdb/db/metadata/MManager.java     |  2 +-
 .../java/org/apache/iotdb/db/metadata/MTree.java   | 64 ++++++++++++++++++----
 .../apache/iotdb/db/qp/executor/PlanExecutor.java  |  9 ++-
 .../iotdb/db/qp/strategy/PhysicalGenerator.java    | 13 +----
 .../db/query/aggregation/impl/AvgAggrResult.java   |  6 ++
 .../reader/universal/PriorityMergeReader.java      | 26 +++++++--
 .../integration/IOTDBGroupByInnerIntervalIT.java   |  4 +-
 .../iotdb/db/integration/IoTDBAlignByDeviceIT.java |  4 +-
 .../iotdb/db/integration/IoTDBSeriesReaderIT.java  |  4 ++
 .../iotdb/db/integration/IoTDBSimpleQueryTest.java | 59 ++++++++++++++++++++
 .../iotdb/db/metadata/MManagerAdvancedTest.java    | 14 +++--
 .../iotdb/db/metadata/MManagerBasicTest.java       | 57 ++++++++++++++++++-
 .../java/org/apache/iotdb/db/qp/PlannerTest.java   | 16 ++++--
 .../db/query/aggregation/AggregateResultTest.java  |  2 +
 .../tsfile/read/query/dataset/EmptyDataSet.java    | 25 +++++----
 25 files changed, 363 insertions(+), 132 deletions(-)
 copy server/src/main/java/org/apache/iotdb/db/tools/watermark/WatermarkEncoder.java => tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/dataset/EmptyDataSet.java (69%)