You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by yo...@apache.org on 2024/02/27 06:35:01 UTC
(iotdb) branch change-folder created (now 4f4b1d4f91f)
This is an automated email from the ASF dual-hosted git repository.
yongzao pushed a change to branch change-folder
in repository https://gitbox.apache.org/repos/asf/iotdb.git
at 4f4b1d4f91f Finish
This branch includes the following new commits:
new 4f4b1d4f91f Finish
The 1 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.
(iotdb) 01/01: Finish
Posted by yo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
yongzao pushed a commit to branch change-folder
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 4f4b1d4f91f063ea001ad4a18ac04aa2ec7af37e
Author: YongzaoDan <53...@qq.com>
AuthorDate: Tue Feb 27 14:34:51 2024 +0800
Finish
---
.../main/java/org/apache/iotdb/db/conf/IoTDBConfig.java | 14 +++++++-------
.../java/org/apache/iotdb/commons/conf/CommonConfig.java | 10 +++++-----
.../java/org/apache/iotdb/commons/conf/IoTDBConstant.java | 3 ++-
3 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
index 854401d7b5e..8aba6ac18b3 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
@@ -258,11 +258,11 @@ public class IoTDBConfig {
/** System directory, including version file for each database and metadata */
private String systemDir =
- IoTDBConstant.DEFAULT_BASE_DIR + File.separator + IoTDBConstant.SYSTEM_FOLDER_NAME;
+ IoTDBConstant.DN_DEFAULT_DATA_DIR + File.separator + IoTDBConstant.SYSTEM_FOLDER_NAME;
/** Schema directory, including storage set of values. */
private String schemaDir =
- IoTDBConstant.DEFAULT_BASE_DIR
+ IoTDBConstant.DN_DEFAULT_DATA_DIR
+ File.separator
+ IoTDBConstant.SYSTEM_FOLDER_NAME
+ File.separator
@@ -270,7 +270,7 @@ public class IoTDBConfig {
/** Query directory, stores temporary files of query */
private String queryDir =
- IoTDBConstant.DEFAULT_BASE_DIR + File.separator + IoTDBConstant.QUERY_FOLDER_NAME;
+ IoTDBConstant.DN_DEFAULT_DATA_DIR + File.separator + IoTDBConstant.QUERY_FOLDER_NAME;
/** External lib directory, stores user-uploaded JAR files */
private String extDir = IoTDBConstant.EXT_FOLDER_NAME;
@@ -307,7 +307,7 @@ public class IoTDBConfig {
/** Tiered data directories. It can be settled as dataDirs = {{"data1"}, {"data2", "data3"}}; */
private String[][] tierDataDirs = {
- {IoTDBConstant.DEFAULT_BASE_DIR + File.separator + IoTDBConstant.DATA_FOLDER_NAME}
+ {IoTDBConstant.DN_DEFAULT_DATA_DIR + File.separator + IoTDBConstant.DATA_FOLDER_NAME}
};
private String loadTsFileDir =
@@ -317,14 +317,14 @@ public class IoTDBConfig {
private String multiDirStrategyClassName = null;
private String ratisDataRegionSnapshotDir =
- IoTDBConstant.DEFAULT_BASE_DIR
+ IoTDBConstant.DN_DEFAULT_DATA_DIR
+ File.separator
+ IoTDBConstant.DATA_FOLDER_NAME
+ File.separator
+ IoTDBConstant.SNAPSHOT_FOLDER_NAME;
/** Consensus directory. */
- private String consensusDir = IoTDBConstant.DEFAULT_BASE_DIR + File.separator + "consensus";
+ private String consensusDir = IoTDBConstant.DN_DEFAULT_DATA_DIR + File.separator + "consensus";
private String dataRegionConsensusDir = consensusDir + File.separator + "data_region";
@@ -332,7 +332,7 @@ public class IoTDBConfig {
/** temp result directory for sortOperator */
private String sortTmpDir =
- IoTDBConstant.DEFAULT_BASE_DIR + File.separator + IoTDBConstant.TMP_FOLDER_NAME;
+ IoTDBConstant.DN_DEFAULT_DATA_DIR + File.separator + IoTDBConstant.TMP_FOLDER_NAME;
/** Maximum MemTable number. Invalid when enableMemControl is true. */
private int maxMemtableNumber = 0;
diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java
index 0a3d1381663..67544a600dd 100644
--- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java
+++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java
@@ -56,21 +56,21 @@ public class CommonConfig {
private String adminPassword = "root";
private String userFolder =
- IoTDBConstant.DEFAULT_BASE_DIR
+ IoTDBConstant.CN_DEFAULT_DATA_DIR
+ File.separator
+ IoTDBConstant.SYSTEM_FOLDER_NAME
+ File.separator
+ "users";
private String roleFolder =
- IoTDBConstant.DEFAULT_BASE_DIR
+ IoTDBConstant.CN_DEFAULT_DATA_DIR
+ File.separator
+ IoTDBConstant.SYSTEM_FOLDER_NAME
+ File.separator
+ "roles";
private String procedureWalFolder =
- IoTDBConstant.DEFAULT_BASE_DIR
+ IoTDBConstant.CN_DEFAULT_DATA_DIR
+ File.separator
+ IoTDBConstant.SYSTEM_FOLDER_NAME
+ File.separator
@@ -78,11 +78,11 @@ public class CommonConfig {
/** Sync directory, including the log and hardlink tsFiles. */
private String syncDir =
- IoTDBConstant.DEFAULT_BASE_DIR + File.separator + IoTDBConstant.SYNC_FOLDER_NAME;
+ IoTDBConstant.DN_DEFAULT_DATA_DIR + File.separator + IoTDBConstant.SYNC_FOLDER_NAME;
/** WAL directories. */
private String[] walDirs = {
- IoTDBConstant.DEFAULT_BASE_DIR + File.separator + IoTDBConstant.WAL_FOLDER_NAME
+ IoTDBConstant.DN_DEFAULT_DATA_DIR + File.separator + IoTDBConstant.WAL_FOLDER_NAME
};
/** Default system file storage is in local file system (unsupported). */
diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/conf/IoTDBConstant.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/conf/IoTDBConstant.java
index 9b7c37782b3..23bc7884345 100644
--- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/conf/IoTDBConstant.java
+++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/conf/IoTDBConstant.java
@@ -221,7 +221,8 @@ public class IoTDBConstant {
MAX_STRING_LENGTH));
// default base dir, stores all IoTDB runtime files
- public static final String DEFAULT_BASE_DIR = "data" + File.separator + DN_ROLE;
+ public static final String CN_DEFAULT_DATA_DIR = "data" + File.separator + CN_ROLE;
+ public static final String DN_DEFAULT_DATA_DIR = "data" + File.separator + DN_ROLE;
// data folder name
public static final String DATA_FOLDER_NAME = "data";