[iotdb] branch rel/0.11 updated: [ISSUE-3458] Load configuration command with null error message (#3490)

[haonan]

This is an automated email from the ASF dual-hosted git repository.

haonan pushed a commit to branch rel/0.11
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/rel/0.11 by this push:
     new 90c7ca6  [ISSUE-3458] Load configuration command with null error 
message (#3490)
90c7ca6 is described below

commit 90c7ca6595f27920f97aac988a72d0de0395ca3b
Author: Hang Ji <55303647+ijih...@users.noreply.github.com>
AuthorDate: Sat Jul 3 09:20:35 2021 +0800

    [ISSUE-3458] Load configuration command with null error message (#3490)
---
 .../org/apache/iotdb/db/conf/IoTDBDescriptor.java  | 33 +++++++++++++++-------
 1 file changed, 23 insertions(+), 10 deletions(-)

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 98e9005..931070d 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
@@ -762,25 +762,38 @@ public class IoTDBDescriptor {
 
       // update max_deduplicated_path_num
       conf.setMaxQueryDeduplicatedPathNum(
-          
Integer.parseInt(properties.getProperty("max_deduplicated_path_num")));
-
+          Integer.parseInt(
+              properties.getProperty(
+                  "max_deduplicated_path_num",
+                  Integer.toString(conf.getMaxQueryDeduplicatedPathNum()))));
       // update frequency_interval_in_minute
       conf.setFrequencyIntervalInMinute(
-          
Integer.parseInt(properties.getProperty("frequency_interval_in_minute")));
-
+          Integer.parseInt(
+              properties.getProperty(
+                  "frequency_interval_in_minute",
+                  Integer.toString(conf.getFrequencyIntervalInMinute()))));
       // update slow_query_threshold
-      
conf.setSlowQueryThreshold(Long.parseLong(properties.getProperty("slow_query_threshold")));
-
+      conf.setSlowQueryThreshold(
+          Long.parseLong(
+              properties.getProperty(
+                  "slow_query_threshold", 
Long.toString(conf.getSlowQueryThreshold()))));
+      
       // update debug_state
-      
conf.setDebugState(Boolean.parseBoolean(properties.getProperty("debug_state")));
+      
conf.setDebugState(Boolean.parseBoolean(properties.getProperty("debug_state",Boolean.toString(conf.isDebugOn()))));
 
       // update enable_continuous_compaction
       conf.setEnableContinuousCompaction(
-          
Boolean.parseBoolean(properties.getProperty("enable_continuous_compaction")));
-
+          Boolean.parseBoolean(
+              properties.getProperty(
+                  "enable_continuous_compaction",
+                  Boolean.toString(conf.isEnableContinuousCompaction()))));
+      
       // update merge_write_throughput_mb_per_sec
       conf.setMergeWriteThroughputMbPerSec(
-          
Integer.parseInt(properties.getProperty("merge_write_throughput_mb_per_sec")));
+          Integer.parseInt(
+              properties.getProperty(
+                  "merge_write_throughput_mb_per_sec",
+                  Integer.toString(conf.getMergeWriteThroughputMbPerSec()))));
     } catch (Exception e) {
       throw new QueryProcessException(
           String.format("Fail to reload configuration because %s", e));