Merge branch 'release-2.70' of https://github.com/apache/beam into users/damccorm/yamlDeps

Author: damccorm

sdks/java/io/iceberg/src/main/java/org/apache/beam/sdk/io/iceberg/FileWriteResult.java

@@ -21,6 +21,7 @@
 import java.util.Map;
 import org.apache.beam.sdk.schemas.AutoValueSchema;
 import org.apache.beam.sdk.schemas.annotations.DefaultSchema;
+import org.apache.beam.sdk.schemas.annotations.SchemaFieldNumber;
 import org.apache.beam.sdk.schemas.annotations.SchemaIgnore;
 import org.apache.iceberg.DataFile;
 import org.apache.iceberg.PartitionSpec;
@@ -34,8 +35,10 @@ abstract class FileWriteResult {
   private transient @MonotonicNonNull TableIdentifier cachedTableIdentifier;
   private transient @MonotonicNonNull DataFile cachedDataFile;
 
+  @SchemaFieldNumber("0")
   abstract String getTableIdentifierString();
 
+  @SchemaFieldNumber("1")
   abstract SerializableDataFile getSerializableDataFile();
 
   @SchemaIgnore

sdks/java/io/iceberg/src/main/java/org/apache/beam/sdk/io/iceberg/SerializableDataFile.java

@@ -28,6 +28,7 @@
 import java.util.Objects;
 import org.apache.beam.sdk.schemas.AutoValueSchema;
 import org.apache.beam.sdk.schemas.annotations.DefaultSchema;
+import org.apache.beam.sdk.schemas.annotations.SchemaFieldNumber;
 import org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Equivalence;
 import org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.Maps;
 import org.apache.iceberg.DataFile;
@@ -58,32 +59,46 @@ public static Builder builder() {
     return new AutoValue_SerializableDataFile.Builder();
   }
 
+  @SchemaFieldNumber("0")
   abstract String getPath();
 
+  @SchemaFieldNumber("1")
   abstract String getFileFormat();
 
+  @SchemaFieldNumber("2")
   abstract long getRecordCount();
 
+  @SchemaFieldNumber("3")
   abstract long getFileSizeInBytes();
 
+  @SchemaFieldNumber("4")
   abstract String getPartitionPath();
 
+  @SchemaFieldNumber("5")
   abstract int getPartitionSpecId();
 
+  @SchemaFieldNumber("6")
   abstract @Nullable ByteBuffer getKeyMetadata();
 
+  @SchemaFieldNumber("7")
   abstract @Nullable List<Long> getSplitOffsets();
 
+  @SchemaFieldNumber("8")
   abstract @Nullable Map<Integer, Long> getColumnSizes();
 
+  @SchemaFieldNumber("9")
   abstract @Nullable Map<Integer, Long> getValueCounts();
 
+  @SchemaFieldNumber("10")
   abstract @Nullable Map<Integer, Long> getNullValueCounts();
 
+  @SchemaFieldNumber("11")
   abstract @Nullable Map<Integer, Long> getNanValueCounts();
 
+  @SchemaFieldNumber("12")
   abstract @Nullable Map<Integer, byte[]> getLowerBounds();
 
+  @SchemaFieldNumber("13")
   abstract @Nullable Map<Integer, byte[]> getUpperBounds();
 
   @AutoValue.Builder