Skip to content

Disable default value preserving #106

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

Merged
rzhang10 merged 2 commits into from
May 12, 2022
Merged

Disable default value preserving #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a4185ae
Disable default value preserving
rzhang10 May 12, 2022
3dd88be
Add ticket number and ignore test
rzhang10 May 12, 2022
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
10 changes: 6 additions & 4 deletions core/src/main/java/org/apache/iceberg/SchemaParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,8 @@ static void toJson(Types.StructType struct, JsonGenerator generator) throws IOEx
generator.writeBooleanField(REQUIRED, field.isRequired());
generator.writeFieldName(TYPE);
toJson(field.type(), generator);
writeDefaultValue(field.getDefaultValue(), field.type(), generator);
// BDP-11826: Disable serializing default value
// writeDefaultValue(field.getDefaultValue(), field.type(), generator);
if (field.doc() != null) {
generator.writeStringField(DOC, field.doc());
}
Expand Down Expand Up @@ -248,13 +249,14 @@ private static Types.StructType structFromJson(JsonNode json) {
int id = JsonUtil.getInt(ID, field);
String name = JsonUtil.getString(NAME, field);
Type type = typeFromJson(field.get(TYPE));
Object defaultValue = defaultValueFromJson(field, type);
// BDP-11826: Disable deserializing default value
// Object defaultValue = defaultValueFromJson(field, type);
String doc = JsonUtil.getStringOrNull(DOC, field);
boolean isRequired = JsonUtil.getBool(REQUIRED, field);
if (isRequired) {
fields.add(Types.NestedField.required(id, name, type, defaultValue, doc));
fields.add(Types.NestedField.required(id, name, type, doc));
} else {
fields.add(Types.NestedField.optional(id, name, type, defaultValue, doc));
fields.add(Types.NestedField.optional(id, name, type, doc));
}
}

Expand Down
3 changes: 2 additions & 1 deletion core/src/test/java/org/apache/iceberg/TestSchemaParserForDefaultValues.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap;
import org.apache.iceberg.types.Types.NestedField;
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;

import static org.apache.avro.Schema.Type.BOOLEAN;
Expand All @@ -42,7 +43,7 @@
import static org.apache.avro.Schema.Type.NULL;
import static org.apache.avro.Schema.Type.STRING;


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

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