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 2019/11/29 09:15:12 UTC
[incubator-iotdb] 01/03: Merge branch 'master' into
add_load_tsfile_feature
This is an automated email from the ASF dual-hosted git repository.
lta pushed a commit to branch add_load_tsfile_feature
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 83db91a0709b4d619b1d3ac780072d2f8a12b141
Merge: b68c549 15643e1
Author: lta <li...@163.com>
AuthorDate: Fri Nov 29 16:01:38 2019 +0800
Merge branch 'master' into add_load_tsfile_feature
.travis.yml | 25 +-
client/src/assembly/client.xml | 2 +-
distribution/src/assembly/distribution.xml | 2 +-
.../1-DDL (Data Definition Language).md | 37 ++
.../5-Operation Manual/4-SQL Reference.md | 23 +-
.../8-System Design (Developer)/1-Hierarchy.md | 392 ++++++++++++++++++++-
.../UserGuide/4-Client/3-Programming - Session.md | 4 +
.../1-DDL (Data Definition Language).md | 38 +-
.../5-Operation Manual/4-SQL Reference.md | 21 +-
.../8-System Design (Developer)/1-Hierarchy.md | 11 +-
.../main/java/org/apache/iotdb/SessionExample.java | 34 ++
.../org/apache/iotdb/jdbc/IoTDBQueryResultSet.java | 113 ++++--
.../java/org/apache/iotdb/jdbc/IoTDBStatement.java | 2 +-
.../src/main/java/org/apache/iotdb/jdbc/Utils.java | 117 ++++--
.../apache/iotdb/jdbc/IoTDBQueryResultSetTest.java | 2 +-
.../test/java/org/apache/iotdb/jdbc/UtilsTest.java | 9 +-
pom.xml | 170 ++++-----
.../resources/conf/iotdb-engine.properties | 1 +
.../src/assembly/resources/sbin/start-server.bat | 44 +--
server/src/assembly/server.xml | 2 +-
.../strategy/RandomOnDiskUsableSpaceStrategy.java | 63 ++++
.../engine/storagegroup/StorageGroupProcessor.java | 1 -
.../iotdb/db/query/control/FileReaderManager.java | 26 +-
.../resourceRelated/UnseqResourceMergeReader.java | 6 +-
.../org/apache/iotdb/db/service/TSServiceImpl.java | 132 ++++---
.../apache/iotdb/db/tools/TsFileSketchTool.java | 9 +-
.../strategy/DirectoryStrategyTest.java | 23 +-
service-rpc/rpc-changelist.md | 2 +
service-rpc/src/main/thrift/rpc.thrift | 12 +
.../java/org/apache/iotdb/session/Session.java | 102 ++++--
.../org/apache/iotdb/session/IoTDBSessionIT.java | 70 +++-
.../iotdb/tsfile/file/metadata/ChunkMetaData.java | 19 +-
.../iotdb/tsfile/file/metadata/TsDigest.java | 317 -----------------
.../file/metadata/statistics/Statistics.java | 282 +++++++++++++++
.../iotdb/tsfile/read/TsFileSequenceReader.java | 16 +-
.../reader/series/FileSeriesReaderWithFilter.java | 6 +-
.../tool/upgrade/TsfileUpgradeToolV0_8_0.java | 16 +-
.../iotdb/tsfile/write/chunk/ChunkWriterImpl.java | 45 +--
.../apache/iotdb/tsfile/write/page/PageWriter.java | 9 +-
.../iotdb/tsfile/write/writer/TsFileIOWriter.java | 16 +-
.../tsfile/file/metadata/utils/TestHelper.java | 34 +-
.../iotdb/tsfile/file/metadata/utils/Utils.java | 3 +-
42 files changed, 1533 insertions(+), 725 deletions(-)