nastra commented on code in PR #7718:
URL: https://github.com/apache/iceberg/pull/7718#discussion_r1226431900
##########
core/src/test/java/org/apache/iceberg/util/TestSnapshotUtil.java:
##########
@@ -101,54 +116,72 @@ public void cleanupTables() {
@Test
public void isParentAncestorOf() {
- Assert.assertTrue(SnapshotUtil.isParentAncestorOf(table, snapshotBId,
snapshotAId));
- Assert.assertFalse(SnapshotUtil.isParentAncestorOf(table, snapshotCId,
snapshotBId));
+ Assert.assertTrue(SnapshotUtil.isParentAncestorOf(table, snapshotMain1Id,
snapshotBaseId));
+ Assert.assertFalse(SnapshotUtil.isParentAncestorOf(table,
snapshotBranchId, snapshotMain1Id));
+ Assert.assertTrue(SnapshotUtil.isParentAncestorOf(table, snapshotFork2Id,
snapshotFork0Id));
}
@Test
public void isAncestorOf() {
- Assert.assertTrue(SnapshotUtil.isAncestorOf(table, snapshotBId,
snapshotAId));
- Assert.assertFalse(SnapshotUtil.isAncestorOf(table, snapshotCId,
snapshotBId));
+ Assert.assertTrue(SnapshotUtil.isAncestorOf(table, snapshotMain1Id,
snapshotBaseId));
+ Assert.assertFalse(SnapshotUtil.isAncestorOf(table, snapshotBranchId,
snapshotMain1Id));
+ Assert.assertFalse(SnapshotUtil.isAncestorOf(table, snapshotFork2Id,
snapshotFork0Id));
- Assert.assertTrue(SnapshotUtil.isAncestorOf(table, snapshotBId));
- Assert.assertFalse(SnapshotUtil.isAncestorOf(table, snapshotCId));
+ Assert.assertTrue(SnapshotUtil.isAncestorOf(table, snapshotMain1Id));
+ Assert.assertFalse(SnapshotUtil.isAncestorOf(table, snapshotBranchId));
}
@Test
public void currentAncestors() {
Iterable<Snapshot> snapshots = SnapshotUtil.currentAncestors(table);
- expectedSnapshots(new long[] {snapshotDId, snapshotBId, snapshotAId},
snapshots);
+ expectedSnapshots(new long[] {snapshotMain2Id, snapshotMain1Id,
snapshotBaseId}, snapshots);
List<Long> snapshotList = SnapshotUtil.currentAncestorIds(table);
Assert.assertArrayEquals(
- new Long[] {snapshotDId, snapshotBId, snapshotAId},
snapshotList.toArray(new Long[0]));
+ new Long[] {snapshotMain2Id, snapshotMain1Id, snapshotBaseId},
+ snapshotList.toArray(new Long[0]));
}
@Test
public void oldestAncestor() {
Snapshot snapshot = SnapshotUtil.oldestAncestor(table);
- Assert.assertEquals(snapshotAId, snapshot.snapshotId());
+ Assert.assertEquals(snapshotBaseId, snapshot.snapshotId());
- snapshot = SnapshotUtil.oldestAncestorOf(table, snapshotDId);
- Assert.assertEquals(snapshotAId, snapshot.snapshotId());
+ snapshot = SnapshotUtil.oldestAncestorOf(table, snapshotMain2Id);
+ Assert.assertEquals(snapshotBaseId, snapshot.snapshotId());
- snapshot = SnapshotUtil.oldestAncestorAfter(table, snapshotATimestamp + 1);
- Assert.assertEquals(snapshotBId, snapshot.snapshotId());
+ snapshot = SnapshotUtil.oldestAncestorAfter(table, snapshotBaseTimestamp +
1);
+ Assert.assertEquals(snapshotMain1Id, snapshot.snapshotId());
}
@Test
public void snapshotsBetween() {
List<Long> snapshotIdsBetween =
- SnapshotUtil.snapshotIdsBetween(table, snapshotAId, snapshotDId);
+ SnapshotUtil.snapshotIdsBetween(table, snapshotBaseId,
snapshotMain2Id);
Assert.assertArrayEquals(
- new Long[] {snapshotDId, snapshotBId}, snapshotIdsBetween.toArray(new
Long[0]));
+ new Long[] {snapshotMain2Id, snapshotMain1Id},
snapshotIdsBetween.toArray(new Long[0]));
Iterable<Snapshot> ancestorsBetween =
- SnapshotUtil.ancestorsBetween(table, snapshotDId, snapshotBId);
- expectedSnapshots(new long[] {snapshotDId}, ancestorsBetween);
+ SnapshotUtil.ancestorsBetween(table, snapshotMain2Id, snapshotMain1Id);
+ expectedSnapshots(new long[] {snapshotMain2Id}, ancestorsBetween);
+
+ ancestorsBetween = SnapshotUtil.ancestorsBetween(table, snapshotMain2Id,
snapshotBranchId);
+ expectedSnapshots(
+ new long[] {snapshotMain2Id, snapshotMain1Id, snapshotBaseId},
ancestorsBetween);
+ }
+
+ @Test
+ public void ancestorsOf() {
+ Iterable<Snapshot> snapshots = SnapshotUtil.ancestorsOf(snapshotFork2Id,
table::snapshot);
+ expectedSnapshots(new long[] {snapshotFork2Id, snapshotFork1Id},
snapshots);
+
+ Iterator<Snapshot> snapshotIter = snapshots.iterator();
+ while (snapshotIter.hasNext()) {
+ snapshotIter.next();
+ }
- ancestorsBetween = SnapshotUtil.ancestorsBetween(table, snapshotDId,
snapshotCId);
- expectedSnapshots(new long[] {snapshotDId, snapshotBId, snapshotAId},
ancestorsBetween);
+ // Once snapshot iterator has been exhausted, call hasNext again to make
sure it is stable.
+ Assert.assertFalse(snapshotIter.hasNext());
Review Comment:
nit: `Assertions.assertThat(snapshotIter).isExhausted()`
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
