You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by lt...@apache.org on 2020/02/10 12:39:08 UTC

[incubator-iotdb] 01/03: Merge branch 'master' of github.com:apache/incubator-iotdb

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

lta pushed a commit to branch add_sync_design_doc
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git

commit 81c76add355a409f2c086ddc1f25c06f1ad4895e
Merge: 959d1b3 4ab12f4
Author: lta <li...@163.com>
AuthorDate: Sun Feb 9 19:47:22 2020 +0800

    Merge branch 'master' of github.com:apache/incubator-iotdb

 docs/Development/Development-Chinese.md            |  21 +
 .../SystemDesign/0-Architecture/1-Architecture.md  |  28 +-
 .../SystemDesign/1-TsFile/1-TsFile.md              |   6 +-
 .../SystemDesign/2-QueryEngine/1-QueryEngine.md    |   4 +-
 .../4-StorageEngine/1-StorageEngine.md             |   6 +-
 .../SystemDesign/6-Tools/1-Sync.md}                |  10 +-
 .../SystemDesign/7-Connector/2-Hive-TsFile.md      | 114 +++
 .../1-DDL (Data Definition Language).md            |   8 +-
 .../2-DML (Data Manipulation Language).md          |  15 +
 .../5-Operation Manual/4-SQL Reference.md          | 102 ++-
 docs/Documentation/SystemDesign/0-Content.md       |   6 +-
 .../SystemDesign/1-TsFile/1-TsFile.md              |   6 +-
 .../1-DDL (Data Definition Language).md            |   9 +-
 .../2-DML (Data Manipulation Language).md          |  16 +
 .../5-Operation Manual/4-SQL Reference.md          |  42 +-
 .../org/apache/iotdb/db/qp/strategy/SqlBase.g4     |   1 +
 .../db/conf/adapter/IoTDBConfigDynamicAdapter.java |   4 +-
 .../db/engine/storagegroup/TsFileProcessor.java    |   1 +
 .../iotdb/db/qp/physical/crud/QueryPlan.java       |  70 ++
 .../iotdb/db/qp/strategy/LogicalGenerator.java     |   9 +
 .../iotdb/db/qp/strategy/PhysicalGenerator.java    |  88 ++-
 .../qp/strategy/optimizer/ConcatPathOptimizer.java |   8 -
 .../qp/strategy/optimizer/RemoveNotOptimizer.java  |   6 +
 .../db/query/dataset/DeviceIterateDataSet.java     |  47 +-
 .../org/apache/iotdb/db/service/TSServiceImpl.java | 146 +++-
 .../iotdb/db/integration/IoTDBGroupbyDeviceIT.java | 823 ++++++++++++++++++++-
 .../iotdb/db/integration/IoTDBMultiSeriesIT.java   |  20 +-
 .../org/apache/iotdb/session/SessionDataSet.java   | 141 ++--
 .../org/apache/iotdb/session/IoTDBSessionIT.java   |  53 ++
 .../org/apache/iotdb/tsfile/read/common/Field.java |  30 +
 .../apache/iotdb/tsfile/read/common/RowRecord.java |   5 +
 31 files changed, 1654 insertions(+), 191 deletions(-)