Skip to content
Draft
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 @@ -816,11 +816,14 @@ void testConcurrentMixedOperations(boolean withMerge) {
snooze(10); // increase the chances of concurrency
commit(context);
}
if (threadId == 2 && withMerge) {
mergeIndexNow(schemaSetup, index);
}
});

// Merge the index outside the loop, as the merge will clear the pending writes flag and may cause conflicts
// on the index
if (withMerge) {
mergeIndexNow(schemaSetup, index);
}

// Verify operation counts
assertEquals(10, insertCount.get()); // 5 threads * 2 inserts
assertEquals(5, updateCount.get()); // 5 threads * 1 update (DELETE+INSERT in queue)
Expand Down
Loading