Skip to content

Commit 44dee29

Browse files
rashtaorashtao
authored
improve serialization and deserialization performances of RawData (#586)
1 parent f493c0f commit 44dee29

File tree

7 files changed

+42
-36
lines changed

7 files changed

+42
-36
lines changed

‎core/src/main/java/com/arangodb/internal/serde/InternalDeserializers.java‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,15 @@
66
import com.arangodb.entity.ReplicationFactor;
77
import com.arangodb.entity.arangosearch.CollectionLink;
88
import com.arangodb.entity.arangosearch.FieldLink;
9-
import com.arangodb.util.RawBytes;
109
import com.arangodb.util.RawJson;
1110
import com.arangodb.internal.InternalResponse;
12-
import com.fasterxml.jackson.core.JsonGenerator;
1311
import com.fasterxml.jackson.core.JsonParser;
1412
import com.fasterxml.jackson.core.TreeNode;
1513
import com.fasterxml.jackson.databind.DeserializationContext;
1614
import com.fasterxml.jackson.databind.JsonDeserializer;
1715
import com.fasterxml.jackson.databind.JsonNode;
1816
import com.fasterxml.jackson.databind.node.*;
1917

20-
import java.io.ByteArrayOutputStream;
2118
import java.io.IOException;
2219
import java.util.ArrayList;
2320
import java.util.Collection;
@@ -29,23 +26,10 @@ public final class InternalDeserializers {
2926
static final JsonDeserializer<RawJson> RAW_JSON_DESERIALIZER = new JsonDeserializer<RawJson>() {
3027
@Override
3128
public RawJson deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
32-
// TODO: find a way to access raw bytes directly
3329
return RawJson.of(SerdeUtils.INSTANCE.writeJson(p.readValueAsTree()));
3430
}
3531
};
3632

37-
static final JsonDeserializer<RawBytes> RAW_BYTES_DESERIALIZER = new JsonDeserializer<RawBytes>() {
38-
@Override
39-
public RawBytes deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
40-
// TODO: find a way to access raw bytes directly
41-
ByteArrayOutputStream os = new ByteArrayOutputStream();
42-
try (JsonGenerator g = p.getCodec().getFactory().createGenerator(os)) {
43-
g.writeTree(p.readValueAsTree());
44-
}
45-
return RawBytes.of(os.toByteArray());
46-
}
47-
};
48-
4933
static final JsonDeserializer<CollectionStatus> COLLECTION_STATUS = new JsonDeserializer<CollectionStatus>() {
5034
@Override
5135
public CollectionStatus deserialize(final JsonParser p, final DeserializationContext ctxt) throws IOException {

‎core/src/main/java/com/arangodb/internal/serde/InternalModule.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import com.arangodb.entity.CollectionType;
55
import com.arangodb.entity.InvertedIndexPrimarySort;
66
import com.arangodb.entity.ReplicationFactor;
7-
import com.arangodb.util.RawBytes;
87
import com.arangodb.util.RawJson;
98
import com.arangodb.internal.InternalRequest;
109
import com.arangodb.internal.InternalResponse;
@@ -22,12 +21,10 @@ enum InternalModule implements Supplier<Module> {
2221
module = new SimpleModule();
2322

2423
module.addSerializer(RawJson.class, InternalSerializers.RAW_JSON_SERIALIZER);
25-
module.addSerializer(RawBytes.class, InternalSerializers.RAW_BYTES_SERIALIZER);
2624
module.addSerializer(InternalRequest.class, InternalSerializers.REQUEST);
2725
module.addSerializer(CollectionType.class, InternalSerializers.COLLECTION_TYPE);
2826

2927
module.addDeserializer(RawJson.class, InternalDeserializers.RAW_JSON_DESERIALIZER);
30-
module.addDeserializer(RawBytes.class, InternalDeserializers.RAW_BYTES_DESERIALIZER);
3128
module.addDeserializer(CollectionStatus.class, InternalDeserializers.COLLECTION_STATUS);
3229
module.addDeserializer(CollectionType.class, InternalDeserializers.COLLECTION_TYPE);
3330
module.addDeserializer(ReplicationFactor.class, InternalDeserializers.REPLICATION_FACTOR);

‎core/src/main/java/com/arangodb/internal/serde/InternalSerdeImpl.java‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import com.arangodb.util.RawBytes;
99
import com.arangodb.util.RawJson;
1010
import com.fasterxml.jackson.annotation.JsonInclude;
11+
import com.fasterxml.jackson.core.JsonFactory;
1112
import com.fasterxml.jackson.core.JsonProcessingException;
1213
import com.fasterxml.jackson.databind.DeserializationFeature;
1314
import com.fasterxml.jackson.databind.JsonNode;
@@ -16,6 +17,7 @@
1617

1718
import java.io.IOException;
1819
import java.lang.reflect.Type;
20+
import java.nio.charset.StandardCharsets;
1921
import java.util.List;
2022
import java.util.stream.Collectors;
2123
import java.util.stream.StreamSupport;
@@ -104,7 +106,11 @@ public byte[] serializeUserData(Object value) {
104106
return serialize(null);
105107
}
106108
Class<?> clazz = value.getClass();
107-
if (isManagedClass(clazz)) {
109+
if (RawBytes.class.equals(clazz)) {
110+
return ((RawBytes) value).get();
111+
} else if (RawJson.class.equals(clazz) && JsonFactory.FORMAT_NAME_JSON.equals(mapper.getFactory().getFormatName())) {
112+
return ((RawJson) value).get().getBytes(StandardCharsets.UTF_8);
113+
} else if (isManagedClass(clazz)) {
108114
return serialize(value);
109115
} else {
110116
return userSerde.serialize(value);
@@ -121,8 +127,13 @@ public byte[] serializeCollectionUserData(Iterable<?> value) {
121127
}
122128

123129
@Override
130+
@SuppressWarnings("unchecked")
124131
public <T> T deserializeUserData(byte[] content, Class<T> clazz) {
125-
if (isManagedClass(clazz)) {
132+
if (RawBytes.class.equals(clazz)) {
133+
return (T) RawBytes.of(content);
134+
} else if (RawJson.class.equals(clazz) && JsonFactory.FORMAT_NAME_JSON.equals(mapper.getFactory().getFormatName())) {
135+
return (T) RawJson.of(new String(content, StandardCharsets.UTF_8));
136+
} else if (isManagedClass(clazz)) {
126137
return deserialize(content, clazz);
127138
} else {
128139
return userSerde.deserialize(content, clazz, RequestContextHolder.INSTANCE.getCtx());

‎core/src/main/java/com/arangodb/internal/serde/InternalSerializers.java‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,9 @@
44
import com.arangodb.entity.arangosearch.CollectionLink;
55
import com.arangodb.entity.arangosearch.FieldLink;
66
import com.arangodb.internal.ArangoRequestParam;
7-
import com.arangodb.util.RawBytes;
87
import com.arangodb.util.RawJson;
98
import com.arangodb.internal.InternalRequest;
109
import com.fasterxml.jackson.core.JsonGenerator;
11-
import com.fasterxml.jackson.core.JsonParser;
1210
import com.fasterxml.jackson.databind.JsonSerializer;
1311
import com.fasterxml.jackson.databind.SerializerProvider;
1412

@@ -26,16 +24,6 @@ public void serialize(RawJson value, JsonGenerator gen, SerializerProvider seria
2624
gen.writeTree(SerdeUtils.INSTANCE.parseJson(value.get()));
2725
}
2826
};
29-
static final JsonSerializer<RawBytes> RAW_BYTES_SERIALIZER = new JsonSerializer<RawBytes>() {
30-
@Override
31-
public void serialize(RawBytes value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
32-
// TODO: find a way to append raw bytes directly
33-
// see https://github.com/FasterXML/jackson-core/issues/914
34-
try (JsonParser parser = gen.getCodec().getFactory().createParser(value.get())) {
35-
gen.writeTree(parser.readValueAsTree());
36-
}
37-
}
38-
};
3927
static final JsonSerializer<InternalRequest> REQUEST = new JsonSerializer<InternalRequest>() {
4028
@Override
4129
public void serialize(InternalRequest value, JsonGenerator gen, SerializerProvider serializers) throws IOException {

‎test-functional/src/test/java/com/arangodb/ArangoDatabaseAsyncTest.java‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
package com.arangodb;
2222

2323
import com.arangodb.entity.*;
24-
import com.arangodb.entity.AqlExecutionExplainEntity.ExecutionPlan;
2524
import com.arangodb.entity.QueryCachePropertiesEntity.CacheMode;
25+
import com.arangodb.internal.serde.InternalSerde;
2626
import com.arangodb.model.*;
2727
import com.arangodb.util.MapBuilder;
2828
import com.arangodb.util.RawBytes;
@@ -668,6 +668,19 @@ void queryWithTTL(ArangoDatabaseAsync db) throws InterruptedException, Execution
668668
assertThat(ex.getMessage()).isEqualTo("Response: 404, Error: 1600 - cursor not found");
669669
}
670670

671+
@ParameterizedTest
672+
@MethodSource("asyncDbs")
673+
void queryRawBytes(ArangoDatabaseAsync db) throws ExecutionException, InterruptedException {
674+
InternalSerde serde = db.getSerde();
675+
RawBytes doc = RawBytes.of(serde.serialize(Collections.singletonMap("value", 1)));
676+
RawBytes res = db.query("RETURN @doc", RawBytes.class, Collections.singletonMap("doc", doc)).get()
677+
.getResult().get(0);
678+
JsonNode data = serde.parse(res.get());
679+
assertThat(data.isObject()).isTrue();
680+
assertThat(data.get("value").isNumber()).isTrue();
681+
assertThat(data.get("value").numberValue()).isEqualTo(1);
682+
}
683+
671684
@ParameterizedTest
672685
@MethodSource("asyncDbs")
673686
void changeQueryCache(ArangoDatabaseAsync db) throws ExecutionException, InterruptedException {

‎test-functional/src/test/java/com/arangodb/ArangoDatabaseTest.java‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222

2323
import com.arangodb.entity.*;
2424
import com.arangodb.entity.QueryCachePropertiesEntity.CacheMode;
25+
import com.arangodb.internal.serde.InternalSerde;
2526
import com.arangodb.model.*;
2627
import com.arangodb.util.*;
2728
import com.fasterxml.jackson.databind.JsonNode;
@@ -736,6 +737,18 @@ void queryWithTTL(ArangoDatabase db) throws InterruptedException {
736737
}
737738
}
738739

740+
@ParameterizedTest
741+
@MethodSource("dbs")
742+
void queryRawBytes(ArangoDatabase db) {
743+
InternalSerde serde = db.getSerde();
744+
RawBytes doc = RawBytes.of(serde.serialize(Collections.singletonMap("value", 1)));
745+
RawBytes res = db.query("RETURN @doc", RawBytes.class, Collections.singletonMap("doc", doc)).next();
746+
JsonNode data = serde.parse(res.get());
747+
assertThat(data.isObject()).isTrue();
748+
assertThat(data.get("value").isNumber()).isTrue();
749+
assertThat(data.get("value").numberValue()).isEqualTo(1);
750+
}
751+
739752
@ParameterizedTest
740753
@MethodSource("dbs")
741754
void changeQueryCache(ArangoDatabase db) {

‎test-functional/src/test/java/com/arangodb/serde/SerdeTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ void rawBytesSerde(ContentType type) {
3737
InternalSerde s = new InternalSerdeProvider(type).create();
3838
ObjectNode node = JsonNodeFactory.instance.objectNode().put("foo", "bar");
3939
RawBytes raw = RawBytes.of(s.serialize(node));
40-
byte[] serialized = s.serialize(raw);
41-
RawBytes deserialized = s.deserialize(serialized, RawBytes.class);
40+
byte[] serialized = s.serializeUserData(raw);
41+
RawBytes deserialized = s.deserializeUserData(serialized, RawBytes.class);
4242
assertThat(deserialized).isEqualTo(raw);
4343
}
4444

0 commit comments

Comments
 (0)