From e6043c2011bee7337de24f52200ee22ce34ef56a Mon Sep 17 00:00:00 2001 From: Caideyipi <87789683+Caideyipi@users.noreply.github.com> Date: Fri, 24 Apr 2026 11:06:11 +0800 Subject: [PATCH 1/2] fix --- .../iotdb/db/schemaengine/SchemaEngine.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/SchemaEngine.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/SchemaEngine.java index dafcaa0d3b0bb..ddd90d29b40eb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/SchemaEngine.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/SchemaEngine.java @@ -25,6 +25,7 @@ import org.apache.iotdb.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.consensus.SchemaRegionId; import org.apache.iotdb.commons.exception.MetadataException; +import org.apache.iotdb.commons.pipe.config.constant.SystemConstant; import org.apache.iotdb.commons.schema.table.TsTable; import org.apache.iotdb.commons.utils.FileUtils; import org.apache.iotdb.commons.utils.PathUtils; @@ -387,15 +388,21 @@ public Map countTimeSeriesNumBySchemaRegion(final List s .filter( entry -> schemaIds.contains(entry.getKey().getId()) - && SchemaRegionConsensusImpl.getInstance().isLeader(entry.getKey())) + && SchemaRegionConsensusImpl.getInstance().isLeader(entry.getKey()) + && !entry.getValue().getDatabaseFullPath().equals(SystemConstant.AUDIT_DATABASE) + && !entry + .getValue() + .getDatabaseFullPath() + .equals(SystemConstant.SYSTEM_DATABASE)) .forEach( entry -> - timeSeriesNum.put(entry.getKey().getId(), getTimeSeriesNumber(entry.getValue()))); + timeSeriesNum.put( + entry.getKey().getId(), getTimeSeriesNumber4Quota(entry.getValue()))); return timeSeriesNum; } // not including view number - private long getTimeSeriesNumber(ISchemaRegion schemaRegion) { + private long getTimeSeriesNumber4Quota(final ISchemaRegion schemaRegion) { return schemaRegion.getSchemaRegionStatistics().getSeriesNumber(false) + schemaRegion.getSchemaRegionStatistics().getTable2DevicesNumMap().entrySet().stream() .map( @@ -465,7 +472,7 @@ public void updateAndFillSchemaCountMap( tmp.put( consensusGroupId.getId(), Optional.ofNullable(schemaRegionMap.get(consensusGroupId)) - .map(this::getTimeSeriesNumber) + .map(this::getTimeSeriesNumber4Quota) .orElse(0L))); } } From b4d3d912baccc2973a83c48ec714f091d068cd3b Mon Sep 17 00:00:00 2001 From: Caideyipi <87789683+Caideyipi@users.noreply.github.com> Date: Fri, 24 Apr 2026 11:20:00 +0800 Subject: [PATCH 2/2] fix --- .../apache/iotdb/db/schemaengine/SchemaEngine.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/SchemaEngine.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/SchemaEngine.java index ddd90d29b40eb..ede0ba13a8515 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/SchemaEngine.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/SchemaEngine.java @@ -389,11 +389,10 @@ public Map countTimeSeriesNumBySchemaRegion(final List s entry -> schemaIds.contains(entry.getKey().getId()) && SchemaRegionConsensusImpl.getInstance().isLeader(entry.getKey()) - && !entry.getValue().getDatabaseFullPath().equals(SystemConstant.AUDIT_DATABASE) && !entry .getValue() .getDatabaseFullPath() - .equals(SystemConstant.SYSTEM_DATABASE)) + .equals(SystemConstant.AUDIT_DATABASE)) .forEach( entry -> timeSeriesNum.put( @@ -466,7 +465,14 @@ public void updateAndFillSchemaCountMap( SchemaRegionConsensusImpl.getInstance().getAllConsensusGroupIds().stream() .filter( consensusGroupId -> - SchemaRegionConsensusImpl.getInstance().isLeader(consensusGroupId)) + SchemaRegionConsensusImpl.getInstance().isLeader(consensusGroupId) + && Optional.ofNullable(schemaRegionMap.get((SchemaRegionId) consensusGroupId)) + .map( + schemaRegion -> + !schemaRegion + .getDatabaseFullPath() + .equals(SystemConstant.AUDIT_DATABASE)) + .orElse(false)) .forEach( consensusGroupId -> tmp.put(