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/09/03 12:44:19 UTC
[incubator-iotdb] 01/02: Merge branch 'master' into reimpl_sync
This is an automated email from the ASF dual-hosted git repository.
lta pushed a commit to branch reimpl_sync
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 9d4cd6f17c64b1ece419ebe37d1d715a6e8fad5e
Merge: 10688c0 8fd6248
Author: lta <li...@163.com>
AuthorDate: Tue Sep 3 20:01:12 2019 +0800
Merge branch 'master' into reimpl_sync
README.md | 2 +
...{Development.md => Development-Contributing.md} | 39 ------
docs/Development-IDE.md | 65 ++++++++++
docs/Documentation-CHN/QuickStart.md | 3 +
.../UserGuide/7-Session API/1-Session API.md | 48 ++++++--
docs/Documentation/QuickStart.md | 1 +
.../4-Deployment and Management/1-Deployment.md | 2 +-
.../UserGuide/6-JDBC API/1-JDBC API.md | 14 ++-
.../UserGuide/7-Session API/1-Session API.md | 49 ++++++--
.../main/java/org/apache/iotdb/SessionExample.java | 31 ++++-
jdbc/README.md | 2 +-
.../main/java/org/apache/iotdb/jdbc/Constant.java | 9 ++
.../apache/iotdb/jdbc/IoTDBDatabaseMetadata.java | 91 ++++++++++++--
.../apache/iotdb/jdbc/IoTDBMetadataResultSet.java | 135 +++++++++++++++------
.../java/org/apache/iotdb/jdbc/IoTDBStatement.java | 31 +++++
.../iotdb/jdbc/IoTDBDatabaseMetadataTest.java | 134 ++++++++++++++++++--
.../resources/conf/iotdb-engine.properties | 6 -
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 10 +-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 6 +-
.../java/org/apache/iotdb/db/metadata/MGraph.java | 4 +
.../org/apache/iotdb/db/metadata/MManager.java | 32 ++---
.../java/org/apache/iotdb/db/metadata/MNode.java | 10 ++
.../java/org/apache/iotdb/db/metadata/MTree.java | 41 +++++--
.../org/apache/iotdb/db/service/JDBCService.java | 3 +-
.../org/apache/iotdb/db/service/TSServiceImpl.java | 53 ++++++++
.../iotdb/db/integration/IoTDBMetadataFetchIT.java | 4 +-
service-rpc/rpc-changelist.md | 12 +-
service-rpc/src/main/thrift/rpc.thrift | 12 ++
session/pom.xml | 20 +++
.../java/org/apache/iotdb/session/Session.java | 16 +++
.../encoding/encoder/RegularDataEncoder.java | 1 -
31 files changed, 720 insertions(+), 166 deletions(-)