This is an automated email from the ASF dual-hosted git repository. hui pushed a commit to branch lmh/addMetricDoc in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 76d51bf29cef0e5aeaba64842af520632d337937 Author: Minghui Liu <[email protected]> AuthorDate: Tue Jan 10 10:28:53 2023 +0800 remove useless config --- .../apache/iotdb/commons/conf/IoTDBConstant.java | 2 - .../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 55 ---------------------- .../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 15 ------ 3 files changed, 72 deletions(-) diff --git a/node-commons/src/main/java/org/apache/iotdb/commons/conf/IoTDBConstant.java b/node-commons/src/main/java/org/apache/iotdb/commons/conf/IoTDBConstant.java index ca68d8283c..eb019d7cab 100644 --- a/node-commons/src/main/java/org/apache/iotdb/commons/conf/IoTDBConstant.java +++ b/node-commons/src/main/java/org/apache/iotdb/commons/conf/IoTDBConstant.java @@ -220,8 +220,6 @@ public class IoTDBConstant { public static final String LOAD_TSFILE_FOLDER_NAME = "load"; public static final String SYNC_FOLDER_NAME = "sync"; public static final String QUERY_FOLDER_NAME = "query"; - public static final String TRACING_FOLDER_NAME = "tracing"; - public static final String TRACING_LOG = "tracing.txt"; public static final String EXT_FOLDER_NAME = "ext"; public static final String UDF_FOLDER_NAME = "udf"; public static final String TRIGGER_FOLDER_NAME = "trigger"; 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 4cbff4d50c..647d6a126d 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 @@ -250,10 +250,6 @@ public class IoTDBConfig { + File.separator + IoTDBConstant.SCHEMA_FOLDER_NAME; - /** Performance tracing directory, stores performance tracing files */ - private String tracingDir = - IoTDBConstant.DEFAULT_BASE_DIR + File.separator + IoTDBConstant.TRACING_FOLDER_NAME; - /** Query directory, stores temporary files of query */ private String queryDir = IoTDBConstant.DEFAULT_BASE_DIR + File.separator + IoTDBConstant.QUERY_FOLDER_NAME; @@ -518,24 +514,9 @@ public class IoTDBConfig { /** Whether to enable Last cache */ private boolean lastCacheEnable = true; - /** Set true to enable statistics monitor service, false to disable statistics service. */ - private boolean enableStatMonitor = false; - - /** Set true to enable writing monitor time series. */ - private boolean enableMonitorSeriesWrite = false; - /** Cache size of {@code checkAndGetDataTypeCache}. */ private int mRemoteSchemaCacheSize = 100000; - /** Is external sort enable. */ - private boolean enableExternalSort = true; - - /** - * The threshold of items in external sort. If the number of chunks participating in sorting - * exceeds this threshold, external sorting is enabled, otherwise memory sorting is used. - */ - private int externalSortThreshold = 1000; - /** White list for sync */ private String ipWhiteList = "127.0.0.1/32"; @@ -780,9 +761,6 @@ public class IoTDBConfig { private float udfCollectorMemoryBudgetInMB = (float) (1.0 / 3 * udfMemoryBudgetInMB); - /** The cached record size (in MB) of each series in group by fill query */ - private float groupByFillCacheSizeInMB = (float) 1.0; - // time in nanosecond precision when starting up private long startUpNanosecond = System.nanoTime(); @@ -1073,14 +1051,6 @@ public class IoTDBConfig { this.udfMemoryBudgetInMB = udfMemoryBudgetInMB; } - public float getGroupByFillCacheSizeInMB() { - return groupByFillCacheSizeInMB; - } - - public void setGroupByFillCacheSizeInMB(float groupByFillCacheSizeInMB) { - this.groupByFillCacheSizeInMB = groupByFillCacheSizeInMB; - } - public float getUdfReaderMemoryBudgetInMB() { return udfReaderMemoryBudgetInMB; } @@ -1156,7 +1126,6 @@ public class IoTDBConfig { systemDir = addDataHomeDir(systemDir); schemaDir = addDataHomeDir(schemaDir); loadTsFileDir = addDataHomeDir(loadTsFileDir); - tracingDir = addDataHomeDir(tracingDir); consensusDir = addDataHomeDir(consensusDir); dataRegionConsensusDir = addDataHomeDir(dataRegionConsensusDir); ratisDataRegionSnapshotDir = addDataHomeDir(ratisDataRegionSnapshotDir); @@ -1350,14 +1319,6 @@ public class IoTDBConfig { this.schemaDir = schemaDir; } - public String getTracingDir() { - return tracingDir; - } - - void setTracingDir(String tracingDir) { - this.tracingDir = tracingDir; - } - public String getQueryDir() { return queryDir; } @@ -1850,22 +1811,6 @@ public class IoTDBConfig { - allocateMemoryForSchema; } - public boolean isEnableExternalSort() { - return enableExternalSort; - } - - void setEnableExternalSort(boolean enableExternalSort) { - this.enableExternalSort = enableExternalSort; - } - - public int getExternalSortThreshold() { - return externalSortThreshold; - } - - void setExternalSortThreshold(int externalSortThreshold) { - this.externalSortThreshold = externalSortThreshold; - } - public boolean isEnablePartialInsert() { return enablePartialInsert; } 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 d0a47ede9a..d98a6be48b 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 @@ -331,8 +331,6 @@ public class IoTDBDescriptor { conf.setQueryDir( FilePathUtils.regularizePath(conf.getSystemDir() + IoTDBConstant.QUERY_FOLDER_NAME)); - conf.setTracingDir(properties.getProperty("dn_tracing_dir", conf.getTracingDir())); - conf.setDataDirs(properties.getProperty("dn_data_dirs", conf.getDataDirs()[0]).split(",")); conf.setConsensusDir(properties.getProperty("dn_consensus_dir", conf.getConsensusDir())); @@ -568,14 +566,6 @@ public class IoTDBDescriptor { Boolean.parseBoolean(properties.getProperty("chunk_buffer_pool_enable"))); } - conf.setEnableExternalSort( - Boolean.parseBoolean( - properties.getProperty( - "enable_external_sort", Boolean.toString(conf.isEnableExternalSort())))); - conf.setExternalSortThreshold( - Integer.parseInt( - properties.getProperty( - "external_sort_threshold", Integer.toString(conf.getExternalSortThreshold())))); conf.setUpgradeThreadCount( Integer.parseInt( properties.getProperty( @@ -1694,11 +1684,6 @@ public class IoTDBDescriptor { Math.min(Float.parseFloat(memoryBudgetInMb), 0.2 * conf.getAllocateMemoryForRead())); } - String groupByFillCacheSizeInMB = properties.getProperty("group_by_fill_cache_size_in_mb"); - if (groupByFillCacheSizeInMB != null) { - conf.setGroupByFillCacheSizeInMB(Float.parseFloat(groupByFillCacheSizeInMB)); - } - String readerTransformerCollectorMemoryProportion = properties.getProperty("udf_reader_transformer_collector_memory_proportion"); if (readerTransformerCollectorMemoryProportion != null) {
