Skip to content

Commit be05acd

Browse files
committed
Parameter order change
1 parent b1c225b commit be05acd

2 files changed

Lines changed: 12 additions & 4 deletions

File tree

spark/v4.1/spark/src/main/java/org/apache/iceberg/spark/data/SparkParquetWriters.java

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,19 +78,28 @@ public class SparkParquetWriters {
7878
private SparkParquetWriters() {}
7979

8080
public static <T> ParquetValueWriter<T> buildWriter(StructType dfSchema, MessageType type) {
81-
return buildWriter(null, dfSchema, type);
81+
return buildWriter(null, type, dfSchema);
8282
}
8383

8484
@SuppressWarnings("unchecked")
8585
public static <T> ParquetValueWriter<T> buildWriter(
86-
Schema icebergSchema, StructType dfSchema, MessageType type) {
86+
Schema icebergSchema, MessageType type, StructType dfSchema) {
8787
return (ParquetValueWriter<T>)
8888
ParquetWithSparkSchemaVisitor.visit(
8989
dfSchema != null ? dfSchema : SparkSchemaUtil.convert(icebergSchema),
9090
type,
9191
new WriteBuilder(type));
9292
}
9393

94+
public static <T> ParquetValueWriter<T> buildWriter(
95+
StructType dfSchema, MessageType type, Schema icebergSchema) {
96+
return (ParquetValueWriter<T>)
97+
ParquetWithSparkSchemaVisitor.visit(
98+
dfSchema != null ? dfSchema : SparkSchemaUtil.convert(icebergSchema),
99+
type,
100+
new WriteBuilder(type));
101+
}
102+
94103
private static class WriteBuilder extends ParquetWithSparkSchemaVisitor<ParquetValueWriter<?>> {
95104
private final MessageType type;
96105

spark/v4.1/spark/src/main/java/org/apache/iceberg/spark/source/SparkFormatModels.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,7 @@ public static void register() {
4848
ParquetFormatModel.create(
4949
InternalRow.class,
5050
StructType.class,
51-
(icebergSchema, fileSchema, engineSchema) ->
52-
SparkParquetWriters.buildWriter(icebergSchema, engineSchema, fileSchema),
51+
SparkParquetWriters::buildWriter,
5352
(icebergSchema, fileSchema, engineSchema, idToConstant) ->
5453
SparkParquetReaders.buildReader(icebergSchema, fileSchema, idToConstant)));
5554

0 commit comments

Comments
 (0)