Core: Implement column file metadata structs

core/src/main/java/org/apache/iceberg/ColumnFile.java

@@ -0,0 +1,54 @@
+/*
+ * 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 java.util.List;
+import org.apache.iceberg.types.Types;
+
+/** Information about a column file. */
+interface ColumnFile {
+  Types.NestedField FIELD_IDS =
+      Types.NestedField.required(
+          161,
+          "field_ids",
+          Types.ListType.ofRequired(162, Types.IntegerType.get()),
+          "Field IDs this column file contains");
+  Types.NestedField LOCATION =
+      Types.NestedField.required(
+          163, "location", Types.StringType.get(), "Location of the column file");
+  Types.NestedField FILE_SIZE_IN_BYTES =
+      Types.NestedField.required(
+          164, "file_size_in_bytes", Types.LongType.get(), "Total column file size in bytes");
+
+  static Types.StructType schema() {
+    return Types.StructType.of(FIELD_IDS, LOCATION, FILE_SIZE_IN_BYTES);
+  }
+
+  /** Returns the field IDs contained in this column file. */
+  List<Integer> fieldIds();
+
+  /** Returns the location of the column file. */
+  String location();
+
+  /** Returns the total size of the column file in bytes. */
+  long fileSizeInBytes();
+
+  /** Copies this column file info. */
+  ColumnFile copy();
+}

core/src/main/java/org/apache/iceberg/ColumnFileStruct.java

@@ -0,0 +1,171 @@
+/*
+ * 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 java.io.Serializable;
+import java.util.Arrays;
+import java.util.List;
+import org.apache.iceberg.avro.SupportsIndexProjection;
+import org.apache.iceberg.relocated.com.google.common.base.MoreObjects;
+import org.apache.iceberg.relocated.com.google.common.base.Preconditions;
+import org.apache.iceberg.types.Types;
+import org.apache.iceberg.util.ArrayUtil;
+
+/** Mutable {@link StructLike} implementation of {@link ColumnFile}. */
+class ColumnFileStruct extends SupportsIndexProjection implements ColumnFile, Serializable {
+  private static final Types.StructType BASE_TYPE =
+      Types.StructType.of(ColumnFile.FIELD_IDS, ColumnFile.LOCATION, ColumnFile.FILE_SIZE_IN_BYTES);
+
+  private int[] fieldIds = null;
+  private String location = null;
+  private long fileSizeInBytes = -1L;
+
+  /** Used by internal readers to instantiate this class with a projection schema. */
+  ColumnFileStruct(Types.StructType projection) {
+    super(BASE_TYPE, projection);
+  }
+
+  private ColumnFileStruct(int[] fieldIds, String location, long fileSizeInBytes) {
+    super(BASE_TYPE.fields().size());
+    this.fieldIds = fieldIds;
+    this.location = location;
+    this.fileSizeInBytes = fileSizeInBytes;
+  }
+
+  /** Copy constructor. */
+  private ColumnFileStruct(ColumnFileStruct toCopy) {
+    super(toCopy);
+    this.fieldIds =
+        toCopy.fieldIds != null ? Arrays.copyOf(toCopy.fieldIds, toCopy.fieldIds.length) : null;
+    this.location = toCopy.location;
+    this.fileSizeInBytes = toCopy.fileSizeInBytes;
+  }
+
+  /** Constructor for Java serialization. */
+  ColumnFileStruct() {
+    super(BASE_TYPE.fields().size());
+  }
+
+  @Override
+  public List<Integer> fieldIds() {
+    return fieldIds != null ? ArrayUtil.toUnmodifiableIntList(fieldIds) : null;
+  }
+
+  @Override
+  public String location() {
+    return location;
+  }
+
+  @Override
+  public long fileSizeInBytes() {
+    return fileSizeInBytes;
+  }
+
+  @Override
+  public ColumnFile copy() {
+    return new ColumnFileStruct(this);
+  }
+
+  @Override
+  protected <T> T internalGet(int pos, Class<T> javaClass) {
+    return javaClass.cast(getByPos(pos));
+  }
+
+  private Object getByPos(int pos) {
+    switch (pos) {
+      case 0:
+        return fieldIds();
+      case 1:
+        return location;
+      case 2:
+        return fileSizeInBytes;
+      default:
+        throw new UnsupportedOperationException("Unknown field ordinal: " + pos);
+    }
+  }
+
+  @Override
+  @SuppressWarnings("unchecked")
+  protected <T> void internalSet(int pos, T value) {
+    switch (pos) {
+      case 0:
+        this.fieldIds = ArrayUtil.toIntArray((List<Integer>) value);
+        break;
+      case 1:
+        // always coerce to String for Serializable
+        this.location = value.toString();
+        break;
+      case 2:
+        this.fileSizeInBytes = (long) value;
+        break;
+      default:
+        // ignore the object, it must be from a newer version of the format
+    }
+  }
+
+  static Builder builder() {
+    return new Builder();
+  }
+
+  @Override
+  public String toString() {
+    return MoreObjects.toStringHelper(this)
+        .add("field_ids", fieldIds == null ? "null" : fieldIds())
+        .add("location", location)
+        .add("file_size_in_bytes", fileSizeInBytes)
+        .toString();
+  }
+
+  static class Builder {
+    private int[] fieldIds = null;
+    private String location = null;
+    private Long fileSizeInBytes = null;
+
+    Builder fieldIds(List<Integer> newFieldIds) {
+      Preconditions.checkArgument(newFieldIds != null, "Invalid field IDs: null");
+      Preconditions.checkArgument(!newFieldIds.isEmpty(), "Invalid field IDs: empty");
+      this.fieldIds = ArrayUtil.toIntArray(newFieldIds);
+      return this;
+    }
+
+    Builder location(String newLocation) {
+      Preconditions.checkArgument(newLocation != null, "Invalid location: null");
+      Preconditions.checkArgument(!newLocation.isEmpty(), "Invalid location: empty");
+      this.location = newLocation;
+      return this;
+    }
+
+    Builder fileSizeInBytes(long newFileSizeInBytes) {
+      Preconditions.checkArgument(
+          newFileSizeInBytes >= 0,
+          "Invalid file size in bytes: %s (must be >= 0)",
+          newFileSizeInBytes);
+      this.fileSizeInBytes = newFileSizeInBytes;
+      return this;
+    }
+
+    ColumnFile build() {
+      Preconditions.checkArgument(fieldIds != null, "Missing required value: fieldIds");
+      Preconditions.checkArgument(location != null, "Missing required value: location");
+      Preconditions.checkArgument(
+          fileSizeInBytes != null, "Missing required value: fileSizeInBytes");
+      return new ColumnFileStruct(fieldIds, location, fileSizeInBytes);
+    }
+  }
+}

core/src/main/java/org/apache/iceberg/TrackedFile.java

@@ -91,6 +91,12 @@ interface TrackedFile {
           "equality_ids",
           Types.ListType.ofRequired(136, Types.IntegerType.get()),
           "Field ids used to determine row equality in equality delete files");
+  Types.NestedField COLUMN_FILES =
+      Types.NestedField.optional(
+          158,
+          "column_files",
+          Types.ListType.ofRequired(159, ColumnFile.schema()),
+          "Column update files");
 
   static Types.StructType schemaWithContentStats(
       Types.StructType partitionType, Types.StructType contentStatsType) {
@@ -110,7 +116,8 @@ static Types.StructType schemaWithContentStats(
         MANIFEST_INFO,
         KEY_METADATA,
         SPLIT_OFFSETS,
-        EQUALITY_IDS);
+        EQUALITY_IDS,
+        COLUMN_FILES);
   }
 
   /** Returns the tracking information for this entry. */
@@ -158,6 +165,9 @@ static Types.StructType schemaWithContentStats(
   /** Returns the set of field IDs used for equality comparison in equality delete files. */
   List<Integer> equalityIds();
 
+  /** Returns the column files for this file. */
+  List<ColumnFile> columnFiles();
+
   /** Copies this tracked file. */
   TrackedFile copy();
 

core/src/main/java/org/apache/iceberg/TrackedFileStruct.java

@@ -21,8 +21,10 @@
 import java.io.Serializable;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.Set;
+import java.util.stream.Collectors;
 import org.apache.iceberg.avro.SupportsIndexProjection;
 import org.apache.iceberg.relocated.com.google.common.base.MoreObjects;
 import org.apache.iceberg.types.Type;
@@ -65,7 +67,8 @@ public PartitionData copy() {
           TrackedFile.MANIFEST_INFO,
           TrackedFile.KEY_METADATA,
           TrackedFile.SPLIT_OFFSETS,
-          TrackedFile.EQUALITY_IDS);
+          TrackedFile.EQUALITY_IDS,
+          TrackedFile.COLUMN_FILES);
 
   private FileContent contentType = null;
   private String location = null;
@@ -84,6 +87,7 @@ public PartitionData copy() {
   private byte[] keyMetadata = null;
   private long[] splitOffsets = null;
   private int[] equalityIds = null;
+  private List<ColumnFile> columnFiles = null;
 
   /** Used by internal readers to instantiate this class with a projection schema. */
   TrackedFileStruct(Types.StructType projection) {
@@ -155,6 +159,10 @@ private TrackedFileStruct(TrackedFileStruct toCopy, boolean withStats, Set<Integ
         toCopy.equalityIds != null
             ? Arrays.copyOf(toCopy.equalityIds, toCopy.equalityIds.length)
             : null;
+    this.columnFiles =
+        toCopy.columnFiles != null
+            ? toCopy.columnFiles.stream().map(ColumnFile::copy).collect(Collectors.toList())
+            : null;
   }
 
   @Override
@@ -232,6 +240,11 @@ public List<Integer> equalityIds() {
     return equalityIds != null ? ArrayUtil.toUnmodifiableIntList(equalityIds) : null;
   }
 
+  @Override
+  public List<ColumnFile> columnFiles() {
+    return columnFiles != null ? Collections.unmodifiableList(columnFiles) : null;
+  }
+
   @Override
   public TrackedFile copy() {
     return new TrackedFileStruct(this, true, null);
@@ -279,6 +292,8 @@ private Object getByPos(int pos) {
         return splitOffsets();
       case 14:
         return equalityIds();
+      case 15:
+        return columnFiles();
       default:
         throw new UnsupportedOperationException("Unknown field ordinal: " + pos);
     }
@@ -333,6 +348,10 @@ protected <T> void internalSet(int pos, T value) {
       case 14:
         this.equalityIds = ArrayUtil.toIntArray((List<Integer>) value);
         break;
+      case 15:
+        this.columnFiles =
+            ((List<ColumnFile>) value).stream().map(ColumnFile::copy).collect(Collectors.toList());
+        break;
       default:
         // ignore the object, it must be from a newer version of the format
     }
@@ -356,6 +375,7 @@ public String toString() {
         .add("key_metadata", keyMetadata == null ? "null" : "(redacted)")
         .add("split_offsets", splitOffsets == null ? "null" : splitOffsets())
         .add("equality_ids", equalityIds == null ? "null" : equalityIds())
+        .add("column_files", columnFiles)
         .toString();
   }
 }

core/src/main/java/org/apache/iceberg/Tracking.java

@@ -65,6 +65,12 @@ interface Tracking {
           "replaced_positions",
           Types.BinaryType.get(),
           "Bitmap of positions replaced in this snapshot");
+  Types.NestedField LATEST_COLUMN_FILE_SNAPSHOT_ID =
+      Types.NestedField.optional(
+          160,
+          "latest_column_file_snapshot_id",
+          Types.LongType.get(),
+          "Snapshot ID where the latest column file was added; null if there are no column files");
 
   static Types.StructType schema() {
     return Types.StructType.of(
@@ -75,7 +81,8 @@ static Types.StructType schema() {
         DV_SNAPSHOT_ID,
         FIRST_ROW_ID,
         DELETED_POSITIONS,
-        REPLACED_POSITIONS);
+        REPLACED_POSITIONS,
+        LATEST_COLUMN_FILE_SNAPSHOT_ID);
   }
 
   /** Returns the status of the entry. */
@@ -107,6 +114,12 @@ default boolean isLive() {
   /** Returns the bitmap of positions replaced in this snapshot. */
   ByteBuffer replacedPositions();
 
+  /**
+   * Returns the snapshot ID where the latest column file was added; null if there are no column
+   * files.
+   */
+  Long latestColumnFileSnapshotId();
+
   /** Returns the manifest location this entry was read from, or null. */
   String manifestLocation();