You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@iotdb.apache.org by qi...@apache.org on 2019/09/03 12:40:12 UTC

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

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

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

commit 4d9b38739841785962f4e7f77ae0305590e2943e
Merge: 660725d 8fd6248
Author: qiaojialin <64...@qq.com>
AuthorDate: Tue Sep 3 20:37:47 2019 +0800

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

 .../UserGuide/6-JDBC API/1-JDBC API.md             |  12 ++
 .../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 ++++++++++++++++++--
 .../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/TSServiceImpl.java |  32 +++++
 .../iotdb/db/integration/IoTDBMetadataFetchIT.java |   4 +-
 service-rpc/src/main/thrift/rpc.thrift             |   3 +
 13 files changed, 460 insertions(+), 78 deletions(-)