You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iceberg.apache.org by bl...@apache.org on 2026/07/08 18:14:01 UTC
(iceberg) branch main updated: Core: Clean up TrackingStruct tests (#17041)
This is an automated email from the ASF dual-hosted git repository.
rdblue pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/iceberg.git
The following commit(s) were added to refs/heads/main by this push:
new 20bf72be73 Core: Clean up TrackingStruct tests (#17041)
20bf72be73 is described below
commit 20bf72be73e9b4aa1dec30913e891fe8adabd8c5
Author: gaborkaszab <ga...@gmail.com>
AuthorDate: Wed Jul 8 20:13:53 2026 +0200
Core: Clean up TrackingStruct tests (#17041)
1) Split the TrackingBuilder tests to a separate suite
2) Replaced setters by ordinal usage with constructors calls, except in
tests that deliberately exercise these setters
3) In TestTrackingStruct replaced the usage of the builder with
constructor calls
---
.../org/apache/iceberg/TestTrackingBuilder.java | 286 +++++++++++
.../org/apache/iceberg/TestTrackingStruct.java | 529 +++++----------------
2 files changed, 410 insertions(+), 405 deletions(-)
diff --git a/core/src/test/java/org/apache/iceberg/TestTrackingBuilder.java b/core/src/test/java/org/apache/iceberg/TestTrackingBuilder.java
new file mode 100644
index 0000000000..b16de40fa8
--- /dev/null
+++ b/core/src/test/java/org/apache/iceberg/TestTrackingBuilder.java
@@ -0,0 +1,286 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.iceberg;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import java.nio.ByteBuffer;
+import java.util.function.Consumer;
+import java.util.stream.Stream;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+class TestTrackingBuilder {
+
+ @Test
+ void testAddedWithSameCommitDvStaysAdded() {
+ Tracking tracking = TrackingBuilder.added(42L).dvUpdated().build();
+
+ assertThat(tracking.status()).isEqualTo(EntryStatus.ADDED);
+ assertThat(tracking.snapshotId()).isEqualTo(42L);
+ assertThat(tracking.dvSnapshotId()).isEqualTo(42L);
+ assertThat(tracking.deletedPositions()).isNull();
+ assertThat(tracking.replacedPositions()).isNull();
+ // sequence numbers and firstRowId remain null; populated by inheritance
+ assertThat(tracking.dataSequenceNumber()).isNull();
+ assertThat(tracking.fileSequenceNumber()).isNull();
+ assertThat(tracking.firstRowId()).isNull();
+ }
+
+ @Test
+ void testExistingBuilderPreservesSourceFields() {
+ Tracking source = sourceTracking();
+
+ Tracking existing = TrackingBuilder.from(source, 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());
+ }
+
+ @Test
+ void testDeleteUpdatesSnapshotIdAndPreservesRest() {
+ Tracking source = sourceTracking();
+
+ Tracking deleted = TrackingBuilder.deleted(source, 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());
+ }
+
+ @Test
+ void testReplaceUpdatesSnapshotIdAndPreservesRest() {
+ Tracking source = sourceTracking();
+
+ Tracking replaced = TrackingBuilder.replaced(source, 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());
+ }
+
+ @Test
+ void testSourceDvPositionsAreNotCarriedForward() {
+ Tracking source =
+ new TrackingStruct(
+ EntryStatus.ADDED, 42L, 10L, 10L, 43L, 1000L, new byte[] {1, 2}, new byte[] {3, 4});
+
+ Tracking existing = TrackingBuilder.from(source, 1L).build();
+ assertThat(existing.deletedPositions()).isNull();
+ assertThat(existing.replacedPositions()).isNull();
+
+ Tracking deleted = TrackingBuilder.deleted(source, 999L);
+ assertThat(deleted.deletedPositions()).isNull();
+ assertThat(deleted.replacedPositions()).isNull();
+
+ Tracking replaced = TrackingBuilder.replaced(source, 999L);
+ assertThat(replaced.deletedPositions()).isNull();
+ assertThat(replaced.replacedPositions()).isNull();
+ }
+
+ @Test
+ void testDvUpdatedProducesModifiedAndAdvancesDvSnapshotId() {
+ Tracking source = sourceTracking();
+ Tracking modified = TrackingBuilder.from(source, 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);
+ // only the DV snapshot id advances to the commit snapshot
+ assertThat(modified.dvSnapshotId()).isEqualTo(999L);
+ }
+
+ @Test
+ void testManifestDVMutatorsRejectedOnAdded() {
+ assertThatThrownBy(
+ () -> TrackingBuilder.added(42L).deletedPositions(ByteBuffer.wrap(new byte[] {1})))
+ .isInstanceOf(IllegalStateException.class)
+ .hasMessage("Cannot set deleted positions on ADDED entry");
+
+ assertThatThrownBy(
+ () -> TrackingBuilder.added(42L).replacedPositions(ByteBuffer.wrap(new byte[] {1})))
+ .isInstanceOf(IllegalStateException.class)
+ .hasMessage("Cannot set replaced positions on ADDED entry");
+ }
+
+ @Test
+ void testDvUpdatedRejectedWhenManifestPositionsSet() {
+ assertThatThrownBy(
+ () ->
+ TrackingBuilder.from(manifestSourceTracking(), 999L)
+ .deletedPositions(ByteBuffer.wrap(new byte[] {1}))
+ .dvUpdated())
+ .isInstanceOf(IllegalStateException.class)
+ .hasMessage(
+ "Cannot mark DV updated on a manifest entry (deleted/replaced positions are set)");
+
+ assertThatThrownBy(
+ () ->
+ TrackingBuilder.from(manifestSourceTracking(), 999L)
+ .replacedPositions(ByteBuffer.wrap(new byte[] {1}))
+ .dvUpdated())
+ .isInstanceOf(IllegalStateException.class)
+ .hasMessage(
+ "Cannot mark DV updated on a manifest entry (deleted/replaced positions are set)");
+ }
+
+ @Test
+ void testBuilderRejectsNullSource() {
+ assertThatThrownBy(() -> TrackingBuilder.from(null, 1L))
+ .isInstanceOf(IllegalArgumentException.class)
+ .hasMessage("Invalid source tracking: null");
+ }
+
+ @Test
+ void testSourceBuildersRejectSourceWithoutSequenceNumbers() {
+ Tracking missingBoth = TrackingBuilder.added(42L).build();
+
+ assertThatThrownBy(() -> TrackingBuilder.from(missingBoth, 1L))
+ .isInstanceOf(IllegalArgumentException.class)
+ .hasMessage("Invalid tracking source: data sequence number is null");
+
+ assertThatThrownBy(() -> TrackingBuilder.deleted(missingBoth, 1L))
+ .isInstanceOf(IllegalArgumentException.class)
+ .hasMessage("Invalid tracking source: data sequence number is null");
+
+ assertThatThrownBy(() -> TrackingBuilder.replaced(missingBoth, 1L))
+ .isInstanceOf(IllegalArgumentException.class)
+ .hasMessage("Invalid tracking source: data sequence number is null");
+
+ TrackingStruct missingFileSeq =
+ new TrackingStruct(EntryStatus.ADDED, 42L, 10L, null, null, null, null, null);
+
+ assertThatThrownBy(() -> TrackingBuilder.from(missingFileSeq, 1L))
+ .isInstanceOf(IllegalArgumentException.class)
+ .hasMessage("Invalid tracking source: file sequence number is null");
+
+ assertThatThrownBy(() -> TrackingBuilder.deleted(missingFileSeq, 1L))
+ .isInstanceOf(IllegalArgumentException.class)
+ .hasMessage("Invalid tracking source: file sequence number is null");
+
+ assertThatThrownBy(() -> TrackingBuilder.replaced(missingFileSeq, 1L))
+ .isInstanceOf(IllegalArgumentException.class)
+ .hasMessage("Invalid tracking source: file sequence number is null");
+ }
+
+ private static Stream<Arguments> terminalTransitionCases() {
+ Consumer<Tracking> builderCall = source -> TrackingBuilder.from(source, 1L);
+ Consumer<Tracking> deletedCall = source -> TrackingBuilder.deleted(source, 1L);
+ Consumer<Tracking> replacedCall = source -> TrackingBuilder.replaced(source, 1L);
+ return Stream.of(
+ Arguments.of(EntryStatus.DELETED, builderCall),
+ Arguments.of(EntryStatus.DELETED, deletedCall),
+ Arguments.of(EntryStatus.DELETED, replacedCall),
+ Arguments.of(EntryStatus.REPLACED, builderCall),
+ Arguments.of(EntryStatus.REPLACED, deletedCall),
+ Arguments.of(EntryStatus.REPLACED, replacedCall));
+ }
+
+ @ParameterizedTest
+ @MethodSource("terminalTransitionCases")
+ void testRejectsTransitionsFromTerminalStatus(
+ EntryStatus sourceStatus, Consumer<Tracking> factoryCall) {
+ Tracking source = sourceTrackingWithStatus(sourceStatus);
+ 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();
+
+ assertThat(existing.status()).isEqualTo(EntryStatus.EXISTING);
+ assertThat(existing.snapshotId()).isEqualTo(existingSource.snapshotId());
+ }
+
+ @Test
+ void testExistingToTerminalTransitions() {
+ Tracking existingSource = sourceTrackingWithStatus(EntryStatus.EXISTING);
+
+ Tracking deleted = TrackingBuilder.deleted(existingSource, 999L);
+ assertThat(deleted.status()).isEqualTo(EntryStatus.DELETED);
+ assertThat(deleted.snapshotId()).isEqualTo(999L);
+
+ Tracking replaced = TrackingBuilder.replaced(existingSource, 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();
+ assertThat(existing.status()).isEqualTo(EntryStatus.EXISTING);
+ assertThat(existing.snapshotId()).isEqualTo(source.snapshotId()).isNotEqualTo(999L);
+ }
+
+ @Test
+ void testCarryForwardFromModifiedSourceChangesToExisting() {
+ Tracking modifiedSource = sourceTrackingWithStatus(EntryStatus.MODIFIED);
+ Tracking carried = TrackingBuilder.from(modifiedSource, 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());
+ }
+
+ @Test
+ void testManifestDVPositionsProduceModified() {
+ ByteBuffer deletedBytes = ByteBuffer.wrap(new byte[] {1, 2});
+
+ Tracking addedSource = manifestSourceTracking();
+ Tracking modified =
+ TrackingBuilder.from(addedSource, 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.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);
+ }
+}
diff --git a/core/src/test/java/org/apache/iceberg/TestTrackingStruct.java b/core/src/test/java/org/apache/iceberg/TestTrackingStruct.java
index 0d1803022a..daa44b1c10 100644
--- a/core/src/test/java/org/apache/iceberg/TestTrackingStruct.java
+++ b/core/src/test/java/org/apache/iceberg/TestTrackingStruct.java
@@ -24,43 +24,51 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.List;
-import java.util.function.Consumer;
-import java.util.stream.Stream;
import org.apache.iceberg.types.Types;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.EnumSource;
import org.junit.jupiter.params.provider.MethodSource;
class TestTrackingStruct {
+ private static final byte[] DELETED_POSITIONS = new byte[] {1, 2};
+ private static final byte[] REPLACED_POSITIONS = new byte[] {3, 4};
- // Ordinals looked up from Tracking.schema() so tests don't hard-code positions.
- private static final List<Types.NestedField> TRACKING_FIELDS = Tracking.schema().fields();
- private static final int STATUS_ORDINAL = TRACKING_FIELDS.indexOf(Tracking.STATUS);
- private static final int SNAPSHOT_ID_ORDINAL = TRACKING_FIELDS.indexOf(Tracking.SNAPSHOT_ID);
- private static final int DATA_SEQUENCE_NUMBER_ORDINAL =
- TRACKING_FIELDS.indexOf(Tracking.SEQUENCE_NUMBER);
- private static final int FILE_SEQUENCE_NUMBER_ORDINAL =
- TRACKING_FIELDS.indexOf(Tracking.FILE_SEQUENCE_NUMBER);
- private static final int DV_SNAPSHOT_ID_ORDINAL =
- TRACKING_FIELDS.indexOf(Tracking.DV_SNAPSHOT_ID);
- private static final int FIRST_ROW_ID_ORDINAL = TRACKING_FIELDS.indexOf(Tracking.FIRST_ROW_ID);
- private static final int DELETED_POSITIONS_ORDINAL =
- TRACKING_FIELDS.indexOf(Tracking.DELETED_POSITIONS);
- private static final int REPLACED_POSITIONS_ORDINAL =
- TRACKING_FIELDS.indexOf(Tracking.REPLACED_POSITIONS);
+ private static final int MANIFEST_POSITION_ORDINAL = Tracking.schema().fields().size();
@Test
void testFieldAccess() {
- TrackingStruct tracking = new TrackingStruct(Tracking.schema());
+ TrackingStruct tracking =
+ new TrackingStruct(
+ EntryStatus.ADDED, 42L, 10L, 11L, 43L, 1000L, DELETED_POSITIONS, REPLACED_POSITIONS);
+ tracking.setManifestLocation("manifest-location");
+ tracking.set(MANIFEST_POSITION_ORDINAL, 7L);
- tracking.set(STATUS_ORDINAL, EntryStatus.ADDED.id());
- tracking.set(SNAPSHOT_ID_ORDINAL, 42L);
- tracking.set(DATA_SEQUENCE_NUMBER_ORDINAL, 10L);
- tracking.set(FILE_SEQUENCE_NUMBER_ORDINAL, 11L);
- tracking.set(DV_SNAPSHOT_ID_ORDINAL, 43L);
- tracking.set(FIRST_ROW_ID_ORDINAL, 1000L);
+ assertThat(tracking.status()).isEqualTo(EntryStatus.ADDED);
+ assertThat(tracking.snapshotId()).isEqualTo(42L);
+ assertThat(tracking.dataSequenceNumber()).isEqualTo(10L);
+ assertThat(tracking.fileSequenceNumber()).isEqualTo(11L);
+ assertThat(tracking.dvSnapshotId()).isEqualTo(43L);
+ assertThat(tracking.firstRowId()).isEqualTo(1000L);
+ assertThat(tracking.deletedPositions()).isEqualTo(ByteBuffer.wrap(DELETED_POSITIONS));
+ assertThat(tracking.replacedPositions()).isEqualTo(ByteBuffer.wrap(REPLACED_POSITIONS));
+ assertThat(tracking.manifestLocation()).isEqualTo("manifest-location");
+ assertThat(tracking.manifestPos()).isEqualTo(7L);
+ }
+
+ @Test
+ void testSetByPosition() {
+ TrackingStruct tracking = new TrackingStruct();
+
+ tracking.set(pos("status"), EntryStatus.ADDED.id());
+ tracking.set(pos("snapshot_id"), 42L);
+ tracking.set(pos("sequence_number"), 10L);
+ tracking.set(pos("file_sequence_number"), 11L);
+ tracking.set(pos("dv_snapshot_id"), 43L);
+ tracking.set(pos("first_row_id"), 1000L);
+ tracking.set(pos("deleted_positions"), ByteBuffer.wrap(DELETED_POSITIONS));
+ tracking.set(pos("replaced_positions"), ByteBuffer.wrap(REPLACED_POSITIONS));
+ tracking.set(MANIFEST_POSITION_ORDINAL, 7L);
assertThat(tracking.status()).isEqualTo(EntryStatus.ADDED);
assertThat(tracking.snapshotId()).isEqualTo(42L);
@@ -68,17 +76,39 @@ class TestTrackingStruct {
assertThat(tracking.fileSequenceNumber()).isEqualTo(11L);
assertThat(tracking.dvSnapshotId()).isEqualTo(43L);
assertThat(tracking.firstRowId()).isEqualTo(1000L);
- assertThat(tracking.deletedPositions()).isNull();
- assertThat(tracking.replacedPositions()).isNull();
+ assertThat(tracking.deletedPositions()).isEqualTo(ByteBuffer.wrap(DELETED_POSITIONS));
+ assertThat(tracking.replacedPositions()).isEqualTo(ByteBuffer.wrap(REPLACED_POSITIONS));
+ assertThat(tracking.manifestPos()).isEqualTo(7L);
+ }
+
+ @Test
+ void testGetByPosition() {
+ TrackingStruct tracking =
+ new TrackingStruct(
+ EntryStatus.ADDED, 42L, 10L, 11L, 43L, 1000L, DELETED_POSITIONS, REPLACED_POSITIONS);
+ tracking.setManifestLocation("manifest-location");
+ tracking.set(MANIFEST_POSITION_ORDINAL, 7L);
+
+ assertThat(tracking.get(pos("status"), Integer.class)).isEqualTo(EntryStatus.ADDED.id());
+ assertThat(tracking.get(pos("snapshot_id"), Long.class)).isEqualTo(42L);
+ assertThat(tracking.get(pos("sequence_number"), Long.class)).isEqualTo(10L);
+ assertThat(tracking.get(pos("file_sequence_number"), Long.class)).isEqualTo(11L);
+ assertThat(tracking.get(pos("dv_snapshot_id"), Long.class)).isEqualTo(43L);
+ assertThat(tracking.get(pos("first_row_id"), Long.class)).isEqualTo(1000L);
+ assertThat(tracking.get(pos("deleted_positions"), ByteBuffer.class))
+ .isEqualTo(ByteBuffer.wrap(DELETED_POSITIONS));
+ assertThat(tracking.get(pos("replaced_positions"), ByteBuffer.class))
+ .isEqualTo(ByteBuffer.wrap(REPLACED_POSITIONS));
+ assertThat(tracking.get(MANIFEST_POSITION_ORDINAL, Long.class)).isEqualTo(7L);
}
@Test
void testCopy() {
- Tracking tracking =
- TrackingBuilder.from(manifestSourceTracking(), 1L)
- .deletedPositions(ByteBuffer.wrap(new byte[] {1, 2}))
- .replacedPositions(ByteBuffer.wrap(new byte[] {3, 4}))
- .build();
+ TrackingStruct tracking =
+ new TrackingStruct(
+ EntryStatus.MODIFIED, 42L, 10L, 11L, 43L, 1000L, DELETED_POSITIONS, REPLACED_POSITIONS);
+ tracking.setManifestLocation("manifest-location");
+ tracking.set(MANIFEST_POSITION_ORDINAL, 7L);
Tracking copy = tracking.copy();
@@ -90,24 +120,18 @@ class TestTrackingStruct {
assertThat(copy.firstRowId()).isEqualTo(tracking.firstRowId());
assertThat(copy.deletedPositions()).isEqualTo(tracking.deletedPositions());
assertThat(copy.replacedPositions()).isEqualTo(tracking.replacedPositions());
+ assertThat(copy.manifestLocation()).isEqualTo(tracking.manifestLocation());
+ assertThat(copy.manifestPos()).isEqualTo(tracking.manifestPos());
// verify deep copy of ByteBuffer backing arrays
assertThat(copy.deletedPositions().array()).isNotSameAs(tracking.deletedPositions().array());
assertThat(copy.replacedPositions().array()).isNotSameAs(tracking.replacedPositions().array());
}
- @ParameterizedTest
- @EnumSource(EntryStatus.class)
- void testAllStatuses(EntryStatus status) {
- TrackingStruct tracking = new TrackingStruct(Tracking.schema());
- tracking.set(STATUS_ORDINAL, status.id());
- assertThat(tracking.status()).isEqualTo(status);
- }
-
@Test
void testInheritSnapshotId() {
- TrackingStruct tracking = new TrackingStruct(Tracking.schema());
- tracking.set(STATUS_ORDINAL, EntryStatus.ADDED.id());
+ TrackingStruct tracking =
+ new TrackingStruct(EntryStatus.ADDED, null, null, null, null, null, null, null);
tracking.inheritFrom(createManifestTracking(100L, 60L));
@@ -117,8 +141,8 @@ class TestTrackingStruct {
@Test
void testInheritSequenceNumberForAddedEntries() {
- TrackingStruct tracking = new TrackingStruct(Tracking.schema());
- tracking.set(STATUS_ORDINAL, EntryStatus.ADDED.id());
+ TrackingStruct tracking =
+ new TrackingStruct(EntryStatus.ADDED, 42L, null, null, null, null, null, null);
tracking.inheritFrom(createManifestTracking(100L, 60L));
@@ -129,10 +153,8 @@ class TestTrackingStruct {
@Test
void testDoNotInheritSequenceNumberForExistingEntries() {
- TrackingStruct tracking = new TrackingStruct(Tracking.schema());
- tracking.set(STATUS_ORDINAL, EntryStatus.EXISTING.id());
- tracking.set(DATA_SEQUENCE_NUMBER_ORDINAL, 5L);
- tracking.set(FILE_SEQUENCE_NUMBER_ORDINAL, 6L);
+ TrackingStruct tracking =
+ new TrackingStruct(EntryStatus.EXISTING, 42L, 5L, 6L, null, null, null, null);
tracking.inheritFrom(createManifestTracking(100L, 60L));
@@ -143,10 +165,8 @@ class TestTrackingStruct {
@Test
void testDoNotInheritSequenceNumberForModifiedEntries() {
- TrackingStruct tracking = new TrackingStruct(Tracking.schema());
- tracking.set(STATUS_ORDINAL, EntryStatus.MODIFIED.id());
- tracking.set(DATA_SEQUENCE_NUMBER_ORDINAL, 5L);
- tracking.set(FILE_SEQUENCE_NUMBER_ORDINAL, 6L);
+ TrackingStruct tracking =
+ new TrackingStruct(EntryStatus.MODIFIED, 42L, 5L, 6L, null, null, null, null);
tracking.inheritFrom(createManifestTracking(100L, 60L));
@@ -157,11 +177,8 @@ class TestTrackingStruct {
@Test
void testExplicitValuesOverrideInheritance() {
- TrackingStruct tracking = new TrackingStruct(Tracking.schema());
- tracking.set(STATUS_ORDINAL, EntryStatus.ADDED.id());
- tracking.set(SNAPSHOT_ID_ORDINAL, 200L);
- tracking.set(DATA_SEQUENCE_NUMBER_ORDINAL, 75L);
- tracking.set(FILE_SEQUENCE_NUMBER_ORDINAL, 76L);
+ TrackingStruct tracking =
+ new TrackingStruct(EntryStatus.ADDED, 200L, 75L, 76L, null, null, null, null);
tracking.inheritFrom(createManifestTracking(100L, 60L));
@@ -173,14 +190,11 @@ class TestTrackingStruct {
@Test
void testInheritFromRejectsUnequalSequenceNumbers() {
- TrackingStruct tracking = new TrackingStruct(Tracking.schema());
- tracking.set(STATUS_ORDINAL, EntryStatus.ADDED.id());
+ TrackingStruct tracking =
+ new TrackingStruct(EntryStatus.ADDED, 42L, null, null, null, null, null, null);
- TrackingStruct manifestTracking = new TrackingStruct(Tracking.schema());
- manifestTracking.set(STATUS_ORDINAL, EntryStatus.ADDED.id());
- manifestTracking.set(SNAPSHOT_ID_ORDINAL, 100L);
- manifestTracking.set(DATA_SEQUENCE_NUMBER_ORDINAL, 50L);
- manifestTracking.set(FILE_SEQUENCE_NUMBER_ORDINAL, 60L);
+ TrackingStruct manifestTracking =
+ new TrackingStruct(EntryStatus.ADDED, 100L, 50L, 60L, null, null, null, null);
assertThatThrownBy(() -> tracking.inheritFrom(manifestTracking))
.isInstanceOf(IllegalArgumentException.class)
@@ -189,8 +203,8 @@ class TestTrackingStruct {
@Test
void testNoDefaultingWithoutInheritance() {
- TrackingStruct tracking = new TrackingStruct(Tracking.schema());
- tracking.set(STATUS_ORDINAL, EntryStatus.ADDED.id());
+ TrackingStruct tracking =
+ new TrackingStruct(EntryStatus.ADDED, null, null, null, null, null, null, null);
// no inheritance, nulls stay null
assertThat(tracking.snapshotId()).isNull();
@@ -200,8 +214,8 @@ class TestTrackingStruct {
@Test
void testInheritFromNullIsNoOp() {
- TrackingStruct tracking = new TrackingStruct(Tracking.schema());
- tracking.set(STATUS_ORDINAL, EntryStatus.ADDED.id());
+ TrackingStruct tracking =
+ new TrackingStruct(EntryStatus.ADDED, null, null, null, null, null, null, null);
tracking.inheritFrom(null);
@@ -212,274 +226,23 @@ class TestTrackingStruct {
}
private static Tracking createManifestTracking(long snapshotId, long sequenceNumber) {
- TrackingStruct tracking = new TrackingStruct(Tracking.schema());
- tracking.set(STATUS_ORDINAL, EntryStatus.ADDED.id());
- tracking.set(SNAPSHOT_ID_ORDINAL, snapshotId);
- tracking.set(DATA_SEQUENCE_NUMBER_ORDINAL, sequenceNumber);
- tracking.set(FILE_SEQUENCE_NUMBER_ORDINAL, sequenceNumber);
- return tracking;
- }
-
- @Test
- void testAddedWithSameCommitDvStaysAdded() {
- Tracking tracking = TrackingBuilder.added(42L).dvUpdated().build();
-
- assertThat(tracking.status()).isEqualTo(EntryStatus.ADDED);
- assertThat(tracking.snapshotId()).isEqualTo(42L);
- assertThat(tracking.dvSnapshotId()).isEqualTo(42L);
- assertThat(tracking.deletedPositions()).isNull();
- assertThat(tracking.replacedPositions()).isNull();
- // sequence numbers and firstRowId remain null; populated by inheritance
- assertThat(tracking.dataSequenceNumber()).isNull();
- assertThat(tracking.fileSequenceNumber()).isNull();
- assertThat(tracking.firstRowId()).isNull();
- }
-
- @Test
- void testExistingBuilderPreservesSourceFields() {
- Tracking source = sourceTracking();
-
- Tracking existing = TrackingBuilder.from(source, 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());
- }
-
- @Test
- void testDeleteUpdatesSnapshotIdAndPreservesRest() {
- Tracking source = sourceTracking();
-
- Tracking deleted = TrackingBuilder.deleted(source, 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());
- }
-
- @Test
- void testReplaceUpdatesSnapshotIdAndPreservesRest() {
- Tracking source = sourceTracking();
-
- Tracking replaced = TrackingBuilder.replaced(source, 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());
- }
-
- @Test
- void testSourceDvPositionsAreNotCarriedForward() {
- TrackingStruct source = sourceTracking();
- source.set(DELETED_POSITIONS_ORDINAL, ByteBuffer.wrap(new byte[] {1, 2}));
- source.set(REPLACED_POSITIONS_ORDINAL, ByteBuffer.wrap(new byte[] {3, 4}));
-
- Tracking existing = TrackingBuilder.from(source, 1L).build();
- assertThat(existing.deletedPositions()).isNull();
- assertThat(existing.replacedPositions()).isNull();
-
- Tracking deleted = TrackingBuilder.deleted(source, 999L);
- assertThat(deleted.deletedPositions()).isNull();
- assertThat(deleted.replacedPositions()).isNull();
-
- Tracking replaced = TrackingBuilder.replaced(source, 999L);
- assertThat(replaced.deletedPositions()).isNull();
- assertThat(replaced.replacedPositions()).isNull();
- }
-
- @Test
- void testDvUpdatedProducesModifiedAndAdvancesDvSnapshotId() {
- Tracking source = sourceTracking();
- Tracking modified = TrackingBuilder.from(source, 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);
- // only the DV snapshot id advances to the commit snapshot
- assertThat(modified.dvSnapshotId()).isEqualTo(999L);
- }
-
- @Test
- void testManifestDVMutatorsRejectedOnAdded() {
- assertThatThrownBy(
- () -> TrackingBuilder.added(42L).deletedPositions(ByteBuffer.wrap(new byte[] {1})))
- .isInstanceOf(IllegalStateException.class)
- .hasMessage("Cannot set deleted positions on ADDED entry");
-
- assertThatThrownBy(
- () -> TrackingBuilder.added(42L).replacedPositions(ByteBuffer.wrap(new byte[] {1})))
- .isInstanceOf(IllegalStateException.class)
- .hasMessage("Cannot set replaced positions on ADDED entry");
- }
-
- @Test
- void testDvUpdatedRejectedWhenManifestPositionsSet() {
- assertThatThrownBy(
- () ->
- TrackingBuilder.from(manifestSourceTracking(), 999L)
- .deletedPositions(ByteBuffer.wrap(new byte[] {1}))
- .dvUpdated())
- .isInstanceOf(IllegalStateException.class)
- .hasMessage(
- "Cannot mark DV updated on a manifest entry (deleted/replaced positions are set)");
-
- assertThatThrownBy(
- () ->
- TrackingBuilder.from(manifestSourceTracking(), 999L)
- .replacedPositions(ByteBuffer.wrap(new byte[] {1}))
- .dvUpdated())
- .isInstanceOf(IllegalStateException.class)
- .hasMessage(
- "Cannot mark DV updated on a manifest entry (deleted/replaced positions are set)");
- }
-
- @Test
- void testBuilderRejectsNullSource() {
- assertThatThrownBy(() -> TrackingBuilder.from(null, 1L))
- .isInstanceOf(IllegalArgumentException.class)
- .hasMessage("Invalid source tracking: null");
- }
-
- @Test
- void testSourceBuildersRejectSourceWithoutSequenceNumbers() {
- Tracking missingBoth = TrackingBuilder.added(42L).build();
-
- assertThatThrownBy(() -> TrackingBuilder.from(missingBoth, 1L))
- .isInstanceOf(IllegalArgumentException.class)
- .hasMessage("Invalid tracking source: data sequence number is null");
-
- assertThatThrownBy(() -> TrackingBuilder.deleted(missingBoth, 1L))
- .isInstanceOf(IllegalArgumentException.class)
- .hasMessage("Invalid tracking source: data sequence number is null");
-
- assertThatThrownBy(() -> TrackingBuilder.replaced(missingBoth, 1L))
- .isInstanceOf(IllegalArgumentException.class)
- .hasMessage("Invalid tracking source: data sequence number is null");
-
- TrackingStruct missingFileSeq = new TrackingStruct(Tracking.schema());
- missingFileSeq.set(STATUS_ORDINAL, EntryStatus.ADDED.id());
- missingFileSeq.set(SNAPSHOT_ID_ORDINAL, 42L);
- missingFileSeq.set(DATA_SEQUENCE_NUMBER_ORDINAL, 10L);
-
- assertThatThrownBy(() -> TrackingBuilder.from(missingFileSeq, 1L))
- .isInstanceOf(IllegalArgumentException.class)
- .hasMessage("Invalid tracking source: file sequence number is null");
-
- assertThatThrownBy(() -> TrackingBuilder.deleted(missingFileSeq, 1L))
- .isInstanceOf(IllegalArgumentException.class)
- .hasMessage("Invalid tracking source: file sequence number is null");
-
- assertThatThrownBy(() -> TrackingBuilder.replaced(missingFileSeq, 1L))
- .isInstanceOf(IllegalArgumentException.class)
- .hasMessage("Invalid tracking source: file sequence number is null");
- }
-
- private static Stream<Arguments> terminalTransitionCases() {
- Consumer<Tracking> builderCall = source -> TrackingBuilder.from(source, 1L);
- Consumer<Tracking> deletedCall = source -> TrackingBuilder.deleted(source, 1L);
- Consumer<Tracking> replacedCall = source -> TrackingBuilder.replaced(source, 1L);
- return Stream.of(
- Arguments.of(EntryStatus.DELETED, builderCall),
- Arguments.of(EntryStatus.DELETED, deletedCall),
- Arguments.of(EntryStatus.DELETED, replacedCall),
- Arguments.of(EntryStatus.REPLACED, builderCall),
- Arguments.of(EntryStatus.REPLACED, deletedCall),
- Arguments.of(EntryStatus.REPLACED, replacedCall));
+ return new TrackingStruct(
+ EntryStatus.ADDED, snapshotId, sequenceNumber, sequenceNumber, null, null, null, null);
}
@ParameterizedTest
- @MethodSource("terminalTransitionCases")
- void testRejectsTransitionsFromTerminalStatus(
- EntryStatus sourceStatus, Consumer<Tracking> factoryCall) {
- Tracking source = sourceTrackingWithStatus(sourceStatus);
- 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();
-
- assertThat(existing.status()).isEqualTo(EntryStatus.EXISTING);
- assertThat(existing.snapshotId()).isEqualTo(existingSource.snapshotId());
- }
-
- @Test
- void testExistingToTerminalTransitions() {
- Tracking existingSource = sourceTrackingWithStatus(EntryStatus.EXISTING);
-
- Tracking deleted = TrackingBuilder.deleted(existingSource, 999L);
- assertThat(deleted.status()).isEqualTo(EntryStatus.DELETED);
- assertThat(deleted.snapshotId()).isEqualTo(999L);
-
- Tracking replaced = TrackingBuilder.replaced(existingSource, 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();
- assertThat(existing.status()).isEqualTo(EntryStatus.EXISTING);
- assertThat(existing.snapshotId()).isEqualTo(source.snapshotId()).isNotEqualTo(999L);
- }
-
- @Test
- void testCarryForwardFromModifiedSourceChangesToExisting() {
- Tracking modifiedSource = sourceTrackingWithStatus(EntryStatus.MODIFIED);
- Tracking carried = TrackingBuilder.from(modifiedSource, 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());
- }
-
- @Test
- void testManifestDVPositionsProduceModified() {
- ByteBuffer deletedBytes = ByteBuffer.wrap(new byte[] {1, 2});
-
- Tracking addedSource = manifestSourceTracking();
- Tracking modified =
- TrackingBuilder.from(addedSource, 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.dvSnapshotId()).isEqualTo(999L);
- assertThat(modified.deletedPositions()).isEqualTo(deletedBytes);
- }
+ @EnumSource(EntryStatus.class)
+ void testIsLiveDelegatesToStatus(EntryStatus status) {
+ TrackingStruct tracking = new TrackingStruct(status, null, null, null, null, null, null, null);
- @Test
- void testIsLiveDelegatesToStatus() {
- assertThat(sourceTrackingWithStatus(EntryStatus.ADDED).isLive()).isTrue();
- assertThat(sourceTrackingWithStatus(EntryStatus.DELETED).isLive()).isFalse();
+ assertThat(tracking.isLive()).isEqualTo(status.isLive());
}
@Test
void testInternalSetIgnoresUnknownOrdinal() {
- TrackingStruct tracking = new TrackingStruct(Tracking.schema());
- tracking.set(STATUS_ORDINAL, EntryStatus.ADDED.id());
- tracking.set(SNAPSHOT_ID_ORDINAL, 42L);
- tracking.set(DATA_SEQUENCE_NUMBER_ORDINAL, 10L);
- tracking.set(FILE_SEQUENCE_NUMBER_ORDINAL, 11L);
- tracking.set(DV_SNAPSHOT_ID_ORDINAL, 43L);
- tracking.set(FIRST_ROW_ID_ORDINAL, 1000L);
- tracking.set(DELETED_POSITIONS_ORDINAL, ByteBuffer.wrap(new byte[] {1, 2}));
- tracking.set(REPLACED_POSITIONS_ORDINAL, ByteBuffer.wrap(new byte[] {3, 4}));
+ TrackingStruct tracking =
+ new TrackingStruct(
+ EntryStatus.ADDED, 42L, 10L, 11L, 43L, 1000L, DELETED_POSITIONS, REPLACED_POSITIONS);
// unknown ordinals from a newer format version are silently ignored
tracking.internalSet(99, "value from a newer format");
@@ -491,8 +254,8 @@ class TestTrackingStruct {
assertThat(tracking.fileSequenceNumber()).isEqualTo(11L);
assertThat(tracking.dvSnapshotId()).isEqualTo(43L);
assertThat(tracking.firstRowId()).isEqualTo(1000L);
- assertThat(tracking.deletedPositions()).isEqualTo(ByteBuffer.wrap(new byte[] {1, 2}));
- assertThat(tracking.replacedPositions()).isEqualTo(ByteBuffer.wrap(new byte[] {3, 4}));
+ assertThat(tracking.deletedPositions()).isEqualTo(ByteBuffer.wrap(DELETED_POSITIONS));
+ assertThat(tracking.replacedPositions()).isEqualTo(ByteBuffer.wrap(REPLACED_POSITIONS));
}
@Test
@@ -514,84 +277,40 @@ class TestTrackingStruct {
assertThat(tracking.get(1, Long.class)).isEqualTo(1000L);
}
- @Test
- void testJavaSerializationRoundTripForDataFile() throws IOException, ClassNotFoundException {
- Tracking tracking = TrackingBuilder.added(42L).dvUpdated().build();
-
- Tracking deserialized = TestHelpers.roundTripSerialize(tracking);
-
- assertThat(deserialized.status()).isEqualTo(EntryStatus.ADDED);
- assertThat(deserialized.snapshotId()).isEqualTo(42L);
- assertThat(deserialized.dvSnapshotId()).isEqualTo(42L);
- assertThat(deserialized.deletedPositions()).isNull();
- assertThat(deserialized.replacedPositions()).isNull();
- }
-
- @Test
- void testJavaSerializationRoundTripForManifest() throws IOException, ClassNotFoundException {
- Tracking tracking =
- TrackingBuilder.from(manifestSourceTracking(), 1L)
- .deletedPositions(ByteBuffer.wrap(new byte[] {1, 2}))
- .replacedPositions(ByteBuffer.wrap(new byte[] {3, 4}))
- .build();
+ @ParameterizedTest
+ @MethodSource("org.apache.iceberg.TestHelpers#serializers")
+ void testSerializationRoundTrip(TestHelpers.RoundTripSerializer<Tracking> roundTripSerializer)
+ throws IOException, ClassNotFoundException {
+ TrackingStruct tracking =
+ new TrackingStruct(
+ EntryStatus.MODIFIED, 42L, 10L, 11L, 43L, 1000L, DELETED_POSITIONS, REPLACED_POSITIONS);
+ tracking.setManifestLocation("manifest-location");
+ tracking.set(MANIFEST_POSITION_ORDINAL, 7L);
- Tracking deserialized = TestHelpers.roundTripSerialize(tracking);
+ Tracking deserialized = roundTripSerializer.apply(tracking);
assertThat(deserialized.status()).isEqualTo(EntryStatus.MODIFIED);
- assertThat(deserialized.dvSnapshotId()).isEqualTo(1L);
- assertThat(deserialized.deletedPositions()).isEqualTo(ByteBuffer.wrap(new byte[] {1, 2}));
- assertThat(deserialized.replacedPositions()).isEqualTo(ByteBuffer.wrap(new byte[] {3, 4}));
- }
-
- @Test
- void testKryoSerializationRoundTripForDataFile() throws IOException {
- Tracking tracking = TrackingBuilder.added(42L).dvUpdated().build();
-
- Tracking deserialized = TestHelpers.KryoHelpers.roundTripSerialize(tracking);
-
- assertThat(deserialized.status()).isEqualTo(EntryStatus.ADDED);
assertThat(deserialized.snapshotId()).isEqualTo(42L);
- assertThat(deserialized.dvSnapshotId()).isEqualTo(42L);
- assertThat(deserialized.deletedPositions()).isNull();
- assertThat(deserialized.replacedPositions()).isNull();
- }
-
- @Test
- void testKryoSerializationRoundTripForManifest() throws IOException {
- Tracking tracking =
- TrackingBuilder.from(manifestSourceTracking(), 1L)
- .deletedPositions(ByteBuffer.wrap(new byte[] {1, 2}))
- .replacedPositions(ByteBuffer.wrap(new byte[] {3, 4}))
- .build();
-
- Tracking deserialized = TestHelpers.KryoHelpers.roundTripSerialize(tracking);
-
- assertThat(deserialized.status()).isEqualTo(EntryStatus.MODIFIED);
- assertThat(deserialized.dvSnapshotId()).isEqualTo(1L);
- assertThat(deserialized.deletedPositions()).isEqualTo(ByteBuffer.wrap(new byte[] {1, 2}));
- assertThat(deserialized.replacedPositions()).isEqualTo(ByteBuffer.wrap(new byte[] {3, 4}));
- }
-
- private static TrackingStruct sourceTracking() {
- TrackingStruct tracking = new TrackingStruct(Tracking.schema());
- tracking.set(STATUS_ORDINAL, EntryStatus.ADDED.id());
- tracking.set(SNAPSHOT_ID_ORDINAL, 42L);
- tracking.set(DATA_SEQUENCE_NUMBER_ORDINAL, 10L);
- tracking.set(FILE_SEQUENCE_NUMBER_ORDINAL, 10L);
- tracking.set(DV_SNAPSHOT_ID_ORDINAL, 43L);
- tracking.set(FIRST_ROW_ID_ORDINAL, 1000L);
- return tracking;
- }
-
- private static TrackingStruct sourceTrackingWithStatus(EntryStatus status) {
- TrackingStruct tracking = sourceTracking();
- tracking.set(STATUS_ORDINAL, status.id());
- return tracking;
- }
-
- private static TrackingStruct manifestSourceTracking() {
- TrackingStruct tracking = sourceTracking();
- tracking.set(DV_SNAPSHOT_ID_ORDINAL, null);
- return tracking;
+ assertThat(deserialized.dataSequenceNumber()).isEqualTo(10L);
+ assertThat(deserialized.fileSequenceNumber()).isEqualTo(11L);
+ assertThat(deserialized.dvSnapshotId()).isEqualTo(43L);
+ assertThat(deserialized.firstRowId()).isEqualTo(1000L);
+ assertThat(deserialized.deletedPositions()).isEqualTo(ByteBuffer.wrap(DELETED_POSITIONS));
+ assertThat(deserialized.replacedPositions()).isEqualTo(ByteBuffer.wrap(REPLACED_POSITIONS));
+ assertThat(deserialized.manifestLocation()).isEqualTo("manifest-location");
+ assertThat(deserialized.manifestPos()).isEqualTo(7L);
+ }
+
+ // Returns the positions of fields within the Tracking schema by name. For internal fields like
+ // '_pos' introduce a constant instead of using this function.
+ private static int pos(String fieldName) {
+ List<Types.NestedField> fields = Tracking.schema().fields();
+ for (int i = 0; i < fields.size(); i++) {
+ if (fields.get(i).name().equals(fieldName)) {
+ return i;
+ }
+ }
+
+ throw new IllegalArgumentException("Field not found in schema: " + fieldName);
}
}