stevenzwu commented on code in PR #16285: URL: https://github.com/apache/iceberg/pull/16285#discussion_r3738480718
########## core/src/test/java/org/apache/iceberg/TestColumnFileStruct.java: ########## @@ -0,0 +1,280 @@ +/* + * 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.io.IOException; +import java.nio.ByteBuffer; +import java.util.List; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; +import org.apache.iceberg.types.Types; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; + +class TestColumnFileStruct { + + private static final int FORMAT_VERSION = 4; + private static final List<Integer> FIELD_IDS = Lists.newArrayList(1, 2, 3); + private static final String LOCATION = "s3://bucket/data/column.parquet"; + private static final FileFormat FILE_FORMAT = FileFormat.PARQUET; + private static final long FILE_SIZE_IN_BYTES = 1024L; + private static final ByteBuffer KEY_METADATA = ByteBuffer.wrap(new byte[] {1, 2, 3}); + private static final List<Long> SPLIT_OFFSETS = Lists.newArrayList(0L, 512L); + + @Test + void fieldAccess() { + ColumnFile columnFile = + new ColumnFileStruct( + FORMAT_VERSION, + FIELD_IDS, + LOCATION, + FILE_FORMAT, + FILE_SIZE_IN_BYTES, + KEY_METADATA, + SPLIT_OFFSETS); + + assertThat(columnFile.formatVersion()).isEqualTo(FORMAT_VERSION); + assertThat(columnFile.fieldIds()).containsExactlyElementsOf(FIELD_IDS); + assertThat(columnFile.location()).isEqualTo(LOCATION); + assertThat(columnFile.fileFormat()).isEqualTo(FILE_FORMAT); + assertThat(columnFile.fileSizeInBytes()).isEqualTo(FILE_SIZE_IN_BYTES); + assertThat(columnFile.keyMetadata()).isEqualTo(KEY_METADATA); + assertThat(columnFile.splitOffsets()).containsExactlyElementsOf(SPLIT_OFFSETS); + } + + @Test + void copy() { + ColumnFile columnFile = + new ColumnFileStruct( + FORMAT_VERSION, + FIELD_IDS, + LOCATION, + FILE_FORMAT, + FILE_SIZE_IN_BYTES, + KEY_METADATA, + SPLIT_OFFSETS); + + ColumnFile copy = columnFile.copy(); + + assertThat(copy.formatVersion()).isEqualTo(FORMAT_VERSION); + assertThat(copy.fieldIds()).containsExactlyElementsOf(FIELD_IDS); + assertThat(copy.location()).isEqualTo(LOCATION); + assertThat(copy.fileFormat()).isEqualTo(FILE_FORMAT); + assertThat(copy.fileSizeInBytes()).isEqualTo(FILE_SIZE_IN_BYTES); + assertThat(copy.keyMetadata()).isEqualTo(KEY_METADATA); + assertThat(copy.splitOffsets()).containsExactlyElementsOf(SPLIT_OFFSETS); + } + + @Test + void structLikeSize() { + ColumnFileStruct columnFile = new ColumnFileStruct(); + assertThat(columnFile.size()).isEqualTo(7); + } + + @Test + void setFieldsByOrdinals() { + ColumnFileStruct columnFile = new ColumnFileStruct(); + + columnFile.set(0, FORMAT_VERSION); + columnFile.set(1, FIELD_IDS); + columnFile.set(2, LOCATION); + columnFile.set(3, FILE_FORMAT.toString()); + columnFile.set(4, FILE_SIZE_IN_BYTES); + columnFile.set(5, KEY_METADATA); + columnFile.set(6, SPLIT_OFFSETS); + + assertThat(columnFile.formatVersion()).isEqualTo(FORMAT_VERSION); + assertThat(columnFile.fieldIds()).containsExactlyElementsOf(FIELD_IDS); + assertThat(columnFile.location()).isEqualTo(LOCATION); + assertThat(columnFile.fileFormat()).isEqualTo(FILE_FORMAT); + assertThat(columnFile.fileSizeInBytes()).isEqualTo(FILE_SIZE_IN_BYTES); + assertThat(columnFile.keyMetadata()).isEqualTo(KEY_METADATA); + assertThat(columnFile.splitOffsets()).containsExactlyElementsOf(SPLIT_OFFSETS); + } + + @Test + void getFieldsByOrdinals() { + ColumnFileStruct columnFile = + new ColumnFileStruct( + FORMAT_VERSION, + FIELD_IDS, + LOCATION, + FILE_FORMAT, + FILE_SIZE_IN_BYTES, + KEY_METADATA, + SPLIT_OFFSETS); + + assertThat(columnFile.get(0, Integer.class)).isEqualTo(FORMAT_VERSION); + assertThat(columnFile.get(1, List.class)).containsExactlyElementsOf(FIELD_IDS); + assertThat(columnFile.get(2, String.class)).isEqualTo(LOCATION); + assertThat(columnFile.get(3, String.class)).isEqualTo(FILE_FORMAT.toString()); + assertThat(columnFile.get(4, Long.class)).isEqualTo(FILE_SIZE_IN_BYTES); + assertThat(columnFile.get(5, ByteBuffer.class)).isEqualTo(KEY_METADATA); + assertThat(columnFile.get(6, List.class)).containsExactlyElementsOf(SPLIT_OFFSETS); + } + + @Test + void projectedStructLike() { + Types.StructType projection = + Types.StructType.of(ColumnFile.LOCATION, ColumnFile.FILE_SIZE_IN_BYTES); + + ColumnFileStruct columnFile = new ColumnFileStruct(projection); + assertThat(columnFile.size()).isEqualTo(2); + + // projected position 0 maps to internal position of location + // projected position 1 maps to internal position of file_size_in_bytes + columnFile.set(0, LOCATION); + columnFile.set(1, 1024L); + + assertThat(columnFile.location()).isEqualTo(LOCATION); + assertThat(columnFile.fileSizeInBytes()).isEqualTo(1024L); + assertThat(columnFile.get(0, String.class)).isEqualTo(LOCATION); + assertThat(columnFile.get(1, Long.class)).isEqualTo(1024L); + } + + @ParameterizedTest + @MethodSource("org.apache.iceberg.TestHelpers#serializers") + void serializationRoundTrip(TestHelpers.RoundTripSerializer<ColumnFile> roundTripSerializer) + throws IOException, ClassNotFoundException { + ColumnFile columnFile = + new ColumnFileStruct( + FORMAT_VERSION, + FIELD_IDS, + LOCATION, + FILE_FORMAT, + FILE_SIZE_IN_BYTES, + KEY_METADATA, + SPLIT_OFFSETS); + + ColumnFile deserialized = roundTripSerializer.apply(columnFile); + + assertThat(deserialized.formatVersion()).isEqualTo(FORMAT_VERSION); Review Comment: maybe use this API from the `Comparators`. ``` public static Comparator<StructLike> forType(Types.StructType struct) ``` ########## core/src/test/java/org/apache/iceberg/TestTrackingBuilder.java: ########## @@ -272,15 +287,69 @@ void manifestDVPositionsProduceModified() { assertThat(modified.deletedPositions()).isEqualTo(deletedBytes); } + @Test + void manifestPositionsWithColumnFilesUpdated() { + ByteBuffer deletedBytes = ByteBuffer.wrap(new byte[] {1}); + Tracking withDeletedPositions = + TrackingBuilder.from(manifestSourceTracking(), 999L) + .columnFilesUpdated() + .deletedPositions(deletedBytes) Review Comment: `deletedPositions` bitmap is only meant for leaf manifest entry in the root manifest file? Ae we testing the scenario of column update for a leaf manifest file in this test? ########## core/src/test/java/org/apache/iceberg/TestTrackingStruct.java: ########## @@ -175,10 +204,22 @@ void doNotInheritSequenceNumberForModifiedEntries() { assertThat(tracking.fileSequenceNumber()).isEqualTo(6L); } + @Test + void inheritDataSequenceNumberAfterColumnFilesChange() { + // Adding column files should set data sequence number to null Review Comment: this test doesn't call the `columnFileUpdated` API and construct the Tracking directly. Hence, it is redundant with the existing inheritFrom tests. maybe change the object construction to reflect the intention this comment describes. ########## core/src/test/java/org/apache/iceberg/TestColumnFileStruct.java: ########## @@ -0,0 +1,280 @@ +/* + * 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.io.IOException; +import java.nio.ByteBuffer; +import java.util.List; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; +import org.apache.iceberg.types.Types; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; + +class TestColumnFileStruct { + + private static final int FORMAT_VERSION = 4; + private static final List<Integer> FIELD_IDS = Lists.newArrayList(1, 2, 3); + private static final String LOCATION = "s3://bucket/data/column.parquet"; + private static final FileFormat FILE_FORMAT = FileFormat.PARQUET; + private static final long FILE_SIZE_IN_BYTES = 1024L; + private static final ByteBuffer KEY_METADATA = ByteBuffer.wrap(new byte[] {1, 2, 3}); + private static final List<Long> SPLIT_OFFSETS = Lists.newArrayList(0L, 512L); + + @Test + void fieldAccess() { + ColumnFile columnFile = + new ColumnFileStruct( + FORMAT_VERSION, + FIELD_IDS, + LOCATION, + FILE_FORMAT, + FILE_SIZE_IN_BYTES, + KEY_METADATA, + SPLIT_OFFSETS); + + assertThat(columnFile.formatVersion()).isEqualTo(FORMAT_VERSION); + assertThat(columnFile.fieldIds()).containsExactlyElementsOf(FIELD_IDS); + assertThat(columnFile.location()).isEqualTo(LOCATION); + assertThat(columnFile.fileFormat()).isEqualTo(FILE_FORMAT); + assertThat(columnFile.fileSizeInBytes()).isEqualTo(FILE_SIZE_IN_BYTES); + assertThat(columnFile.keyMetadata()).isEqualTo(KEY_METADATA); + assertThat(columnFile.splitOffsets()).containsExactlyElementsOf(SPLIT_OFFSETS); + } + + @Test + void copy() { + ColumnFile columnFile = + new ColumnFileStruct( + FORMAT_VERSION, + FIELD_IDS, + LOCATION, + FILE_FORMAT, + FILE_SIZE_IN_BYTES, + KEY_METADATA, + SPLIT_OFFSETS); + + ColumnFile copy = columnFile.copy(); + + assertThat(copy.formatVersion()).isEqualTo(FORMAT_VERSION); + assertThat(copy.fieldIds()).containsExactlyElementsOf(FIELD_IDS); + assertThat(copy.location()).isEqualTo(LOCATION); + assertThat(copy.fileFormat()).isEqualTo(FILE_FORMAT); + assertThat(copy.fileSizeInBytes()).isEqualTo(FILE_SIZE_IN_BYTES); + assertThat(copy.keyMetadata()).isEqualTo(KEY_METADATA); + assertThat(copy.splitOffsets()).containsExactlyElementsOf(SPLIT_OFFSETS); + } + + @Test + void structLikeSize() { + ColumnFileStruct columnFile = new ColumnFileStruct(); + assertThat(columnFile.size()).isEqualTo(7); + } + + @Test + void setFieldsByOrdinals() { + ColumnFileStruct columnFile = new ColumnFileStruct(); + + columnFile.set(0, FORMAT_VERSION); + columnFile.set(1, FIELD_IDS); + columnFile.set(2, LOCATION); + columnFile.set(3, FILE_FORMAT.toString()); + columnFile.set(4, FILE_SIZE_IN_BYTES); + columnFile.set(5, KEY_METADATA); + columnFile.set(6, SPLIT_OFFSETS); + + assertThat(columnFile.formatVersion()).isEqualTo(FORMAT_VERSION); + assertThat(columnFile.fieldIds()).containsExactlyElementsOf(FIELD_IDS); + assertThat(columnFile.location()).isEqualTo(LOCATION); + assertThat(columnFile.fileFormat()).isEqualTo(FILE_FORMAT); + assertThat(columnFile.fileSizeInBytes()).isEqualTo(FILE_SIZE_IN_BYTES); + assertThat(columnFile.keyMetadata()).isEqualTo(KEY_METADATA); + assertThat(columnFile.splitOffsets()).containsExactlyElementsOf(SPLIT_OFFSETS); + } + + @Test + void getFieldsByOrdinals() { + ColumnFileStruct columnFile = + new ColumnFileStruct( + FORMAT_VERSION, + FIELD_IDS, + LOCATION, + FILE_FORMAT, + FILE_SIZE_IN_BYTES, + KEY_METADATA, + SPLIT_OFFSETS); + + assertThat(columnFile.get(0, Integer.class)).isEqualTo(FORMAT_VERSION); + assertThat(columnFile.get(1, List.class)).containsExactlyElementsOf(FIELD_IDS); + assertThat(columnFile.get(2, String.class)).isEqualTo(LOCATION); + assertThat(columnFile.get(3, String.class)).isEqualTo(FILE_FORMAT.toString()); + assertThat(columnFile.get(4, Long.class)).isEqualTo(FILE_SIZE_IN_BYTES); + assertThat(columnFile.get(5, ByteBuffer.class)).isEqualTo(KEY_METADATA); + assertThat(columnFile.get(6, List.class)).containsExactlyElementsOf(SPLIT_OFFSETS); + } + + @Test + void projectedStructLike() { + Types.StructType projection = + Types.StructType.of(ColumnFile.LOCATION, ColumnFile.FILE_SIZE_IN_BYTES); + + ColumnFileStruct columnFile = new ColumnFileStruct(projection); + assertThat(columnFile.size()).isEqualTo(2); + + // projected position 0 maps to internal position of location + // projected position 1 maps to internal position of file_size_in_bytes + columnFile.set(0, LOCATION); + columnFile.set(1, 1024L); Review Comment: nit: wondering why we don't use the `FILE_SIZE_IN_BYTES` constant for this projected field ########## core/src/test/java/org/apache/iceberg/TestTrackingBuilder.java: ########## @@ -272,15 +287,69 @@ void manifestDVPositionsProduceModified() { assertThat(modified.deletedPositions()).isEqualTo(deletedBytes); } + @Test + void manifestPositionsWithColumnFilesUpdated() { + ByteBuffer deletedBytes = ByteBuffer.wrap(new byte[] {1}); + Tracking withDeletedPositions = + TrackingBuilder.from(manifestSourceTracking(), 999L) + .columnFilesUpdated() + .deletedPositions(deletedBytes) + .build(); + + assertThat(withDeletedPositions.status()).isEqualTo(EntryStatus.MODIFIED); + assertThat(withDeletedPositions.latestColumnFileSnapshotId()).isEqualTo(999L); + assertThat(withDeletedPositions.dvSnapshotId()).isEqualTo(999L); + assertThat(withDeletedPositions.deletedPositions()).isEqualTo(deletedBytes); + + ByteBuffer replacedBytes = ByteBuffer.wrap(new byte[] {2}); + Tracking withReplacedPositions = + TrackingBuilder.from(manifestSourceTracking(), 999L) + .columnFilesUpdated() + .replacedPositions(replacedBytes) + .build(); + + assertThat(withReplacedPositions.status()).isEqualTo(EntryStatus.MODIFIED); + assertThat(withReplacedPositions.latestColumnFileSnapshotId()).isEqualTo(999L); + assertThat(withReplacedPositions.dvSnapshotId()).isEqualTo(999L); + assertThat(withReplacedPositions.replacedPositions()).isEqualTo(replacedBytes); + } + + @Test + void columnFilesUpdatedWithManifestPositions() { Review Comment: how is this test different with the previous one? -- 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]
