PackIndexMerger: remove rawIterator() method

It was a workaround to test the internal iterators. Now we use
MidxIterators that have their own tests.

Change-Id: Ie917a8253c2dbbf613c857c2427b4da16a6a6964

Author: ifradeo

org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/midx/PackIndexMergerTest.java

@@ -27,7 +27,7 @@
 public class PackIndexMergerTest {
 
 	@Test
-	public void rawIterator_noDuplicates() {
+	public void bySha1Iterator_noDuplicates() {
 		PackIndex idxOne = indexOf(
 				oidOffset("0000000000000000000000000000000000000001", 500),
 				oidOffset("0000000000000000000000000000000000000005", 12),
@@ -45,7 +45,7 @@ public void rawIterator_noDuplicates() {
 		assertEquals(9, merger.getUniqueObjectCount());
 		assertEquals(3, merger.getPackCount());
 		assertFalse(merger.needsLargeOffsetsChunk());
-		Iterator<MutableEntry> it = merger.rawIterator();
+		Iterator<MutableEntry> it = merger.bySha1Iterator();
 		assertNextEntry(it, "0000000000000000000000000000000000000001", 0, 500);
 		assertNextEntry(it, "0000000000000000000000000000000000000002", 1, 501);
 		assertNextEntry(it, "0000000000000000000000000000000000000003", 1, 13);
@@ -62,79 +62,18 @@ public void rawIterator_noDuplicates() {
 	}
 
 	@Test
-	public void rawIterator_noDuplicates_honorPackOrder() {
+	public void bySha1Iterator_withDuplicates() {
 		PackIndex idxOne = indexOf(
 				oidOffset("0000000000000000000000000000000000000001", 500),
-				oidOffset("0000000000000000000000000000000000000005", 12),
 				oidOffset("0000000000000000000000000000000000000010", 1500));
 		PackIndex idxTwo = indexOf(
 				oidOffset("0000000000000000000000000000000000000002", 501),
 				oidOffset("0000000000000000000000000000000000000003", 13),
+				oidOffset("0000000000000000000000000000000000000005", 800),
 				oidOffset("0000000000000000000000000000000000000015", 1501));
 		PackIndex idxThree = indexOf(
 				oidOffset("0000000000000000000000000000000000000004", 502),
-				oidOffset("0000000000000000000000000000000000000007", 14),
-				oidOffset("0000000000000000000000000000000000000012", 1502));
-        PackIndexMerger merger = new PackIndexMerger(
-				orderedMapOf("p3", idxThree, "p2", idxTwo, "p1", idxOne));
-		assertEquals(9, merger.getUniqueObjectCount());
-		assertEquals(3, merger.getPackCount());
-		assertFalse(merger.needsLargeOffsetsChunk());
-		Iterator<MutableEntry> it = merger.rawIterator();
-		assertNextEntry(it, "0000000000000000000000000000000000000001", 2, 500);
-		assertNextEntry(it, "0000000000000000000000000000000000000002", 1, 501);
-		assertNextEntry(it, "0000000000000000000000000000000000000003", 1, 13);
-		assertNextEntry(it, "0000000000000000000000000000000000000004", 0, 502);
-		assertNextEntry(it, "0000000000000000000000000000000000000005", 2, 12);
-		assertNextEntry(it, "0000000000000000000000000000000000000007", 0, 14);
-		assertNextEntry(it, "0000000000000000000000000000000000000010", 2,
-				1500);
-		assertNextEntry(it, "0000000000000000000000000000000000000012", 0,
-				1502);
-		assertNextEntry(it, "0000000000000000000000000000000000000015", 1,
-				1501);
-		assertFalse(it.hasNext());
-	}
-
-	@Test
-	public void rawIterator_allDuplicates() {
-		PackIndex idxOne = indexOf(
-				oidOffset("0000000000000000000000000000000000000001", 500),
 				oidOffset("0000000000000000000000000000000000000005", 12),
-				oidOffset("0000000000000000000000000000000000000010", 1500));
-		PackIndexMerger merger = new PackIndexMerger(
-				orderedMapOf("p1", idxOne, "p2", idxOne, "p3", idxOne));
-		assertEquals(3, merger.getUniqueObjectCount());
-		assertEquals(3, merger.getPackCount());
-		assertFalse(merger.needsLargeOffsetsChunk());
-		Iterator<MutableEntry> it = merger.rawIterator();
-		assertNextEntry(it, "0000000000000000000000000000000000000001", 0, 500);
-		assertNextEntry(it, "0000000000000000000000000000000000000001", 1, 500);
-		assertNextEntry(it, "0000000000000000000000000000000000000001", 2, 500);
-		assertNextEntry(it, "0000000000000000000000000000000000000005", 0, 12);
-		assertNextEntry(it, "0000000000000000000000000000000000000005", 1, 12);
-		assertNextEntry(it, "0000000000000000000000000000000000000005", 2, 12);
-		assertNextEntry(it, "0000000000000000000000000000000000000010", 0,
-				1500);
-		assertNextEntry(it, "0000000000000000000000000000000000000010", 1,
-				1500);
-		assertNextEntry(it, "0000000000000000000000000000000000000010", 2,
-				1500);
-		assertFalse(it.hasNext());
-	}
-
-	@Test
-	public void bySha1Iterator_noDuplicates() {
-		PackIndex idxOne = indexOf(
-				oidOffset("0000000000000000000000000000000000000001", 500),
-				oidOffset("0000000000000000000000000000000000000005", 12),
-				oidOffset("0000000000000000000000000000000000000010", 1500));
-		PackIndex idxTwo = indexOf(
-				oidOffset("0000000000000000000000000000000000000002", 501),
-				oidOffset("0000000000000000000000000000000000000003", 13),
-				oidOffset("0000000000000000000000000000000000000015", 1501));
-		PackIndex idxThree = indexOf(
-				oidOffset("0000000000000000000000000000000000000004", 502),
 				oidOffset("0000000000000000000000000000000000000007", 14),
 				oidOffset("0000000000000000000000000000000000000012", 1502));
 		PackIndexMerger merger = new PackIndexMerger(
@@ -147,7 +86,7 @@ public void bySha1Iterator_noDuplicates() {
 		assertNextEntry(it, "0000000000000000000000000000000000000002", 1, 501);
 		assertNextEntry(it, "0000000000000000000000000000000000000003", 1, 13);
 		assertNextEntry(it, "0000000000000000000000000000000000000004", 2, 502);
-		assertNextEntry(it, "0000000000000000000000000000000000000005", 0, 12);
+		assertNextEntry(it, "0000000000000000000000000000000000000005", 1, 800);
 		assertNextEntry(it, "0000000000000000000000000000000000000007", 2, 14);
 		assertNextEntry(it, "0000000000000000000000000000000000000010", 0,
 				1500);
@@ -193,7 +132,7 @@ public void bySha1Iterator_differentIndexSizes() {
 		assertEquals(6, merger.getUniqueObjectCount());
 		assertEquals(3, merger.getPackCount());
 		assertFalse(merger.needsLargeOffsetsChunk());
-		Iterator<MutableEntry> it = merger.rawIterator();
+		Iterator<MutableEntry> it = merger.bySha1Iterator();
 		assertNextEntry(it, "0000000000000000000000000000000000000002", 1, 500);
 		assertNextEntry(it, "0000000000000000000000000000000000000003", 1, 12);
 		assertNextEntry(it, "0000000000000000000000000000000000000004", 2, 500);

org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/PackIndexMerger.java

@@ -156,19 +156,10 @@ int getPackCount() {
 	 * @return an iterator in sha1 order without duplicates.
 	 */
 	MidxIterator bySha1Iterator() {
-		return MidxIterators.dedup(rawIterator());
-	}
-
-	/**
-	 * For testing. Iterate all entries, not skipping duplicates (stable order)
-	 *
-	 * @return an iterator of all objects in sha1 order, including duplicates.
-	 */
-	MidxIterator rawIterator() {
 		List<MidxIterator> list = packs.entrySet().stream()
 				.map(e -> MidxIterators.fromPackIndexIterator(e.getKey(),
 						e.getValue().iterator()))
 				.toList();
-		return MidxIterators.join(list);
+		return MidxIterators.dedup(MidxIterators.join(list));
 	}
 }