You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2021/08/17 05:37:55 UTC

[iotdb] 01/01: merge

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

haonan pushed a commit to branch set_read_only
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit 0b738224bc0f3fbfb2ce5897e6c6f85a257794bf
Merge: 39b205d 7430fdc
Author: HTHou <hh...@outlook.com>
AuthorDate: Tue Aug 17 13:37:23 2021 +0800

    merge

 RELEASE_NOTES.md                                   |   2 +
 .../antlr4/org/apache/iotdb/db/qp/sql/SqlBase.g4   |  31 +--
 .../cluster/server/heartbeat/HeartbeatThread.java  |  34 ++--
 .../DML-Data-Manipulation-Language.md              |   4 +-
 .../UserGuide/System-Tools/Load-External-Tsfile.md |  32 +++-
 .../DML-Data-Manipulation-Language.md              |   4 +-
 .../UserGuide/System-Tools/Load-External-Tsfile.md |  56 +++---
 pom.xml                                            |   4 +-
 .../resources/conf/iotdb-engine.properties         |   2 +-
 .../java/org/apache/iotdb/db/conf/IoTDBConfig.java |  10 +-
 .../engine/storagegroup/StorageGroupProcessor.java | 210 +++++++++++----------
 .../apache/iotdb/db/qp/executor/PlanExecutor.java  |  36 ++++
 .../db/qp/logical/crud/BasicFunctionOperator.java  |   2 +-
 .../iotdb/db/qp/logical/sys/LoadFilesOperator.java |  21 ++-
 .../iotdb/db/qp/physical/sys/OperateFilePlan.java  |  23 ++-
 .../apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java    |  68 +++++--
 .../iotdb/db/qp/strategy/PhysicalGenerator.java    |   3 +-
 .../db/writelog/node/ExclusiveWriteLogNode.java    |   4 +-
 .../iotdb/db/integration/IoTDBDeletionIT.java      |  81 ++++++++
 .../apache/iotdb/db/integration/IoTDBFillIT.java   |   2 +-
 .../apache/iotdb/db/integration/IoTDBJMXTest.java  |  62 ++++++
 .../db/integration/IoTDBLoadExternalTsfileIT.java  | 121 +++++++++++-
 .../iotdb/db/qp/physical/PhysicalPlanTest.java     |  42 ++++-
 .../iotdb/db/utils/TsFileRewriteToolTest.java      |   4 +-
 24 files changed, 647 insertions(+), 211 deletions(-)