Skip to content

Improved fast serializer code generation logic for Enum type #54

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
volauvent merged 2 commits into from
Jun 8, 2020
Merged

Improved fast serializer code generation logic for Enum type #54

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
14b17a3
Improved fast serializer code generation logic for Enum type
May 28, 2020
d311774
Changes of generated fast serializers
Jun 4, 2020
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
4 changes: 0 additions & 4 deletions ...generated/serialization/AVRO_1_4/Array_of_UNION_GenericSerializer_585074122056792963.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,7 @@

import java.io.IOException;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import com.linkedin.avro.fastserde.FastSerializer;
import org.apache.avro.Schema;
import org.apache.avro.generic.IndexedRecord;
import org.apache.avro.io.Encoder;
import org.apache.avro.util.Utf8;
Expand All @@ -15,7 +12,6 @@ public class Array_of_UNION_GenericSerializer_585074122056792963
implements FastSerializer<List<IndexedRecord>>
{

private Map<Long, Schema> enumSchemaMap = new ConcurrentHashMap<Long, Schema>();

public void serialize(List<IndexedRecord> data, Encoder encoder)
throws IOException
Expand Down
4 changes: 0 additions & 4 deletions ...nerated/serialization/AVRO_1_4/Array_of_record_GenericSerializer_1629046702287533603.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,7 @@

import java.io.IOException;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import com.linkedin.avro.fastserde.FastSerializer;
import org.apache.avro.Schema;
import org.apache.avro.generic.IndexedRecord;
import org.apache.avro.io.Encoder;
import org.apache.avro.util.Utf8;
Expand All @@ -15,7 +12,6 @@ public class Array_of_record_GenericSerializer_1629046702287533603
implements FastSerializer<List<IndexedRecord>>
{

private Map<Long, Schema> enumSchemaMap = new ConcurrentHashMap<Long, Schema>();

public void serialize(List<IndexedRecord> data, Encoder encoder)
throws IOException
Expand Down
15 changes: 4 additions & 11 deletions ...GenericSerializerGeneratorTest_shouldWriteEnum_GenericSerializer_6137374763587019173.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@

import java.io.IOException;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import com.linkedin.avro.fastserde.FastSerializer;
import org.apache.avro.Schema;
import org.apache.avro.generic.IndexedRecord;
Expand All @@ -14,7 +12,7 @@ public class FastGenericSerializerGeneratorTest_shouldWriteEnum_GenericSerialize
implements FastSerializer<IndexedRecord>
{

private Map<Long, Schema> enumSchemaMap = new ConcurrentHashMap<Long, Schema>();
private final Schema testEnumEnumSchema69 = Schema.parse("{\"type\":\"enum\",\"name\":\"testEnum\",\"namespace\":\"com.adpilot.utils.generated.avro\",\"symbols\":[\"A\",\"B\"]}");

public void serialize(IndexedRecord data, Encoder encoder)
throws IOException
Expand All @@ -26,11 +24,6 @@ public void serialize(IndexedRecord data, Encoder encoder)
public void serializeFastGenericSerializerGeneratorTest_shouldWriteEnum68(IndexedRecord data, Encoder encoder)
throws IOException
{
Schema testEnumEnumSchema69 = enumSchemaMap.get(-3346156575824446940L);
if (null == testEnumEnumSchema69) {
testEnumEnumSchema69 = Schema.parse("{\"type\":\"enum\",\"name\":\"testEnum\",\"namespace\":\"com.adpilot.utils.generated.avro\",\"symbols\":[\"A\",\"B\"]}");
enumSchemaMap.put(-3346156575824446940L, testEnumEnumSchema69);
}
(encoder).writeEnum(testEnumEnumSchema69 .getEnumOrdinal(((org.apache.avro.generic.GenericData.EnumSymbol) data.get(0)).toString()));
org.apache.avro.generic.GenericData.EnumSymbol testEnumUnion70 = ((org.apache.avro.generic.GenericData.EnumSymbol) data.get(1));
if (testEnumUnion70 == null) {
Expand All @@ -39,7 +32,7 @@ public void serializeFastGenericSerializerGeneratorTest_shouldWriteEnum68(Indexe
} else {
if (testEnumUnion70 instanceof org.apache.avro.generic.GenericData.EnumSymbol) {
(encoder).writeIndex(1);
(encoder).writeEnum(enumSchemaMap.get(-3346156575824446940L).getEnumOrdinal(((org.apache.avro.generic.GenericData.EnumSymbol) testEnumUnion70).toString()));
(encoder).writeEnum(testEnumEnumSchema69 .getEnumOrdinal(((org.apache.avro.generic.GenericData.EnumSymbol) testEnumUnion70).toString()));
}
}
List<org.apache.avro.generic.GenericData.EnumSymbol> testEnumArray71 = ((List<org.apache.avro.generic.GenericData.EnumSymbol> ) data.get(2));
Expand All @@ -50,7 +43,7 @@ public void serializeFastGenericSerializerGeneratorTest_shouldWriteEnum68(Indexe
(encoder).setItemCount(testEnumArray71 .size());
for (int counter72 = 0; (counter72 <((List<org.apache.avro.generic.GenericData.EnumSymbol> ) testEnumArray71).size()); counter72 ++) {
(encoder).startItem();
(encoder).writeEnum(enumSchemaMap.get(-3346156575824446940L).getEnumOrdinal(((org.apache.avro.generic.GenericData.EnumSymbol) testEnumArray71 .get(counter72)).toString()));
(encoder).writeEnum(testEnumEnumSchema69 .getEnumOrdinal(((org.apache.avro.generic.GenericData.EnumSymbol) testEnumArray71 .get(counter72)).toString()));
}
}
(encoder).writeArrayEnd();
Expand All @@ -70,7 +63,7 @@ public void serializeFastGenericSerializerGeneratorTest_shouldWriteEnum68(Indexe
} else {
if (union75 instanceof org.apache.avro.generic.GenericData.EnumSymbol) {
(encoder).writeIndex(1);
(encoder).writeEnum(enumSchemaMap.get(-3346156575824446940L).getEnumOrdinal(((org.apache.avro.generic.GenericData.EnumSymbol) union75).toString()));
(encoder).writeEnum(testEnumEnumSchema69 .getEnumOrdinal(((org.apache.avro.generic.GenericData.EnumSymbol) union75).toString()));
}
}
}
Expand Down
4 changes: 0 additions & 4 deletions ...enericSerializerGeneratorTest_shouldWriteFixed_GenericSerializer_8889056593487745201.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,14 @@

import java.io.IOException;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import com.linkedin.avro.fastserde.FastSerializer;
import org.apache.avro.Schema;
import org.apache.avro.generic.IndexedRecord;
import org.apache.avro.io.Encoder;

public class FastGenericSerializerGeneratorTest_shouldWriteFixed_GenericSerializer_8889056593487745201
implements FastSerializer<IndexedRecord>
{

private Map<Long, Schema> enumSchemaMap = new ConcurrentHashMap<Long, Schema>();

public void serialize(IndexedRecord data, Encoder encoder)
throws IOException
Expand Down
4 changes: 0 additions & 4 deletions ...erGeneratorTest_shouldWriteMultipleChoiceUnion_GenericSerializer_4388851848367235159.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@
package com.linkedin.avro.fastserde.generated.serialization.AVRO_1_4;

import java.io.IOException;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import com.linkedin.avro.fastserde.FastSerializer;
import org.apache.avro.Schema;
import org.apache.avro.generic.IndexedRecord;
import org.apache.avro.io.Encoder;
import org.apache.avro.util.Utf8;
Expand All @@ -14,7 +11,6 @@ public class FastGenericSerializerGeneratorTest_shouldWriteMultipleChoiceUnion_G
implements FastSerializer<IndexedRecord>
{

private Map<Long, Schema> enumSchemaMap = new ConcurrentHashMap<Long, Schema>();
Copy link
Collaborator

@FelixGV FelixGV Jun 4, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Heh... deleting an unused variable... that sounds like the right call!


public void serialize(IndexedRecord data, Encoder encoder)
throws IOException
Expand Down
4 changes: 0 additions & 4 deletions ...cSerializerGeneratorTest_shouldWritePrimitives_GenericSerializer_5300080091170871849.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,7 @@

import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import com.linkedin.avro.fastserde.FastSerializer;
import org.apache.avro.Schema;
import org.apache.avro.generic.IndexedRecord;
import org.apache.avro.io.Encoder;
import org.apache.avro.util.Utf8;
Expand All @@ -15,7 +12,6 @@ public class FastGenericSerializerGeneratorTest_shouldWritePrimitives_GenericSer
implements FastSerializer<IndexedRecord>
{

private Map<Long, Schema> enumSchemaMap = new ConcurrentHashMap<Long, Schema>();

public void serialize(IndexedRecord data, Encoder encoder)
throws IOException
Expand Down
4 changes: 0 additions & 4 deletions ...alizerGeneratorTest_shouldWriteRightUnionIndex_GenericSerializer_5485438821003579903.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@
package com.linkedin.avro.fastserde.generated.serialization.AVRO_1_4;

import java.io.IOException;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import com.linkedin.avro.fastserde.FastSerializer;
import org.apache.avro.Schema;
import org.apache.avro.generic.IndexedRecord;
import org.apache.avro.io.Encoder;
import org.apache.avro.util.Utf8;
Expand All @@ -14,7 +11,6 @@ public class FastGenericSerializerGeneratorTest_shouldWriteRightUnionIndex_Gener
implements FastSerializer<IndexedRecord>
{

private Map<Long, Schema> enumSchemaMap = new ConcurrentHashMap<Long, Schema>();

public void serialize(IndexedRecord data, Encoder encoder)
throws IOException
Expand Down
3 changes: 0 additions & 3 deletions ...ratorTest_shouldWriteSubRecordCollectionsField_GenericSerializer_4869519538077502381.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@
import java.io.IOException;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import com.linkedin.avro.fastserde.FastSerializer;
import org.apache.avro.Schema;
import org.apache.avro.generic.IndexedRecord;
import org.apache.avro.io.Encoder;
import org.apache.avro.util.Utf8;
Expand All @@ -15,7 +13,6 @@ public class FastGenericSerializerGeneratorTest_shouldWriteSubRecordCollectionsF
implements FastSerializer<IndexedRecord>
{

private Map<Long, Schema> enumSchemaMap = new ConcurrentHashMap<Long, Schema>();

public void serialize(IndexedRecord data, Encoder encoder)
throws IOException
Expand Down
3 changes: 0 additions & 3 deletions ...st_shouldWriteSubRecordComplexCollectionsField_GenericSerializer_6532465341493029871.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@
import java.io.IOException;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import com.linkedin.avro.fastserde.FastSerializer;
import org.apache.avro.Schema;
import org.apache.avro.generic.IndexedRecord;
import org.apache.avro.io.Encoder;
import org.apache.avro.util.Utf8;
Expand All @@ -15,7 +13,6 @@ public class FastGenericSerializerGeneratorTest_shouldWriteSubRecordComplexColle
implements FastSerializer<IndexedRecord>
{

private Map<Long, Schema> enumSchemaMap = new ConcurrentHashMap<Long, Schema>();

public void serialize(IndexedRecord data, Encoder encoder)
throws IOException
Expand Down
4 changes: 0 additions & 4 deletions ...ializerGeneratorTest_shouldWriteSubRecordField_GenericSerializer_1161833140095035747.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@
package com.linkedin.avro.fastserde.generated.serialization.AVRO_1_4;

import java.io.IOException;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import com.linkedin.avro.fastserde.FastSerializer;
import org.apache.avro.Schema;
import org.apache.avro.generic.IndexedRecord;
import org.apache.avro.io.Encoder;
import org.apache.avro.util.Utf8;
Expand All @@ -14,7 +11,6 @@ public class FastGenericSerializerGeneratorTest_shouldWriteSubRecordField_Generi
implements FastSerializer<IndexedRecord>
{

private Map<Long, Schema> enumSchemaMap = new ConcurrentHashMap<Long, Schema>();

public void serialize(IndexedRecord data, Encoder encoder)
throws IOException
Expand Down
3 changes: 0 additions & 3 deletions .../generated/serialization/AVRO_1_4/Map_of_UNION_GenericSerializer_2087096002965517991.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@

import java.io.IOException;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import com.linkedin.avro.fastserde.FastSerializer;
import org.apache.avro.Schema;
import org.apache.avro.generic.IndexedRecord;
import org.apache.avro.io.Encoder;
import org.apache.avro.util.Utf8;
Expand All @@ -14,7 +12,6 @@ public class Map_of_UNION_GenericSerializer_2087096002965517991
implements FastSerializer<Map<CharSequence, IndexedRecord>>
{

private Map<Long, Schema> enumSchemaMap = new ConcurrentHashMap<Long, Schema>();

public void serialize(Map<CharSequence, IndexedRecord> data, Encoder encoder)
throws IOException
Expand Down
3 changes: 0 additions & 3 deletions ...generated/serialization/AVRO_1_4/Map_of_record_GenericSerializer_2141121767969292399.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@

import java.io.IOException;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import com.linkedin.avro.fastserde.FastSerializer;
import org.apache.avro.Schema;
import org.apache.avro.generic.IndexedRecord;
import org.apache.avro.io.Encoder;
import org.apache.avro.util.Utf8;
Expand All @@ -14,7 +12,6 @@ public class Map_of_record_GenericSerializer_2141121767969292399
implements FastSerializer<Map<CharSequence, IndexedRecord>>
{

private Map<Long, Schema> enumSchemaMap = new ConcurrentHashMap<Long, Schema>();

public void serialize(Map<CharSequence, IndexedRecord> data, Encoder encoder)
throws IOException
Expand Down
56 changes: 13 additions & 43 deletions avro-fastserde/src/main/java/com/linkedin/avro/fastserde/FastSerializerGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import com.sun.codemodel.JConditional;
import com.sun.codemodel.JExpr;
import com.sun.codemodel.JExpression;
import com.sun.codemodel.JFieldVar;
import com.sun.codemodel.JForEach;
import com.sun.codemodel.JForLoop;
import com.sun.codemodel.JMethod;
Expand All @@ -16,11 +15,8 @@
import java.io.File;
import java.io.IOException;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.avro.Schema;
import org.apache.avro.io.Encoder;
import org.apache.avro.util.Utf8;
Expand All @@ -36,13 +32,9 @@ public class FastSerializerGenerator<T> extends FastSerializerGeneratorBase<T> {
private final SchemaAssistant schemaAssistant;

/**
* Enum schema mapping for Avro-1.4.
* Enum schema mapping for Avro-1.4 to record schema id and corresponding schema JVar.
*/
private JFieldVar enumSchemaMapField;
/**
* This field is used to decide whether the corresponding schema is already in {@link #enumSchemaMapField} or not.
*/
private final Set<Long> enumSchemaIdSet = new HashSet<>();
private final Map<Long, JVar> enumSchemaVarMap = new HashMap<>();


public FastSerializerGenerator(boolean useGenericTypes, Schema schema, File destination, ClassLoader classLoader,
Expand All @@ -60,20 +52,6 @@ public FastSerializer<T> generateSerializer() {
try {
serializerClass = classPackage._class(className);

if (Utils.isAvro14()) {
/**
* In Avro-1.4, there is no way to infer/extract enum schema from {@link org.apache.avro.generic.GenericData.EnumSymbol}, so
* the serializer needs to maintain a mapping between the schema id and the actual {@link org.apache.avro.Schema.EnumSchema},
* and get the enum id from the corresponding EnumSchema in {@link #processEnum(Schema, JExpression, JBlock)}.
*/
enumSchemaMapField =
serializerClass.field(
JMod.PRIVATE,
codeModel.ref(Map.class).narrow(Long.class).narrow(Schema.class),
"enumSchemaMap",
JExpr._new(codeModel.ref(ConcurrentHashMap.class).narrow(Long.class).narrow(Schema.class)));
}

final JMethod serializeMethod = serializerClass.method(JMod.PUBLIC, void.class, "serialize");
final JVar serializeMethodParam;

Expand Down Expand Up @@ -323,26 +301,18 @@ private void processEnum(Schema enumSchema, JExpression enumValueExpression, JBl
if (useGenericTypes) {
if (Utils.isAvro14()) {
/**
* Register/retrieve the corresponding {@link org.apache.avro.Schema.EnumSchema} from the mapping.
* In Avro-1.4, there is no way to infer/extract enum schema from {@link org.apache.avro.generic.GenericData.EnumSymbol},
* so the serializer needs to record the schema id and the corresponding {@link org.apache.avro.Schema.EnumSchema},
* and maintain a mapping between the schema id and EnumSchema JVar for future use.
*/
long enumSchemaFingerprint = Utils.getSchemaFingerprint(enumSchema);
if (enumSchemaIdSet.contains(enumSchemaFingerprint)) {
valueToWrite = JExpr.invoke(
enumSchemaMapField.invoke("get").arg(JExpr.lit(enumSchemaFingerprint)),
"getEnumOrdinal"
).arg(enumValueCasted.invoke("toString"));
} else {
enumSchemaIdSet.add(enumSchemaFingerprint);
JVar enumSchemaVar = body.decl(codeModel.ref(Schema.class),
getVariableName(enumSchema.getName() + "EnumSchema"),
enumSchemaMapField.invoke("get").arg(JExpr.lit(enumSchemaFingerprint)));
JConditional schemaCheckCond = body._if(JExpr._null().eq(enumSchemaVar));
JBlock thenBody = schemaCheckCond._then();
thenBody.assign(enumSchemaVar, codeModel.ref(Schema.class).staticInvoke("parse").arg(enumSchema.toString()));
thenBody.invoke(enumSchemaMapField, "put").arg(JExpr.lit(enumSchemaFingerprint)).arg(enumSchemaVar);

valueToWrite = JExpr.invoke(enumSchemaVar, "getEnumOrdinal").arg(enumValueCasted.invoke("toString"));
}
JVar enumSchemaVar = enumSchemaVarMap.computeIfAbsent(Utils.getSchemaFingerprint(enumSchema), s->
serializerClass.field(
JMod.PRIVATE | JMod.FINAL,
Schema.class,
getVariableName(enumSchema.getName() + "EnumSchema"),
codeModel.ref(Schema.class).staticInvoke("parse").arg(enumSchema.toString()))
);
valueToWrite = JExpr.invoke(enumSchemaVar, "getEnumOrdinal").arg(enumValueCasted.invoke("toString"));
} else {
valueToWrite = JExpr.invoke(
enumValueCasted.invoke("getSchema"),
Expand Down