This is an automated email from the ASF dual-hosted git repository. hxd pushed a commit to branch cluster- in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit aae37ad7c23ec2293c154d8a375725b717969b09 Merge: 4246406 4884dc8 Author: xiangdong huang <[email protected]> AuthorDate: Tue Aug 10 09:51:35 2021 +0800 Merge remote-tracking branch 'origin/master' into cluster- .../iotdb/cluster/config/ClusterDescriptor.java | 2 +- example/mqtt-customize/pom.xml | 1 - .../iotdb/jdbc/AbstractIoTDBJDBCResultSet.java | 68 +- .../main/java/org/apache/iotdb/jdbc/Constant.java | 3 + .../src/main/java/org/apache/iotdb/jdbc/Field.java | 71 + .../iotdb/jdbc/GroupedLSBWatermarkEncoder.java | 139 + .../org/apache/iotdb/jdbc/IoTDBConnection.java | 16 +- .../apache/iotdb/jdbc/IoTDBDatabaseMetadata.java | 2744 +++++++++++++++++--- .../org/apache/iotdb/jdbc/IoTDBJDBCResultSet.java | 58 +- .../iotdb/jdbc/IoTDBNonAlignJDBCResultSet.java | 38 +- .../apache/iotdb/jdbc/IoTDBPreparedStatement.java | 585 ++++- .../org/apache/iotdb/jdbc/IoTDBResultMetadata.java | 173 +- .../java/org/apache/iotdb/jdbc/IoTDBStatement.java | 38 +- .../iotdb/jdbc/{Constant.java => ListDataSet.java} | 33 +- .../java/org/apache/iotdb/jdbc/StringUtils.java | 78 + .../jdbc/{Constant.java => WatermarkEncoder.java} | 15 +- .../org/apache/iotdb/jdbc/IoTDBConnectionTest.java | 3 +- .../iotdb/jdbc/IoTDBDatabaseMetadataTest.java | 162 ++ .../iotdb/jdbc/IoTDBPreparedStatementTest.java | 32 +- .../apache/iotdb/jdbc/IoTDBResultMetadataTest.java | 21 +- .../db/engine/storagegroup/TsFileResource.java | 6 +- .../storagegroup/timeindex/DeviceTimeIndex.java | 2 +- .../storagegroup/timeindex/FileTimeIndex.java | 71 +- .../engine/storagegroup/timeindex/ITimeIndex.java | 2 +- .../org/apache/iotdb/db/service/TSServiceImpl.java | 67 +- .../apache/iotdb/db/tools/TsFileRewriteTool.java | 148 +- .../db/tools/upgrade/TsFileOnlineUpgradeTool.java | 151 +- .../org/apache/iotdb/rpc/IoTDBJDBCDataSet.java | 618 +++++ thrift/src/main/thrift/rpc.thrift | 13 + 29 files changed, 4726 insertions(+), 632 deletions(-)
