Skip to content

Fix to default values issue #1054

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

Draft
SrilakshmiBharadwaj wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Fix to default values issue #1054

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 17 additions & 0 deletions data-avro/src/main/java/com/linkedin/data/avro/DataTranslator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,18 @@ public class DataTranslator implements DataTranslatorContext
{
protected DataTranslationOptions _dataTranslationOptions;

public static void backFillMissingDeafultInDataMap(DataMap map, RecordDataSchema dataSchema) {
for (RecordDataSchema.Field field: dataSchema.getFields()) {
DataSchema fieldType = field.getType();
if ( fieldType.getDereferencedType() != DataSchema.Type.ARRAY && fieldType.getDereferencedType() != DataSchema.Type.MAP) {
continue;
}
if (field.getDefault() != null && (!map.containsKey(field.getName()) || map.get(field.getName()) == null)) {
map.put(field.getName(), field.getDefault());
}
}
}

/**
* Convert the given {@link DataMap} conforming to the provided {@link RecordDataSchema} to a {@link GenericRecord}.
*
Expand All @@ -74,6 +86,7 @@ public class DataTranslator implements DataTranslatorContext
*/
public static GenericRecord dataMapToGenericRecord(DataMap map, RecordDataSchema dataSchema) throws DataTranslationException
{
backFillMissingDeafultInDataMap(map, dataSchema);
Schema avroSchema = SchemaTranslator.dataToAvroSchema(dataSchema);
return dataMapToGenericRecord(map, dataSchema, avroSchema, null);
}
Expand All @@ -94,6 +107,7 @@ public static GenericRecord dataMapToGenericRecord(DataMap map, RecordDataSchema
DataMapToAvroRecordTranslationOptions options)
throws DataTranslationException
{
backFillMissingDeafultInDataMap(map, dataSchema);
Schema avroSchema = SchemaTranslator.dataToAvroSchema(dataSchema);
return dataMapToGenericRecord(map, dataSchema, avroSchema, options);
}
Expand All @@ -102,6 +116,7 @@ public static GenericRecord dataMapToGenericRecord(DataMap map, RecordDataSchema
DataMapToAvroRecordTranslationOptions options)
throws DataTranslationException
{
backFillMissingDeafultInDataMap(map, dataSchema);
DataMapToGenericRecordTranslator translator = new DataMapToGenericRecordTranslator(options);
try
{
Expand All @@ -116,6 +131,7 @@ public static GenericRecord dataMapToGenericRecord(DataMap map, RecordDataSchema

public static <T extends SpecificRecordBase> T dataMapToSpecificRecord(DataMap map, RecordDataSchema dataSchema,
Schema avroSchema) throws DataTranslationException {
backFillMissingDeafultInDataMap(map, dataSchema);
DataMapToSpecificRecordTranslator translator = new DataMapToSpecificRecordTranslator();
try {
T avroRecord = translator.translate(map, dataSchema, avroSchema);
Expand Down Expand Up @@ -145,6 +161,7 @@ public static <T extends SpecificRecordBase> T dataMapToSpecificRecord(DataMap m
*/
public static GenericRecord dataMapToGenericRecord(DataMap map, RecordDataSchema dataSchema, Schema avroSchema) throws DataTranslationException
{
backFillMissingDeafultInDataMap(map, dataSchema);
return dataMapToGenericRecord(map, dataSchema, avroSchema, null);
}

Expand Down
31 changes: 30 additions & 1 deletion data-avro/src/test/java/com/linkedin/data/avro/TestDataTranslator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
package com.linkedin.data.avro;

import com.google.common.collect.ImmutableMap;
import com.linkedin.avroutil1.compatibility.AvroCompatibilityHelper;
import com.linkedin.data.Data;
import com.linkedin.data.DataList;
import com.linkedin.data.DataMap;
import com.linkedin.data.TestUtil;
Expand All @@ -28,6 +30,7 @@
import com.linkedin.data.avro.testevents.RecordArray;
import com.linkedin.data.avro.testevents.RecordMap;
import com.linkedin.data.avro.testevents.StringRecord;
import com.linkedin.data.avro.testevents.TestArray;
import com.linkedin.data.avro.testevents.TestEventRecordOfRecord;
import com.linkedin.data.avro.testevents.TestEventWithUnionAndEnum;
import com.linkedin.data.avro.util.AvroUtil;
Expand Down Expand Up @@ -1165,7 +1168,9 @@ private void testDataTranslation(String schemaText, String[][] row) throws IOExc
String expectedBeforeNamespaceProcessor = row[col][i];
String expected = TestAvroUtil.namespaceProcessor(expectedBeforeNamespaceProcessor);
if (debug && expected != expectedBeforeNamespaceProcessor) out.println(" Expected:" + expected);

if (!result.contains(expected)) {
System.out.println("RESULT: "+result+"\n"+"EXPECTED: "+expected);
}
assertTrue(result.contains(expected));
}

Expand Down Expand Up @@ -2291,5 +2296,29 @@ public void testMapArrayUnion() throws IOException {
Assert.assertTrue(mapOfMapOfArrayOfMapArrayUnion.get(0) instanceof Map);
Assert.assertEquals(((Map<?, ?>) mapOfMapOfArrayOfMapArrayUnion.get(0)).get("recordMap"), mapOfArrayOfMapArrayUnion);
}

@Test
public void testDataMapBackfill() throws IOException {
final String SCHEMA =
"{" +
" \"type\":\"record\"," +
" \"name\":\"Foo\"," +
" \"fields\":[" +
" {" +
" \"name\":\"arrayField\"," +
" \"type\":{" +
" \"type\":\"array\"," +
" \"items\":\"string\"" +
" }," +
" \"default\":[ ]" +
" }" +
" ]" +
"}";
RecordDataSchema recordDataSchema =
(RecordDataSchema) TestUtil.dataSchemaFromString(SCHEMA);
DataMap map = new DataMap();
GenericRecord record = DataTranslator.dataMapToGenericRecord(map, recordDataSchema);
Assert.assertEquals(record.get("arrayField"), map.get("arrayField"));
}
}

Loading