Skip to content

[Java] move string array serializers #116

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
chaokunyang merged 1 commit into from
May 8, 2023
Merged

[Java] move string array serializers #116

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
1 change: 0 additions & 1 deletion java/fury-core/src/main/java/io/fury/resolver/ClassResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,6 @@ public void initialize() {
private void addDefaultSerializers() {
// primitive types will be boxed.
addDefaultSerializer(String.class, new StringSerializer(fury));
addDefaultSerializer(String[].class, new Serializers.StringArraySerializer(fury));
Serializers.registerDefaultSerializers(fury);
ArraySerializers.registerDefaultSerializers(fury);
}
Expand Down
73 changes: 73 additions & 0 deletions java/fury-core/src/main/java/io/fury/serializer/ArraySerializers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,78 @@ protected double[] newInstance(int numElements) {
}
}

public static final class StringArraySerializer extends Serializer<String[]> {
private final StringSerializer stringSerializer;

public StringArraySerializer(Fury fury) {
super(fury, String[].class);
stringSerializer = new StringSerializer(fury);
}

@Override
public short getCrossLanguageTypeId() {
return (short) -Type.FURY_STRING_ARRAY.getId();
}

@Override
public void write(MemoryBuffer buffer, String[] value) {
int len = value.length;
buffer.writeInt(len);
for (String elem : value) {
// TODO reference support
if (elem != null) {
buffer.writeByte(Fury.REF_VALUE_FLAG);
stringSerializer.writeJavaString(buffer, elem);
} else {
buffer.writeByte(Fury.NULL_FLAG);
}
}
}

@Override
public String[] read(MemoryBuffer buffer) {
int numElements = buffer.readInt();
String[] value = new String[numElements];
fury.getReferenceResolver().reference(value);
for (int i = 0; i < numElements; i++) {
if (buffer.readByte() == Fury.REF_VALUE_FLAG) {
value[i] = stringSerializer.readJavaString(buffer);
} else {
value[i] = null;
}
}
return value;
}

@Override
public void crossLanguageWrite(MemoryBuffer buffer, String[] value) {
int len = value.length;
buffer.writeInt(len);
for (String elem : value) {
if (elem != null) {
buffer.writeByte(Fury.REF_VALUE_FLAG);
stringSerializer.writeUTF8String(buffer, elem);
} else {
buffer.writeByte(Fury.NULL_FLAG);
}
}
}

@Override
public String[] crossLanguageRead(MemoryBuffer buffer) {
int numElements = buffer.readInt();
String[] value = new String[numElements];
for (int i = 0; i < numElements; i++) {
if (buffer.readByte() == Fury.REF_VALUE_FLAG) {
value[i] = stringSerializer.readUTF8String(buffer);
} else {
value[i] = null;
}
}
return value;
}
}

public static void registerDefaultSerializers(Fury fury) {
fury.registerSerializer(Object[].class, new ObjectArraySerializer<>(fury, Object[].class));
fury.registerSerializer(byte[].class, new ByteArraySerializer(fury));
Expand All @@ -407,6 +479,7 @@ public static void registerDefaultSerializers(Fury fury) {
fury.registerSerializer(float[].class, new FloatArraySerializer(fury));
fury.registerSerializer(double[].class, new DoubleArraySerializer(fury));
fury.registerSerializer(boolean[].class, new BooleanArraySerializer(fury));
fury.registerSerializer(String[].class, new StringArraySerializer(fury));
}

// ########################## utils ##########################
Expand Down
72 changes: 0 additions & 72 deletions java/fury-core/src/main/java/io/fury/serializer/Serializers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,78 +558,6 @@ public AtomicReference read(MemoryBuffer buffer) {
}
}

public static final class StringArraySerializer extends Serializer<String[]> {
private final StringSerializer stringSerializer;

public StringArraySerializer(Fury fury) {
super(fury, String[].class);
stringSerializer = new StringSerializer(fury);
}

@Override
public short getCrossLanguageTypeId() {
return (short) -Type.FURY_STRING_ARRAY.getId();
}

@Override
public void write(MemoryBuffer buffer, String[] value) {
int len = value.length;
buffer.writeInt(len);
for (String elem : value) {
// TODO reference support
if (elem != null) {
buffer.writeByte(Fury.REF_VALUE_FLAG);
stringSerializer.writeJavaString(buffer, elem);
} else {
buffer.writeByte(Fury.NULL_FLAG);
}
}
}

@Override
public String[] read(MemoryBuffer buffer) {
int numElements = buffer.readInt();
String[] value = new String[numElements];
fury.getReferenceResolver().reference(value);
for (int i = 0; i < numElements; i++) {
if (buffer.readByte() == Fury.REF_VALUE_FLAG) {
value[i] = stringSerializer.readJavaString(buffer);
} else {
value[i] = null;
}
}
return value;
}

@Override
public void crossLanguageWrite(MemoryBuffer buffer, String[] value) {
int len = value.length;
buffer.writeInt(len);
for (String elem : value) {
if (elem != null) {
buffer.writeByte(Fury.REF_VALUE_FLAG);
stringSerializer.writeUTF8String(buffer, elem);
} else {
buffer.writeByte(Fury.NULL_FLAG);
}
}
}

@Override
public String[] crossLanguageRead(MemoryBuffer buffer) {
int numElements = buffer.readInt();
String[] value = new String[numElements];
for (int i = 0; i < numElements; i++) {
if (buffer.readByte() == Fury.REF_VALUE_FLAG) {
value[i] = stringSerializer.readUTF8String(buffer);
} else {
value[i] = null;
}
}
return value;
}
}

public static final class ClassSerializer extends Serializer<Class> {
private static final byte USE_CLASS_ID = 0;
private static final byte USE_CLASSNAME = 1;
Expand Down