Fix IT/UT
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/rescon/MemSchemaEngineStatistics.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/rescon/MemSchemaEngineStatistics.java index 943981c..ce2c5d5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/rescon/MemSchemaEngineStatistics.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/rescon/MemSchemaEngineStatistics.java
@@ -37,7 +37,11 @@ private static final Logger logger = LoggerFactory.getLogger(MemSchemaEngineStatistics.class); // Total size of schema region - private final IMemoryBlock memoryBlock; + private final IMemoryBlock memoryBlock = + IoTDBDescriptor.getInstance() + .getMemoryConfig() + .getSchemaRegionMemoryManager() + .forceAllocate("SchemaRegion", MemoryBlockType.DYNAMIC); private final ClusterTemplateManager clusterTemplateManager = ClusterTemplateManager.getInstance(); @@ -53,14 +57,6 @@ // In pbtree mode, we only need related log for debug. protected volatile boolean needLog = true; - public MemSchemaEngineStatistics() { - memoryBlock = - IoTDBDescriptor.getInstance() - .getMemoryConfig() - .getSchemaRegionMemoryManager() - .forceAllocate("SchemaRegion", MemoryBlockType.DYNAMIC); - } - @Override public boolean isAllowToCreateNewSeries() { return allowToCreateNewSeries;
diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/memory/MemoryManager.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/memory/MemoryManager.java index 2d5b08d..54ed568 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/memory/MemoryManager.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/memory/MemoryManager.java
@@ -253,7 +253,7 @@ LOGGER.warn("register memory block already exists: {}", block); return block; } else { - if (block.getMemoryBlockType().equals(MemoryBlockType.STATIC)) { + if (type.equals(MemoryBlockType.STATIC)) { staticAllocatedMemorySizeInBytes += sizeInBytes; } allocatedMemorySizeInBytes += sizeInBytes;