Skip to content

Fix binary allocator test & querying type-altered chunks in memory may affect the result of flush #17105

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
JackieTien97 merged 4 commits into from
Jan 28, 2026
+19 −11
Merged

Fix binary allocator test & querying type-altered chunks in memory may affect the result of flush #17105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a73ac90
Fix that the last binary in BinaryAllocator may not be evicted
jt2594838 Jan 28, 2026
ff454dd
Fix that querying type-altered chunks in memory may affect the result…
jt2594838 Jan 28, 2026
5e0297a
Fix SchemaUtilsTest ut by changing unmodifiable singletonList to Arra…
JackieTien97 Jan 28, 2026
7be2a64
Merge branch 'fix_binary_allocator_test' of https://github.com/apache…
JackieTien97 Jan 28, 2026
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: 4 additions & 1 deletion iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/SchemaUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,9 +406,10 @@ public static void rewriteAlignedChunkMetadataStatistics(
Statistics<?> statistics = Statistics.getStatsByType(targetDataType);
statistics = getNewStatistics(valueChunkMetadata, targetDataType, statistics);

ChunkMetadata newChunkMetadata = (ChunkMetadata) valueChunkMetadata;
ChunkMetadata newChunkMetadata = new ChunkMetadata((ChunkMetadata) valueChunkMetadata);
newChunkMetadata.setTsDataType(targetDataType);
newChunkMetadata.setStatistics(statistics);
alignedChunkMetadata.getValueChunkMetadataList().set(index, newChunkMetadata);
} else {
alignedChunkMetadata.getValueChunkMetadataList().set(index, null);
}
Expand All @@ -421,8 +422,10 @@ public static void rewriteNonAlignedChunkMetadataStatistics(
Statistics<?> statistics = Statistics.getStatsByType(targetDataType);
statistics = getNewStatistics(chunkMetadata, targetDataType, statistics);

chunkMetadata = new ChunkMetadata(chunkMetadata);
chunkMetadata.setTsDataType(targetDataType);
chunkMetadata.setStatistics(statistics);
chunkMetadataList.set(index, chunkMetadata);
} else {
chunkMetadataList.set(index, null);
}
Expand Down
18 changes: 9 additions & 9 deletions iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/SchemaUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,15 +96,15 @@ public void rewriteAlignedChunkMetadataStatistics() {
|| tsDataType == TSDataType.OBJECT) {
continue;
}
List<IChunkMetadata> valueChunkMetadatas =
Collections.singletonList(
new ChunkMetadata(
"s0",
tsDataType,
TSEncoding.RLE,
CompressionType.LZ4,
0,
Statistics.getStatsByType(tsDataType)));
List<IChunkMetadata> valueChunkMetadatas = new ArrayList<>(1);
valueChunkMetadatas.add(
new ChunkMetadata(
"s0",
tsDataType,
TSEncoding.RLE,
CompressionType.LZ4,
0,
Statistics.getStatsByType(tsDataType)));
AlignedChunkMetadata alignedChunkMetadata =
new AlignedChunkMetadata(new ChunkMetadata(), valueChunkMetadatas);
try {
Expand Down
7 changes: 6 additions & 1 deletion ...core/node-commons/src/main/java/org/apache/iotdb/commons/binaryallocator/arena/Arena.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,12 @@ private void updateSample() {

private long resize() {
average.update();
int needRemain = (int) Math.ceil(average.average()) - getActiveSize();
float averageActiveSize = average.average();
if (averageActiveSize < 0.0001f) {
// avoid keeping the last binary forever
averageActiveSize = 0.0f;
}
int needRemain = (int) Math.ceil(averageActiveSize) - getActiveSize();
return evict(getQueueSize() - needRemain);
}

Expand Down