Skip to content
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

Jump to bottom

Fix NPE when filtering read entries #10704

Merged
merged 2 commits into from
May 26, 2021
Merged

Fix NPE when filtering read entries #10704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
730f145
Fix NPE when filtering read entries
315157973 May 25, 2021
775513c
fix unit test
315157973 May 26, 2021
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
4 changes: 2 additions & 2 deletions managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedCursorImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1999,8 +1999,8 @@ List<Entry> filterReadEntries(List<Entry> entries) {
log.debug("[{}] [{}] Filtering entries {} - alreadyDeleted: {}", ledger.getName(), name, entriesRange,
individualDeletedMessages);
}

if (individualDeletedMessages.isEmpty() || !entriesRange.isConnected(individualDeletedMessages.span())) {
if (individualDeletedMessages.isEmpty() || individualDeletedMessages.span() == null ||
!entriesRange.isConnected(individualDeletedMessages.span())) {
// There are no individually deleted messages in this entry list, no need to perform filtering
if (log.isDebugEnabled()) {
log.debug("[{}] [{}] No filtering needed for entries {}", ledger.getName(), name, entriesRange);
Expand Down
3 changes: 3 additions & 0 deletions ...c/main/java/org/apache/pulsar/common/util/collections/ConcurrentOpenLongPairRangeSet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,9 @@ public void clear() {

@Override
public Range<T> span() {
if (rangeBitSetMap.size() == 0) {
return null;
}
Entry<Long, BitSet> firstSet = rangeBitSetMap.firstEntry();
Entry<Long, BitSet> lastSet = rangeBitSetMap.lastEntry();
int first = firstSet.getValue().nextSetBit(0);
Expand Down
6 changes: 6 additions & 0 deletions ...st/java/org/apache/pulsar/common/util/collections/ConcurrentOpenLongPairRangeSetTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,12 @@ public void testAddCompareCompareWithGuava() {
}
}

@Test
public void testNPE() {
ConcurrentOpenLongPairRangeSet<LongPair> set = new ConcurrentOpenLongPairRangeSet<>(consumer);
assertNull(set.span());
}

@Test
public void testDeleteCompareWithGuava() {

Expand Down