Skip to content

Fixed the potential NPE of schema quota #17140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jt2594838 merged 1 commit into from
Feb 3, 2026
+4 −5
Merged

Fixed the potential NPE of schema quota #17140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions ...ore/confignode/src/main/java/org/apache/iotdb/confignode/manager/ClusterQuotaManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicLong;

Expand Down Expand Up @@ -111,8 +112,8 @@ public TSStatus setSpaceQuota(final TSetSpaceQuotaReq req) {
/** If the new quota is smaller than the quota already used, the setting fails. */
private boolean checkSpaceQuota(TSetSpaceQuotaReq req) {
for (String database : req.getDatabase()) {
if (quotaInfo.getSpaceQuotaLimit().containsKey(database)) {
TSpaceQuota spaceQuota = quotaInfo.getSpaceQuotaUsage().get(database);
TSpaceQuota spaceQuota = quotaInfo.getSpaceQuotaUsage().get(database);
if (Objects.nonNull(spaceQuota)) {
if (req.getSpaceLimit().getDeviceNum() != IoTDBConstant.UNLIMITED_VALUE
&& req.getSpaceLimit().getDeviceNum() != IoTDBConstant.DEFAULT_VALUE
&& spaceQuota.getDeviceNum() > req.getSpaceLimit().getDeviceNum()) {
Expand Down
4 changes: 1 addition & 3 deletions ...ore/confignode/src/main/java/org/apache/iotdb/confignode/persistence/quota/QuotaInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,7 @@ public TSStatus setSpaceQuota(SetSpaceQuotaPlan setSpaceQuotaPlan) {
spaceQuota.setDiskSize(IoTDBConstant.DEFAULT_VALUE);
}
}
if (!spaceQuotaUsage.containsKey(database)) {
spaceQuotaUsage.put(database, new TSpaceQuota());
}
spaceQuotaUsage.computeIfAbsent(database, k -> new TSpaceQuota());
spaceQuotaLimit.put(database, spaceQuota);
}
return RpcUtils.getStatus(TSStatusCode.SUCCESS_STATUS);
Expand Down
Loading