Skip to content

Fix serialization tests run failed #450

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
zhoney merged 2 commits into from
Apr 15, 2019
Merged

Fix serialization tests run failed #450

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
0f4ef51
Fix serialization tests run failed
Linary Apr 15, 2019
04261ff
tiny improve
Linary Apr 15, 2019
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
5 changes: 1 addition & 4 deletions hugegraph-api/src/main/java/com/baidu/hugegraph/core/GraphManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
import org.apache.tinkerpop.gremlin.server.util.MetricManager;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.Transaction;
import org.apache.tinkerpop.gremlin.structure.io.IoCore;
import org.apache.tinkerpop.gremlin.structure.util.GraphFactory;
import org.slf4j.Logger;

Expand Down Expand Up @@ -107,9 +106,7 @@ public HugeGraph graph(String name) {
}

public Serializer serializer(Graph g) {
// TODO: cache Serializer
return new JsonSerializer(g.io(IoCore.graphson()).writer()
.wrapAdjacencyList(true).create());
return JsonSerializer.instance();
}

public void rollbackAll() {
Expand Down
35 changes: 13 additions & 22 deletions hugegraph-api/src/main/java/com/baidu/hugegraph/serializer/JsonSerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
import org.apache.tinkerpop.gremlin.structure.Edge;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONWriter;
import org.apache.tinkerpop.gremlin.structure.util.CloseableIterator;

import com.baidu.hugegraph.HugeException;
Expand All @@ -51,23 +50,15 @@

public class JsonSerializer implements Serializer {

private final GraphSONWriter writer;

private static final int BUF_SIZE = 128;
private static final int LBUF_SIZE = 1024;

public JsonSerializer(GraphSONWriter writer) {
this.writer = writer;
private static JsonSerializer INSTANCE = new JsonSerializer();

private JsonSerializer() {
}

private String writeObject(Object object) {
try (ByteArrayOutputStream out = new ByteArrayOutputStream(BUF_SIZE)) {
this.writer.writeObject(out, object);
return out.toString(API.CHARSET);
} catch (Exception e) {
throw new HugeException("Failed to serialize %s", e,
object.getClass().getSimpleName());
}
public static JsonSerializer instance() {
return INSTANCE;
}

private String writeList(String label, List<?> list) {
Expand Down Expand Up @@ -136,7 +127,7 @@ private String writeIterator(String label, Iterator<?> itor,

@Override
public String writePropertyKey(PropertyKey propertyKey) {
return writeObject(propertyKey);
return JsonUtil.toJson(propertyKey);
}

@Override
Expand All @@ -146,7 +137,7 @@ public String writePropertyKeys(List<PropertyKey> propertyKeys) {

@Override
public String writeVertexLabel(VertexLabel vertexLabel) {
return writeObject(vertexLabel);
return JsonUtil.toJson(vertexLabel);
}

@Override
Expand All @@ -156,7 +147,7 @@ public String writeVertexLabels(List<VertexLabel> vertexLabels) {

@Override
public String writeEdgeLabel(EdgeLabel edgeLabel) {
return writeObject(edgeLabel);
return JsonUtil.toJson(edgeLabel);
}

@Override
Expand All @@ -166,7 +157,7 @@ public String writeEdgeLabels(List<EdgeLabel> edgeLabels) {

@Override
public String writeIndexlabel(IndexLabel indexLabel) {
return writeObject(indexLabel);
return JsonUtil.toJson(indexLabel);
}

@Override
Expand All @@ -188,7 +179,7 @@ public String writeCreatedIndexLabel(IndexLabel.CreatedIndexLabel cil) {

@Override
public String writeVertex(Vertex vertex) {
return writeObject(vertex);
return JsonUtil.toJson(vertex);
}

@Override
Expand All @@ -198,7 +189,7 @@ public String writeVertices(Iterator<Vertex> vertices, boolean paging) {

@Override
public String writeEdge(Edge edge) {
return writeObject(edge);
return JsonUtil.toJson(edge);
}

@Override
Expand All @@ -209,9 +200,9 @@ public String writeEdges(Iterator<Edge> edges, boolean paging) {
@Override
public String writeIds(String name, Collection<Id> ids) {
if (ids instanceof List) {
return writeList(name, (List<?>) ids);
return this.writeList(name, (List<?>) ids);
} else {
return writeList(name, new ArrayList<>(ids));
return this.writeList(name, new ArrayList<>(ids));
}
}

Expand Down
12 changes: 9 additions & 3 deletions hugegraph-core/src/main/java/com/baidu/hugegraph/io/HugeGraphSONModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,9 @@ public class HugeGraphSONModule extends TinkerPopJacksonModule {
TYPE_DEFINITIONS.put(EdgeLabel.class, "EdgeLabel");
TYPE_DEFINITIONS.put(IndexLabel.class, "IndexLabel");

// HugeGraph vertex/edge serializer
// HugeGraph vertex serializer
TYPE_DEFINITIONS.put(HugeVertex.class, "HugeVertex");
TYPE_DEFINITIONS.put(HugeEdge.class, "HugeEdge");
// TYPE_DEFINITIONS.put(HugeEdge.class, "HugeEdge");

// HugeGraph shard serializer
TYPE_DEFINITIONS.put(Shard.class, "Shard");
Expand Down Expand Up @@ -128,7 +128,13 @@ private HugeGraphSONModule() {
addSerializer(IndexLabel.class, new IndexLabelSerializer());

addSerializer(HugeVertex.class, new HugeVertexSerializer());
addSerializer(HugeEdge.class, new HugeEdgeSerializer());
/*
* Use customized edge serializer need to be compatible with V1 and V2
* Graphson, and seems need to implement edge deserializer，it is
* a little complicated.
* Honestly, I don't know why there is no problem with vertex serializer
*/
// addSerializer(HugeEdge.class, new HugeEdgeSerializer());

addSerializer(Shard.class, new ShardSerializer());
}
Expand Down
5 changes: 5 additions & 0 deletions hugegraph-test/src/main/resources/fast-methods.filter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,11 @@ org.apache.tinkerpop.gremlin.structure.GraphTest.shouldRemoveVertices: Random UU
org.apache.tinkerpop.gremlin.structure.GraphTest.shouldRemoveEdges: Random UUID as edge label
org.apache.tinkerpop.gremlin.structure.TransactionTest.shouldExecuteWithCompetingThreads: Hang the tests because property 'test' have both String and long value

## vertex properties doesn't have nested structures with HugeVertexSerializer
org.apache.tinkerpop.gremlin.structure.SerializationTest.GraphSONTest.shouldSerializeVertex: Vertex properties doesn't have nested structures with HugeVertexSerializer
org.apache.tinkerpop.gremlin.structure.SerializationTest.GraphSONTest.shouldSerializePath: Vertex properties doesn't have nested structures with HugeVertexSerializer
org.apache.tinkerpop.gremlin.structure.SerializationTest.GraphSONTest.shouldSerializeTree: Vertex properties doesn't have nested structures with HugeVertexSerializer

#################### process suite ####################

# unsupported automatic edge id, therefore number of edge is wrong
Expand Down
5 changes: 5 additions & 0 deletions hugegraph-test/src/main/resources/methods.filter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,11 @@ org.apache.tinkerpop.gremlin.structure.GraphTest.shouldRemoveVertices: Random UU
org.apache.tinkerpop.gremlin.structure.GraphTest.shouldRemoveEdges: Random UUID as edge label
org.apache.tinkerpop.gremlin.structure.TransactionTest.shouldExecuteWithCompetingThreads: Hang the tests because property 'test' have both String and long value

## vertex properties doesn't have nested structures with HugeVertexSerializer
org.apache.tinkerpop.gremlin.structure.SerializationTest.GraphSONTest.shouldSerializeVertex: Vertex properties doesn't have nested structures with HugeVertexSerializer
org.apache.tinkerpop.gremlin.structure.SerializationTest.GraphSONTest.shouldSerializePath: Vertex properties doesn't have nested structures with HugeVertexSerializer
org.apache.tinkerpop.gremlin.structure.SerializationTest.GraphSONTest.shouldSerializeTree: Vertex properties doesn't have nested structures with HugeVertexSerializer

#################### process suite ####################

# unsupported automatic edge id, therefore number of edge is wrong
Expand Down