This is an automated email from the ASF dual-hosted git repository. jackietien pushed a commit to branch NewTsFileV2 in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 8f0c32b42894b6b9d3a7a4259e4dc799de5b1015 Merge: c9de562 4f8c41f Author: JackieTien97 <[email protected]> AuthorDate: Fri Jan 22 09:26:11 2021 +0800 Merge remote-tracking branch 'origin/master' into NewTsFileV2 .travis.yml | 192 --------------------- .../antlr4/org/apache/iotdb/db/qp/sql/SqlBase.g4 | 4 +- .../client-cpp-example/src/SessionExample.cpp | 13 ++ client-cpp/src/main/Session.cpp | 18 +- client-cpp/src/main/Session.h | 4 + client-cpp/src/test/cpp/sessionIT.cpp | 22 +++ client-py/readme.md | 6 + client-py/src/SessionExample.py | 14 +- .../src/{SessionExample.py => SessionTest.py} | 79 +++++++-- client-py/src/iotdb/Session.py | 143 +++++++++++++-- client-py/src/iotdb/utils/IoTDBRpcDataSet.py | 5 +- .../Concept/Data Model and Terminology.md | 15 +- docs/UserGuide/Concept/SDT.md | 21 ++- .../DDL Data Definition Language.md | 3 + docs/UserGuide/Operation Manual/SQL Reference.md | 10 +- .../Concept/Data Model and Terminology.md | 16 +- docs/zh/UserGuide/Concept/SDT.md | 17 +- .../DDL Data Definition Language.md | 4 + .../zh/UserGuide/Operation Manual/SQL Reference.md | 10 +- .../main/java/org/apache/iotdb/SessionExample.java | 12 +- .../org/apache/iotdb/jdbc/IoTDBConnection.java | 60 +++---- .../iotdb/db/engine/merge/task/MergeFileTask.java | 15 +- .../engine/storagegroup/StorageGroupProcessor.java | 33 ++++ .../iotdb/db/query/control/QueryTimeManager.java | 6 +- .../iotdb/db/query/reader/series/SeriesReader.java | 8 +- .../org/apache/iotdb/db/service/TSServiceImpl.java | 11 +- .../db/sync/receiver/transfer/SyncServiceImpl.java | 18 +- .../java/org/apache/iotdb/db/utils/MergeUtils.java | 2 +- .../iotdb/db/engine/merge/MergeTaskTest.java | 66 ++++--- .../iotdb/db/integration/IoTDBMergeTest.java | 51 +++++- .../iotdb/db/integration/IoTDBSimpleQueryIT.java | 6 +- .../iotdb/db/qp/physical/PhysicalPlanTest.java | 3 +- .../iotdb/tsfile/encoding/encoder/SDTEncoder.java | 72 ++++---- .../iotdb/tsfile/write/chunk/ChunkWriterImpl.java | 10 +- 34 files changed, 580 insertions(+), 389 deletions(-)
