Skip to content

Commit 955de3b

Browse files
committed
Disable default value preserving (linkedin#106)
* Disable default value preserving
1 parent a3be29e commit 955de3b

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

core/src/main/java/org/apache/iceberg/SchemaParser.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,8 @@ private static void toJson(Types.StructType struct, Integer schemaId, Set<Intege
119119
generator.writeBooleanField(REQUIRED, field.isRequired());
120120
generator.writeFieldName(TYPE);
121121
toJson(field.type(), generator);
122-
writeDefaultValue(field.getDefaultValue(), field.type(), generator);
122+
// BDP-11826: Disable serializing default value
123+
// writeDefaultValue(field.getDefaultValue(), field.type(), generator);
123124
if (field.doc() != null) {
124125
generator.writeStringField(DOC, field.doc());
125126
}
@@ -268,13 +269,14 @@ private static Types.StructType structFromJson(JsonNode json) {
268269
int id = JsonUtil.getInt(ID, field);
269270
String name = JsonUtil.getString(NAME, field);
270271
Type type = typeFromJson(field.get(TYPE));
271-
Object defaultValue = defaultValueFromJson(field, type);
272+
// BDP-11826: Disable deserializing default value
273+
// Object defaultValue = defaultValueFromJson(field, type);
272274
String doc = JsonUtil.getStringOrNull(DOC, field);
273275
boolean isRequired = JsonUtil.getBool(REQUIRED, field);
274276
if (isRequired) {
275-
fields.add(Types.NestedField.required(id, name, type, defaultValue, doc));
277+
fields.add(Types.NestedField.required(id, name, type, doc));
276278
} else {
277-
fields.add(Types.NestedField.optional(id, name, type, defaultValue, doc));
279+
fields.add(Types.NestedField.optional(id, name, type, doc));
278280
}
279281
}
280282

core/src/test/java/org/apache/iceberg/TestSchemaParserForDefaultValues.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap;
3232
import org.apache.iceberg.types.Types.NestedField;
3333
import org.junit.Assert;
34+
import org.junit.Ignore;
3435
import org.junit.Test;
3536

3637
import static org.apache.avro.Schema.Type.BOOLEAN;
@@ -42,7 +43,7 @@
4243
import static org.apache.avro.Schema.Type.NULL;
4344
import static org.apache.avro.Schema.Type.STRING;
4445

45-
46+
@Ignore("BDP-11826: Disable default value preserving in iceberg schema")
4647
public class TestSchemaParserForDefaultValues {
4748

4849
private void assertEqualStructs(org.apache.iceberg.Schema expected, org.apache.iceberg.Schema actual) {

0 commit comments

Comments
 (0)