Skip to content

[To dev/1.3] Fixed the calculation error of schema cache (#16818) #16822

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
merged 1 commit into from
Nov 27, 2025
Merged

[To dev/1.3] Fixed the calculation error of schema cache (#16818) #16822

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
3 changes: 1 addition & 2 deletions .../main/java/org/apache/iotdb/db/queryengine/plan/analyze/cache/schema/DeviceLastCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,7 @@ int initOrInvalidate(final String[] measurements, final boolean isInvalidate) {
}
if (Objects.isNull(tvPair)) {
diff.addAndGet(
(int) RamUsageEstimator.sizeOf(measurement)
+ (int) RamUsageEstimator.HASHTABLE_RAM_BYTES_PER_ENTRY);
(int) RamUsageEstimator.sizeOf(measurement) + getTVPairEntrySize(newPair));
return newPair;
}
return tvPair;
Expand Down
8 changes: 6 additions & 2 deletions ...in/java/org/apache/iotdb/db/queryengine/plan/analyze/cache/schema/DeviceNormalSchema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,10 @@ private int putEntry(
final SchemaCacheEntry putEntry = new SchemaCacheEntry(schema, tagMap);
final SchemaCacheEntry cachedEntry = measurementMap.put(measurement, putEntry);
return Objects.isNull(cachedEntry)
? (int) (RamUsageEstimator.sizeOf(measurement) + SchemaCacheEntry.estimateSize(putEntry))
? (int)
(RamUsageEstimator.sizeOf(measurement)
+ SchemaCacheEntry.estimateSize(putEntry)
+ RamUsageEstimator.HASHTABLE_RAM_BYTES_PER_ENTRY)
: SchemaCacheEntry.estimateSize(putEntry) - SchemaCacheEntry.estimateSize(cachedEntry);
}

Expand All @@ -101,7 +104,8 @@ public int estimateSize() {
entry ->
Math.toIntExact(
RamUsageEstimator.sizeOf(entry.getKey())
+ SchemaCacheEntry.estimateSize(entry.getValue())))
+ SchemaCacheEntry.estimateSize(entry.getValue())
+ RamUsageEstimator.HASHTABLE_RAM_BYTES_PER_ENTRY))
.reduce(0, Integer::sum);
}
}
Loading