You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by lt...@apache.org on 2020/12/29 07:14:31 UTC
[iotdb] 02/02: merge master
This is an automated email from the ASF dual-hosted git repository.
lta pushed a commit to branch cluster_multi_raft
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit c0c5dfb03ccbd35917f9279bf2a8c460bc519623
Merge: 25ea701 8ffc98d
Author: lta <li...@163.com>
AuthorDate: Tue Dec 29 15:14:02 2020 +0800
merge master
.../apache/iotdb/cluster/server/ClientServer.java | 2 +-
.../iotdb/cluster/server/member/RaftMember.java | 5 +-
.../Ecosystem Integration/Zeppelin-IoTDB.md | 9 +-
.../Operation Manual/UDF User Defined Function.md | 15 ++-
.../Ecosystem Integration/Zeppelin-IoTDB.md | 9 +-
.../Operation Manual/UDF User Defined Function.md | 17 ++-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 31 +++++-
.../org/apache/iotdb/db/conf/IoTDBConstant.java | 2 +
.../apache/iotdb/db/qp/physical/crud/UDFPlan.java | 17 ++-
.../apache/iotdb/db/qp/physical/crud/UDTFPlan.java | 27 ++++-
.../apache/iotdb/db/query/dataset/UDTFDataSet.java | 4 +-
.../db/query/udf/core/executor/UDTFExecutor.java | 12 +-
.../iotdb/db/query/udf/service/UDFClassLoader.java | 53 ++++++---
.../query/udf/service/UDFClassLoaderManager.java | 122 +++++++++++++++++++++
.../udf/service/UDFRegistrationInformation.java | 17 ++-
.../query/udf/service/UDFRegistrationService.java | 62 ++++++-----
.../java/org/apache/iotdb/db/service/IoTDB.java | 2 +
.../org/apache/iotdb/db/service/ServiceType.java | 5 +-
.../org/apache/iotdb/db/service/TSServiceImpl.java | 13 ++-
19 files changed, 336 insertions(+), 88 deletions(-)