Skip to content

Correct the memroy calculation of BinaryColumnBuilder #529

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 1 commit into from
Jul 3, 2025
Merged

Correct the memroy calculation of BinaryColumnBuilder #529

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: 3 additions & 0 deletions java/tsfile/src/main/java/org/apache/tsfile/read/common/block/column/BinaryColumn.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import static org.apache.tsfile.read.common.block.column.ColumnUtil.checkArrayRange;
import static org.apache.tsfile.read.common.block.column.ColumnUtil.checkReadablePosition;
import static org.apache.tsfile.read.common.block.column.ColumnUtil.checkValidRegion;
import static org.apache.tsfile.utils.RamUsageEstimator.NUM_BYTES_OBJECT_REF;
import static org.apache.tsfile.utils.RamUsageEstimator.sizeOf;
import static org.apache.tsfile.utils.RamUsageEstimator.sizeOfBooleanArray;

Expand All @@ -40,6 +41,8 @@ public class BinaryColumn implements Column {
private static final int INSTANCE_SIZE =
(int) RamUsageEstimator.shallowSizeOfInstance(BinaryColumn.class);

public static final int SHALLOW_SIZE_IN_BYTES_PER_POSITION = NUM_BYTES_OBJECT_REF + Byte.BYTES;

private final int arrayOffset;
private int positionCount;
private boolean[] valueIsNull;
Expand Down
8 changes: 8 additions & 0 deletions .../tsfile/src/main/java/org/apache/tsfile/read/common/block/column/BinaryColumnBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,11 @@ public ColumnBuilder writeBinary(Binary value) {

hasNonNullValue = true;
positionCount++;
if (columnBuilderStatus != null) {
columnBuilderStatus.addBytes(
BinaryColumn.SHALLOW_SIZE_IN_BYTES_PER_POSITION
+ (value == null ? 0 : (int) value.ramBytesUsed()));
}
return this;
}

Expand Down Expand Up @@ -110,6 +115,9 @@ public ColumnBuilder appendNull() {

hasNullValue = true;
positionCount++;
if (columnBuilderStatus != null) {
columnBuilderStatus.addBytes(BinaryColumn.SHALLOW_SIZE_IN_BYTES_PER_POSITION);
}
return this;
}

Expand Down