Skip to content

Commit cb12c93

Browse files
committed
Adding back a null check for SparkFileWriterFactory.schema
1 parent e6c6147 commit cb12c93

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

spark/v4.0/spark/src/main/java/org/apache/iceberg/spark/source/SparkFileWriterFactory.java

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ class SparkFileWriterFactory extends RegistryBasedFileWriterFactory<InternalRow,
9595
equalityDeleteSortOrder,
9696
writeProperties,
9797
calculateSparkType(dataSparkType, dataSchema),
98-
calculateSparkType(equalityDeleteSparkType, equalityDeleteRowSchema));
98+
calculateSparkTypeForEqualityDelete(equalityDeleteSparkType, equalityDeleteRowSchema));
9999

100100
this.table = table;
101101
this.format = dataFileFormat;
@@ -348,6 +348,16 @@ SparkFileWriterFactory build() {
348348
}
349349

350350
private static StructType calculateSparkType(StructType sparkType, Schema schema) {
351+
if (sparkType != null) {
352+
return sparkType;
353+
} else {
354+
Preconditions.checkNotNull(schema, "Data schema must not be null");
355+
return SparkSchemaUtil.convert(schema);
356+
}
357+
}
358+
359+
private static StructType calculateSparkTypeForEqualityDelete(
360+
StructType sparkType, Schema schema) {
351361
if (sparkType != null) {
352362
return sparkType;
353363
} else if (schema != null) {

0 commit comments

Comments
 (0)