You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ja...@apache.org on 2022/11/10 04:22:01 UTC
[iotdb] branch master updated: [IOTDB-4887] Tidy the UDF and Trigger folders (#7945)
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new 1bd98662c2 [IOTDB-4887] Tidy the UDF and Trigger folders (#7945)
1bd98662c2 is described below
commit 1bd98662c228a956a8ee130774faece7bc9e11d1
Author: Weihao Li <60...@users.noreply.github.com>
AuthorDate: Thu Nov 10 12:21:56 2022 +0800
[IOTDB-4887] Tidy the UDF and Trigger folders (#7945)
---
.../iotdb/confignode/conf/ConfigNodeConfig.java | 64 +++++++++++++---------
.../confignode/conf/ConfigNodeDescriptor.java | 8 +--
.../iotdb/confignode/persistence/TriggerInfo.java | 2 +-
.../iotdb/confignode/persistence/UDFInfo.java | 2 +-
.../iotdb/confignode/service/ConfigNode.java | 4 --
.../confignode1conf/iotdb-common.properties | 2 +-
.../confignode2conf/iotdb-common.properties | 2 +-
.../confignode3conf/iotdb-common.properties | 2 +-
docs/UserGuide/Process-Data/Triggers.md | 9 ---
docs/zh/UserGuide/Process-Data/Triggers.md | 8 ---
.../resources/conf/iotdb-common.properties | 50 +----------------
.../apache/iotdb/commons/conf/IoTDBConstant.java | 3 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 19 ++++---
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 4 +-
.../datanode1conf/iotdb-common.properties | 2 +-
.../datanode2conf/iotdb-common.properties | 2 +-
.../datanode3conf/iotdb-common.properties | 2 +-
.../src/test/resources/iotdb-datanode.properties | 2 -
18 files changed, 64 insertions(+), 123 deletions(-)
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConfig.java b/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConfig.java
index 1cf93b4aa8..f0b54710d3 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConfig.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConfig.java
@@ -102,16 +102,19 @@ public class ConfigNodeConfig {
private String extLibDir = IoTDBConstant.EXT_FOLDER_NAME;
/** External lib directory for UDF, stores user-uploaded JAR files */
- private String udfLibDir =
+ private String udfDir =
IoTDBConstant.EXT_FOLDER_NAME + File.separator + IoTDBConstant.UDF_FOLDER_NAME;
- /** External lib directory for Trigger, stores user-uploaded JAR files */
- private String triggerLibDir =
+ /** External temporary lib directory for storing downloaded udf JAR files */
+ private String udfTemporaryLibDir = udfDir + File.separator + IoTDBConstant.TMP_FOLDER_NAME;
+
+ /** External lib directory for trigger, stores user-uploaded JAR files */
+ private String triggerDir =
IoTDBConstant.EXT_FOLDER_NAME + File.separator + IoTDBConstant.TRIGGER_FOLDER_NAME;
- /** External temporary lib directory for storing downloaded JAR files */
- private String temporaryLibDir =
- IoTDBConstant.EXT_FOLDER_NAME + File.separator + IoTDBConstant.UDF_TMP_FOLDER_NAME;
+ /** External temporary lib directory for storing downloaded trigger JAR files */
+ private String triggerTemporaryLibDir =
+ triggerDir + File.separator + IoTDBConstant.TMP_FOLDER_NAME;
/** Time partition interval in milliseconds */
private long timePartitionInterval = 604_800_000;
@@ -238,9 +241,10 @@ public class ConfigNodeConfig {
systemDir = addHomeDir(systemDir);
consensusDir = addHomeDir(consensusDir);
extLibDir = addHomeDir(extLibDir);
- udfLibDir = addHomeDir(udfLibDir);
- temporaryLibDir = addHomeDir(temporaryLibDir);
- triggerLibDir = addHomeDir(triggerLibDir);
+ udfDir = addHomeDir(udfDir);
+ udfTemporaryLibDir = addHomeDir(udfTemporaryLibDir);
+ triggerDir = addHomeDir(triggerDir);
+ triggerTemporaryLibDir = addHomeDir(triggerTemporaryLibDir);
}
private String addHomeDir(String dir) {
@@ -432,40 +436,46 @@ public class ConfigNodeConfig {
this.systemDir = systemDir;
}
- public String getSystemUdfDir() {
- return getSystemDir() + File.separator + "udf" + File.separator;
+ public String getExtLibDir() {
+ return extLibDir;
}
- public String getUdfLibDir() {
- return udfLibDir;
+ public void setExtLibDir(String extLibDir) {
+ this.extLibDir = extLibDir;
}
- public void setUdfLibDir(String udfLibDir) {
- this.udfLibDir = udfLibDir;
+ public String getUdfDir() {
+ return udfDir;
}
- public String getExtLibDir() {
- return extLibDir;
+ public void setUdfDir(String udfDir) {
+ this.udfDir = udfDir;
+ updateUdfTemporaryLibDir();
}
- public void setExtLibDir(String extLibDir) {
- this.extLibDir = extLibDir;
+ public String getUdfTemporaryLibDir() {
+ return udfTemporaryLibDir;
+ }
+
+ public void updateUdfTemporaryLibDir() {
+ this.udfTemporaryLibDir = udfDir + File.separator + IoTDBConstant.TMP_FOLDER_NAME;
}
- public String getTriggerLibDir() {
- return triggerLibDir;
+ public String getTriggerDir() {
+ return triggerDir;
}
- public void setTriggerLibDir(String triggerLibDir) {
- this.triggerLibDir = triggerLibDir;
+ public void setTriggerDir(String triggerDir) {
+ this.triggerDir = triggerDir;
+ updateTriggerTemporaryLibDir();
}
- public String getTemporaryLibDir() {
- return temporaryLibDir;
+ public String getTriggerTemporaryLibDir() {
+ return triggerTemporaryLibDir;
}
- public void setTemporaryLibDir(String temporaryLibDir) {
- this.temporaryLibDir = temporaryLibDir;
+ public void updateTriggerTemporaryLibDir() {
+ this.triggerTemporaryLibDir = triggerDir + File.separator + IoTDBConstant.TMP_FOLDER_NAME;
}
public int getSchemaReplicationFactor() {
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeDescriptor.java b/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeDescriptor.java
index d84872ebbc..6240d499b5 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeDescriptor.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeDescriptor.java
@@ -257,13 +257,9 @@ public class ConfigNodeDescriptor {
conf.setConsensusDir(properties.getProperty("cn_consensus_dir", conf.getConsensusDir()).trim());
- conf.setUdfLibDir(properties.getProperty("udf_lib_dir", conf.getUdfLibDir()).trim());
+ conf.setUdfDir(properties.getProperty("udf_lib_dir", conf.getUdfDir()).trim());
- conf.setTemporaryLibDir(
- properties.getProperty("udf_temporary_lib_dir", conf.getTemporaryLibDir()).trim());
-
- conf.setTriggerLibDir(
- properties.getProperty("trigger_lib_dir", conf.getTriggerLibDir()).trim());
+ conf.setTriggerDir(properties.getProperty("trigger_lib_dir", conf.getTriggerDir()).trim());
conf.setTimePartitionInterval(
Long.parseLong(
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/persistence/TriggerInfo.java b/confignode/src/main/java/org/apache/iotdb/confignode/persistence/TriggerInfo.java
index d4426bd794..1de673f89c 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/persistence/TriggerInfo.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/persistence/TriggerInfo.java
@@ -88,7 +88,7 @@ public class TriggerInfo implements SnapshotProcessor {
// jarReferenceTable = new ConcurrentHashMap<>();
triggerExecutableManager =
TriggerExecutableManager.setupAndGetInstance(
- CONFIG_NODE_CONF.getTemporaryLibDir(), CONFIG_NODE_CONF.getTriggerLibDir());
+ CONFIG_NODE_CONF.getTriggerTemporaryLibDir(), CONFIG_NODE_CONF.getTriggerDir());
}
public void acquireTriggerTableLock() {
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/persistence/UDFInfo.java b/confignode/src/main/java/org/apache/iotdb/confignode/persistence/UDFInfo.java
index c2cad4ed75..bddbbdfd7f 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/persistence/UDFInfo.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/persistence/UDFInfo.java
@@ -76,7 +76,7 @@ public class UDFInfo implements SnapshotProcessor {
existedJarToMD5 = new HashMap<>();
udfExecutableManager =
UDFExecutableManager.setupAndGetInstance(
- CONFIG_NODE_CONF.getTemporaryLibDir(), CONFIG_NODE_CONF.getUdfLibDir());
+ CONFIG_NODE_CONF.getUdfTemporaryLibDir(), CONFIG_NODE_CONF.getUdfDir());
}
public void acquireUDFTableLock() {
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/service/ConfigNode.java b/confignode/src/main/java/org/apache/iotdb/confignode/service/ConfigNode.java
index 51c5a9d607..06c72f812e 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/service/ConfigNode.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/service/ConfigNode.java
@@ -26,7 +26,6 @@ import org.apache.iotdb.commons.exception.StartupException;
import org.apache.iotdb.commons.service.JMXService;
import org.apache.iotdb.commons.service.RegisterManager;
import org.apache.iotdb.commons.service.metric.MetricService;
-import org.apache.iotdb.commons.udf.service.UDFClassLoaderManager;
import org.apache.iotdb.commons.utils.TestOnly;
import org.apache.iotdb.confignode.client.ConfigNodeRequestType;
import org.apache.iotdb.confignode.client.sync.SyncConfigNodeClientPool;
@@ -204,9 +203,6 @@ public class ConfigNode implements ConfigNodeMBean {
registerManager.register(new JMXService());
JMXService.registerMBean(this, mbeanName);
- // Setup UDFService
- registerManager.register(UDFClassLoaderManager.setupAndGetInstance(CONF.getUdfLibDir()));
-
registerManager.register(MetricService.getInstance());
// bind predefined metric sets
MetricService.getInstance().addMetricSet(new JvmMetrics());
diff --git a/confignode/src/test/resources/confignode1conf/iotdb-common.properties b/confignode/src/test/resources/confignode1conf/iotdb-common.properties
index b79e4d8e7a..caf36ccdc2 100644
--- a/confignode/src/test/resources/confignode1conf/iotdb-common.properties
+++ b/confignode/src/test/resources/confignode1conf/iotdb-common.properties
@@ -23,5 +23,5 @@ schema_region_consensus_protocol_class=org.apache.iotdb.consensus.ratis.RatisCon
schema_replication_factor=3
data_replication_factor=3
udf_lib_dir=target/confignode1/ext/udf
-trigger_root_dir=target/confignode1/ext/trigger
+trigger_lib_dir=target/confignode1/ext/trigger
config_node_ratis_log_appender_buffer_size_max = 14194304
\ No newline at end of file
diff --git a/confignode/src/test/resources/confignode2conf/iotdb-common.properties b/confignode/src/test/resources/confignode2conf/iotdb-common.properties
index 675d97c842..2f25f57537 100644
--- a/confignode/src/test/resources/confignode2conf/iotdb-common.properties
+++ b/confignode/src/test/resources/confignode2conf/iotdb-common.properties
@@ -23,5 +23,5 @@ schema_region_consensus_protocol_class=org.apache.iotdb.consensus.ratis.RatisCon
schema_replication_factor=3
data_replication_factor=3
udf_lib_dir=target/confignode2/ext/udf
-trigger_root_dir=target/confignode2/ext/trigger
+trigger_lib_dir=target/confignode2/ext/trigger
config_node_ratis_log_appender_buffer_size_max = 14194304
\ No newline at end of file
diff --git a/confignode/src/test/resources/confignode3conf/iotdb-common.properties b/confignode/src/test/resources/confignode3conf/iotdb-common.properties
index b723170581..208d039b7c 100644
--- a/confignode/src/test/resources/confignode3conf/iotdb-common.properties
+++ b/confignode/src/test/resources/confignode3conf/iotdb-common.properties
@@ -23,5 +23,5 @@ schema_region_consensus_protocol_class=org.apache.iotdb.consensus.ratis.RatisCon
schema_replication_factor=3
data_replication_factor=3
udf_lib_dir=target/confignode3/ext/udf
-trigger_root_dir=target/confignode3/ext/trigger
+trigger_lib_dir=target/confignode3/ext/trigger
config_node_ratis_log_appender_buffer_size_max = 14194304
\ No newline at end of file
diff --git a/docs/UserGuide/Process-Data/Triggers.md b/docs/UserGuide/Process-Data/Triggers.md
index dd2bd201ad..cf99d4e679 100644
--- a/docs/UserGuide/Process-Data/Triggers.md
+++ b/docs/UserGuide/Process-Data/Triggers.md
@@ -464,15 +464,6 @@ During the process of creating and dropping triggers in the cluster, we maintain
## Configuration Parameters
-Configuration parameters on ConfigNode:
-
| Parameter | Meaning |
| ----------------- | ----------------------------------------- |
| *trigger_lib_dir* | Directory to save the trigger jar package |
-
-Configuration parameters on DataNode:
-
-| Parameter | Meaning |
-| --------------------------- | -------------------------------------------------- |
-| *trigger_root_dir* | Directory to save the trigger jar package |
-| *trigger_temporary_lib_dir* | Directory to save the temporary file when managing |
diff --git a/docs/zh/UserGuide/Process-Data/Triggers.md b/docs/zh/UserGuide/Process-Data/Triggers.md
index ab310d7014..e5da136b6d 100644
--- a/docs/zh/UserGuide/Process-Data/Triggers.md
+++ b/docs/zh/UserGuide/Process-Data/Triggers.md
@@ -451,15 +451,7 @@ SHOW TRIGGERS
## 配置参数
-ConfigNode 上的配置参数：
-
| 配置项 | 含义 |
| ----------------- | --------------------------- |
| *trigger_lib_dir* | 保存触发器 jar 包的目录位置 |
-DataNode 上的配置参数：
-
-| 配置项 | 含义 |
-| --------------------------- | ------------------------------------ |
-| *trigger_root_dir* | 保存触发器 jar 包的目录位置 |
-| *trigger_temporary_lib_dir* | 管理触发器时产生的临时文件的存放目录 |
diff --git a/node-commons/src/assembly/resources/conf/iotdb-common.properties b/node-commons/src/assembly/resources/conf/iotdb-common.properties
index 6a894ffc8f..8122732058 100644
--- a/node-commons/src/assembly/resources/conf/iotdb-common.properties
+++ b/node-commons/src/assembly/resources/conf/iotdb-common.properties
@@ -838,62 +838,18 @@
# If its prefix is "/", then the path is absolute. Otherwise, it is relative.
# udf_lib_dir=ext/udf
-# temporary lib dir
-# If this property is unset, system will save the data in the default relative path directory under
-# the UDF folder(i.e., %CONFIGNODE_HOME%/ext/temporary).
-#
-# If it is absolute, system will save the data in exact location it points to.
-# If it is relative, system will save the data in the relative path directory it indicates under the
-# UDF folder.
-# Note: If data_dir is assigned an empty string(i.e.,zero-size), it will be handled as a relative
-# path.
-#
-# For Window platform
-# If its prefix is a drive specifier followed by "\\", or if its prefix is "\\\\", then the path is
-# absolute. Otherwise, it is relative.
-# udf_temporary_lib_dir=ext\\udf_temporary
-#
-# For Linux platform
-# If its prefix is "/", then the path is absolute. Otherwise, it is relative.
-# udf_temporary_lib_dir=ext/udf_temporary
-
####################
### Trigger Configuration
####################
-# The size of log buffer for every trigger management operation plan. If the size of a trigger
-# management operation plan is larger than this parameter, the trigger management operation plan
-# will be rejected by TriggerManager.
-# Datatype: int
-# tlog_buffer_size=1048576
-
-# Uncomment the following field to configure the trigger root directory.
+# Uncomment the following field to configure the trigger lib directory.
# For Window platform
# If its prefix is a drive specifier followed by "\\", or if its prefix is "\\\\", then the path is
# absolute. Otherwise, it is relative.
-# trigger_root_dir=ext\\trigger
-# For Linux platform
-# If its prefix is "/", then the path is absolute. Otherwise, it is relative.
-# trigger_root_dir=ext/trigger
-
-# temporary lib dir
-# If this property is unset, system will save the data in the default relative path directory under
-# the Trigger folder(i.e., ext/temporary).
-#
-# If it is absolute, system will save the data in exact location it points to.
-# If it is relative, system will save the data in the relative path directory it indicates under the
-# Trigger folder.
-# Note: If data_dir is assigned an empty string(i.e.,zero-size), it will be handled as a relative
-# path.
-#
-# For Window platform
-# If its prefix is a drive specifier followed by "\\", or if its prefix is "\\\\", then the path is
-# absolute. Otherwise, it is relative.
-# trigger_temporary_lib_dir=ext\\trigger_temporary
-#
+# trigger_lib_dir=ext\\trigger
# For Linux platform
# If its prefix is "/", then the path is absolute. Otherwise, it is relative.
-# trigger_temporary_lib_dir=ext/trigger_temporary
+# trigger_lib_dir=ext/trigger
# How many threads can be used for evaluating sliding windows. When <= 0, use CPU core number.
# Datatype: int
diff --git a/node-commons/src/main/java/org/apache/iotdb/commons/conf/IoTDBConstant.java b/node-commons/src/main/java/org/apache/iotdb/commons/conf/IoTDBConstant.java
index 32adf711ca..9245336015 100644
--- a/node-commons/src/main/java/org/apache/iotdb/commons/conf/IoTDBConstant.java
+++ b/node-commons/src/main/java/org/apache/iotdb/commons/conf/IoTDBConstant.java
@@ -227,10 +227,9 @@ public class IoTDBConstant {
public static final String TRACING_LOG = "tracing.txt";
public static final String EXT_FOLDER_NAME = "ext";
public static final String UDF_FOLDER_NAME = "udf";
- public static final String UDF_TMP_FOLDER_NAME = "udf_temporary";
public static final String TRIGGER_FOLDER_NAME = "trigger";
+ public static final String TMP_FOLDER_NAME = "tmp";
- public static final String TRIGGER_TMP_FOLDER_NAME = "trigger_temporary";
public static final String MQTT_FOLDER_NAME = "mqtt";
public static final String WAL_FOLDER_NAME = "wal";
public static final String EXT_PIPE_FOLDER_NAME = "extPipe";
diff --git a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
index fa4d833deb..882caaf97f 100644
--- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
+++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
@@ -261,8 +261,7 @@ public class IoTDBConfig {
IoTDBConstant.EXT_FOLDER_NAME + File.separator + IoTDBConstant.UDF_FOLDER_NAME;
/** External temporary lib directory for storing downloaded udf JAR files */
- private String udfTemporaryLibDir =
- IoTDBConstant.EXT_FOLDER_NAME + File.separator + IoTDBConstant.UDF_TMP_FOLDER_NAME;
+ private String udfTemporaryLibDir = udfDir + File.separator + IoTDBConstant.TMP_FOLDER_NAME;
/** External lib directory for trigger, stores user-uploaded JAR files */
private String triggerDir =
@@ -270,7 +269,7 @@ public class IoTDBConfig {
/** External temporary lib directory for storing downloaded trigger JAR files */
private String triggerTemporaryLibDir =
- IoTDBConstant.EXT_FOLDER_NAME + File.separator + IoTDBConstant.TRIGGER_TMP_FOLDER_NAME;
+ triggerDir + File.separator + IoTDBConstant.TMP_FOLDER_NAME;
/** External lib directory for ext Pipe plugins, stores user-defined JAR files */
private String extPipeDir =
@@ -1411,28 +1410,34 @@ public class IoTDBConfig {
public void setUdfDir(String udfDir) {
this.udfDir = udfDir;
+ updateUdfTemporaryLibDir();
}
public String getUdfTemporaryLibDir() {
return udfTemporaryLibDir;
}
+ public void updateUdfTemporaryLibDir() {
+ this.udfTemporaryLibDir = udfDir + File.separator + IoTDBConstant.TMP_FOLDER_NAME;
+ }
+
public String getTriggerDir() {
return triggerDir;
}
public void setTriggerDir(String triggerDir) {
this.triggerDir = triggerDir;
- }
-
- public void setTriggerTemporaryLibDir(String triggerTemporaryLibDir) {
- this.triggerTemporaryLibDir = triggerTemporaryLibDir;
+ updateTriggerTemporaryLibDir();
}
public String getTriggerTemporaryLibDir() {
return triggerTemporaryLibDir;
}
+ public void updateTriggerTemporaryLibDir() {
+ this.triggerTemporaryLibDir = triggerDir + File.separator + IoTDBConstant.TMP_FOLDER_NAME;
+ }
+
public String getMqttDir() {
return mqttDir;
}
diff --git a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
index 10a94ad9fa..ef945bb55b 100644
--- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
+++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
@@ -1789,9 +1789,7 @@ public class IoTDBDescriptor {
}
private void loadTriggerProps(Properties properties) {
- conf.setTriggerDir(properties.getProperty("trigger_root_dir", conf.getTriggerDir()));
- conf.setTriggerTemporaryLibDir(
- properties.getProperty("trigger_temporary_lib_dir", conf.getTriggerTemporaryLibDir()));
+ conf.setTriggerDir(properties.getProperty("trigger_lib_dir", conf.getTriggerDir()));
conf.setRetryNumToFindStatefulTrigger(
Integer.parseInt(
properties.getProperty(
diff --git a/server/src/test/resources/datanode1conf/iotdb-common.properties b/server/src/test/resources/datanode1conf/iotdb-common.properties
index 7991cc2b98..553d89d795 100644
--- a/server/src/test/resources/datanode1conf/iotdb-common.properties
+++ b/server/src/test/resources/datanode1conf/iotdb-common.properties
@@ -19,4 +19,4 @@
timestamp_precision=ms
udf_lib_dir=target/datanode1/ext/udf
-trigger_root_dir=target/datanode1/ext/trigger
\ No newline at end of file
+trigger_lib_dir=target/datanode1/ext/trigger
\ No newline at end of file
diff --git a/server/src/test/resources/datanode2conf/iotdb-common.properties b/server/src/test/resources/datanode2conf/iotdb-common.properties
index 7b9be7eed2..80add439f2 100644
--- a/server/src/test/resources/datanode2conf/iotdb-common.properties
+++ b/server/src/test/resources/datanode2conf/iotdb-common.properties
@@ -19,4 +19,4 @@
timestamp_precision=ms
udf_lib_dir=target/datanode2/ext/udf
-trigger_root_dir=target/datanode2/ext/trigger
\ No newline at end of file
+trigger_lib_dir=target/datanode2/ext/trigger
\ No newline at end of file
diff --git a/server/src/test/resources/datanode3conf/iotdb-common.properties b/server/src/test/resources/datanode3conf/iotdb-common.properties
index b21a4882e6..7a06e6d735 100644
--- a/server/src/test/resources/datanode3conf/iotdb-common.properties
+++ b/server/src/test/resources/datanode3conf/iotdb-common.properties
@@ -19,4 +19,4 @@
timestamp_precision=ms
udf_lib_dir=target/datanode3/ext/udf
-trigger_root_dir=target/datanode3/ext/trigger
\ No newline at end of file
+trigger_lib_dir=target/datanode3/ext/trigger
\ No newline at end of file
diff --git a/server/src/test/resources/iotdb-datanode.properties b/server/src/test/resources/iotdb-datanode.properties
index ba51d421c8..909a83e684 100644
--- a/server/src/test/resources/iotdb-datanode.properties
+++ b/server/src/test/resources/iotdb-datanode.properties
@@ -21,8 +21,6 @@ base_dir=target/tmp
dn_data_dirs=target/data
dn_wal_dirs=target/wal
index_root_dir=target/index
-udf_lib_dir=target/ext/udf
-trigger_root_dir=target/ext/trigger
dn_tracing_dir=target/data/tracing
minimum_schema_file_segment_in_bytes=0
page_cache_in_schema_file=10