From 976d1d854c12574ef880fbd8aa51c27bd14d0af0 Mon Sep 17 00:00:00 2001
From: zhang-arvin <arvin.zhang@htx-inc.com>
Date: Sat, 29 Aug 2026 20:18:20 +0800
Subject: [PATCH] [Bug] Add sequence-number fields to REST ContentFile
 serialization (#17319)

Signed-off-by: zhang-arvin <arvin.zhang@htx-inc.com>
---
 .../org/apache/iceberg/ContentFileParser.java | 69 ++++++++++++-------
 open-api/rest-catalog-open-api.yaml           |  8 +++
 2 files changed, 51 insertions(+), 26 deletions(-)

diff --git a/core/src/main/java/org/apache/iceberg/ContentFileParser.java b/core/src/main/java/org/apache/iceberg/ContentFileParser.java
index 0499fef6d90a..d50a4194da9d 100644
--- a/core/src/main/java/org/apache/iceberg/ContentFileParser.java
+++ b/core/src/main/java/org/apache/iceberg/ContentFileParser.java
@@ -48,6 +48,8 @@ public class ContentFileParser {
   private static final String EQUALITY_IDS = "equality-ids";
   private static final String SORT_ORDER_ID = "sort-order-id";
   private static final String FIRST_ROW_ID = "first-row-id";
+  private static final String DATA_SEQUENCE_NUMBER = "data-sequence-number";
+  private static final String FILE_SEQUENCE_NUMBER = "file-sequence-number";
   private static final String REFERENCED_DATA_FILE = "referenced-data-file";
   private static final String CONTENT_OFFSET = "content-offset";
   private static final String CONTENT_SIZE = "content-size-in-bytes";
@@ -123,6 +125,11 @@ public static void toJson(ContentFile<?> contentFile, PartitionSpec spec, JsonGe
 
     JsonUtil.writeLongFieldIfPresent(FIRST_ROW_ID, contentFile.firstRowId(), generator);
 
+    JsonUtil.writeLongFieldIfPresent(
+        DATA_SEQUENCE_NUMBER, contentFile.dataSequenceNumber(), generator);
+    JsonUtil.writeLongFieldIfPresent(
+        FILE_SEQUENCE_NUMBER, contentFile.fileSequenceNumber(), generator);
+
     if (contentFile instanceof DeleteFile) {
       DeleteFile deleteFile = (DeleteFile) contentFile;
 
@@ -170,38 +177,48 @@ public static ContentFile<?> fromJson(JsonNode jsonNode, Map<Integer, PartitionS
     int[] equalityFieldIds = JsonUtil.getIntArrayOrNull(EQUALITY_IDS, jsonNode);
     Integer sortOrderId = JsonUtil.getIntOrNull(SORT_ORDER_ID, jsonNode);
     Long firstRowId = JsonUtil.getLongOrNull(FIRST_ROW_ID, jsonNode);
+    Long dataSequenceNumber = JsonUtil.getLongOrNull(DATA_SEQUENCE_NUMBER, jsonNode);
+    Long fileSequenceNumber = JsonUtil.getLongOrNull(FILE_SEQUENCE_NUMBER, jsonNode);
     String referencedDataFile = JsonUtil.getStringOrNull(REFERENCED_DATA_FILE, jsonNode);
     Long contentOffset = JsonUtil.getLongOrNull(CONTENT_OFFSET, jsonNode);
     Long contentSizeInBytes = JsonUtil.getLongOrNull(CONTENT_SIZE, jsonNode);
 
     if (fileContent == FileContent.DATA) {
-      return new GenericDataFile(
-          specId,
-          filePath,
-          fileFormat,
-          partitionData,
-          fileSizeInBytes,
-          metrics,
-          keyMetadata,
-          splitOffsets,
-          sortOrderId,
-          firstRowId);
+      GenericDataFile dataFile =
+          new GenericDataFile(
+              specId,
+              filePath,
+              fileFormat,
+              partitionData,
+              fileSizeInBytes,
+              metrics,
+              keyMetadata,
+              splitOffsets,
+              sortOrderId,
+              firstRowId);
+      dataFile.setDataSequenceNumber(dataSequenceNumber);
+      dataFile.setFileSequenceNumber(fileSequenceNumber);
+      return dataFile;
     } else {
-      return new GenericDeleteFile(
-          specId,
-          fileContent,
-          filePath,
-          fileFormat,
-          partitionData,
-          fileSizeInBytes,
-          metrics,
-          equalityFieldIds,
-          sortOrderId,
-          splitOffsets,
-          keyMetadata,
-          referencedDataFile,
-          contentOffset,
-          contentSizeInBytes);
+      GenericDeleteFile deleteFile =
+          new GenericDeleteFile(
+              specId,
+              fileContent,
+              filePath,
+              fileFormat,
+              partitionData,
+              fileSizeInBytes,
+              metrics,
+              equalityFieldIds,
+              sortOrderId,
+              splitOffsets,
+              keyMetadata,
+              referencedDataFile,
+              contentOffset,
+              contentSizeInBytes);
+      deleteFile.setDataSequenceNumber(dataSequenceNumber);
+      deleteFile.setFileSequenceNumber(fileSequenceNumber);
+      return deleteFile;
     }
   }
 
diff --git a/open-api/rest-catalog-open-api.yaml b/open-api/rest-catalog-open-api.yaml
index e9a530a12804..cb64ce313dac 100644
--- a/open-api/rest-catalog-open-api.yaml
+++ b/open-api/rest-catalog-open-api.yaml
@@ -5222,6 +5222,14 @@ components:
           description: "List of splittable offsets"
         sort-order-id:
           type: integer
+        data-sequence-number:
+          type: integer
+          format: int64
+          description: The data sequence number of the file
+        file-sequence-number:
+          type: integer
+          format: int64
+          description: The file sequence number of the file
 
     DataFile:
       allOf: