Skip to content
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,8 @@ public void testCompactBulkMergeClone() throws Exception {

Wait.waitFor(() -> !getLocksInfo().heldLocks.isEmpty());
var lockInfo = getLocksInfo();
assertEquals(lockInfo.heldLocks.keySet(), lockInfo.findId(LockRange.of(null, "b5")));
// For compactions the range (null, b5] will be widened to the table range (null,c]
assertEquals(lockInfo.heldLocks.keySet(), lockInfo.findId(LockRange.of(null, "c")));

// this bulk will overlap the compaction range, but should not get stuck because both are read
// locks
Expand Down Expand Up @@ -171,7 +172,7 @@ public void testCompactBulkMergeClone() throws Exception {

// remove the fate op that only has a lock on the namespace
lockInfo.heldLocks.values().removeIf(idList -> idList.equals(List.of("R:+default")));
assertEquals(lockInfo.heldLocks.keySet(), lockInfo.findId(LockRange.of(null, "b5")));
assertEquals(lockInfo.heldLocks.keySet(), lockInfo.findId(LockRange.of(null, "c")));
assertEquals(lockInfo.waitingLocks.keySet(),
lockInfo.findId(LockRange.of("b", "d"), LockRange.of(null, "d"), LockRange.infinite()));

Expand Down