Skip to content

Core: Clean up TestTrackingBuilder #17145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gaborkaszab wants to merge 1 commit into
base: main
Choose a base branch
from
+55 −61
Open

Core: Clean up TestTrackingBuilder #17145

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
116 changes: 55 additions & 61 deletions core/src/test/java/org/apache/iceberg/TestTrackingBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,13 @@

class TestTrackingBuilder {

private static final Tracking SOURCE_TRACKING_ADDED =
new TrackingStruct(EntryStatus.ADDED, 42L, 10L, 10L, 43L, 1000L, null, null);
private static final Tracking SOURCE_TRACKING_EXISTING =
new TrackingStruct(EntryStatus.EXISTING, 42L, 10L, 10L, 43L, 1000L, null, null);
private static final Tracking SOURCE_TRACKING_MODIFIED =
new TrackingStruct(EntryStatus.MODIFIED, 42L, 10L, 10L, 43L, 1000L, null, null);

@Test
void testAddedWithSameCommitDvStaysAdded() {
Tracking tracking = TrackingBuilder.added(42L).dvUpdated().build();
Expand All @@ -48,44 +55,38 @@ void testAddedWithSameCommitDvStaysAdded() {

@Test
void testExistingBuilderPreservesSourceFields() {
Tracking source = sourceTracking();

Tracking existing = TrackingBuilder.from(source, 1L).build();
Tracking existing = TrackingBuilder.from(SOURCE_TRACKING_ADDED, 1L).build();

assertThat(existing.status()).isEqualTo(EntryStatus.EXISTING);
assertThat(existing.snapshotId()).isEqualTo(source.snapshotId());
assertThat(existing.dataSequenceNumber()).isEqualTo(source.dataSequenceNumber());
assertThat(existing.fileSequenceNumber()).isEqualTo(source.fileSequenceNumber());
assertThat(existing.dvSnapshotId()).isEqualTo(source.dvSnapshotId());
assertThat(existing.firstRowId()).isEqualTo(source.firstRowId());
assertThat(existing.snapshotId()).isEqualTo(SOURCE_TRACKING_ADDED.snapshotId());
assertThat(existing.dataSequenceNumber()).isEqualTo(SOURCE_TRACKING_ADDED.dataSequenceNumber());
assertThat(existing.fileSequenceNumber()).isEqualTo(SOURCE_TRACKING_ADDED.fileSequenceNumber());
assertThat(existing.dvSnapshotId()).isEqualTo(SOURCE_TRACKING_ADDED.dvSnapshotId());
assertThat(existing.firstRowId()).isEqualTo(SOURCE_TRACKING_ADDED.firstRowId());
}

@Test
void testDeleteUpdatesSnapshotIdAndPreservesRest() {
Tracking source = sourceTracking();

Tracking deleted = TrackingBuilder.deleted(source, 999L);
Tracking deleted = TrackingBuilder.deleted(SOURCE_TRACKING_ADDED, 999L);

assertThat(deleted.status()).isEqualTo(EntryStatus.DELETED);
assertThat(deleted.snapshotId()).isEqualTo(999L);
assertThat(deleted.dataSequenceNumber()).isEqualTo(source.dataSequenceNumber());
assertThat(deleted.fileSequenceNumber()).isEqualTo(source.fileSequenceNumber());
assertThat(deleted.dvSnapshotId()).isEqualTo(source.dvSnapshotId());
assertThat(deleted.firstRowId()).isEqualTo(source.firstRowId());
assertThat(deleted.dataSequenceNumber()).isEqualTo(SOURCE_TRACKING_ADDED.dataSequenceNumber());
assertThat(deleted.fileSequenceNumber()).isEqualTo(SOURCE_TRACKING_ADDED.fileSequenceNumber());
assertThat(deleted.dvSnapshotId()).isEqualTo(SOURCE_TRACKING_ADDED.dvSnapshotId());
assertThat(deleted.firstRowId()).isEqualTo(SOURCE_TRACKING_ADDED.firstRowId());
}

@Test
void testReplaceUpdatesSnapshotIdAndPreservesRest() {
Tracking source = sourceTracking();

Tracking replaced = TrackingBuilder.replaced(source, 999L);
Tracking replaced = TrackingBuilder.replaced(SOURCE_TRACKING_ADDED, 999L);

assertThat(replaced.status()).isEqualTo(EntryStatus.REPLACED);
assertThat(replaced.snapshotId()).isEqualTo(999L);
assertThat(replaced.dataSequenceNumber()).isEqualTo(source.dataSequenceNumber());
assertThat(replaced.fileSequenceNumber()).isEqualTo(source.fileSequenceNumber());
assertThat(replaced.dvSnapshotId()).isEqualTo(source.dvSnapshotId());
assertThat(replaced.firstRowId()).isEqualTo(source.firstRowId());
assertThat(replaced.dataSequenceNumber()).isEqualTo(SOURCE_TRACKING_ADDED.dataSequenceNumber());
assertThat(replaced.fileSequenceNumber()).isEqualTo(SOURCE_TRACKING_ADDED.fileSequenceNumber());
assertThat(replaced.dvSnapshotId()).isEqualTo(SOURCE_TRACKING_ADDED.dvSnapshotId());
assertThat(replaced.firstRowId()).isEqualTo(SOURCE_TRACKING_ADDED.firstRowId());
}

@Test
Expand All @@ -109,12 +110,13 @@ void testSourceDvPositionsAreNotCarriedForward() {

@Test
void testDvUpdatedProducesModifiedAndAdvancesDvSnapshotId() {
Tracking source = sourceTracking();
Tracking modified = TrackingBuilder.from(source, 999L).dvUpdated().build();
Tracking modified = TrackingBuilder.from(SOURCE_TRACKING_ADDED, 999L).dvUpdated().build();

assertThat(modified.status()).isEqualTo(EntryStatus.MODIFIED);
// the entry snapshot id is preserved so we still know when the base file was added
assertThat(modified.snapshotId()).isEqualTo(source.snapshotId()).isNotEqualTo(999L);
assertThat(modified.snapshotId())
.isEqualTo(SOURCE_TRACKING_ADDED.snapshotId())
.isNotEqualTo(999L);
// only the DV snapshot id advances to the commit snapshot
assertThat(modified.dvSnapshotId()).isEqualTo(999L);
}
Expand All @@ -136,7 +138,7 @@ void testManifestDVMutatorsRejectedOnAdded() {
void testDvUpdatedRejectedWhenManifestPositionsSet() {
assertThatThrownBy(
() ->
TrackingBuilder.from(manifestSourceTracking(), 999L)
TrackingBuilder.from(SOURCE_TRACKING_ADDED, 999L)
.deletedPositions(ByteBuffer.wrap(new byte[] {1}))
.dvUpdated())
.isInstanceOf(IllegalStateException.class)
Expand All @@ -145,7 +147,7 @@ void testDvUpdatedRejectedWhenManifestPositionsSet() {

assertThatThrownBy(
() ->
TrackingBuilder.from(manifestSourceTracking(), 999L)
TrackingBuilder.from(SOURCE_TRACKING_ADDED, 999L)
.replacedPositions(ByteBuffer.wrap(new byte[] {1}))
.dvUpdated())
.isInstanceOf(IllegalStateException.class)
Expand Down Expand Up @@ -209,78 +211,70 @@ private static Stream<Arguments> terminalTransitionCases() {
@MethodSource("terminalTransitionCases")
void testRejectsTransitionsFromTerminalStatus(
EntryStatus sourceStatus, Consumer<Tracking> factoryCall) {
Tracking source = sourceTrackingWithStatus(sourceStatus);
Tracking source = new TrackingStruct(sourceStatus, 42L, 10L, 10L, 43L, 1000L, null, null);

assertThatThrownBy(() -> factoryCall.accept(source))
.isInstanceOf(IllegalStateException.class)
.hasMessage("Cannot revive non-live entry with status " + sourceStatus);
}

@Test
void testExistingToExistingIsAllowed() {
Tracking existingSource = sourceTrackingWithStatus(EntryStatus.EXISTING);

Tracking existing = TrackingBuilder.from(existingSource, 1L).build();
Tracking existing = TrackingBuilder.from(SOURCE_TRACKING_EXISTING, 1L).build();

assertThat(existing.status()).isEqualTo(EntryStatus.EXISTING);
assertThat(existing.snapshotId()).isEqualTo(existingSource.snapshotId());
assertThat(existing.snapshotId()).isEqualTo(SOURCE_TRACKING_EXISTING.snapshotId());
}

@Test
void testExistingToTerminalTransitions() {
Tracking existingSource = sourceTrackingWithStatus(EntryStatus.EXISTING);

Tracking deleted = TrackingBuilder.deleted(existingSource, 999L);
Tracking deleted = TrackingBuilder.deleted(SOURCE_TRACKING_EXISTING, 999L);
assertThat(deleted.status()).isEqualTo(EntryStatus.DELETED);
assertThat(deleted.snapshotId()).isEqualTo(999L);

Tracking replaced = TrackingBuilder.replaced(existingSource, 999L);
Tracking replaced = TrackingBuilder.replaced(SOURCE_TRACKING_EXISTING, 999L);
assertThat(replaced.status()).isEqualTo(EntryStatus.REPLACED);
assertThat(replaced.snapshotId()).isEqualTo(999L);
}

@Test
void testExistingPreservesSourceSnapshotId() {
Tracking source = sourceTracking();
Tracking existing = TrackingBuilder.from(source, 999L).build();
Tracking existing = TrackingBuilder.from(SOURCE_TRACKING_ADDED, 999L).build();
assertThat(existing.status()).isEqualTo(EntryStatus.EXISTING);
assertThat(existing.snapshotId()).isEqualTo(source.snapshotId()).isNotEqualTo(999L);
assertThat(existing.snapshotId())
.isEqualTo(SOURCE_TRACKING_ADDED.snapshotId())
.isNotEqualTo(999L);
}

@Test
void testCarryForwardFromModifiedSourceChangesToExisting() {
Tracking modifiedSource = sourceTrackingWithStatus(EntryStatus.MODIFIED);
Tracking carried = TrackingBuilder.from(modifiedSource, 999L).build();
Tracking carried = TrackingBuilder.from(SOURCE_TRACKING_MODIFIED, 999L).build();
assertThat(carried.status()).isEqualTo(EntryStatus.EXISTING);
assertThat(carried.snapshotId()).isEqualTo(modifiedSource.snapshotId()).isNotEqualTo(999L);
assertThat(carried.dvSnapshotId()).isEqualTo(modifiedSource.dvSnapshotId()).isNotEqualTo(999L);
assertThat(carried.dataSequenceNumber()).isEqualTo(modifiedSource.dataSequenceNumber());
assertThat(carried.fileSequenceNumber()).isEqualTo(modifiedSource.fileSequenceNumber());
assertThat(carried.firstRowId()).isEqualTo(modifiedSource.firstRowId());
assertThat(carried.snapshotId())
.isEqualTo(SOURCE_TRACKING_MODIFIED.snapshotId())
.isNotEqualTo(999L);
assertThat(carried.dvSnapshotId())
.isEqualTo(SOURCE_TRACKING_MODIFIED.dvSnapshotId())
.isNotEqualTo(999L);
assertThat(carried.dataSequenceNumber())
.isEqualTo(SOURCE_TRACKING_MODIFIED.dataSequenceNumber());
assertThat(carried.fileSequenceNumber())
.isEqualTo(SOURCE_TRACKING_MODIFIED.fileSequenceNumber());
assertThat(carried.firstRowId()).isEqualTo(SOURCE_TRACKING_MODIFIED.firstRowId());
}

@Test
void testManifestDVPositionsProduceModified() {
ByteBuffer deletedBytes = ByteBuffer.wrap(new byte[] {1, 2});

Tracking addedSource = manifestSourceTracking();
Tracking modified =
TrackingBuilder.from(addedSource, 999L).deletedPositions(deletedBytes).build();
TrackingBuilder.from(SOURCE_TRACKING_ADDED, 999L).deletedPositions(deletedBytes).build();
assertThat(modified.status()).isEqualTo(EntryStatus.MODIFIED);
// the entry snapshot id is preserved; only the DV snapshot id advances to the commit snapshot
assertThat(modified.snapshotId()).isEqualTo(addedSource.snapshotId()).isNotEqualTo(999L);
assertThat(modified.snapshotId())
.isEqualTo(SOURCE_TRACKING_ADDED.snapshotId())
.isNotEqualTo(999L);
assertThat(modified.dvSnapshotId()).isEqualTo(999L);
assertThat(modified.deletedPositions()).isEqualTo(deletedBytes);
}

private static TrackingStruct sourceTracking() {
return sourceTrackingWithStatus(EntryStatus.ADDED);
}

private static TrackingStruct sourceTrackingWithStatus(EntryStatus status) {
return new TrackingStruct(status, 42L, 10L, 10L, 43L, 1000L, null, null);
}

private static TrackingStruct manifestSourceTracking() {
return new TrackingStruct(EntryStatus.ADDED, 42L, 10L, 10L, null, 1000L, null, null);
}
}
Loading