This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a change to branch cluster_premerge
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from b674ea3 Merge branch 'master' into cluster_premerge
add 7b29194 [IOTDB-652] Fix Group By Fill Null Pointer Bug (#1176)
add 7528c01 [IOTDB-654] ignore gitpod theia settings
add f4d28fd [IOTDB-656] Upgrade fastjson version to 1.2.68 (#1179)
add ef8ef2c [IOTDB-658] Update JMX User Guide document (#1178)
add 3276737 Fix concurrent queries cause BufferUnderflowException when
storage in HDFS (#1151)
add 8f2b0e4 group by bug (#1182)
add 2a8052c [IOTDB-661] Keep the alias column in result if it's used in
query (#1183)
add 391bd28 modify sample data link (#1184)
add 1275474 [IOTDB-659] Move the same construct dataset logic to
service-rpc (#1181)
add 01f5924 Merge branch 'master' into cluster_premerge
No new revisions were added by this update.
Summary of changes:
.gitignore | 3 +
LICENSE-binary | 2 +-
.../java/org/apache/iotdb/cli/AbstractCli.java | 8 +-
.../2-DML Data Manipulation Language.md | 4 +-
.../3-Account Management Statements.md | 2 +-
docs/UserGuide/6-System Tools/3-JMX Tool.md | 47 +--
.../2-DML Data Manipulation Language.md | 4 +-
.../3-Account Management Statements.md | 2 +-
docs/zh/UserGuide/6-System Tools/3-JMX Tool.md | 59 +--
.../apache/iotdb/hadoop/fileSystem/HDFSFile.java | 2 +-
.../apache/iotdb/hadoop/fileSystem/HDFSInput.java | 45 +--
.../apache/iotdb/hadoop/fileSystem/HDFSOutput.java | 15 +-
...ultSet.java => AbstractIoTDBJDBCResultSet.java} | 273 ++++++--------
.../org/apache/iotdb/jdbc/IoTDBJDBCResultSet.java | 93 +++++
...ultSet.java => IoTDBNonAlignJDBCResultSet.java} | 110 +++---
.../org/apache/iotdb/jdbc/IoTDBQueryResultSet.java | 203 -----------
.../java/org/apache/iotdb/jdbc/IoTDBStatement.java | 14 +-
...ultSetTest.java => IoTDBJDBCResultSetTest.java} | 2 +-
pom.xml | 2 +-
.../org/apache/iotdb/db/metadata/MManager.java | 14 +
.../java/org/apache/iotdb/db/metadata/MTree.java | 20 +
.../iotdb/db/qp/strategy/PhysicalGenerator.java | 26 +-
.../qp/strategy/optimizer/ConcatPathOptimizer.java | 25 +-
.../query/dataset/groupby/GroupByFillDataSet.java | 3 +-
.../dataset/groupby/LocalGroupByExecutor.java | 6 +-
.../iotdb/db/query/executor/LastQueryExecutor.java | 9 +-
.../org/apache/iotdb/db/service/TSServiceImpl.java | 12 +-
.../apache/iotdb/db/integration/IoTDBAliasIT.java | 273 ++++++++++++++
.../iotdb/db/integration/IoTDBGroupByFillIT.java | 60 ++-
.../org/apache/iotdb/db/metadata/MTreeTest.java | 14 +
service-rpc/pom.xml | 5 +
.../java/org/apache/iotdb/rpc/IoTDBRpcDataSet.java | 406 +++++++++++++++++++++
.../org/apache/iotdb/session/SessionDataSet.java | 363 +++---------------
.../org/apache/iotdb/spark/db/Converter.scala | 4 +-
.../iotdb/tsfile/read/TsFileSequenceReader.java | 25 +-
.../org/apache/iotdb/tsfile/read/common/Path.java | 8 +-
36 files changed, 1253 insertions(+), 910 deletions(-)
rename jdbc/src/main/java/org/apache/iotdb/jdbc/{AbstractIoTDBResultSet.java
=> AbstractIoTDBJDBCResultSet.java} (80%)
create mode 100644
jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBJDBCResultSet.java
rename
jdbc/src/main/java/org/apache/iotdb/jdbc/{IoTDBNonAlignQueryResultSet.java =>
IoTDBNonAlignJDBCResultSet.java} (58%)
delete mode 100644
jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBQueryResultSet.java
rename jdbc/src/test/java/org/apache/iotdb/jdbc/{IoTDBQueryResultSetTest.java
=> IoTDBJDBCResultSetTest.java} (99%)
create mode 100644
server/src/test/java/org/apache/iotdb/db/integration/IoTDBAliasIT.java
create mode 100644
service-rpc/src/main/java/org/apache/iotdb/rpc/IoTDBRpcDataSet.java
