chaokunyang commented on code in PR #1892:
URL: https://github.com/apache/fury/pull/1892#discussion_r1809135571
##########
java/fury-core/src/main/java/org/apache/fury/serializer/EnumSerializer.java:
##########
@@ -20,40 +20,69 @@
package org.apache.fury.serializer;
import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
import org.apache.fury.Fury;
import org.apache.fury.memory.MemoryBuffer;
+import org.apache.fury.meta.MetaString;
+import org.apache.fury.resolver.MetaStringResolver;
import org.apache.fury.util.Preconditions;
@SuppressWarnings("rawtypes")
-public final class EnumSerializer extends ImmutableSerializer<Enum> {
+public class EnumSerializer extends ImmutableSerializer<Enum> {
+ private static final MetaStringResolver META_STRING_RESOLVER = new
MetaStringResolver();
private final Enum[] enumConstants;
+ private final Map<String, Enum> enumStringRepresentation;
public EnumSerializer(Fury fury, Class<Enum> cls) {
super(fury, cls, false);
+
+ enumStringRepresentation = new HashMap<>();
+
if (cls.isEnum()) {
enumConstants = cls.getEnumConstants();
+ for (Enum e : enumConstants) {
+ enumStringRepresentation.put(e.name(), e);
+ }
} else {
Preconditions.checkArgument(Enum.class.isAssignableFrom(cls) && cls !=
Enum.class);
@SuppressWarnings("unchecked")
Class<Enum> enclosingClass = (Class<Enum>) cls.getEnclosingClass();
Preconditions.checkNotNull(enclosingClass);
Preconditions.checkArgument(enclosingClass.isEnum());
enumConstants = enclosingClass.getEnumConstants();
+ for (Enum e : enumConstants) {
+ enumStringRepresentation.put(e.name(), e);
+ }
}
}
@Override
public void write(MemoryBuffer buffer, Enum value) {
- buffer.writeVarUint32Small7(value.ordinal());
+ if (fury.getConfig().treatEnumAsString()) {
+ META_STRING_RESOLVER.writeMetaStringBytesFromString(
+ buffer, value.name(), MetaString.Encoding.UTF_8);
+ } else {
+ buffer.writeVarUint32Small7(value.ordinal());
+ }
}
@Override
public Enum read(MemoryBuffer buffer) {
- int value = buffer.readVarUint32Small7();
- if (value >= enumConstants.length) {
- return handleNonexistentEnumValue(value);
+ if (fury.getConfig().treatEnumAsString()) {
+ String metaStringBytes = META_STRING_RESOLVER.readMetaString(buffer);
Review Comment:
We could read and return MetaStringBytes directly and use it as the map key
to avoid create a String object every time
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
