This is an automated email from the ASF dual-hosted git repository.
caogaofei 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 cb74d4983d [IOTDB-4673]Removes the space character from both the start
and the end of the parameter value (#7921)
cb74d4983d is described below
commit cb74d4983d2fa8281770242529c489cd52a012b9
Author: ljn55966005 <[email protected]>
AuthorDate: Tue Nov 8 10:44:09 2022 +0800
[IOTDB-4673]Removes the space character from both the start and the end of
the parameter value (#7921)
---
.../confignode/conf/ConfigNodeDescriptor.java | 496 +++++++++++++--------
.../iotdb/commons/conf/CommonDescriptor.java | 61 ++-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 101 +++--
3 files changed, 413 insertions(+), 245 deletions(-)
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 db98d70fcf..4eed5f5137 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
@@ -141,62 +141,82 @@ public class ConfigNodeDescriptor {
private void loadProperties(Properties properties) throws
BadNodeUrlException, IOException {
conf.setInternalAddress(
- properties.getProperty(IoTDBConstant.CN_INTERNAL_ADDRESS,
conf.getInternalAddress()));
+ properties
+ .getProperty(IoTDBConstant.CN_INTERNAL_ADDRESS,
conf.getInternalAddress())
+ .trim());
conf.setInternalPort(
Integer.parseInt(
- properties.getProperty(
- IoTDBConstant.CN_INTERNAL_PORT,
String.valueOf(conf.getInternalPort()))));
+ properties
+ .getProperty(IoTDBConstant.CN_INTERNAL_PORT,
String.valueOf(conf.getInternalPort()))
+ .trim()));
conf.setConsensusPort(
Integer.parseInt(
- properties.getProperty(
- IoTDBConstant.CN_CONSENSUS_PORT,
String.valueOf(conf.getConsensusPort()))));
+ properties
+ .getProperty(
+ IoTDBConstant.CN_CONSENSUS_PORT,
String.valueOf(conf.getConsensusPort()))
+ .trim()));
// TODO: Enable multiple target_config_node_list
String targetConfigNodes =
properties.getProperty(IoTDBConstant.CN_TARGET_CONFIG_NODE_LIST, null);
if (targetConfigNodes != null) {
-
conf.setTargetConfigNode(NodeUrlUtils.parseTEndPointUrl(targetConfigNodes));
+
conf.setTargetConfigNode(NodeUrlUtils.parseTEndPointUrl(targetConfigNodes.trim()));
}
conf.setSeriesPartitionSlotNum(
Integer.parseInt(
- properties.getProperty(
- "series_partition_slot_num",
String.valueOf(conf.getSeriesPartitionSlotNum()))));
+ properties
+ .getProperty(
+ "series_partition_slot_num",
String.valueOf(conf.getSeriesPartitionSlotNum()))
+ .trim()));
conf.setSeriesPartitionExecutorClass(
- properties.getProperty(
- "series_partition_executor_class",
conf.getSeriesPartitionExecutorClass()));
+ properties
+ .getProperty("series_partition_executor_class",
conf.getSeriesPartitionExecutorClass())
+ .trim());
conf.setConfigNodeConsensusProtocolClass(
- properties.getProperty(
- "config_node_consensus_protocol_class",
conf.getConfigNodeConsensusProtocolClass()));
+ properties
+ .getProperty(
+ "config_node_consensus_protocol_class",
conf.getConfigNodeConsensusProtocolClass())
+ .trim());
conf.setSchemaRegionConsensusProtocolClass(
- properties.getProperty(
- "schema_region_consensus_protocol_class",
- conf.getSchemaRegionConsensusProtocolClass()));
+ properties
+ .getProperty(
+ "schema_region_consensus_protocol_class",
+ conf.getSchemaRegionConsensusProtocolClass())
+ .trim());
conf.setSchemaRegionPerDataNode(
Double.parseDouble(
- properties.getProperty(
- "schema_region_per_data_node",
String.valueOf(conf.getSchemaRegionPerDataNode()))));
+ properties
+ .getProperty(
+ "schema_region_per_data_node",
+ String.valueOf(conf.getSchemaRegionPerDataNode()))
+ .trim()));
conf.setDataRegionConsensusProtocolClass(
- properties.getProperty(
- "data_region_consensus_protocol_class",
conf.getDataRegionConsensusProtocolClass()));
+ properties
+ .getProperty(
+ "data_region_consensus_protocol_class",
conf.getDataRegionConsensusProtocolClass())
+ .trim());
conf.setDataRegionPerProcessor(
Double.parseDouble(
- properties.getProperty(
- "data_region_per_processor",
String.valueOf(conf.getDataRegionPerProcessor()))));
+ properties
+ .getProperty(
+ "data_region_per_processor",
String.valueOf(conf.getDataRegionPerProcessor()))
+ .trim()));
try {
conf.setRegionAllocateStrategy(
RegionBalancer.RegionAllocateStrategy.valueOf(
- properties.getProperty(
- "region_allocate_strategy",
conf.getRegionAllocateStrategy().name())));
+ properties
+ .getProperty("region_allocate_strategy",
conf.getRegionAllocateStrategy().name())
+ .trim()));
} catch (IllegalArgumentException e) {
LOGGER.warn(
"The configured region allocate strategy does not exist, use the
default: GREEDY!");
@@ -204,60 +224,77 @@ public class ConfigNodeDescriptor {
conf.setCnRpcAdvancedCompressionEnable(
Boolean.parseBoolean(
- properties.getProperty(
- "cn_rpc_advanced_compression_enable",
- String.valueOf(conf.isCnRpcAdvancedCompressionEnable()))));
+ properties
+ .getProperty(
+ "cn_rpc_advanced_compression_enable",
+ String.valueOf(conf.isCnRpcAdvancedCompressionEnable()))
+ .trim()));
conf.setCnRpcMaxConcurrentClientNum(
Integer.parseInt(
- properties.getProperty(
- "cn_rpc_max_concurrent_client_num",
- String.valueOf(conf.getCnRpcMaxConcurrentClientNum()))));
+ properties
+ .getProperty(
+ "cn_rpc_max_concurrent_client_num",
+ String.valueOf(conf.getCnRpcMaxConcurrentClientNum()))
+ .trim()));
conf.setCnThriftDefaultBufferSize(
Integer.parseInt(
- properties.getProperty(
- "cn_thrift_init_buffer_size",
- String.valueOf(conf.getCnThriftDefaultBufferSize()))));
+ properties
+ .getProperty(
+ "cn_thrift_init_buffer_size",
+ String.valueOf(conf.getCnThriftDefaultBufferSize()))
+ .trim()));
conf.setCnThriftMaxFrameSize(
Integer.parseInt(
- properties.getProperty(
- "cn_thrift_max_frame_size",
String.valueOf(conf.getCnThriftMaxFrameSize()))));
+ properties
+ .getProperty(
+ "cn_thrift_max_frame_size",
String.valueOf(conf.getCnThriftMaxFrameSize()))
+ .trim()));
- conf.setSystemDir(properties.getProperty("cn_system_dir",
conf.getSystemDir()));
+ conf.setSystemDir(properties.getProperty("cn_system_dir",
conf.getSystemDir()).trim());
- conf.setConsensusDir(properties.getProperty("cn_consensus_dir",
conf.getConsensusDir()));
+ conf.setConsensusDir(properties.getProperty("cn_consensus_dir",
conf.getConsensusDir()).trim());
- conf.setUdfLibDir(properties.getProperty("udf_lib_dir",
conf.getUdfLibDir()));
+ conf.setUdfLibDir(properties.getProperty("udf_lib_dir",
conf.getUdfLibDir()).trim());
conf.setTemporaryLibDir(
- properties.getProperty("udf_temporary_lib_dir",
conf.getTemporaryLibDir()));
+ properties.getProperty("udf_temporary_lib_dir",
conf.getTemporaryLibDir()).trim());
- conf.setTriggerLibDir(properties.getProperty("trigger_lib_dir",
conf.getTriggerLibDir()));
+ conf.setTriggerLibDir(
+ properties.getProperty("trigger_lib_dir",
conf.getTriggerLibDir()).trim());
conf.setTimePartitionInterval(
Long.parseLong(
- properties.getProperty(
- "time_partition_interval_for_routing",
- String.valueOf(conf.getTimePartitionInterval()))));
+ properties
+ .getProperty(
+ "time_partition_interval_for_routing",
+ String.valueOf(conf.getTimePartitionInterval()))
+ .trim()));
conf.setSchemaReplicationFactor(
Integer.parseInt(
- properties.getProperty(
- "schema_replication_factor",
String.valueOf(conf.getSchemaReplicationFactor()))));
+ properties
+ .getProperty(
+ "schema_replication_factor",
String.valueOf(conf.getSchemaReplicationFactor()))
+ .trim()));
conf.setDataReplicationFactor(
Integer.parseInt(
- properties.getProperty(
- "data_replication_factor",
String.valueOf(conf.getDataReplicationFactor()))));
+ properties
+ .getProperty(
+ "data_replication_factor",
String.valueOf(conf.getDataReplicationFactor()))
+ .trim()));
conf.setHeartbeatIntervalInMs(
Long.parseLong(
- properties.getProperty(
- "heartbeat_interval_in_ms",
String.valueOf(conf.getHeartbeatIntervalInMs()))));
+ properties
+ .getProperty(
+ "heartbeat_interval_in_ms",
String.valueOf(conf.getHeartbeatIntervalInMs()))
+ .trim()));
- String routingPolicy = properties.getProperty("routing_policy",
conf.getRoutingPolicy());
+ String routingPolicy = properties.getProperty("routing_policy",
conf.getRoutingPolicy()).trim();
if (routingPolicy.equals(RouteBalancer.GREEDY_POLICY)
|| routingPolicy.equals(RouteBalancer.LEADER_POLICY)) {
conf.setRoutingPolicy(routingPolicy);
@@ -268,7 +305,7 @@ public class ConfigNodeDescriptor {
}
String readConsistencyLevel =
- properties.getProperty("read_consistency_level",
conf.getReadConsistencyLevel());
+ properties.getProperty("read_consistency_level",
conf.getReadConsistencyLevel()).trim();
if (readConsistencyLevel.equals("strong") ||
readConsistencyLevel.equals("weak")) {
conf.setReadConsistencyLevel(readConsistencyLevel);
} else {
@@ -284,21 +321,27 @@ public class ConfigNodeDescriptor {
conf.setProcedureCompletedEvictTTL(
Integer.parseInt(
- properties.getProperty(
- "procedure_completed_evict_ttl",
- String.valueOf(conf.getProcedureCompletedEvictTTL()))));
+ properties
+ .getProperty(
+ "procedure_completed_evict_ttl",
+ String.valueOf(conf.getProcedureCompletedEvictTTL()))
+ .trim()));
conf.setProcedureCompletedCleanInterval(
Integer.parseInt(
- properties.getProperty(
- "procedure_completed_clean_interval",
- String.valueOf(conf.getProcedureCompletedCleanInterval()))));
+ properties
+ .getProperty(
+ "procedure_completed_clean_interval",
+ String.valueOf(conf.getProcedureCompletedCleanInterval()))
+ .trim()));
conf.setProcedureCoreWorkerThreadsCount(
Integer.parseInt(
- properties.getProperty(
- "procedure_core_worker_thread_count",
- String.valueOf(conf.getProcedureCoreWorkerThreadsCount()))));
+ properties
+ .getProperty(
+ "procedure_core_worker_thread_count",
+ String.valueOf(conf.getProcedureCoreWorkerThreadsCount()))
+ .trim()));
loadRatisConsensusConfig(properties);
loadCQConfig(properties);
@@ -307,242 +350,325 @@ public class ConfigNodeDescriptor {
private void loadRatisConsensusConfig(Properties properties) {
conf.setDataRegionRatisConsensusLogAppenderBufferSize(
Long.parseLong(
- properties.getProperty(
- "data_region_ratis_log_appender_buffer_size_max",
-
String.valueOf(conf.getDataRegionRatisConsensusLogAppenderBufferSize()))));
+ properties
+ .getProperty(
+ "data_region_ratis_log_appender_buffer_size_max",
+
String.valueOf(conf.getDataRegionRatisConsensusLogAppenderBufferSize()))
+ .trim()));
conf.setConfigNodeRatisConsensusLogAppenderBufferSize(
Long.parseLong(
- properties.getProperty(
- "config_node_ratis_log_appender_buffer_size_max",
-
String.valueOf(conf.getConfigNodeRatisConsensusLogAppenderBufferSize()))));
+ properties
+ .getProperty(
+ "config_node_ratis_log_appender_buffer_size_max",
+
String.valueOf(conf.getConfigNodeRatisConsensusLogAppenderBufferSize()))
+ .trim()));
conf.setSchemaRegionRatisConsensusLogAppenderBufferSize(
Long.parseLong(
- properties.getProperty(
- "schema_region_ratis_log_appender_buffer_size_max",
-
String.valueOf(conf.getSchemaRegionRatisConsensusLogAppenderBufferSize()))));
+ properties
+ .getProperty(
+ "schema_region_ratis_log_appender_buffer_size_max",
+
String.valueOf(conf.getSchemaRegionRatisConsensusLogAppenderBufferSize()))
+ .trim()));
conf.setDataRegionRatisSnapshotTriggerThreshold(
Long.parseLong(
- properties.getProperty(
- "data_region_ratis_snapshot_trigger_threshold",
-
String.valueOf(conf.getDataRegionRatisSnapshotTriggerThreshold()))));
+ properties
+ .getProperty(
+ "data_region_ratis_snapshot_trigger_threshold",
+
String.valueOf(conf.getDataRegionRatisSnapshotTriggerThreshold()))
+ .trim()));
conf.setConfigNodeRatisSnapshotTriggerThreshold(
Long.parseLong(
- properties.getProperty(
- "config_node_ratis_snapshot_trigger_threshold",
-
String.valueOf(conf.getConfigNodeRatisSnapshotTriggerThreshold()))));
+ properties
+ .getProperty(
+ "config_node_ratis_snapshot_trigger_threshold",
+
String.valueOf(conf.getConfigNodeRatisSnapshotTriggerThreshold()))
+ .trim()));
conf.setConfigNodeSimpleConsensusSnapshotTriggerThreshold(
Long.parseLong(
- properties.getProperty(
- "config_node_simple_consensus_snapshot_trigger_threshold",
-
String.valueOf(conf.getConfigNodeSimpleConsensusSnapshotTriggerThreshold()))));
+ properties
+ .getProperty(
+ "config_node_simple_consensus_snapshot_trigger_threshold",
+
String.valueOf(conf.getConfigNodeSimpleConsensusSnapshotTriggerThreshold()))
+ .trim()));
conf.setSchemaRegionRatisSnapshotTriggerThreshold(
Long.parseLong(
- properties.getProperty(
- "schema_region_ratis_snapshot_trigger_threshold",
-
String.valueOf(conf.getSchemaRegionRatisSnapshotTriggerThreshold()))));
+ properties
+ .getProperty(
+ "schema_region_ratis_snapshot_trigger_threshold",
+
String.valueOf(conf.getSchemaRegionRatisSnapshotTriggerThreshold()))
+ .trim()));
conf.setDataRegionRatisLogUnsafeFlushEnable(
Boolean.parseBoolean(
- properties.getProperty(
- "data_region_ratis_log_unsafe_flush_enable",
-
String.valueOf(conf.isDataRegionRatisLogUnsafeFlushEnable()))));
+ properties
+ .getProperty(
+ "data_region_ratis_log_unsafe_flush_enable",
+
String.valueOf(conf.isDataRegionRatisLogUnsafeFlushEnable()))
+ .trim()));
conf.setConfigNodeRatisLogUnsafeFlushEnable(
Boolean.parseBoolean(
- properties.getProperty(
- "config_node_ratis_log_unsafe_flush_enable",
-
String.valueOf(conf.isConfigNodeRatisLogUnsafeFlushEnable()))));
+ properties
+ .getProperty(
+ "config_node_ratis_log_unsafe_flush_enable",
+
String.valueOf(conf.isConfigNodeRatisLogUnsafeFlushEnable()))
+ .trim()));
conf.setSchemaRegionRatisLogUnsafeFlushEnable(
Boolean.parseBoolean(
- properties.getProperty(
- "schema_region_ratis_log_unsafe_flush_enable",
-
String.valueOf(conf.isSchemaRegionRatisLogUnsafeFlushEnable()))));
+ properties
+ .getProperty(
+ "schema_region_ratis_log_unsafe_flush_enable",
+
String.valueOf(conf.isSchemaRegionRatisLogUnsafeFlushEnable()))
+ .trim()));
conf.setDataRegionRatisLogSegmentSizeMax(
Long.parseLong(
- properties.getProperty(
- "data_region_ratis_log_segment_size_max_in_byte",
- String.valueOf(conf.getDataRegionRatisLogSegmentSizeMax()))));
+ properties
+ .getProperty(
+ "data_region_ratis_log_segment_size_max_in_byte",
+ String.valueOf(conf.getDataRegionRatisLogSegmentSizeMax()))
+ .trim()));
conf.setConfigNodeRatisLogSegmentSizeMax(
Long.parseLong(
- properties.getProperty(
- "config_node_ratis_log_segment_size_max_in_byte",
- String.valueOf(conf.getConfigNodeRatisLogSegmentSizeMax()))));
+ properties
+ .getProperty(
+ "config_node_ratis_log_segment_size_max_in_byte",
+ String.valueOf(conf.getConfigNodeRatisLogSegmentSizeMax()))
+ .trim()));
conf.setSchemaRegionRatisLogSegmentSizeMax(
Long.parseLong(
- properties.getProperty(
- "schema_region_ratis_log_segment_size_max_in_byte",
-
String.valueOf(conf.getSchemaRegionRatisLogSegmentSizeMax()))));
+ properties
+ .getProperty(
+ "schema_region_ratis_log_segment_size_max_in_byte",
+
String.valueOf(conf.getSchemaRegionRatisLogSegmentSizeMax()))
+ .trim()));
conf.setConfigNodeSimpleConsensusLogSegmentSizeMax(
Long.parseLong(
- properties.getProperty(
- "config_node_simple_consensus_log_segment_size_max_in_byte",
-
String.valueOf(conf.getConfigNodeSimpleConsensusLogSegmentSizeMax()))));
+ properties
+ .getProperty(
+
"config_node_simple_consensus_log_segment_size_max_in_byte",
+
String.valueOf(conf.getConfigNodeSimpleConsensusLogSegmentSizeMax()))
+ .trim()));
conf.setDataRegionRatisGrpcFlowControlWindow(
Long.parseLong(
- properties.getProperty(
- "data_region_ratis_grpc_flow_control_window",
-
String.valueOf(conf.getDataRegionRatisGrpcFlowControlWindow()))));
+ properties
+ .getProperty(
+ "data_region_ratis_grpc_flow_control_window",
+
String.valueOf(conf.getDataRegionRatisGrpcFlowControlWindow()))
+ .trim()));
conf.setConfigNodeRatisGrpcFlowControlWindow(
Long.parseLong(
- properties.getProperty(
- "config_node_ratis_grpc_flow_control_window",
-
String.valueOf(conf.getConfigNodeRatisGrpcFlowControlWindow()))));
+ properties
+ .getProperty(
+ "config_node_ratis_grpc_flow_control_window",
+
String.valueOf(conf.getConfigNodeRatisGrpcFlowControlWindow()))
+ .trim()));
conf.setSchemaRegionRatisGrpcFlowControlWindow(
Long.parseLong(
- properties.getProperty(
- "schema_region_ratis_grpc_flow_control_window",
-
String.valueOf(conf.getSchemaRegionRatisGrpcFlowControlWindow()))));
+ properties
+ .getProperty(
+ "schema_region_ratis_grpc_flow_control_window",
+
String.valueOf(conf.getSchemaRegionRatisGrpcFlowControlWindow()))
+ .trim()));
conf.setDataRegionRatisRpcLeaderElectionTimeoutMinMs(
Long.parseLong(
- properties.getProperty(
- "data_region_ratis_rpc_leader_election_timeout_min_ms",
-
String.valueOf(conf.getDataRegionRatisRpcLeaderElectionTimeoutMinMs()))));
+ properties
+ .getProperty(
+ "data_region_ratis_rpc_leader_election_timeout_min_ms",
+
String.valueOf(conf.getDataRegionRatisRpcLeaderElectionTimeoutMinMs()))
+ .trim()));
conf.setConfigNodeRatisRpcLeaderElectionTimeoutMinMs(
Long.parseLong(
- properties.getProperty(
- "config_node_ratis_rpc_leader_election_timeout_min_ms",
-
String.valueOf(conf.getConfigNodeRatisRpcLeaderElectionTimeoutMinMs()))));
+ properties
+ .getProperty(
+ "config_node_ratis_rpc_leader_election_timeout_min_ms",
+
String.valueOf(conf.getConfigNodeRatisRpcLeaderElectionTimeoutMinMs()))
+ .trim()));
conf.setSchemaRegionRatisRpcLeaderElectionTimeoutMinMs(
Long.parseLong(
- properties.getProperty(
- "schema_region_ratis_rpc_leader_election_timeout_min_ms",
-
String.valueOf(conf.getSchemaRegionRatisRpcLeaderElectionTimeoutMinMs()))));
+ properties
+ .getProperty(
+ "schema_region_ratis_rpc_leader_election_timeout_min_ms",
+
String.valueOf(conf.getSchemaRegionRatisRpcLeaderElectionTimeoutMinMs()))
+ .trim()));
conf.setDataRegionRatisRpcLeaderElectionTimeoutMaxMs(
Long.parseLong(
- properties.getProperty(
- "data_region_ratis_rpc_leader_election_timeout_max_ms",
-
String.valueOf(conf.getDataRegionRatisRpcLeaderElectionTimeoutMaxMs()))));
+ properties
+ .getProperty(
+ "data_region_ratis_rpc_leader_election_timeout_max_ms",
+
String.valueOf(conf.getDataRegionRatisRpcLeaderElectionTimeoutMaxMs()))
+ .trim()));
conf.setConfigNodeRatisRpcLeaderElectionTimeoutMaxMs(
Long.parseLong(
- properties.getProperty(
- "config_node_ratis_rpc_leader_election_timeout_max_ms",
-
String.valueOf(conf.getConfigNodeRatisRpcLeaderElectionTimeoutMaxMs()))));
+ properties
+ .getProperty(
+ "config_node_ratis_rpc_leader_election_timeout_max_ms",
+
String.valueOf(conf.getConfigNodeRatisRpcLeaderElectionTimeoutMaxMs()))
+ .trim()));
conf.setSchemaRegionRatisRpcLeaderElectionTimeoutMaxMs(
Long.parseLong(
- properties.getProperty(
- "schema_region_ratis_rpc_leader_election_timeout_max_ms",
-
String.valueOf(conf.getSchemaRegionRatisRpcLeaderElectionTimeoutMaxMs()))));
+ properties
+ .getProperty(
+ "schema_region_ratis_rpc_leader_election_timeout_max_ms",
+
String.valueOf(conf.getSchemaRegionRatisRpcLeaderElectionTimeoutMaxMs()))
+ .trim()));
conf.setConfigNodeRatisRequestTimeoutMs(
Long.parseLong(
- properties.getProperty(
- "config_node_ratis_request_timeout_ms",
- String.valueOf(conf.getConfigNodeRatisRequestTimeoutMs()))));
+ properties
+ .getProperty(
+ "config_node_ratis_request_timeout_ms",
+ String.valueOf(conf.getConfigNodeRatisRequestTimeoutMs()))
+ .trim()));
conf.setSchemaRegionRatisRequestTimeoutMs(
Long.parseLong(
- properties.getProperty(
- "schema_region_ratis_request_timeout_ms",
- String.valueOf(conf.getSchemaRegionRatisRequestTimeoutMs()))));
+ properties
+ .getProperty(
+ "schema_region_ratis_request_timeout_ms",
+
String.valueOf(conf.getSchemaRegionRatisRequestTimeoutMs()))
+ .trim()));
conf.setDataRegionRatisRequestTimeoutMs(
Long.parseLong(
- properties.getProperty(
- "data_region_ratis_request_timeout_ms",
- String.valueOf(conf.getDataRegionRatisRequestTimeoutMs()))));
+ properties
+ .getProperty(
+ "data_region_ratis_request_timeout_ms",
+ String.valueOf(conf.getDataRegionRatisRequestTimeoutMs()))
+ .trim()));
conf.setConfigNodeRatisMaxRetryAttempts(
Integer.parseInt(
- properties.getProperty(
- "config_node_ratis_max_retry_attempts",
- String.valueOf(conf.getConfigNodeRatisMaxRetryAttempts()))));
+ properties
+ .getProperty(
+ "config_node_ratis_max_retry_attempts",
+ String.valueOf(conf.getConfigNodeRatisMaxRetryAttempts()))
+ .trim()));
conf.setConfigNodeRatisInitialSleepTimeMs(
Long.parseLong(
- properties.getProperty(
- "config_node_ratis_initial_sleep_time_ms",
- String.valueOf(conf.getConfigNodeRatisInitialSleepTimeMs()))));
+ properties
+ .getProperty(
+ "config_node_ratis_initial_sleep_time_ms",
+
String.valueOf(conf.getConfigNodeRatisInitialSleepTimeMs()))
+ .trim()));
conf.setConfigNodeRatisMaxSleepTimeMs(
Long.parseLong(
- properties.getProperty(
- "config_node_ratis_max_sleep_time_ms",
- String.valueOf(conf.getConfigNodeRatisMaxSleepTimeMs()))));
+ properties
+ .getProperty(
+ "config_node_ratis_max_sleep_time_ms",
+ String.valueOf(conf.getConfigNodeRatisMaxSleepTimeMs()))
+ .trim()));
conf.setDataRegionRatisMaxRetryAttempts(
Integer.parseInt(
- properties.getProperty(
- "data_region_ratis_max_retry_attempts",
- String.valueOf(conf.getDataRegionRatisMaxRetryAttempts()))));
+ properties
+ .getProperty(
+ "data_region_ratis_max_retry_attempts",
+ String.valueOf(conf.getDataRegionRatisMaxRetryAttempts()))
+ .trim()));
conf.setDataRegionRatisInitialSleepTimeMs(
Long.parseLong(
- properties.getProperty(
- "data_region_ratis_initial_sleep_time_ms",
- String.valueOf(conf.getDataRegionRatisInitialSleepTimeMs()))));
+ properties
+ .getProperty(
+ "data_region_ratis_initial_sleep_time_ms",
+
String.valueOf(conf.getDataRegionRatisInitialSleepTimeMs()))
+ .trim()));
conf.setDataRegionRatisMaxSleepTimeMs(
Long.parseLong(
- properties.getProperty(
- "data_region_ratis_max_sleep_time_ms",
- String.valueOf(conf.getDataRegionRatisMaxSleepTimeMs()))));
+ properties
+ .getProperty(
+ "data_region_ratis_max_sleep_time_ms",
+ String.valueOf(conf.getDataRegionRatisMaxSleepTimeMs()))
+ .trim()));
conf.setSchemaRegionRatisMaxRetryAttempts(
Integer.parseInt(
- properties.getProperty(
- "schema_region_ratis_max_retry_attempts",
- String.valueOf(conf.getSchemaRegionRatisMaxRetryAttempts()))));
+ properties
+ .getProperty(
+ "schema_region_ratis_max_retry_attempts",
+
String.valueOf(conf.getSchemaRegionRatisMaxRetryAttempts()))
+ .trim()));
conf.setSchemaRegionRatisInitialSleepTimeMs(
Long.parseLong(
- properties.getProperty(
- "schema_region_ratis_initial_sleep_time_ms",
-
String.valueOf(conf.getSchemaRegionRatisInitialSleepTimeMs()))));
+ properties
+ .getProperty(
+ "schema_region_ratis_initial_sleep_time_ms",
+
String.valueOf(conf.getSchemaRegionRatisInitialSleepTimeMs()))
+ .trim()));
conf.setSchemaRegionRatisMaxSleepTimeMs(
Long.parseLong(
- properties.getProperty(
- "schema_region_ratis_max_sleep_time_ms",
- String.valueOf(conf.getSchemaRegionRatisMaxSleepTimeMs()))));
+ properties
+ .getProperty(
+ "schema_region_ratis_max_sleep_time_ms",
+ String.valueOf(conf.getSchemaRegionRatisMaxSleepTimeMs()))
+ .trim()));
conf.setConfigNodeRatisPreserveLogsWhenPurge(
Long.parseLong(
- properties.getProperty(
- "config_node_ratis_preserve_logs_num_when_purge",
-
String.valueOf(conf.getConfigNodeRatisPreserveLogsWhenPurge()))));
+ properties
+ .getProperty(
+ "config_node_ratis_preserve_logs_num_when_purge",
+
String.valueOf(conf.getConfigNodeRatisPreserveLogsWhenPurge()))
+ .trim()));
conf.setSchemaRegionRatisPreserveLogsWhenPurge(
Long.parseLong(
- properties.getProperty(
- "schema_region_ratis_preserve_logs_num_when_purge",
-
String.valueOf(conf.getSchemaRegionRatisPreserveLogsWhenPurge()))));
+ properties
+ .getProperty(
+ "schema_region_ratis_preserve_logs_num_when_purge",
+
String.valueOf(conf.getSchemaRegionRatisPreserveLogsWhenPurge()))
+ .trim()));
conf.setDataRegionRatisPreserveLogsWhenPurge(
Long.parseLong(
- properties.getProperty(
- "data_region_ratis_preserve_logs_num_when_purge",
-
String.valueOf(conf.getDataRegionRatisPreserveLogsWhenPurge()))));
+ properties
+ .getProperty(
+ "data_region_ratis_preserve_logs_num_when_purge",
+
String.valueOf(conf.getDataRegionRatisPreserveLogsWhenPurge()))
+ .trim()));
conf.setRatisFirstElectionTimeoutMinMs(
Long.parseLong(
- properties.getProperty(
- "ratis_first_election_timeout_min_ms",
- String.valueOf(conf.getRatisFirstElectionTimeoutMinMs()))));
+ properties
+ .getProperty(
+ "ratis_first_election_timeout_min_ms",
+ String.valueOf(conf.getRatisFirstElectionTimeoutMinMs()))
+ .trim()));
conf.setRatisFirstElectionTimeoutMaxMs(
Long.parseLong(
- properties.getProperty(
- "ratis_first_election_timeout_max_ms",
- String.valueOf(conf.getRatisFirstElectionTimeoutMaxMs()))));
+ properties
+ .getProperty(
+ "ratis_first_election_timeout_max_ms",
+ String.valueOf(conf.getRatisFirstElectionTimeoutMaxMs()))
+ .trim()));
}
private void loadCQConfig(Properties properties) {
int cqSubmitThread =
Integer.parseInt(
- properties.getProperty(
- "continuous_query_submit_thread_count",
String.valueOf(conf.getCqSubmitThread())));
+ properties
+ .getProperty(
+ "continuous_query_submit_thread_count",
+ String.valueOf(conf.getCqSubmitThread()))
+ .trim());
if (cqSubmitThread <= 0) {
LOGGER.warn(
"continuous_query_submit_thread should be greater than 0, but
current value is {}, ignore that and use the default value {}",
@@ -554,9 +680,11 @@ public class ConfigNodeDescriptor {
long cqMinEveryIntervalInMs =
Long.parseLong(
- properties.getProperty(
- "continuous_query_min_every_interval_in_ms",
- String.valueOf(conf.getCqMinEveryIntervalInMs())));
+ properties
+ .getProperty(
+ "continuous_query_min_every_interval_in_ms",
+ String.valueOf(conf.getCqMinEveryIntervalInMs()))
+ .trim());
if (cqMinEveryIntervalInMs <= 0) {
LOGGER.warn(
"continuous_query_min_every_interval_in_ms should be greater than 0,
but current value is {}, ignore that and use the default value {}",
diff --git
a/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonDescriptor.java
b/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonDescriptor.java
index 85b5246910..739ad39743 100644
---
a/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonDescriptor.java
+++
b/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonDescriptor.java
@@ -61,16 +61,19 @@ public class CommonDescriptor {
public void loadCommonProps(Properties properties) {
config.setAuthorizerProvider(
- properties.getProperty("authorizer_provider_class",
config.getAuthorizerProvider()));
+ properties.getProperty("authorizer_provider_class",
config.getAuthorizerProvider()).trim());
// if using org.apache.iotdb.db.auth.authorizer.OpenIdAuthorizer,
openID_url is needed.
config.setOpenIdProviderUrl(
- properties.getProperty("openID_url", config.getOpenIdProviderUrl()));
- config.setAdminName(properties.getProperty("admin_name",
config.getAdminName()));
+ properties.getProperty("openID_url",
config.getOpenIdProviderUrl()).trim());
+ config.setAdminName(properties.getProperty("admin_name",
config.getAdminName()).trim());
- config.setAdminPassword(properties.getProperty("admin_password",
config.getAdminPassword()));
+ config.setAdminPassword(
+ properties.getProperty("admin_password",
config.getAdminPassword()).trim());
config.setEncryptDecryptProvider(
- properties.getProperty(
- "iotdb_server_encrypt_decrypt_provider",
config.getEncryptDecryptProvider()));
+ properties
+ .getProperty(
+ "iotdb_server_encrypt_decrypt_provider",
config.getEncryptDecryptProvider())
+ .trim());
config.setEncryptDecryptProviderParameter(
properties.getProperty(
@@ -79,39 +82,51 @@ public class CommonDescriptor {
config.setDefaultTTLInMs(
Long.parseLong(
- properties.getProperty(
- "default_ttl_in_ms",
String.valueOf(config.getDefaultTTLInMs()))));
- config.setSyncFolder(properties.getProperty("sync_dir",
config.getSyncFolder()));
+ properties
+ .getProperty("default_ttl_in_ms",
String.valueOf(config.getDefaultTTLInMs()))
+ .trim()));
+ config.setSyncFolder(properties.getProperty("sync_dir",
config.getSyncFolder()).trim());
- config.setWalDirs(properties.getProperty("dn_wal_dirs",
config.getWalDirs()[0]).split(","));
+ config.setWalDirs(
+ properties.getProperty("dn_wal_dirs",
config.getWalDirs()[0]).trim().split(","));
config.setCnRpcThriftCompressionEnabled(
Boolean.parseBoolean(
- properties.getProperty(
- "cn_rpc_thrift_compression_enable",
- String.valueOf(config.isCnRpcThriftCompressionEnabled()))));
+ properties
+ .getProperty(
+ "cn_rpc_thrift_compression_enable",
+ String.valueOf(config.isCnRpcThriftCompressionEnabled()))
+ .trim()));
config.setCnConnectionTimeoutInMS(
Integer.parseInt(
- properties.getProperty(
- "cn_connection_timeout_ms",
String.valueOf(config.getCnConnectionTimeoutInMS()))));
+ properties
+ .getProperty(
+ "cn_connection_timeout_ms",
String.valueOf(config.getCnConnectionTimeoutInMS()))
+ .trim()));
config.setCnSelectorNumOfClientManager(
Integer.parseInt(
- properties.getProperty(
- "cn_selector_thread_nums_of_client_manager",
- String.valueOf(config.getCnSelectorNumOfClientManager()))));
+ properties
+ .getProperty(
+ "cn_selector_thread_nums_of_client_manager",
+ String.valueOf(config.getCnSelectorNumOfClientManager()))
+ .trim()));
config.setHandleSystemErrorStrategy(
HandleSystemErrorStrategy.valueOf(
- properties.getProperty(
- "handle_system_error",
String.valueOf(config.getHandleSystemErrorStrategy()))));
+ properties
+ .getProperty(
+ "handle_system_error",
String.valueOf(config.getHandleSystemErrorStrategy()))
+ .trim()));
config.setDiskSpaceWarningThreshold(
Double.parseDouble(
- properties.getProperty(
- "disk_space_warning_threshold",
- String.valueOf(config.getDiskSpaceWarningThreshold()))));
+ properties
+ .getProperty(
+ "disk_space_warning_threshold",
+ String.valueOf(config.getDiskSpaceWarningThreshold()))
+ .trim()));
}
public void loadGlobalConfig(TGlobalConfig globalConfig) {
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 61eca23cbc..4ce523aff3 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
@@ -199,7 +199,8 @@ public class IoTDBDescriptor {
public void loadProperties(Properties properties) {
- conf.setRpcAddress(properties.getProperty(IoTDBConstant.DN_RPC_ADDRESS,
conf.getRpcAddress()));
+ conf.setRpcAddress(
+ properties.getProperty(IoTDBConstant.DN_RPC_ADDRESS,
conf.getRpcAddress()).trim());
// TODO: Use FQDN to identify our nodes afterwards
try {
@@ -210,84 +211,108 @@ public class IoTDBDescriptor {
conf.setRpcThriftCompressionEnable(
Boolean.parseBoolean(
- properties.getProperty(
- "rpc_thrift_compression_enable",
- Boolean.toString(conf.isRpcThriftCompressionEnable()))));
+ properties
+ .getProperty(
+ "rpc_thrift_compression_enable",
+ Boolean.toString(conf.isRpcThriftCompressionEnable()))
+ .trim()));
conf.setRpcAdvancedCompressionEnable(
Boolean.parseBoolean(
- properties.getProperty(
- "rpc_advanced_compression_enable",
- Boolean.toString(conf.isRpcAdvancedCompressionEnable()))));
+ properties
+ .getProperty(
+ "rpc_advanced_compression_enable",
+ Boolean.toString(conf.isRpcAdvancedCompressionEnable()))
+ .trim()));
conf.setConnectionTimeoutInMS(
Integer.parseInt(
- properties.getProperty(
- "connection_timeout_ms",
String.valueOf(conf.getConnectionTimeoutInMS()))));
+ properties
+ .getProperty(
+ "connection_timeout_ms",
String.valueOf(conf.getConnectionTimeoutInMS()))
+ .trim()));
conf.setMaxConnectionForInternalService(
Integer.parseInt(
- properties.getProperty(
- "max_connection_for_internal_service",
- String.valueOf(conf.getMaxConnectionForInternalService()))));
+ properties
+ .getProperty(
+ "max_connection_for_internal_service",
+ String.valueOf(conf.getMaxConnectionForInternalService()))
+ .trim()));
conf.setCoreConnectionForInternalService(
Integer.parseInt(
- properties.getProperty(
- "core_connection_for_internal_service",
- String.valueOf(conf.getCoreConnectionForInternalService()))));
+ properties
+ .getProperty(
+ "core_connection_for_internal_service",
+ String.valueOf(conf.getCoreConnectionForInternalService()))
+ .trim()));
conf.setSelectorNumOfClientManager(
Integer.parseInt(
- properties.getProperty(
- "selector_thread_count_of_client_manager",
- String.valueOf(conf.getSelectorNumOfClientManager()))));
+ properties
+ .getProperty(
+ "selector_thread_count_of_client_manager",
+ String.valueOf(conf.getSelectorNumOfClientManager()))
+ .trim()));
conf.setRpcPort(
Integer.parseInt(
- properties.getProperty(
- IoTDBConstant.DN_RPC_PORT,
Integer.toString(conf.getRpcPort()))));
+ properties
+ .getProperty(IoTDBConstant.DN_RPC_PORT,
Integer.toString(conf.getRpcPort()))
+ .trim()));
conf.setEnableInfluxDBRpcService(
Boolean.parseBoolean(
- properties.getProperty(
- "enable_influxdb_rpc_service",
- Boolean.toString(conf.isEnableInfluxDBRpcService()))));
+ properties
+ .getProperty(
+ "enable_influxdb_rpc_service",
+ Boolean.toString(conf.isEnableInfluxDBRpcService()))
+ .trim()));
conf.setInfluxDBRpcPort(
Integer.parseInt(
- properties.getProperty(
- "influxdb_rpc_port",
Integer.toString(conf.getInfluxDBRpcPort()))));
+ properties
+ .getProperty("influxdb_rpc_port",
Integer.toString(conf.getInfluxDBRpcPort()))
+ .trim()));
conf.setTimestampPrecision(
- properties.getProperty("timestamp_precision",
conf.getTimestampPrecision()));
+ properties.getProperty("timestamp_precision",
conf.getTimestampPrecision()).trim());
conf.setBufferedArraysMemoryProportion(
Double.parseDouble(
- properties.getProperty(
- "buffered_arrays_memory_proportion",
- Double.toString(conf.getBufferedArraysMemoryProportion()))));
+ properties
+ .getProperty(
+ "buffered_arrays_memory_proportion",
+ Double.toString(conf.getBufferedArraysMemoryProportion()))
+ .trim()));
conf.setFlushProportion(
Double.parseDouble(
- properties.getProperty(
- "flush_proportion",
Double.toString(conf.getFlushProportion()))));
+ properties
+ .getProperty("flush_proportion",
Double.toString(conf.getFlushProportion()))
+ .trim()));
conf.setRejectProportion(
Double.parseDouble(
- properties.getProperty(
- "reject_proportion",
Double.toString(conf.getRejectProportion()))));
+ properties
+ .getProperty("reject_proportion",
Double.toString(conf.getRejectProportion()))
+ .trim()));
conf.setWriteMemoryVariationReportProportion(
Double.parseDouble(
- properties.getProperty(
- "write_memory_variation_report_proportion",
-
Double.toString(conf.getWriteMemoryVariationReportProportion()))));
+ properties
+ .getProperty(
+ "write_memory_variation_report_proportion",
+
Double.toString(conf.getWriteMemoryVariationReportProportion()))
+ .trim()));
conf.setMetaDataCacheEnable(
Boolean.parseBoolean(
- properties.getProperty(
- "meta_data_cache_enable",
Boolean.toString(conf.isMetaDataCacheEnable()))));
+ properties
+ .getProperty(
+ "meta_data_cache_enable",
Boolean.toString(conf.isMetaDataCacheEnable()))
+ .trim()));
initMemoryAllocate(properties);
