This is an automated email from the ASF dual-hosted git repository.
caogaofei pushed a change to branch beyyes/sort_transform_elimate_topk
in repository https://gitbox.apache.org/repos/asf/iotdb.git
from f65df7a02dc merge
add 6c8d0d876a5 Support print time column in table model
add 35510c7b9b2 resolve conflict
No new revisions were added by this update.
Summary of changes:
.../db/it/aggregation/IoTDBAggregationIT.java | 15 +-
.../db/it/aggregation/maxby/IoTDBMaxByIT.java | 3 +-
.../db/it/aggregation/minby/IoTDBMinByIT.java | 3 +-
.../db/it/udf/IoTDBUDTFBuiltinFunctionIT.java | 4 +-
.../iotdb/relational/it/schema/IoTDBTableIT.java | 4 +-
.../org/apache/iotdb/isession/SessionDataSet.java | 86 +-
.../iotdb/jdbc/AbstractIoTDBJDBCResultSet.java | 1220 --------------------
.../org/apache/iotdb/jdbc/IoTDBConnection.java | 8 +
.../org/apache/iotdb/jdbc/IoTDBJDBCResultSet.java | 81 +-
.../iotdb/jdbc/IoTDBNonAlignJDBCResultSet.java | 323 ------
.../java/org/apache/iotdb/jdbc/IoTDBStatement.java | 69 +-
.../iotdb/jdbc/IoTDBDatabaseMetadataTest.java | 10 +-
.../apache/iotdb/jdbc/IoTDBJDBCResultSetTest.java | 2 +
.../java/org/apache/iotdb/rpc/IoTDBRpcDataSet.java | 297 +++--
.../main/java/org/apache/iotdb/rpc/RpcUtils.java | 60 +-
.../apache/iotdb/session/SessionConnection.java | 25 +-
.../org/apache/iotdb/session/ThriftConnection.java | 8 +-
.../apache/iotdb/session/pool/SessionPoolTest.java | 8 +-
.../protocol/thrift/impl/ClientRPCServiceImpl.java | 10 +-
.../queryengine/common/header/DatasetHeader.java | 6 +
.../execution/operator/AggregationUtil.java | 3 -
.../AbstractSeriesAggregationScanOperator.java | 3 -
.../relational/metadata/TableMetadataImpl.java | 7 +-
.../plan/relational/planner/LogicalPlanner.java | 7 +-
.../distribute/TableDistributionPlanner.java | 33 +-
.../apache/iotdb/commons/schema/table/TsTable.java | 2 +-
.../thrift-datanode/src/main/thrift/client.thrift | 1 +
27 files changed, 372 insertions(+), 1926 deletions(-)
delete mode 100644
iotdb-client/jdbc/src/main/java/org/apache/iotdb/jdbc/AbstractIoTDBJDBCResultSet.java
delete mode 100644
iotdb-client/jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBNonAlignJDBCResultSet.java
