This is an automated email from the ASF dual-hosted git repository. lta pushed a commit to branch cluster in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 0c8c17a1646bd963e6f042ca23ced9c5b6b74447 Merge: 27252b1 5c15ac3 Author: lta <[email protected]> AuthorDate: Wed Jun 5 10:29:27 2019 +0800 merge master' .../apache/iotdb/cli/client/AbstractClient.java | 2 +- iotdb/iotdb/conf/iotdb-engine.properties | 28 +++++++++++++--------- iotdb/iotdb/conf/iotdb-sync-client.properties | 4 ++-- .../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 10 ++++---- .../org/apache/iotdb/db/service/TSServiceImpl.java | 2 +- .../org/apache/iotdb/db/sync/conf/Constans.java | 6 ++--- .../iotdb/db/sync/conf/SyncSenderConfig.java | 10 ++++---- .../iotdb/db/sync/conf/SyncSenderDescriptor.java | 6 ++--- 8 files changed, 37 insertions(+), 31 deletions(-) diff --cc iotdb/iotdb/conf/iotdb-engine.properties index 7351604,848696c..750a2be --- a/iotdb/iotdb/conf/iotdb-engine.properties +++ b/iotdb/iotdb/conf/iotdb-engine.properties @@@ -87,33 -87,33 +87,37 @@@ force_wal_period_in_ms=1 # mult_dir_strategy=MaxDiskUsableSpaceFirstStrategy # 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 metric directory under the IoTDB folder(i.e., %IOTDB_HOME%/data/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. -# Note: If sys_dir is assigned an empty string(i.e.,zero-length), it will be handled as a relative path. +# If it is relative, system will save the data in the relative metric directory it indicates under the IoTDB folder. +# Note: If sys_dir is assigned an empty string(i.e.,zero-length), it will be handled as a relative metric. # 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. +# If its prefix is a drive specifier followed by "\\", or if its prefix is "\\\\", then the metric is absolute. Otherwise, it is relative. # sys_dir=D:\\iotdb\\data\\system # For Linux platform -# If its prefix is "/", then the path is absolute. Otherwise, it is relative. -# sys_dir=/path/iotdb/data/system +# If its prefix is "/", then the metric is absolute. Otherwise, it is relative. +# sys_dir=/metric/iotdb/data/system # wal 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 metric directory under the IoTDB folder(i.e., %IOTDB_HOME%/data). # 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 wal_dir is assigned an empty string(i.e.,zero-length), it will be handled as a relative path. +# If it is relative, system will save the data in the relative metric directory it indicates under the IoTDB folder. +# Note: If wal_dir is assigned an empty string(i.e.,zero-length), it will be handled as a relative metric. # 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. +# If its prefix is a drive specifier followed by "\\", or if its prefix is "\\\\", then the metric is absolute. Otherwise, it is relative. # wal_dir=D:\\iotdb\\data # For Linux platform -# If its prefix is "/", then the path is absolute. Otherwise, it is relative. -# wal_dir=/path/iotdb/data +# If its prefix is "/", then the metric is absolute. Otherwise, it is relative. +# wal_dir=/metric/iotdb/data + +#################### +### Memory Control Configuration +#################### + #################### + ### Memory Control Configuration + #################### + # The maximum concurrent thread number for merging overflow # Increase this value, it will increase IO and CPU consumption # Decrease this value, when there is much overflow data, it will increase disk usage, which will reduce read speed diff --cc iotdb/iotdb/conf/iotdb-sync-client.properties index 3cff138,65b3074..562c4c8 --- a/iotdb/iotdb/conf/iotdb-sync-client.properties +++ b/iotdb/iotdb/conf/iotdb-sync-client.properties @@@ -23,10 -23,10 +23,10 @@@ server_ip=127.0.0. # Sync client port server_port=5555 - # The period time of sync process, the unit of time is second - sync_period_in_seconds=600 + # The period time of sync process, the time unit is second. + sync_period_in_second=600 -# Set bufferWrite data absolute path of IoTDB +# Set bufferWrite data absolute metric of IoTDB # It needs to be set with iotdb_schema_directory, they have to belong to the same IoTDB # iotdb_bufferWrite_directory = D:\\iotdb\\data\\data\\settled
