This is an automated email from the ASF dual-hosted git repository.
spricoder pushed a commit to branch feature/memory_zhy
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/feature/memory_zhy by this
push:
new 76b795fd41e add from stage
76b795fd41e is described below
commit 76b795fd41eb88f6ba84d5041d41e7051ebf6972
Author: spricoder <[email protected]>
AuthorDate: Wed Sep 25 21:52:21 2024 +0800
add from stage
---
.../logdispatcher/IoTConsensusMemoryManager.java | 2 ++
.../IoTConsensusMemoryManagerMetrics.java | 2 ++
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 2 ++
.../db/pipe/resource/memory/PipeMemoryManager.java | 4 ++++
.../queryengine/execution/memory/MemoryPool.java | 4 ++++
.../cache/schema/DataNodeDevicePathCache.java | 4 +++-
.../schema/DeviceUsingTemplateSchemaCache.java | 4 +++-
.../cache/schema/TimeSeriesSchemaCache.java | 4 +++-
.../plan/planner/LocalExecutionPlanner.java | 8 ++++++--
.../fetcher/cache/TableDeviceSchemaCache.java | 4 +++-
.../db/storageengine/buffer/BloomFilterCache.java | 4 +++-
.../iotdb/db/storageengine/buffer/ChunkCache.java | 4 +++-
.../buffer/TimeSeriesMetadataCache.java | 4 +++-
.../rescon/memory/PrimitiveArrayManager.java | 4 +++-
.../db/storageengine/rescon/memory/SystemInfo.java | 22 ++++++++++++++++++----
.../rescon/memory/TimePartitionManager.java | 4 ++++
.../rescon/memory/TsFileResourceManager.java | 4 ++++
17 files changed, 70 insertions(+), 14 deletions(-)
diff --git
a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/iot/logdispatcher/IoTConsensusMemoryManager.java
b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/iot/logdispatcher/IoTConsensusMemoryManager.java
index 6be4d3e146a..638f154e137 100644
---
a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/iot/logdispatcher/IoTConsensusMemoryManager.java
+++
b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/iot/logdispatcher/IoTConsensusMemoryManager.java
@@ -48,6 +48,8 @@ public class IoTConsensusMemoryManager {
"IoT-Consensus",
Tag.TYPE.toString(),
"threshold",
+ Tag.FROM.toString(),
+ "other",
Tag.MODULE.toString(),
"consensus")
.set(maxMemorySizeInByte);
diff --git
a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/iot/logdispatcher/IoTConsensusMemoryManagerMetrics.java
b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/iot/logdispatcher/IoTConsensusMemoryManagerMetrics.java
index 8c5c30d7d58..2a806fa0abb 100644
---
a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/iot/logdispatcher/IoTConsensusMemoryManagerMetrics.java
+++
b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/iot/logdispatcher/IoTConsensusMemoryManagerMetrics.java
@@ -51,6 +51,8 @@ public class IoTConsensusMemoryManagerMetrics implements
IMetricSet {
"IoT-Consensus",
Tag.TYPE.toString(),
"actual",
+ Tag.FROM.toString(),
+ "other",
Tag.MODULE.toString(),
"consensus");
metricService.createAutoGauge(
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
index ba1dfee65f9..18b088e78b2 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
@@ -2106,6 +2106,8 @@ public class IoTDBDescriptor {
"Coordinator",
Tag.TYPE.toString(),
"threshold",
+ Tag.FROM.toString(),
+ "other",
Tag.MODULE.toString(),
"query")
.set(maxMemoryAvailable *
Integer.parseInt(proportions[3].trim()) / proportionSum);
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/resource/memory/PipeMemoryManager.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/resource/memory/PipeMemoryManager.java
index 4a758ea2638..7921a5e86ea 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/resource/memory/PipeMemoryManager.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/resource/memory/PipeMemoryManager.java
@@ -79,6 +79,8 @@ public class PipeMemoryManager {
"total",
Tag.TYPE.toString(),
"threshold",
+ Tag.FROM.toString(),
+ "other",
Tag.MODULE.toString(),
"stream")
.set(TOTAL_MEMORY_SIZE_IN_BYTES);
@@ -92,6 +94,8 @@ public class PipeMemoryManager {
"total",
Tag.TYPE.toString(),
"actual",
+ Tag.FROM.toString(),
+ "other",
Tag.MODULE.toString(),
"stream");
}
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/memory/MemoryPool.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/memory/MemoryPool.java
index 806f21d9842..d478fcfb4a4 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/memory/MemoryPool.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/memory/MemoryPool.java
@@ -148,6 +148,8 @@ public class MemoryPool {
"DataExchange",
Tag.TYPE.toString(),
"threshold",
+ Tag.FROM.toString(),
+ "other",
Tag.MODULE.toString(),
"query")
.set(maxBytes);
@@ -161,6 +163,8 @@ public class MemoryPool {
"DataExchange",
Tag.TYPE.toString(),
"actual",
+ Tag.FROM.toString(),
+ "other",
Tag.MODULE.toString(),
"query");
}
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/cache/schema/DataNodeDevicePathCache.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/cache/schema/DataNodeDevicePathCache.java
index 0c05ffe084b..ba7d92b2881 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/cache/schema/DataNodeDevicePathCache.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/cache/schema/DataNodeDevicePathCache.java
@@ -59,8 +59,10 @@ public class DataNodeDevicePathCache {
"DataNodeDevicePathCache",
Tag.TYPE.toString(),
"threshold",
+ Tag.FROM.toString(),
+ "cache",
Tag.MODULE.toString(),
- "storage-cache")
+ "storage")
.set(maxWeight);
}
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/cache/schema/DeviceUsingTemplateSchemaCache.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/cache/schema/DeviceUsingTemplateSchemaCache.java
index 5b97753b4d3..d7dc80c1927 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/cache/schema/DeviceUsingTemplateSchemaCache.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/cache/schema/DeviceUsingTemplateSchemaCache.java
@@ -75,8 +75,10 @@ public class DeviceUsingTemplateSchemaCache {
"DeviceUsingTemplateSchemaCache",
Tag.TYPE.toString(),
"threshold",
+ Tag.FROM.toString(),
+ "cache",
Tag.MODULE.toString(),
- "schema-cache")
+ "schema")
.set(config.getAllocateMemoryForSchemaCache());
}
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/cache/schema/TimeSeriesSchemaCache.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/cache/schema/TimeSeriesSchemaCache.java
index fb04669f26f..088f014760f 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/cache/schema/TimeSeriesSchemaCache.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/cache/schema/TimeSeriesSchemaCache.java
@@ -82,8 +82,10 @@ public class TimeSeriesSchemaCache {
"TimeSeriesSchemaCache",
Tag.TYPE.toString(),
"threshold",
+ Tag.FROM.toString(),
+ "cache",
Tag.MODULE.toString(),
- "schema-cache")
+ "schema")
.set(config.getAllocateMemoryForSchemaCache());
}
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanner.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanner.java
index 41260f39a80..e4d8b1790eb 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanner.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanner.java
@@ -86,8 +86,10 @@ public class LocalExecutionPlanner {
"ChunkCache",
Tag.TYPE.toString(),
"threshold",
+ Tag.FROM.toString(),
+ "other",
Tag.MODULE.toString(),
- "query-cache")
+ "query")
.set(ALLOCATE_MEMORY_FOR_OPERATORS);
MetricService.getInstance()
.createAutoGauge(
@@ -99,8 +101,10 @@ public class LocalExecutionPlanner {
"Operators",
Tag.TYPE.toString(),
"actual",
+ Tag.FROM.toString(),
+ "other",
Tag.MODULE.toString(),
- "query-cache");
+ "query");
}
public long getFreeMemoryForOperators() {
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/cache/TableDeviceSchemaCache.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/cache/TableDeviceSchemaCache.java
index d32dde26e9e..6b0e5e13323 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/cache/TableDeviceSchemaCache.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/cache/TableDeviceSchemaCache.java
@@ -80,8 +80,10 @@ public class TableDeviceSchemaCache {
"TableDeviceSchemaCache",
Tag.TYPE.toString(),
"threshold",
+ Tag.FROM.toString(),
+ "cache",
Tag.MODULE.toString(),
- "schema-cache")
+ "schema")
.set(config.getAllocateMemoryForSchemaCache());
}
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/buffer/BloomFilterCache.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/buffer/BloomFilterCache.java
index 5e5dcfb3be0..a66fe997cf6 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/buffer/BloomFilterCache.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/buffer/BloomFilterCache.java
@@ -81,8 +81,10 @@ public class BloomFilterCache {
"BloomFilterCache",
Tag.TYPE.toString(),
"threshold",
+ Tag.FROM.toString(),
+ "cache",
Tag.MODULE.toString(),
- "query-cache")
+ "query")
.set(MEMORY_THRESHOLD_IN_BLOOM_FILTER_CACHE);
}
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/buffer/ChunkCache.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/buffer/ChunkCache.java
index e3cb5480181..afd3aa5d294 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/buffer/ChunkCache.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/buffer/ChunkCache.java
@@ -105,8 +105,10 @@ public class ChunkCache {
"ChunkCache",
Tag.TYPE.toString(),
"threshold",
+ Tag.FROM.toString(),
+ "cache",
Tag.MODULE.toString(),
- "query-cache")
+ "query")
.set(MEMORY_THRESHOLD_IN_CHUNK_CACHE);
// add metrics
MetricService.getInstance().addMetricSet(new ChunkCacheMetrics(this));
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/buffer/TimeSeriesMetadataCache.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/buffer/TimeSeriesMetadataCache.java
index a681b2822db..2d88edbdaaf 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/buffer/TimeSeriesMetadataCache.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/buffer/TimeSeriesMetadataCache.java
@@ -105,8 +105,10 @@ public class TimeSeriesMetadataCache {
"TimeSeriesMetaCache",
Tag.TYPE.toString(),
"threshold",
+ Tag.FROM.toString(),
+ "cache",
Tag.MODULE.toString(),
- "query-cache")
+ "query")
.set(MEMORY_THRESHOLD_IN_TIME_SERIES_METADATA_CACHE);
// add metrics
MetricService.getInstance().addMetricSet(new
TimeSeriesMetadataCacheMetrics(this));
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/rescon/memory/PrimitiveArrayManager.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/rescon/memory/PrimitiveArrayManager.java
index 2ad168ce883..e368cff6737 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/rescon/memory/PrimitiveArrayManager.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/rescon/memory/PrimitiveArrayManager.java
@@ -94,8 +94,10 @@ public class PrimitiveArrayManager {
"pooled_array",
Tag.TYPE.toString(),
"threshold",
+ Tag.FROM.toString(),
+ "write",
Tag.MODULE.toString(),
- "storage-write")
+ "storage")
.set((long) POOLED_ARRAYS_MEMORY_THRESHOLD);
// POOLED_ARRAYS_MEMORY_THRESHOLD = ∑(datatype[i].getDataTypeSize() *
ARRAY_SIZE * LIMITS[i])
// we init all LIMITS[i] with the same value, so we have
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/rescon/memory/SystemInfo.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/rescon/memory/SystemInfo.java
index c28d1c8ec54..b8feebe5a10 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/rescon/memory/SystemInfo.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/rescon/memory/SystemInfo.java
@@ -415,6 +415,8 @@ public class SystemInfo {
"total",
Tag.TYPE.toString(),
"threshold",
+ Tag.FROM.toString(),
+ "other",
Tag.MODULE.toString(),
"off-heap")
.set(config.getMaxOffHeapMemoryBytes());
@@ -426,6 +428,8 @@ public class SystemInfo {
"direct_buffer",
Tag.TYPE.toString(),
"threshold",
+ Tag.FROM.toString(),
+ "other",
Tag.MODULE.toString(),
"off-heap")
.set(totalDirectBufferMemorySizeLimit);
@@ -439,8 +443,10 @@ public class SystemInfo {
"direct_buffer",
Tag.TYPE.toString(),
"actual",
+ Tag.FROM.toString(),
+ "write",
Tag.MODULE.toString(),
- "storage-write");
+ "storage");
MetricService.getInstance()
.getOrCreateGauge(
Metric.IOT_MEMORY.toString(),
@@ -449,8 +455,10 @@ public class SystemInfo {
"memtable",
Tag.TYPE.toString(),
"threshold",
+ Tag.FROM.toString(),
+ "write",
Tag.MODULE.toString(),
- "storage-write")
+ "storage")
.set(memorySizeForMemtable);
MetricService.getInstance()
.createAutoGauge(
@@ -462,8 +470,10 @@ public class SystemInfo {
"memtable",
Tag.TYPE.toString(),
"actual",
+ Tag.FROM.toString(),
+ "write",
Tag.MODULE.toString(),
- "storage-write");
+ "storage");
MetricService.getInstance()
.getOrCreateGauge(
Metric.IOT_MEMORY.toString(),
@@ -472,6 +482,8 @@ public class SystemInfo {
"compaction",
Tag.TYPE.toString(),
"threshold",
+ Tag.FROM.toString(),
+ "compaction",
Tag.MODULE.toString(),
"storage-compaction")
.set(memorySizeForCompaction);
@@ -485,8 +497,10 @@ public class SystemInfo {
"compaction",
Tag.TYPE.toString(),
"actual",
+ Tag.FROM.toString(),
+ "compaction",
Tag.MODULE.toString(),
- "storage-compaction");
+ "storage");
FLUSH_THRESHOLD = memorySizeForMemtable * config.getFlushProportion();
REJECT_THRESHOLD = memorySizeForMemtable * config.getRejectProportion();
WritingMetrics.getInstance().recordFlushThreshold(FLUSH_THRESHOLD);
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/rescon/memory/TimePartitionManager.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/rescon/memory/TimePartitionManager.java
index 16d3cba6c33..e287bc826e9 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/rescon/memory/TimePartitionManager.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/rescon/memory/TimePartitionManager.java
@@ -61,6 +61,8 @@ public class TimePartitionManager {
"timePartitionInfo",
Tag.TYPE.toString(),
"actual",
+ Tag.FROM.toString(),
+ "other",
Tag.MODULE.toString(),
"storage");
MetricService.getInstance()
@@ -71,6 +73,8 @@ public class TimePartitionManager {
"timePartitionInfo",
Tag.TYPE.toString(),
"threshold",
+ Tag.FROM.toString(),
+ "other",
Tag.MODULE.toString(),
"storage")
.set(timePartitionInfoMemoryThreshold);
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/rescon/memory/TsFileResourceManager.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/rescon/memory/TsFileResourceManager.java
index 64a09f6a435..5aeb6b5c39e 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/rescon/memory/TsFileResourceManager.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/rescon/memory/TsFileResourceManager.java
@@ -60,6 +60,8 @@ public class TsFileResourceManager {
"TimeIndex",
Tag.TYPE.toString(),
"threshold",
+ Tag.FROM.toString(),
+ "other",
Tag.MODULE.toString(),
"query")
.set(timeIndexMemoryThreshold);
@@ -73,6 +75,8 @@ public class TsFileResourceManager {
"TimeIndex",
Tag.TYPE.toString(),
"actual",
+ Tag.FROM.toString(),
+ "other",
Tag.MODULE.toString(),
"query");
}
