Apache Solr open-source search software
SOLR-15676: extend PeerSyncTest.handleVersionsWithRangesTests() to consider duplicates (#327)
Christine Poerschkeda16d9f4bed7
diff --git a/solr/core/src/java/org/apache/solr/update/PeerSync.java b/solr/core/src/java/org/apache/solr/update/PeerSync.javaindex 270b10dedd4..ee75d98e595 100644--- a/solr/core/src/java/org/apache/solr/update/PeerSync.java+++ b/solr/core/src/java/org/apache/solr/update/PeerSync.java@@ -717,6 +717,9 @@ public class PeerSync implements SolrMetricProducer {}@VisibleForTesting+ /**+ * Implementation assumes the passed in lists are sorted and contain no duplicates.+ */static MissedUpdatesRequest handleVersionsWithRanges(List<Long> otherVersions, boolean completeList,List<Long> ourUpdates, long ourLowThreshold) {// we may endup asking for updates for too many versions, causing 2MB post payload limit. Construct a range ofdiff --git a/solr/core/src/test/org/apache/solr/update/PeerSyncTest.java b/solr/core/src/test/org/apache/solr/update/PeerSyncTest.javaindex 3c3cf64396b..4d9b74447fa 100644--- a/solr/core/src/test/org/apache/solr/update/PeerSyncTest.java+++ b/solr/core/src/test/org/apache/solr/update/PeerSyncTest.java@@ -364,7 +364,8 @@ public class PeerSyncTest extends BaseDistributedSearchTestCase {testHandleVersionsWithRangesMissingOneOfTwo(false /* highestMissing */);testHandleVersionsWithRangesMissingOneOfTwo(true /* highestMissing */);testHandleVersionsWithRangesMissingMiddleOfThree();- testHandleVersionsWithRangesMissingOneRange();+ testHandleVersionsWithRangesMissingOneRange(false /* duplicateMiddle */);+ testHandleVersionsWithRangesMissingOneRange(true /* duplicateMiddle */);testHandleVersionsWithRangesMissingTwoRanges();}@@ -466,16 +467,19 @@ public class PeerSyncTest extends BaseDistributedSearchTestCase {}}- private static void testHandleVersionsWithRangesMissingOneRange() throws Exception {+ private static void testHandleVersionsWithRangesMissingOneRange(boolean duplicateMiddle) throws Exception {for (boolean completeList : new boolean[] { false , true }) {- List<Long> otherVersions = List.of(9L, 8L, 7L, 6L, 5L, 4L, 3L, 2L, 1L);+ List<Long> otherVersions = duplicateMiddle+ ? List.of(9L, 8L, 7L, 6L, 5L, 5L, 4L, 3L, 2L, 1L)+ : List.of(9L, 8L, 7L, 6L, 5L, 4L, 3L, 2L, 1L);LinkedList<Long> ourUpdates = new LinkedList<>(List.of(9L, 8L, 7L, 3L, 2L, 1L));+ long expectedTotalRequestedUpdates = duplicateMiddle ? 4L : 3L;{long ourLowThreshold = ourUpdates.getLast(); // lowest in descending listMissedUpdatesRequest mur = PeerSync.MissedUpdatesFinderBase.handleVersionsWithRanges(otherVersions, completeList, ourUpdates, ourLowThreshold);// request all we are missing- assertEquals(3L, mur.totalRequestedUpdates);+ assertEquals(expectedTotalRequestedUpdates, mur.totalRequestedUpdates);assertEquals("4...6", mur.versionsAndRanges);}{@@ -484,7 +488,7 @@ public class PeerSyncTest extends BaseDistributedSearchTestCase {otherVersions, completeList, ourUpdates, ourLowThreshold);if (completeList) {// request all we are missing since we want a complete list- assertEquals(3L, mur.totalRequestedUpdates);+ assertEquals(expectedTotalRequestedUpdates, mur.totalRequestedUpdates);assertEquals("4...6", mur.versionsAndRanges);} else {// request no updates because ???@@ -498,7 +502,7 @@ public class PeerSyncTest extends BaseDistributedSearchTestCase {otherVersions, completeList, ourUpdates, ourLowThreshold);if (completeList) {// request all we are missing since we want a complete list- assertEquals(3L, mur.totalRequestedUpdates);+ assertEquals(expectedTotalRequestedUpdates, mur.totalRequestedUpdates);assertEquals("4...6", mur.versionsAndRanges);} else {// request no updates because ???@@ -512,7 +516,7 @@ public class PeerSyncTest extends BaseDistributedSearchTestCase {otherVersions, completeList, ourUpdates, ourLowThreshold);if (completeList) {// request all we are missing since we want a complete list- assertEquals(3L, mur.totalRequestedUpdates);+ assertEquals(expectedTotalRequestedUpdates, mur.totalRequestedUpdates);assertEquals("4...6", mur.versionsAndRanges);} else {// request no updates since we don't need a complete list ...