This is an automated email from the ASF dual-hosted git repository. haonan pushed a commit to branch pkg in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit a0365e426bf584bbcb496ad9aceebd93affa1858 Author: HTHou <[email protected]> AuthorDate: Thu Oct 20 16:02:02 2022 +0800 datadir --- .../resources/conf/iotdb-confignode.properties | 12 +++++----- .../iotdb/confignode/conf/ConfigNodeConstant.java | 2 +- .../apache/iotdb/commons/conf/IoTDBConstant.java | 2 +- .../resources/conf/iotdb-datanode.properties | 28 +++++++++++----------- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/confignode/src/assembly/resources/conf/iotdb-confignode.properties b/confignode/src/assembly/resources/conf/iotdb-confignode.properties index 22d1906a65..82d7aa25fe 100644 --- a/confignode/src/assembly/resources/conf/iotdb-confignode.properties +++ b/confignode/src/assembly/resources/conf/iotdb-confignode.properties @@ -192,28 +192,28 @@ target_config_nodes=127.0.0.1:22277 # system dir -# If this property is unset, system will save the data in the default relative path directory under the confignode folder(i.e., %CONFIGNODE_HOME%/data/system). +# If this property is unset, system will save the data in the default relative path directory under the confignode folder(i.e., %CONFIGNODE_HOME%/confignode/system). # 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 confignode folder. # For windows platform # If its prefix is a drive specifier followed by "\\", or if its prefix is "\\\\", then the path is absolute. Otherwise, it is relative. -# system_dir=data\\system +# system_dir=confignode\\system # For Linux platform # If its prefix is "/", then the path is absolute. Otherwise, it is relative. -# system_dir=data/system +# system_dir=confignode/system # consensus dir -# If this property is unset, system will save the data in the default relative path directory under the confignode folder(i.e., %CONFIGNODE_HOME%/data/consensus). +# If this property is unset, system will save the data in the default relative path directory under the confignode folder(i.e., %CONFIGNODE_HOME%/confignode/consensus). # 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 confignode folder. # Note: If data_dir is assigned an empty string(i.e.,zero-size), it will be handled as a relative path. # For windows platform # If its prefix is a drive specifier followed by "\\", or if its prefix is "\\\\", then the path is absolute. Otherwise, it is relative. -# consensus_dir=data\\consensus +# consensus_dir=confignode\\consensus # For Linux platform # If its prefix is "/", then the path is absolute. Otherwise, it is relative. -# consensus_dir=data/consensus +# consensus_dir=confignode/consensus # UDF lib dir # If this property is unset, system will save the data in the default relative path directory under diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConstant.java b/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConstant.java index 940de32e5a..14978cde15 100644 --- a/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConstant.java +++ b/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConstant.java @@ -31,7 +31,7 @@ public class ConfigNodeConstant { public static final String JMX_TYPE = "type"; public static final String CONFIGNODE_JMX_PORT = "confignode.jmx.port"; - public static final String DATA_DIR = "data"; + public static final String DATA_DIR = "confignode"; public static final String CONF_DIR = "conf"; public static final String CONSENSUS_FOLDER = "consensus"; public static final String UDF_FOLDER = "udf"; 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 d5f647a82a..0f1c39db4e 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 @@ -199,7 +199,7 @@ public class IoTDBConstant { public static final String SDT_COMP_MAX_TIME = "compmaxtime"; // default base dir, stores all IoTDB runtime files - public static final String DEFAULT_BASE_DIR = "data"; + public static final String DEFAULT_BASE_DIR = "datanode"; // data folder name public static final String DATA_FOLDER_NAME = "data"; diff --git a/server/src/assembly/resources/conf/iotdb-datanode.properties b/server/src/assembly/resources/conf/iotdb-datanode.properties index 5e413f3e4c..6157b4d0a6 100644 --- a/server/src/assembly/resources/conf/iotdb-datanode.properties +++ b/server/src/assembly/resources/conf/iotdb-datanode.properties @@ -132,10 +132,10 @@ target_config_nodes=127.0.0.1:22277 # Note: If wal_dirs is assigned an empty string(i.e.,zero-size), it will be handled as a relative path. # For windows platform # If its prefix is a drive specifier followed by "\\", or if its prefix is "\\\\", then the path is absolute. Otherwise, it is relative. -# wal_dirs=data\\wal +# wal_dirs=datanode\\wal # For Linux platform # If its prefix is "/", then the path is absolute. Otherwise, it is relative. -# wal_dirs=data/wal +# wal_dirs=datanode/wal # Max number of wal nodes, each node corresponds to one wal directory # The default value 0 means twice the number of wal dirs. @@ -204,29 +204,29 @@ target_config_nodes=127.0.0.1:22277 #################### # system dir -# If this property is unset, system will save the data in the default relative path directory under the IoTDB folder(i.e., %IOTDB_HOME%/data/system). +# If this property is unset, system will save the data in the default relative path directory under the IoTDB folder(i.e., %IOTDB_HOME%/datanode/system). # 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 IoTDB folder. # For windows platform # If its prefix is a drive specifier followed by "\\", or if its prefix is "\\\\", then the path is absolute. Otherwise, it is relative. -# system_dir=data\\system +# system_dir=datanode\\system # For Linux platform # If its prefix is "/", then the path is absolute. Otherwise, it is relative. -# system_dir=data/system +# system_dir=datanode/system # data dirs -# If this property is unset, system will save the data in the default relative path directory under the IoTDB folder(i.e., %IOTDB_HOME%/data/data). +# If this property is unset, system will save the data in the default relative path directory under the IoTDB folder(i.e., %IOTDB_HOME%/datanode/data). # 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 IoTDB folder. # If there are more than one directory, please separate them by commas ",". # Note: If data_dirs is assigned an empty string(i.e.,zero-size), it will be handled as a relative path. # For windows platform # If its prefix is a drive specifier followed by "\\", or if its prefix is "\\\\", then the path is absolute. Otherwise, it is relative. -# data_dirs=data\\data +# data_dirs=datanode\\data # For Linux platform # If its prefix is "/", then the path is absolute. Otherwise, it is relative. -# data_dirs=data/data +# data_dirs=datanode/data # multi_dir_strategy @@ -243,16 +243,16 @@ target_config_nodes=127.0.0.1:22277 # multi_dir_strategy=MaxDiskUsableSpaceFirstStrategy # consensus dir -# If this property is unset, system will save the data in the default relative path directory under the IoTDB folder(i.e., %IOTDB_HOME%/data). +# If this property is unset, system will save the data in the default relative path directory under the IoTDB folder(i.e., %IOTDB_HOME%/datanode). # If it is absolute, system will save the data in the exact location it points to. # If it is relative, system will save the data in the relative path directory it indicates under the IoTDB folder. # Note: If consensus_dir is assigned an empty string(i.e.,zero-size), it will be handled as a relative path. # For windows platform # If its prefix is a drive specifier followed by "\\", or if its prefix is "\\\\", then the path is absolute. Otherwise, it is relative. -# consensus_dir=data\\consensus +# consensus_dir=datanode\\consensus # For Linux platform # If its prefix is "/", then the path is absolute. Otherwise, it is relative. -# consensus_dir=data/consensus +# consensus_dir=datanode/consensus # TSFile storage file system. Currently, TsFiles are supported to be stored in LOCAL file system or HDFS. @@ -721,10 +721,10 @@ timestamp_precision=ms # Uncomment following fields to configure the tracing root directory. # For Window platform, the index is as follows: -# tracing_dir=data\\tracing +# tracing_dir=datanode\\tracing # For Linux platform # If its prefix is "/", then the path is absolute. Otherwise, it is relative. -# tracing_dir=data/tracing +# tracing_dir=datanode/tracing #################### ### Configurations for watermark module @@ -1057,7 +1057,7 @@ timestamp_precision=ms # index_root_dir=data\\index # For Linux platform # If its prefix is "/", then the path is absolute. Otherwise, it is relative. -# index_root_dir=data/index +# index_root_dir=datanode/index # Is index enable # Datatype: boolean
