This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new 2dadbf3 remove partition in config (#1260)
2dadbf3 is described below
commit 2dadbf38277e0544342077b0396f16228faf8a07
Author: Jialin Qiao <[email protected]>
AuthorDate: Mon May 25 17:51:11 2020 +0800
remove partition in config (#1260)
---
.../assembly/resources/conf/iotdb-engine.properties | 19 +------------------
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 4 ++--
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 14 +++++++-------
3 files changed, 10 insertions(+), 27 deletions(-)
diff --git a/server/src/assembly/resources/conf/iotdb-engine.properties
b/server/src/assembly/resources/conf/iotdb-engine.properties
index 4d10c01..1fcb7fa 100644
--- a/server/src/assembly/resources/conf/iotdb-engine.properties
+++ b/server/src/assembly/resources/conf/iotdb-engine.properties
@@ -175,16 +175,6 @@ timestamp_precision=ms
# data.
# default_ttl=36000000
-# whether enable data partition
-# if disabled, all data belongs to the partition 0
-enable_partition=false
-
-# Time range for divide storage group
-# Time series data will divide into groups by this time range
-# Unit is second
-# default value is one week, which is 604800 seconds
-partition_interval=604800
-
# Size of log buffer in each log node(in byte).
# If WAL is enabled and the size of a insert plan is smaller than this
parameter, then the insert plan will be rejected by WAL
# If it sets a value smaller than 0, use the default value 16777216
@@ -211,13 +201,6 @@ concurrent_query_thread=0
# (i.e., whether use ChunkBufferPool), value true, false
chunk_buffer_pool_enable=false
-# the num of time partition which can be concurrently write in each storage
group
-# This config decides how many time partitions in a storage group can be
inserted concurrently
-# For example, your partitionInterval is 86400 and you want to insert data in
5 different days,
-# you should set this param >= 5
-# default number is 1
-concurrent_writing_time_partition=1
-
# The amount of data iterate each time in server (the number of data strips,
that is, the number of different timestamps.)
batch_size=100000
@@ -243,7 +226,7 @@ enable_parameter_adapter=true
write_read_free_memory_proportion=6:3:1
# primitive array size (length of each array) in array pool
-primitive_array_size=128
+primitive_array_size=64
####################
diff --git a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
index 1c40347..29257db 100644
--- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
+++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
@@ -512,7 +512,7 @@ public class IoTDBConfig {
private String kerberosKeytabFilePath = "/path";
/**
- * kerberos pricipal
+ * kerberos principal
*/
private String kerberosPrincipal = "principal";
@@ -536,7 +536,7 @@ public class IoTDBConfig {
/**
* The default value of primitive array size in array pool
*/
- private int primitiveArraySize = 128;
+ private int primitiveArraySize = 64;
/**
* whether enable data partition
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 c2d3887..ab08ead 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
@@ -366,17 +366,17 @@ public class IoTDBDescriptor {
conf.setDefaultTTL(Long.parseLong(properties.getProperty("default_ttl",
String.valueOf(conf.getDefaultTTL()))));
- conf.setEnablePartition(Boolean.parseBoolean(
- properties.getProperty("enable_partition",
String.valueOf(conf.isEnablePartition()))));
+// conf.setEnablePartition(Boolean.parseBoolean(
+// properties.getProperty("enable_partition",
String.valueOf(conf.isEnablePartition()))));
// Time range for dividing storage group
- conf.setPartitionInterval(Long.parseLong(properties
- .getProperty("partition_interval",
String.valueOf(conf.getPartitionInterval()))));
+// conf.setPartitionInterval(Long.parseLong(properties
+// .getProperty("partition_interval",
String.valueOf(conf.getPartitionInterval()))));
// the num of memtables in each storage group
- conf.setConcurrentWritingTimePartition(
-
Integer.parseInt(properties.getProperty("concurrent_writing_time_partition",
- String.valueOf(conf.getConcurrentWritingTimePartition()))));
+// conf.setConcurrentWritingTimePartition(
+//
Integer.parseInt(properties.getProperty("concurrent_writing_time_partition",
+// String.valueOf(conf.getConcurrentWritingTimePartition()))));
// the default fill interval in LinearFill and PreviousFill
conf.setDefaultFillInterval(
