You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ro...@apache.org on 2021/09/22 03:14:34 UTC
[iotdb] 04/06: Merge branch 'master' of github.com:apache/iotdb
into nested-operations
This is an automated email from the ASF dual-hosted git repository.
rong pushed a commit to branch nested-operations
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 0e64141b84d538cc6508501ec397ebebb405c3ec
Merge: fdf2a96 d13523b
Author: Steve Yurong Su <ro...@apache.org>
AuthorDate: Wed Sep 22 09:29:02 2021 +0800
Merge branch 'master' of github.com:apache/iotdb into nested-operations
.github/workflows/main-unix.yml | 2 +-
.github/workflows/main-win.yml | 2 +-
README.md | 2 +-
README_ZH.md | 2 +-
.../antlr4/org/apache/iotdb/db/qp/sql/SqlBase.g4 | 20 ++--
.../manage/FilePartitionedSnapshotLogManager.java | 12 ++-
.../log/manage/PartitionedSnapshotLogManager.java | 5 +-
.../DDL-Data-Definition-Language.md | 2 +-
.../UserGuide/System-Tools/Load-External-Tsfile.md | 10 +-
.../DDL-Data-Definition-Language.md | 2 +-
.../UserGuide/System-Tools/Load-External-Tsfile.md | 10 +-
.../apache/iotdb/jdbc/IoTDBPreparedStatement.java | 4 +-
pom.xml | 4 +-
.../org/apache/iotdb/db/engine/StorageEngine.java | 6 +-
.../db/engine/merge/manage/MergeResource.java | 4 +-
.../engine/storagegroup/StorageGroupProcessor.java | 16 ++--
.../org/apache/iotdb/db/metadata/mnode/MNode.java | 2 +-
.../apache/iotdb/db/metadata/tag/TagManager.java | 3 +-
.../apache/iotdb/db/qp/constant/SQLConstant.java | 4 +-
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 23 ++---
.../org/apache/iotdb/db/qp/logical/Operator.java | 2 +-
.../db/qp/logical/sys/CreateFunctionOperator.java | 11 +--
.../db/qp/logical/sys/ShowFunctionsOperator.java | 12 +--
...veFileOperator.java => UnloadFileOperator.java} | 10 +-
.../db/qp/physical/sys/CreateFunctionPlan.java | 18 +---
.../db/qp/physical/sys/ShowFunctionsPlan.java | 9 +-
.../apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java | 14 +--
.../db/query/executor/fill/LastPointReader.java | 13 ++-
.../udf/service/UDFRegistrationInformation.java | 13 +--
.../query/udf/service/UDFRegistrationService.java | 58 +++++-------
.../java/org/apache/iotdb/db/utils/MemUtils.java | 36 +++----
.../db/integration/IoTDBLoadExternalTsfileIT.java | 26 +++---
.../iotdb/db/integration/IoTDBUDFManagementIT.java | 104 +--------------------
.../iotdb/db/qp/physical/PhysicalPlanTest.java | 44 ++-------
.../test/java/org/apache/iotdb/db/sql/Cases.java | 22 +----
35 files changed, 153 insertions(+), 374 deletions(-)