This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch 0.13.0.1_edge
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/0.13.0.1_edge by this push:
new 5396bc83cb 0.13.0 Edge configuration (#6470)
5396bc83cb is described below
commit 5396bc83cbe46f483ee9fbcd0079260bf5264606
Author: sunhao <[email protected]>
AuthorDate: Wed Jun 29 10:52:16 2022 +0800
0.13.0 Edge configuration (#6470)
---
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 48 ++++-----------------
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 49 +---------------------
.../iotdb/tsfile/common/conf/TSFileConfig.java | 6 +--
.../iotdb/tsfile/common/conf/TSFileDescriptor.java | 1 -
4 files changed, 10 insertions(+), 94 deletions(-)
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 d33e8a0ff3..fd9811ce18 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
@@ -131,7 +131,7 @@ public class IoTDBConfig {
private double rejectProportion = 0.8;
/** If storage group increased more than this threshold, report to system.
Unit: byte */
- private long storageGroupSizeReportThreshold = 16 * 1024 * 1024L;
+ private long storageGroupSizeReportThreshold = (long) 1.6 * 1024 * 1024L;
/** When inserting rejected, waiting period to check system again. Unit:
millisecond */
private int checkPeriodWhenInsertBlocked = 50;
@@ -166,7 +166,7 @@ public class IoTDBConfig {
* WAL is enabled and the size of the inserted plan is greater than one-half
of this parameter,
* then the insert plan will be rejected by WAL. Unit: byte
*/
- private int walBufferSize = 16 * 1024 * 1024;
+ private int walBufferSize = (int) 1.6 * 1024 * 1024;
private int maxWalBytebufferNumForEachPartition = 6;
@@ -330,7 +330,7 @@ public class IoTDBConfig {
private long seqMemtableFlushCheckInterval = 10 * 60 * 1000L;
/** Whether to timed flush unsequence tsfiles' memtables. */
- private boolean enableTimedFlushUnseqMemtable = true;
+ private boolean enableTimedFlushUnseqMemtable = false;
/**
* If a memTable's created time is older than current time minus this, the
memtable will be
@@ -342,7 +342,7 @@ public class IoTDBConfig {
private long unseqMemtableFlushCheckInterval = 10 * 60 * 1000L;
/** Whether to timed close tsfiles. */
- private boolean enableTimedCloseTsFile = true;
+ private boolean enableTimedCloseTsFile = false;
/**
* If a TsfileProcessor's last working memtable flush time is older than
current time minus this
@@ -357,13 +357,13 @@ public class IoTDBConfig {
private int avgSeriesPointNumberThreshold = 10000;
/** Enable inner space copaction for sequence files */
- private boolean enableSeqSpaceCompaction = true;
+ private boolean enableSeqSpaceCompaction = false;
/** Enable inner space copaction for unsequence files */
- private boolean enableUnseqSpaceCompaction = true;
+ private boolean enableUnseqSpaceCompaction = false;
/** Compact the unsequence files into the overlapped sequence files */
- private boolean enableCrossSpaceCompaction = true;
+ private boolean enableCrossSpaceCompaction = false;
/**
* The strategy of inner space compaction task. There are just one inner
space compaction strategy
@@ -445,7 +445,7 @@ public class IoTDBConfig {
private long allocateMemoryForChunkCache = allocateMemoryForRead * 100 /
1001;
/** Whether to enable Last cache */
- private boolean lastCacheEnable = true;
+ private boolean lastCacheEnable = false;
/** Set true to enable statistics monitor service, false to disable
statistics service. */
private boolean enableStatMonitor = false;
@@ -1408,10 +1408,6 @@ public class IoTDBConfig {
return walBufferSize;
}
- public void setWalBufferSize(int walBufferSize) {
- this.walBufferSize = walBufferSize;
- }
-
public int getMaxWalBytebufferNumForEachPartition() {
return maxWalBytebufferNumForEachPartition;
}
@@ -1512,10 +1508,6 @@ public class IoTDBConfig {
return storageGroupSizeReportThreshold;
}
- public void setStorageGroupSizeReportThreshold(long
storageGroupSizeReportThreshold) {
- this.storageGroupSizeReportThreshold = storageGroupSizeReportThreshold;
- }
-
public long getAllocateMemoryForWrite() {
return allocateMemoryForWrite;
}
@@ -1682,10 +1674,6 @@ public class IoTDBConfig {
return enableTimedFlushUnseqMemtable;
}
- public void setEnableTimedFlushUnseqMemtable(boolean
enableTimedFlushUnseqMemtable) {
- this.enableTimedFlushUnseqMemtable = enableTimedFlushUnseqMemtable;
- }
-
public long getUnseqMemtableFlushInterval() {
return unseqMemtableFlushInterval;
}
@@ -1706,10 +1694,6 @@ public class IoTDBConfig {
return enableTimedCloseTsFile;
}
- public void setEnableTimedCloseTsFile(boolean enableTimedCloseTsFile) {
- this.enableTimedCloseTsFile = enableTimedCloseTsFile;
- }
-
public long getCloseTsFileIntervalAfterFlushing() {
return closeTsFileIntervalAfterFlushing;
}
@@ -1787,10 +1771,6 @@ public class IoTDBConfig {
return lastCacheEnable;
}
- public void setEnableLastCache(boolean lastCacheEnable) {
- this.lastCacheEnable = lastCacheEnable;
- }
-
public boolean isEnableWatermark() {
return enableWatermark;
}
@@ -2411,26 +2391,14 @@ public class IoTDBConfig {
return enableSeqSpaceCompaction;
}
- public void setEnableSeqSpaceCompaction(boolean enableSeqSpaceCompaction) {
- this.enableSeqSpaceCompaction = enableSeqSpaceCompaction;
- }
-
public boolean isEnableUnseqSpaceCompaction() {
return enableUnseqSpaceCompaction;
}
- public void setEnableUnseqSpaceCompaction(boolean
enableUnseqSpaceCompaction) {
- this.enableUnseqSpaceCompaction = enableUnseqSpaceCompaction;
- }
-
public boolean isEnableCrossSpaceCompaction() {
return enableCrossSpaceCompaction;
}
- public void setEnableCrossSpaceCompaction(boolean
enableCrossSpaceCompaction) {
- this.enableCrossSpaceCompaction = enableCrossSpaceCompaction;
- }
-
public InnerCompactionStrategy getInnerCompactionStrategy() {
return innerCompactionStrategy;
}
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 5ff5d12683..d93f0d9a06 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
@@ -184,22 +184,11 @@ public class IoTDBDescriptor {
properties.getProperty(
"reject_proportion",
Double.toString(conf.getRejectProportion()))));
- conf.setStorageGroupSizeReportThreshold(
- Long.parseLong(
- properties.getProperty(
- "storage_group_report_threshold",
- Long.toString(conf.getStorageGroupSizeReportThreshold()))));
-
conf.setMetaDataCacheEnable(
Boolean.parseBoolean(
properties.getProperty(
"meta_data_cache_enable",
Boolean.toString(conf.isMetaDataCacheEnable()))));
- conf.setEnableLastCache(
- Boolean.parseBoolean(
- properties.getProperty(
- "enable_last_cache",
Boolean.toString(conf.isLastCacheEnabled()))));
-
initMemoryAllocate(properties);
loadWALProps(properties);
@@ -328,24 +317,6 @@ public class IoTDBDescriptor {
"compaction_submission_interval_in_ms",
Long.toString(conf.getCompactionSubmissionIntervalInMs()))));
- conf.setEnableCrossSpaceCompaction(
- Boolean.parseBoolean(
- properties.getProperty(
- "enable_cross_space_compaction",
- Boolean.toString(conf.isEnableCrossSpaceCompaction()))));
-
- conf.setEnableSeqSpaceCompaction(
- Boolean.parseBoolean(
- properties.getProperty(
- "enable_seq_space_compaction",
- Boolean.toString(conf.isEnableSeqSpaceCompaction()))));
-
- conf.setEnableUnseqSpaceCompaction(
- Boolean.parseBoolean(
- properties.getProperty(
- "enable_unseq_space_compaction",
- Boolean.toString(conf.isEnableUnseqSpaceCompaction()))));
-
conf.setCrossCompactionStrategy(
CrossCompactionStrategy.getCrossCompactionStrategy(
properties.getProperty(
@@ -958,9 +929,6 @@ public class IoTDBDescriptor {
int walBufferSize =
Integer.parseInt(
properties.getProperty("wal_buffer_size",
Integer.toString(conf.getWalBufferSize())));
- if (walBufferSize > 0) {
- conf.setWalBufferSize(walBufferSize);
- }
int maxWalBytebufferNumForEachPartition =
Integer.parseInt(
@@ -1115,11 +1083,7 @@ public class IoTDBDescriptor {
properties.getProperty(
"value_encoder",
TSFileDescriptor.getInstance().getConfig().getValueEncoder()));
TSFileDescriptor.getInstance()
- .getConfig()
- .setCompressor(
- properties.getProperty(
- "compressor",
-
TSFileDescriptor.getInstance().getConfig().getCompressor().toString()));
+ .getConfig();
TSFileDescriptor.getInstance()
.getConfig()
.setMaxDegreeOfIndexNode(
@@ -1160,12 +1124,6 @@ public class IoTDBDescriptor {
conf.setSeqMemtableFlushCheckInterval(seqMemTableFlushCheckInterval);
}
- conf.setEnableTimedFlushUnseqMemtable(
- Boolean.parseBoolean(
- properties.getProperty(
- "enable_timed_flush_unseq_memtable",
- Boolean.toString(conf.isEnableTimedFlushUnseqMemtable()))));
-
long unseqMemTableFlushInterval =
Long.parseLong(
properties
@@ -1188,11 +1146,6 @@ public class IoTDBDescriptor {
conf.setUnseqMemtableFlushCheckInterval(unseqMemTableFlushCheckInterval);
}
- conf.setEnableTimedCloseTsFile(
- Boolean.parseBoolean(
- properties.getProperty(
- "enable_timed_close_tsfile",
Boolean.toString(conf.isEnableTimedCloseTsFile()))));
-
long closeTsFileIntervalAfterFlushing =
Long.parseLong(
properties
diff --git
a/tsfile/src/main/java/org/apache/iotdb/tsfile/common/conf/TSFileConfig.java
b/tsfile/src/main/java/org/apache/iotdb/tsfile/common/conf/TSFileConfig.java
index 060aba9189..20569647dc 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/common/conf/TSFileConfig.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/common/conf/TSFileConfig.java
@@ -108,7 +108,7 @@ public class TSFileConfig implements Serializable {
/** Default DFT satisfy rate is 0.1 */
private double dftSatisfyRate = 0.1;
/** Data compression method, TsFile supports UNCOMPRESSED, SNAPPY or LZ4. */
- private CompressionType compressor = CompressionType.SNAPPY;
+ private CompressionType compressor = CompressionType.GZIP;
/** Line count threshold for checking page memory occupied size. */
private int pageCheckSizeThreshold = 100;
/** Default endian value is BIG_ENDIAN. */
@@ -280,10 +280,6 @@ public class TSFileConfig implements Serializable {
return compressor;
}
- public void setCompressor(String compressor) {
- this.compressor = CompressionType.valueOf(compressor);
- }
-
public int getPageCheckSizeThreshold() {
return pageCheckSizeThreshold;
}
diff --git
a/tsfile/src/main/java/org/apache/iotdb/tsfile/common/conf/TSFileDescriptor.java
b/tsfile/src/main/java/org/apache/iotdb/tsfile/common/conf/TSFileDescriptor.java
index 840e64d756..f51f4afd91 100644
---
a/tsfile/src/main/java/org/apache/iotdb/tsfile/common/conf/TSFileDescriptor.java
+++
b/tsfile/src/main/java/org/apache/iotdb/tsfile/common/conf/TSFileDescriptor.java
@@ -79,7 +79,6 @@ public class TSFileDescriptor {
writer.setInt(conf::setFloatPrecision, "float_precision");
writer.setString(conf::setTimeEncoder, "time_encoder");
writer.setString(conf::setValueEncoder, "value_encoder");
- writer.setString(conf::setCompressor, "compressor");
writer.setInt(conf::setBatchSize, "batch_size");
}
