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:29 UTC
[iotdb] branch cluster_multi_raft updated (ae1b6f3 -> c0c5dfb)
This is an automated email from the ASF dual-hosted git repository.
lta pushed a change to branch cluster_multi_raft
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
from ae1b6f3 assign slots
new 25ea701 fix a bug
add 3496136 fix
add 346da56 fix fix
add 10ae899 Merge pull request #2362 from LebronAl/fix_serialToParallelPool_init_bug
add 3e24aef [IOTDB-1086] Improve document of Zeppelin installation (#2354)
add 8ffc98d [IOTDB-1090] Unable to update UDF (#2361)
new c0c5dfb merge master
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../iotdb/cluster/config/ClusterDescriptor.java | 2 +-
.../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 ++-
20 files changed, 337 insertions(+), 89 deletions(-)
create mode 100644 server/src/main/java/org/apache/iotdb/db/query/udf/service/UDFClassLoaderManager.java
[iotdb] 01/02: fix a bug
Posted by lt...@apache.org.
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 25ea70131a7fb0c0c0c436e3efc2dcb014ce97b9
Author: lta <li...@163.com>
AuthorDate: Tue Dec 29 15:12:03 2020 +0800
fix a bug
---
.../main/java/org/apache/iotdb/cluster/config/ClusterDescriptor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/config/ClusterDescriptor.java b/cluster/src/main/java/org/apache/iotdb/cluster/config/ClusterDescriptor.java
index d0c620b..9cd56ef 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/config/ClusterDescriptor.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/config/ClusterDescriptor.java
@@ -212,7 +212,7 @@ public class ClusterDescriptor {
"multi_raft_factor", String.valueOf(config.getMultiRaftFactor()))));
config.setReplicationNum(Integer.parseInt(properties.getProperty(
- "", String.valueOf(config.getReplicationNum()))));
+ "default_replica_num", String.valueOf(config.getReplicationNum()))));
config.setClusterName(properties.getProperty("cluster_name", config.getClusterName()));
[iotdb] 02/02: merge master
Posted by lt...@apache.org.
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(-)