This is an automated email from the ASF dual-hosted git repository. xuekaifeng pushed a commit to branch virtual_partition_2_merge in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 9c7e86f9b477f9ed8497752ed7c3dbf53e6f3d7d Merge: 1510ae4 39e68b2 Author: 151250176 <[email protected]> AuthorDate: Fri Dec 18 10:45:12 2020 +0800 Merge branch 'master' of https://github.com/apache/iotdb into virtual_partition_2_merge .../antlr4/org/apache/iotdb/db/qp/sql/SqlBase.g4 | 8 +- .../DML Data Manipulation Language.md | 6 + .../DML Data Manipulation Language.md | 5 + hive-connector/pom.xml | 6 +- .../apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java | 5 +- .../iotdb/db/query/control/TracingManager.java | 2 +- .../iotdb/db/query/executor/LastQueryExecutor.java | 18 +- .../apache/iotdb/db/engine/merge/MergeTest.java | 2 +- .../iotdb/db/integration/IoTDBAddSubDeviceIT.java | 15 +- .../iotdb/db/integration/IoTDBAlignByDeviceIT.java | 31 +-- .../org/apache/iotdb/db/integration/IoTDBAsIT.java | 10 + .../db/integration/IoTDBAutoCreateSchemaIT.java | 19 +- .../iotdb/db/integration/IoTDBDeletionIT.java | 18 ++ .../apache/iotdb/db/integration/IoTDBLastIT.java | 13 +- .../IoTDBAggregationByLevelIT.java | 9 +- .../IoTDBAggregationDeleteIT.java | 16 +- .../{ => aggregation}/IoTDBAggregationIT.java | 2 +- .../IoTDBAggregationLargeDataIT.java | 247 +++------------------ .../IoTDBAggregationSmallDataIT.java | 179 ++++++++------- .../{ => auth}/IoTDBAuthorizationIT.java | 2 +- .../db/query/aggregation/AggregateResultTest.java | 19 +- .../query/aggregation/DescAggregateResultTest.java | 126 +++++++++++ .../iotdb/db/query/control/TracingManagerTest.java | 111 +++++++++ .../db/query/dataset/ShowTimeSeriesResultTest.java | 57 +++++ .../groupby}/GroupByEngineDataSetTest.java | 94 +++++--- .../{ => groupby}/GroupByFillDataSetTest.java | 2 +- .../{ => groupby}/GroupByLevelDataSetTest.java | 2 +- .../{ => groupby}/GroupByTimeDataSetTest.java | 2 +- 28 files changed, 619 insertions(+), 407 deletions(-)
