Skip to content

perf: Optimize the mark bitmap operation of AlignedTVList InsertTablet #16199

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 8 commits into from
Aug 27, 2025
Merged

perf: Optimize the mark bitmap operation of AlignedTVList InsertTablet #16199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6df13fd
perf: Optimize the mark bitmap operation of AlignedTVList InsertTablet
luoluoyuyu Aug 18, 2025
04fc347
add UT
luoluoyuyu Aug 19, 2025
d74692a
update
luoluoyuyu Aug 19, 2025
a94f045
fix
luoluoyuyu Aug 19, 2025
475f62a
fix
luoluoyuyu Aug 19, 2025
8f04621
update tsfile version
luoluoyuyu Aug 25, 2025
599b14b
Merge remote-tracking branch 'iotdb/master' into opt-insert
luoluoyuyu Aug 25, 2025
2e0e1a2
fix
luoluoyuyu Aug 25, 2025
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
10 changes: 6 additions & 4 deletions ...ode/src/main/java/org/apache/iotdb/db/pipe/resource/memory/InsertNodeMemoryEstimator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -650,10 +650,12 @@ private static long getBinarySize(final Binary[] binaries) {
return 0L;
}

return RamUsageEstimator.shallowSizeOf(binaries)
+ Arrays.stream(binaries)
.mapToLong(InsertNodeMemoryEstimator::sizeOfBinary)
.reduce(0L, Long::sum);
long size = 0L;
for (Binary binary : binaries) {
size += InsertNodeMemoryEstimator.sizeOfBinary(binary);
}

return size + RamUsageEstimator.shallowSizeOf(binaries);
}

public static long sizeOfValues(
Expand Down
156 changes: 111 additions & 45 deletions iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/datastructure/AlignedTVList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -786,17 +786,9 @@ public synchronized void putAlignedValues(
if (indices != null) {
indices.get(arrayIdx)[elementIdx + i] = rowCount;
}
for (int j = 0; j < values.size(); j++) {
if (value[j] == null
|| bitMaps != null && bitMaps[j] != null && bitMaps[j].isMarked(idx + i)
|| results != null
&& results[idx + i] != null
&& results[idx + i].code != TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
markNullValue(j, arrayIdx, elementIdx + i);
}
}
rowCount++;
}
markNullBitmapRange(value, bitMaps, results, idx, elementIdx, inputRemaining, arrayIdx);
break;
} else {
// the remaining inputs cannot fit the last array, fill the last array and create a new
Expand All @@ -807,23 +799,67 @@ public synchronized void putAlignedValues(
if (indices != null) {
indices.get(arrayIdx)[elementIdx + i] = rowCount;
}
for (int j = 0; j < values.size(); j++) {
if (value[j] == null
|| bitMaps != null && bitMaps[j] != null && bitMaps[j].isMarked(idx + i)
|| results != null
&& results[idx + i] != null
&& results[idx + i].code != TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
markNullValue(j, arrayIdx, elementIdx + i);
}
}
rowCount++;
}
markNullBitmapRange(value, bitMaps, results, idx, elementIdx, internalRemaining, arrayIdx);
idx += internalRemaining;
checkExpansion();
}
}
}

private void markNullBitmapRange(
Object[] values,
BitMap[] bitMaps,
TSStatus[] results,
int idx,
int elementIdx,
int len,
int arrayIndex) {

/* 1. Build result-level bitmap (1 = failure row) */
byte[] resultBitMap =
(results != null) ? buildResultBitMapBytes(results, idx, elementIdx, len) : null;

for (int j = 0; j < values.length; j++) {
/* Fast-path: column is entirely null */
if (values[j] == null) {
getBitMap(j, arrayIndex).markRange(elementIdx, len);
continue;
}

/* 2.mask the column bitmap */
if (bitMaps != null && bitMaps[j] != null) {
getBitMap(j, arrayIndex).merge(bitMaps[j], idx, elementIdx, len);
}

/* 3. Overlay result bitmap (failure rows) */
if (resultBitMap != null) {
markNullValue(j, arrayIndex, elementIdx, resultBitMap);
}
}
}

public static byte[] buildResultBitMapBytes(
TSStatus[] results, int idx, int elementIdx, int length) {
int start = elementIdx & 7;
int totalBits = start + length;
int size = (totalBits + 7) >> 3;
BitMap bitmap = new BitMap(size, new byte[size]);

if (results == null) {
return bitmap.getByteArray();
}

for (int i = 0; i < length; i++) {
if (results[idx + i] != null
&& results[idx + i].code != TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
bitmap.mark(start + i);
}
}
return bitmap.getByteArray();
}

private void arrayCopy(Object[] value, int idx, int arrayIndex, int elementIndex, int remaining) {
for (int i = 0; i < values.size(); i++) {
if (value[i] == null) {
Expand Down Expand Up @@ -871,7 +907,7 @@ private void arrayCopy(Object[] value, int idx, int arrayIndex, int elementIndex
}
}

private void markNullValue(int columnIndex, int arrayIndex, int elementIndex) {
private BitMap getBitMap(int columnIndex, int arrayIndex) {
// init BitMaps if doesn't have
if (bitMaps == null) {
List<List<BitMap>> localBitMaps = new ArrayList<>(dataTypes.size());
Expand All @@ -885,18 +921,31 @@ private void markNullValue(int columnIndex, int arrayIndex, int elementIndex) {
if (bitMaps.get(columnIndex) == null) {
List<BitMap> columnBitMaps = new ArrayList<>(values.get(columnIndex).size());
for (int i = 0; i < values.get(columnIndex).size(); i++) {
columnBitMaps.add(new BitMap(ARRAY_SIZE));
columnBitMaps.add(new BitMap(ARRAY_SIZE, new byte[ARRAY_SIZE]));
}
bitMaps.set(columnIndex, columnBitMaps);
}

// if the bitmap in arrayIndex is null, init the bitmap
if (bitMaps.get(columnIndex).get(arrayIndex) == null) {
bitMaps.get(columnIndex).set(arrayIndex, new BitMap(ARRAY_SIZE));
bitMaps.get(columnIndex).set(arrayIndex, new BitMap(ARRAY_SIZE, new byte[ARRAY_SIZE]));
}

return bitMaps.get(columnIndex).get(arrayIndex);
}

private void markNullValue(
int columnIndex, int arrayIndex, int elementIndex, byte[] resultBitMap) {
byte[] bitMap = getBitMap(columnIndex, arrayIndex).getByteArray();
int start = elementIndex >>> 3;
for (byte b : resultBitMap) {
bitMap[start++] |= b;
}
}

private void markNullValue(int columnIndex, int arrayIndex, int elementIndex) {
// mark the null value in the current bitmap
bitMaps.get(columnIndex).get(arrayIndex).mark(elementIndex);
getBitMap(columnIndex, arrayIndex).mark(elementIndex);
}

@Override
Expand Down Expand Up @@ -1451,33 +1500,50 @@ public BitMap getAllValueColDeletedMap() {
}

byte[] rowBitsArr = new byte[rowCount / Byte.SIZE + 1];
for (int row = 0; row < rowCount; row += Byte.SIZE) {
boolean isFirstColumn = true;
byte rowBits = 0x00;
for (int columnIndex = 0; columnIndex < values.size(); columnIndex++) {
List<BitMap> columnBitMaps = bitMaps.get(columnIndex);
byte columnBits;
if (values.get(columnIndex) == null) {
columnBits = (byte) 0xFF;
} else if (columnBitMaps == null || columnBitMaps.get(row / ARRAY_SIZE) == null) {
// row exists when any column value exists
rowBits = 0x00;
break;
} else {
columnBits =
columnBitMaps.get(row / ARRAY_SIZE).getByteArray()[(row % ARRAY_SIZE) / Byte.SIZE];
int bitsMapSize =
rowCount % ARRAY_SIZE == 0 ? rowCount / ARRAY_SIZE : rowCount / ARRAY_SIZE + 1;
boolean[] allNotNullArray = new boolean[bitsMapSize];
Arrays.fill(rowBitsArr, (byte) 0xFF);
for (int columnIndex = 0; columnIndex < values.size(); columnIndex++) {
List<BitMap> columnBitMaps = bitMaps.get(columnIndex);
if (columnBitMaps == null) {
Arrays.fill(rowBitsArr, (byte) 0x00);
break;
} else if (values.get(columnIndex) != null) {
int row = 0;
boolean isEnd = true;
for (int i = 0; i < bitsMapSize; i++) {
if (allNotNullArray[i]) {
row += ARRAY_SIZE;
continue;
}

BitMap bitMap = columnBitMaps.get(i);
int index = row / Byte.SIZE;
int size = ((Math.min((rowCount - row), ARRAY_SIZE)) + 7) >>> 3;
row += ARRAY_SIZE;

if (bitMap == null) {
Arrays.fill(rowBitsArr, index, index + size, (byte) 0x00);
allNotNullArray[i] = true;
continue;
}

byte bits = (byte) 0X00;
for (int j = 0; j < size; j++) {
rowBitsArr[index] &= bitMap.getByteArray()[j];
bits |= rowBitsArr[index++];
isEnd = false;
}

allNotNullArray[i] = bits == (byte) 0;
}
// set row to null when all column values are null
if (isFirstColumn) {
rowBits = columnBits;
isFirstColumn = false;
} else {
rowBits &= columnBits;

if (isEnd) {
break;
}
}
rowBitsArr[row / Byte.SIZE] = rowBits;
}

return new BitMap(rowCount, rowBitsArr);
}

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@
<thrift.version>0.14.1</thrift.version>
<xz.version>1.9</xz.version>
<zstd-jni.version>1.5.6-3</zstd-jni.version>
<tsfile.version>2.2.0-250813-SNAPSHOT</tsfile.version>
<tsfile.version>2.2.0-250825-SNAPSHOT</tsfile.version>
</properties>
<!--
if we claim dependencies in dependencyManagement, then we do not claim
Expand Down
Loading