Skip to content

Commit bd97844

Browse files
authored
fix (#16773)
1 parent cd443ba commit bd97844

File tree

5 files changed

+16
-10
lines changed

5 files changed

+16
-10
lines changed

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/DataNodeMemoryConfig.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@
3232
public class DataNodeMemoryConfig {
3333
private static final Logger LOGGER = LoggerFactory.getLogger(DataNodeMemoryConfig.class);
3434

35+
public static final String SCHEMA_CACHE = "SchemaCache";
36+
public static final String SCHEMA_REGION = "SchemaRegion";
37+
public static final String PARTITION_CACHE = "PartitionCache";
38+
3539
/** Reject proportion for system */
3640
private double rejectProportion = 0.8;
3741

@@ -266,13 +270,13 @@ private void initSchemaMemoryAllocate(
266270

267271
schemaRegionMemoryManager =
268272
schemaEngineMemoryManager.getOrCreateMemoryManager(
269-
"SchemaRegion", schemaMemoryTotal * schemaMemoryProportion[0] / proportionSum);
273+
SCHEMA_REGION, schemaMemoryTotal * schemaMemoryProportion[0] / proportionSum);
270274
schemaCacheMemoryManager =
271275
schemaEngineMemoryManager.getOrCreateMemoryManager(
272-
"SchemaCache", schemaMemoryTotal * schemaMemoryProportion[1] / proportionSum);
276+
SCHEMA_CACHE, schemaMemoryTotal * schemaMemoryProportion[1] / proportionSum);
273277
partitionCacheMemoryManager =
274278
schemaEngineMemoryManager.getOrCreateMemoryManager(
275-
"PartitionCache", schemaMemoryTotal * schemaMemoryProportion[2] / proportionSum);
279+
PARTITION_CACHE, schemaMemoryTotal * schemaMemoryProportion[2] / proportionSum);
276280

277281
LOGGER.info(
278282
"allocateMemoryForSchemaRegion = {}",

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/cache/partition/PartitionCache.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ public PartitionCache() {
128128
this.memoryBlock =
129129
memoryConfig
130130
.getPartitionCacheMemoryManager()
131-
.exactAllocate("PartitionCache", MemoryBlockType.STATIC);
131+
.exactAllocate(DataNodeMemoryConfig.PARTITION_CACHE, MemoryBlockType.STATIC);
132132
this.memoryBlock.allocate(this.memoryBlock.getTotalMemorySizeInBytes());
133133
// TODO @spricoder: PartitionCache need to be controlled according to memory
134134
this.schemaPartitionCache =

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/cache/TableDeviceSchemaCache.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ private TableDeviceSchemaCache() {
112112
memoryBlock =
113113
memoryConfig
114114
.getSchemaCacheMemoryManager()
115-
.exactAllocate("TableDeviceSchemaCache", MemoryBlockType.STATIC);
115+
.exactAllocate(DataNodeMemoryConfig.SCHEMA_CACHE, MemoryBlockType.STATIC);
116116
dualKeyCache =
117117
new DualKeyCacheBuilder<TableId, IDeviceID, TableDeviceCacheEntry>()
118118
.cacheEvictionPolicy(

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/cache/TableDeviceSchemaCacheMetrics.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
import org.apache.iotdb.commons.service.metric.enums.Metric;
2323
import org.apache.iotdb.commons.service.metric.enums.Tag;
24+
import org.apache.iotdb.db.conf.DataNodeMemoryConfig;
2425
import org.apache.iotdb.metrics.AbstractMetricService;
2526
import org.apache.iotdb.metrics.metricsets.IMetricSet;
2627
import org.apache.iotdb.metrics.utils.MetricLevel;
@@ -47,7 +48,7 @@ public void bindTo(final AbstractMetricService metricService) {
4748
tableDeviceSchemaCache,
4849
TableDeviceSchemaCache::getHitCount,
4950
Tag.NAME.toString(),
50-
"SchemaCache",
51+
DataNodeMemoryConfig.SCHEMA_CACHE,
5152
Tag.TYPE.toString(),
5253
"hit");
5354
metricService.createAutoGauge(
@@ -56,7 +57,7 @@ public void bindTo(final AbstractMetricService metricService) {
5657
tableDeviceSchemaCache,
5758
TableDeviceSchemaCache::getRequestCount,
5859
Tag.NAME.toString(),
59-
"SchemaCache",
60+
DataNodeMemoryConfig.SCHEMA_CACHE,
6061
Tag.TYPE.toString(),
6162
"all");
6263
metricService.createAutoGauge(
@@ -86,14 +87,14 @@ public void unbindFrom(final AbstractMetricService metricService) {
8687
MetricType.AUTO_GAUGE,
8788
Metric.CACHE.toString(),
8889
Tag.NAME.toString(),
89-
"SchemaCache",
90+
DataNodeMemoryConfig.SCHEMA_CACHE,
9091
Tag.TYPE.toString(),
9192
"hit");
9293
metricService.remove(
9394
MetricType.AUTO_GAUGE,
9495
Metric.CACHE.toString(),
9596
Tag.NAME.toString(),
96-
"SchemaCache",
97+
DataNodeMemoryConfig.SCHEMA_CACHE,
9798
Tag.TYPE.toString(),
9899
"all");
99100
metricService.remove(

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/rescon/MemSchemaEngineStatistics.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
import org.apache.iotdb.commons.memory.IMemoryBlock;
2323
import org.apache.iotdb.commons.memory.MemoryBlockType;
24+
import org.apache.iotdb.db.conf.DataNodeMemoryConfig;
2425
import org.apache.iotdb.db.conf.IoTDBDescriptor;
2526
import org.apache.iotdb.db.schemaengine.SchemaEngine;
2627
import org.apache.iotdb.db.schemaengine.template.ClusterTemplateManager;
@@ -41,7 +42,7 @@ public class MemSchemaEngineStatistics implements ISchemaEngineStatistics {
4142
IoTDBDescriptor.getInstance()
4243
.getMemoryConfig()
4344
.getSchemaRegionMemoryManager()
44-
.exactAllocate("SchemaRegion", MemoryBlockType.DYNAMIC);
45+
.exactAllocate(DataNodeMemoryConfig.SCHEMA_REGION, MemoryBlockType.DYNAMIC);
4546
private final ClusterTemplateManager clusterTemplateManager =
4647
ClusterTemplateManager.getInstance();
4748

0 commit comments

Comments
 (0)