[test] Assert file_size propagation in iceberg delete file FE/BE tests

Author: cambyzju

be/test/format/table/iceberg/iceberg_delete_file_reader_helper_test.cpp

@@ -219,6 +219,9 @@ TEST(IcebergDeleteFileReaderHelperTest, BuildDeleteFileRange) {
     EXPECT_EQ(range.start_offset, 0);
     EXPECT_EQ(range.size, -1);
     EXPECT_EQ(range.file_size, -1);
+
+    auto range2 = build_iceberg_delete_file_range("s3://bucket/delete.parquet", 1024);
+    EXPECT_EQ(range2.file_size, 1024);
 }
 
 TEST(IcebergDeleteFileReaderHelperTest, IsDeletionVector) {

be/test/format_v2/table/iceberg_reader_test.cpp

@@ -5019,10 +5019,6 @@ TEST(IcebergV2ReaderTest, DataFileIsMarkedImmutableForPageCache) {
     EXPECT_TRUE(reader.current_data_file_is_immutable());
 }
 
-// E2E: Verify file_size from FE thrift propagates through the full reader chain.
-// Data file: 3 rows (id=1,2,3). Equality delete: delete id=2.
-// With file_size set on TIcebergDeleteFileDesc, the reader should use it
-// instead of falling back to stat, and return correct results (id=1,3).
 TEST(IcebergV2ReaderTest, IcebergEqualityDeleteFileSizePropagatedToReader) {
     const auto test_dir =
             std::filesystem::temp_directory_path() / "doris_iceberg_eq_delete_file_size_test";
@@ -5080,9 +5076,6 @@ TEST(IcebergV2ReaderTest, IcebergEqualityDeleteFileSizePropagatedToReader) {
     std::filesystem::remove_all(test_dir);
 }
 
-// E2E: Verify that when file_size is not set (thrift optional defaults to 0),
-// build_iceberg_delete_file_range converts 0 to -1, and FileFactory falls back
-// to stat. The reader should still return correct results.
 TEST(IcebergV2ReaderTest, IcebergEqualityDeleteFileSizeUnknownFallsBackToStat) {
     const auto test_dir =
             std::filesystem::temp_directory_path() / "doris_iceberg_eq_delete_no_file_size_test";
@@ -5094,13 +5087,11 @@ TEST(IcebergV2ReaderTest, IcebergEqualityDeleteFileSizeUnknownFallsBackToStat) {
     write_int_pair_parquet_file(file_path, {1, 2, 3}, {10, 20, 30}, {"one", "two", "three"});
     write_iceberg_equality_delete_parquet_file(delete_file_path, 0, 2);
 
-    // Construct delete file WITHOUT file_size (simulating FE not setting it)
     TIcebergDeleteFileDesc delete_file;
     delete_file.__set_content(2);
     delete_file.__set_path(delete_file_path);
     delete_file.__set_field_ids({0});
     delete_file.__set_file_format(TFileFormatType::FORMAT_PARQUET);
-    // file_size intentionally not set — thrift defaults to 0
 
     std::vector<ColumnDefinition> projected_columns;
     projected_columns.push_back(make_table_column(0, "id", std::make_shared<DataTypeInt32>()));

fe/fe-connector/fe-connector-iceberg/src/test/java/org/apache/doris/connector/iceberg/IcebergScanPlanProviderTest.java

@@ -4200,14 +4200,11 @@ public void deleteFile(String path) {
 
     @Test
     public void deleteFileSizePropagatedFromIcebergManifest() {
-        // E2E: iceberg DeleteFile.fileSizeInBytes (482) → IcebergScanPlanProvider →
-        // IcebergScanRange.DeleteFile.fileSize → toThrift → TIcebergDeleteFileDesc.file_size
         Table table = createTable("t_filesize", SCHEMA, PartitionSpec.unpartitioned(),
                 Collections.singletonMap("format-version", "2"));
         table.newAppend()
                 .appendFile(dataFile(table.spec(), "s3://b/db/t_filesize/f1.parquet", 512, null, null))
                 .commit();
-        // Position delete with fileSizeInBytes=128 (rewritableDeleteDescs includes position deletes)
         DeleteFile posDelete = FileMetadata.deleteFileBuilder(table.spec())
                 .ofPositionDeletes()
                 .withPath("s3://b/db/t_filesize/pos-delete.parquet")
@@ -4227,9 +4224,6 @@ public void deleteFileSizePropagatedFromIcebergManifest() {
         Assertions.assertEquals(1, ranges.size());
         IcebergScanRange range = (IcebergScanRange) ranges.get(0);
 
-        // Use rewritableDeleteDescs() (returns TIcebergDeleteFileDesc via toThrift)
-        // to verify file_size propagated from iceberg manifest → DeleteFile → toThrift.
-        // Note: equality deletes are excluded from rewritableDeleteDescs, so use position delete instead.
         List<TIcebergDeleteFileDesc> descs = range.rewritableDeleteDescs();
         Assertions.assertFalse(descs.isEmpty());
         TIcebergDeleteFileDesc desc = descs.get(0);

fe/fe-connector/fe-connector-iceberg/src/test/java/org/apache/doris/connector/iceberg/IcebergScanRangeTest.java

@@ -207,6 +207,9 @@ public void populateRangeParamsV2EmitsPositionDeleteFile() {
         Assertions.assertEquals(10L, d.getPositionLowerBound());
         Assertions.assertTrue(d.isSetPositionUpperBound());
         Assertions.assertEquals(99L, d.getPositionUpperBound());
+        // file_size is propagated from DeleteFile to TIcebergDeleteFileDesc.
+        Assertions.assertTrue(d.isSetFileSize());
+        Assertions.assertEquals(100L, d.getFileSize());
         // A position delete carries neither equality field-ids nor a deletion-vector blob ref.
         Assertions.assertFalse(d.isSetFieldIds());
         Assertions.assertFalse(d.isSetContentOffset());
@@ -255,13 +258,17 @@ public void populateRangeParamsV2EmitsDeletionVectorAndEqualityDelete() {
         Assertions.assertEquals(64L, dvDesc.getContentSizeInBytes());
         Assertions.assertEquals(5L, dvDesc.getPositionLowerBound());
         Assertions.assertEquals(42L, dvDesc.getPositionUpperBound());
+        Assertions.assertTrue(dvDesc.isSetFileSize());
+        Assertions.assertEquals(100L, dvDesc.getFileSize());
 
         TIcebergDeleteFileDesc eqDesc = deletes.get(1);
         Assertions.assertEquals(2, eqDesc.getContent());
         Assertions.assertEquals(Arrays.asList(3, 7), eqDesc.getFieldIds());
         Assertions.assertEquals(TFileFormatType.FORMAT_PARQUET, eqDesc.getFileFormat());
         Assertions.assertFalse(eqDesc.isSetContentOffset());
         Assertions.assertFalse(eqDesc.isSetPositionLowerBound());
+        Assertions.assertTrue(eqDesc.isSetFileSize());
+        Assertions.assertEquals(100L, eqDesc.getFileSize());
     }
 
     @Test