Skip to content

Commit 7cb6b56

Browse files
committed
Revert "Fix Test"
This reverts commit 60c0815.
1 parent 7059cd3 commit 7cb6b56

1 file changed

Lines changed: 2 additions & 20 deletions

File tree

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/BitMapUtils.java

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ public static BitMap[] compactBitMaps(final BitMap[] bitMaps, final int rowCount
3434

3535
boolean hasMarkedBitMap = false;
3636
for (int i = 0; i < bitMaps.length; ++i) {
37-
if (Objects.nonNull(bitMaps[i]) && isAllUnmarked(bitMaps[i], rowCount)) {
37+
if (Objects.nonNull(bitMaps[i])
38+
&& bitMaps[i].isAllUnmarked(Math.min(rowCount, bitMaps[i].getSize()))) {
3839
bitMaps[i] = null;
3940
}
4041
if (Objects.nonNull(bitMaps[i])) {
@@ -43,23 +44,4 @@ public static BitMap[] compactBitMaps(final BitMap[] bitMaps, final int rowCount
4344
}
4445
return hasMarkedBitMap ? bitMaps : null;
4546
}
46-
47-
private static boolean isAllUnmarked(final BitMap bitMap, final int rowCount) {
48-
final int checkedSize = Math.min(rowCount, bitMap.getSize());
49-
if (checkedSize <= 0) {
50-
return true;
51-
}
52-
53-
final byte[] bytes = bitMap.getByteArray();
54-
final int fullByteCount = checkedSize / Byte.SIZE;
55-
for (int i = 0; i < fullByteCount; ++i) {
56-
if (bytes[i] != 0) {
57-
return false;
58-
}
59-
}
60-
61-
final int remainingBitCount = checkedSize % Byte.SIZE;
62-
return remainingBitCount == 0
63-
|| (bytes[fullByteCount] & (0xFF << (Byte.SIZE - remainingBitCount))) == 0;
64-
}
6547
}

0 commit comments

Comments
 (0)