Skip to content

Data: Add TCK tests for Metadata Columns in BaseFormatModelTests #15675

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Guosmilesmile wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Data: Add TCK tests for Metadata Columns in BaseFormatModelTests #15675

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
486652f
Data: Add TCK tests for Metadata Columns in BaseFormatModelTests
Guosmilesmile Mar 18, 2026
455a30d
Address Comment
Guosmilesmile Mar 24, 2026
2fa854a
fix ci
Guosmilesmile Mar 24, 2026
d0d35a0
Address Comment
Guosmilesmile Mar 25, 2026
8ad4e9c
fix other version
Guosmilesmile Mar 25, 2026
ac01dbd
add testReaderSchemaEvolutionNewColumnWithDefault
Guosmilesmile Mar 25, 2026
14d33d0
remove useless
Guosmilesmile Mar 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
549 changes: 548 additions & 1 deletion data/src/test/java/org/apache/iceberg/data/BaseFormatModelTests.java
View file
Open in desktop

Large diffs are not rendered by default.

26 changes: 26 additions & 0 deletions flink/v1.20/flink/src/test/java/org/apache/iceberg/flink/data/TestFlinkFormatModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,17 @@
package org.apache.iceberg.flink.data;

import java.util.List;
import org.apache.flink.table.data.GenericRowData;
import org.apache.flink.table.data.RowData;
import org.apache.iceberg.PartitionData;
import org.apache.iceberg.Schema;
import org.apache.iceberg.data.BaseFormatModelTests;
import org.apache.iceberg.data.Record;
import org.apache.iceberg.flink.FlinkSchemaUtil;
import org.apache.iceberg.flink.RowDataConverter;
import org.apache.iceberg.flink.TestHelpers;
import org.apache.iceberg.types.Type;
import org.apache.iceberg.types.Types;

public class TestFlinkFormatModel extends BaseFormatModelTests<RowData> {

Expand All @@ -48,4 +52,26 @@ protected RowData convertToEngine(Record record, Schema schema) {
protected void assertEquals(Schema schema, List<RowData> expected, List<RowData> actual) {
TestHelpers.assertRows(actual, expected, FlinkSchemaUtil.convert(schema));
}

@Override
protected Object convertConstantToEngine(Type type, Object value) {
if (value instanceof PartitionData partitionData) {
Types.StructType structType = type.asStructType();
List<Types.NestedField> fields = structType.fields();
GenericRowData rowData = new GenericRowData(fields.size());
int sourceSize = partitionData.size();
for (int i = 0; i < fields.size(); i++) {
if (i < sourceSize) {
Object fieldValue = partitionData.get(i, Object.class);
rowData.setField(i, convertConstantToEngine(fields.get(i).type(), fieldValue));
} else {
rowData.setField(i, null);
}
}

return rowData;
}

return RowDataUtil.convertConstant(type, value);
}
}
26 changes: 26 additions & 0 deletions flink/v2.0/flink/src/test/java/org/apache/iceberg/flink/data/TestFlinkFormatModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,17 @@
package org.apache.iceberg.flink.data;

import java.util.List;
import org.apache.flink.table.data.GenericRowData;
import org.apache.flink.table.data.RowData;
import org.apache.iceberg.PartitionData;
import org.apache.iceberg.Schema;
import org.apache.iceberg.data.BaseFormatModelTests;
import org.apache.iceberg.data.Record;
import org.apache.iceberg.flink.FlinkSchemaUtil;
import org.apache.iceberg.flink.RowDataConverter;
import org.apache.iceberg.flink.TestHelpers;
import org.apache.iceberg.types.Type;
import org.apache.iceberg.types.Types;

public class TestFlinkFormatModel extends BaseFormatModelTests<RowData> {

Expand All @@ -48,4 +52,26 @@ protected RowData convertToEngine(Record record, Schema schema) {
protected void assertEquals(Schema schema, List<RowData> expected, List<RowData> actual) {
TestHelpers.assertRows(actual, expected, FlinkSchemaUtil.convert(schema));
}

@Override
protected Object convertConstantToEngine(Type type, Object value) {
if (value instanceof PartitionData partitionData) {
Types.StructType structType = type.asStructType();
List<Types.NestedField> fields = structType.fields();
GenericRowData rowData = new GenericRowData(fields.size());
int sourceSize = partitionData.size();
for (int i = 0; i < fields.size(); i++) {
if (i < sourceSize) {
Object fieldValue = partitionData.get(i, Object.class);
rowData.setField(i, convertConstantToEngine(fields.get(i).type(), fieldValue));
} else {
rowData.setField(i, null);
}
}

return rowData;
}

return RowDataUtil.convertConstant(type, value);
}
}
26 changes: 26 additions & 0 deletions flink/v2.1/flink/src/test/java/org/apache/iceberg/flink/data/TestFlinkFormatModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,17 @@
package org.apache.iceberg.flink.data;

import java.util.List;
import org.apache.flink.table.data.GenericRowData;
import org.apache.flink.table.data.RowData;
import org.apache.iceberg.PartitionData;
import org.apache.iceberg.Schema;
import org.apache.iceberg.data.BaseFormatModelTests;
import org.apache.iceberg.data.Record;
import org.apache.iceberg.flink.FlinkSchemaUtil;
import org.apache.iceberg.flink.RowDataConverter;
import org.apache.iceberg.flink.TestHelpers;
import org.apache.iceberg.types.Type;
import org.apache.iceberg.types.Types;

public class TestFlinkFormatModel extends BaseFormatModelTests<RowData> {

Expand All @@ -48,4 +52,26 @@ protected RowData convertToEngine(Record record, Schema schema) {
protected void assertEquals(Schema schema, List<RowData> expected, List<RowData> actual) {
TestHelpers.assertRows(actual, expected, FlinkSchemaUtil.convert(schema));
}

@Override
protected Object convertConstantToEngine(Type type, Object value) {
if (value instanceof PartitionData partitionData) {
Types.StructType structType = type.asStructType();
List<Types.NestedField> fields = structType.fields();
GenericRowData rowData = new GenericRowData(fields.size());
int sourceSize = partitionData.size();
for (int i = 0; i < fields.size(); i++) {
if (i < sourceSize) {
Object fieldValue = partitionData.get(i, Object.class);
rowData.setField(i, convertConstantToEngine(fields.get(i).type(), fieldValue));
} else {
rowData.setField(i, null);
}
}

return rowData;
}

return RowDataUtil.convertConstant(type, value);
}
}
7 changes: 7 additions & 0 deletions spark/v3.4/spark/src/test/java/org/apache/iceberg/spark/data/TestSparkFormatModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
import org.apache.iceberg.data.BaseFormatModelTests;
import org.apache.iceberg.data.Record;
import org.apache.iceberg.spark.SparkSchemaUtil;
import org.apache.iceberg.spark.SparkUtil;
import org.apache.iceberg.types.Type;
import org.apache.spark.sql.catalyst.InternalRow;

public class TestSparkFormatModel extends BaseFormatModelTests<InternalRow> {
Expand All @@ -51,4 +53,9 @@ protected void assertEquals(Schema schema, List<InternalRow> expected, List<Inte
TestHelpers.assertEquals(schema, expected.get(i), actual.get(i));
}
}

@Override
protected Object convertConstantToEngine(Type type, Object value) {
return SparkUtil.internalToSpark(type, value);
}
}
7 changes: 7 additions & 0 deletions spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/data/TestSparkFormatModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
import org.apache.iceberg.data.BaseFormatModelTests;
import org.apache.iceberg.data.Record;
import org.apache.iceberg.spark.SparkSchemaUtil;
import org.apache.iceberg.spark.SparkUtil;
import org.apache.iceberg.types.Type;
import org.apache.spark.sql.catalyst.InternalRow;

public class TestSparkFormatModel extends BaseFormatModelTests<InternalRow> {
Expand All @@ -51,4 +53,9 @@ protected void assertEquals(Schema schema, List<InternalRow> expected, List<Inte
TestHelpers.assertEquals(schema, expected.get(i), actual.get(i));
}
}

@Override
protected Object convertConstantToEngine(Type type, Object value) {
return SparkUtil.internalToSpark(type, value);
}
}
7 changes: 7 additions & 0 deletions spark/v4.0/spark/src/test/java/org/apache/iceberg/spark/data/TestSparkFormatModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
import org.apache.iceberg.data.BaseFormatModelTests;
import org.apache.iceberg.data.Record;
import org.apache.iceberg.spark.SparkSchemaUtil;
import org.apache.iceberg.spark.SparkUtil;
import org.apache.iceberg.types.Type;
import org.apache.spark.sql.catalyst.InternalRow;

public class TestSparkFormatModel extends BaseFormatModelTests<InternalRow> {
Expand All @@ -51,4 +53,9 @@ protected void assertEquals(Schema schema, List<InternalRow> expected, List<Inte
TestHelpers.assertEquals(schema, expected.get(i), actual.get(i));
}
}

@Override
protected Object convertConstantToEngine(Type type, Object value) {
return SparkUtil.internalToSpark(type, value);
}
}
7 changes: 7 additions & 0 deletions spark/v4.1/spark/src/test/java/org/apache/iceberg/spark/data/TestSparkFormatModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
import org.apache.iceberg.data.BaseFormatModelTests;
import org.apache.iceberg.data.Record;
import org.apache.iceberg.spark.SparkSchemaUtil;
import org.apache.iceberg.spark.SparkUtil;
import org.apache.iceberg.types.Type;
import org.apache.spark.sql.catalyst.InternalRow;

public class TestSparkFormatModel extends BaseFormatModelTests<InternalRow> {
Expand All @@ -51,4 +53,9 @@ protected void assertEquals(Schema schema, List<InternalRow> expected, List<Inte
TestHelpers.assertEquals(schema, expected.get(i), actual.get(i));
}
}

@Override
protected Object convertConstantToEngine(Type type, Object value) {
return SparkUtil.internalToSpark(type, value);
}
}
Loading