Skip to content

Datatranslator emoji #1059

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
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

Datatranslator emoji #1059

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8de6fdb
Fixing test
Apr 9, 2025
5d8addc
Test emoji in string field
Apr 19, 2025
ee5e4a3
remove other changes
Apr 19, 2025
23439ba
add log
Apr 19, 2025
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
1 change: 0 additions & 1 deletion 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 @@ -60,7 +60,6 @@
public class DataTranslator implements DataTranslatorContext
{
protected DataTranslationOptions _dataTranslationOptions;

/**
* Convert the given {@link DataMap} conforming to the provided {@link RecordDataSchema} to a {@link GenericRecord}.
*
Expand Down
40 changes: 39 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 All @@ -37,6 +40,7 @@
import com.linkedin.data.schema.validation.ValidateDataAgainstSchema;
import com.linkedin.data.schema.validation.ValidationOptions;
import com.linkedin.data.schema.validation.ValidationResult;
import com.linkedin.data.template.RecordTemplate;
import java.io.FileDescriptor;
import java.io.FileOutputStream;
import java.io.IOException;
Expand Down Expand Up @@ -1165,7 +1169,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 +2297,37 @@ public void testMapArrayUnion() throws IOException {
Assert.assertTrue(mapOfMapOfArrayOfMapArrayUnion.get(0) instanceof Map);
Assert.assertEquals(((Map<?, ?>) mapOfMapOfArrayOfMapArrayUnion.get(0)).get("recordMap"), mapOfArrayOfMapArrayUnion);
}

@Test
public void testEmoji() throws IOException {
String schemaText = "{\n" +
" \"type\" : \"record\",\n" +
" \"name\" : \"Foo\",\n" +
" \"fields\" : [\n" +
" { \"name\" : \"a\", \"type\" : { \"type\" : \"record\", \"name\" : \"FooFoo\", \"fields\" : [ { \"name\" : \"b\", \"type\" : \"string\" } ] }, \"optional\": true }\n" +
" ]\n" +
"}\n";

RecordDataSchema recordDataSchema = (RecordDataSchema) TestUtil.dataSchemaFromString(schemaText);
String avroSchemaText = "{\n" +
" \"type\" : \"record\",\n" +
" \"name\" : \"Foo\",\n" +
" \"fields\" : [\n" +
" { \"name\" : \"a\", \"type\" : [ \"null\", { \"type\" : \"record\", \"name\" : \"FooFoo\", \"fields\" : [ { \"name\" : \"b\", \"type\" : \"string\" } ] } ] }\n" +
" ]\n" +
"}\n";

Schema avroSchema = Schema.parse(avroSchemaText);

GenericRecord avroRecord = AvroUtil.genericRecordFromJson(TestAvroUtil.namespaceProcessor("{ \"a\" : { \"FooFoo\": { \"b\" : \"❤\" } } }"), avroSchema);
System.out.println("Original avro record = "+avroRecord);
DataMap pegasusDataMap = DataTranslator.genericRecordToDataMap(avroRecord, recordDataSchema, avroSchema);
System.out.println("Avro record to data map = "+pegasusDataMap);
DataMap innerMap = new DataMap();
innerMap.put("b", "❤");
DataMap expectedMap = new DataMap();
expectedMap.put("a", innerMap);
assertEquals(pegasusDataMap, expectedMap);
}
}

Loading