This is an automated email from the ASF dual-hosted git repository.
jorgebg pushed a commit to branch TINKERPOP-1942
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
The following commit(s) were added to refs/heads/TINKERPOP-1942 by this push:
new 7cabf44 Support Tree serialization
7cabf44 is described below
commit 7cabf44ee4c48f7db9f1bab4eb4188ef491fba94
Author: Jorge Bay Gondra <[email protected]>
AuthorDate: Tue Dec 18 09:52:46 2018 +0100
Support Tree serialization
---
docs/src/dev/io/graphbinary.asciidoc | 11 ++++
.../gremlin/driver/ser/binary/DataType.java | 1 +
.../driver/ser/binary/TypeSerializerRegistry.java | 45 ++--------------
.../driver/ser/binary/types/TreeSerializer.java | 61 ++++++++++++++++++++++
.../GraphBinaryReaderWriterRoundTripTest.java | 11 ++++
.../remote/GraphBinaryRemoteGraphProvider.java | 5 --
6 files changed, 87 insertions(+), 47 deletions(-)
diff --git a/docs/src/dev/io/graphbinary.asciidoc
b/docs/src/dev/io/graphbinary.asciidoc
index ddbabb5..e301164 100644
--- a/docs/src/dev/io/graphbinary.asciidoc
+++ b/docs/src/dev/io/graphbinary.asciidoc
@@ -104,6 +104,7 @@ Changes to existing types require new revision.
- `0x28`: TextP
- `0x29`: TraversalStrategy
- `0x2a`: BulkSet
+- `0x2b`: Tree
- `0xfe`: Unspecified null object
- `0x00`: Custom
@@ -532,6 +533,16 @@ If the implementing language does not have a `BulkSet`
object to deserialize int
`List` and still be considered compliant with Gremlin. Simply create "expand
the bulk" by adding the item to the `List`
the number of times specified by the bulk.
+==== Tree
+
+Format: `{length}{item_0}...{item_n}`
+
+Where:
+
+- `{length}` is an `Int` describing the length of the items.
+- `{item_0}...{item_n}` are the items of the `Tree`. `{item_i}` is composed of
`{key}` is a fully-qualified type value
+followed by a `{Tree}`.
+
==== Custom
A custom type, represented as a blob value.
diff --git
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/binary/DataType.java
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/binary/DataType.java
index d6a152c..4087fb0 100644
---
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/binary/DataType.java
+++
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/binary/DataType.java
@@ -64,6 +64,7 @@ public enum DataType {
TEXTP(0x28),
TRAVERSALSTRATEGY(0X29),
BULKSET(0X2A),
+ TREE(0X2B),
CHAR(0X80),
DURATION(0X81),
diff --git
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/binary/TypeSerializerRegistry.java
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/binary/TypeSerializerRegistry.java
index 85524ac..cc8b42a 100644
---
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/binary/TypeSerializerRegistry.java
+++
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/binary/TypeSerializerRegistry.java
@@ -19,48 +19,7 @@
package org.apache.tinkerpop.gremlin.driver.ser.binary;
import org.apache.tinkerpop.gremlin.driver.ser.SerializationException;
-import
org.apache.tinkerpop.gremlin.driver.ser.binary.types.BigDecimalSerializer;
-import
org.apache.tinkerpop.gremlin.driver.ser.binary.types.BigIntegerSerializer;
-import org.apache.tinkerpop.gremlin.driver.ser.binary.types.BindingSerializer;
-import org.apache.tinkerpop.gremlin.driver.ser.binary.types.BulkSetSerializer;
-import
org.apache.tinkerpop.gremlin.driver.ser.binary.types.ByteBufferSerializer;
-import org.apache.tinkerpop.gremlin.driver.ser.binary.types.ByteCodeSerializer;
-import org.apache.tinkerpop.gremlin.driver.ser.binary.types.CharSerializer;
-import org.apache.tinkerpop.gremlin.driver.ser.binary.types.ClassSerializer;
-import
org.apache.tinkerpop.gremlin.driver.ser.binary.types.CustomTypeSerializer;
-import org.apache.tinkerpop.gremlin.driver.ser.binary.types.DateSerializer;
-import org.apache.tinkerpop.gremlin.driver.ser.binary.types.DurationSerializer;
-import org.apache.tinkerpop.gremlin.driver.ser.binary.types.EdgeSerializer;
-import org.apache.tinkerpop.gremlin.driver.ser.binary.types.EnumSerializer;
-import org.apache.tinkerpop.gremlin.driver.ser.binary.types.GraphSerializer;
-import
org.apache.tinkerpop.gremlin.driver.ser.binary.types.InetAddressSerializer;
-import org.apache.tinkerpop.gremlin.driver.ser.binary.types.InstantSerializer;
-import org.apache.tinkerpop.gremlin.driver.ser.binary.types.LambdaSerializer;
-import org.apache.tinkerpop.gremlin.driver.ser.binary.types.ListSerializer;
-import
org.apache.tinkerpop.gremlin.driver.ser.binary.types.LocalDateSerializer;
-import
org.apache.tinkerpop.gremlin.driver.ser.binary.types.LocalDateTimeSerializer;
-import
org.apache.tinkerpop.gremlin.driver.ser.binary.types.LocalTimeSerializer;
-import org.apache.tinkerpop.gremlin.driver.ser.binary.types.MapEntrySerializer;
-import org.apache.tinkerpop.gremlin.driver.ser.binary.types.MapSerializer;
-import org.apache.tinkerpop.gremlin.driver.ser.binary.types.MonthDaySerializer;
-import
org.apache.tinkerpop.gremlin.driver.ser.binary.types.OffsetDateTimeSerializer;
-import
org.apache.tinkerpop.gremlin.driver.ser.binary.types.OffsetTimeSerializer;
-import org.apache.tinkerpop.gremlin.driver.ser.binary.types.PSerializer;
-import org.apache.tinkerpop.gremlin.driver.ser.binary.types.PathSerializer;
-import org.apache.tinkerpop.gremlin.driver.ser.binary.types.PeriodSerializer;
-import org.apache.tinkerpop.gremlin.driver.ser.binary.types.PropertySerializer;
-import org.apache.tinkerpop.gremlin.driver.ser.binary.types.SetSerializer;
-import
org.apache.tinkerpop.gremlin.driver.ser.binary.types.SingleTypeSerializer;
-import org.apache.tinkerpop.gremlin.driver.ser.binary.types.StringSerializer;
-import
org.apache.tinkerpop.gremlin.driver.ser.binary.types.TransformSerializer;
-import
org.apache.tinkerpop.gremlin.driver.ser.binary.types.TraversalStrategySerializer;
-import
org.apache.tinkerpop.gremlin.driver.ser.binary.types.TraverserSerializer;
-import org.apache.tinkerpop.gremlin.driver.ser.binary.types.UUIDSerializer;
-import
org.apache.tinkerpop.gremlin.driver.ser.binary.types.VertexPropertySerializer;
-import org.apache.tinkerpop.gremlin.driver.ser.binary.types.VertexSerializer;
-import
org.apache.tinkerpop.gremlin.driver.ser.binary.types.YearMonthSerializer;
-import
org.apache.tinkerpop.gremlin.driver.ser.binary.types.ZoneOffsetSerializer;
-import
org.apache.tinkerpop.gremlin.driver.ser.binary.types.ZonedDateTimeSerializer;
+import org.apache.tinkerpop.gremlin.driver.ser.binary.types.*;
import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
import org.apache.tinkerpop.gremlin.process.traversal.Operator;
import org.apache.tinkerpop.gremlin.process.traversal.Order;
@@ -74,6 +33,7 @@ import
org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
import
org.apache.tinkerpop.gremlin.process.traversal.step.TraversalOptionParent;
import org.apache.tinkerpop.gremlin.process.traversal.step.util.BulkSet;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
import org.apache.tinkerpop.gremlin.process.traversal.util.AndP;
import org.apache.tinkerpop.gremlin.process.traversal.util.OrP;
import org.apache.tinkerpop.gremlin.structure.Column;
@@ -172,6 +132,7 @@ public class TypeSerializerRegistry {
new RegistryEntry<>(Boolean.class,
SingleTypeSerializer.BooleanSerializer),
new RegistryEntry<>(TraversalStrategy.class, new
TraversalStrategySerializer()),
new RegistryEntry<>(BulkSet.class, new BulkSetSerializer()),
+ new RegistryEntry<>(Tree.class, new TreeSerializer()),
new RegistryEntry<>(Map.Entry.class, new MapEntrySerializer()),
diff --git
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/binary/types/TreeSerializer.java
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/binary/types/TreeSerializer.java
new file mode 100644
index 0000000..d5f1277
--- /dev/null
+++
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/binary/types/TreeSerializer.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.driver.ser.binary.types;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.buffer.CompositeByteBuf;
+import org.apache.tinkerpop.gremlin.driver.ser.SerializationException;
+import org.apache.tinkerpop.gremlin.driver.ser.binary.DataType;
+import org.apache.tinkerpop.gremlin.driver.ser.binary.GraphBinaryReader;
+import org.apache.tinkerpop.gremlin.driver.ser.binary.GraphBinaryWriter;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
+
+public class TreeSerializer extends SimpleTypeSerializer<Tree> {
+ public TreeSerializer() {
+ super(DataType.TREE);
+ }
+
+ @Override
+ Tree readValue(ByteBuf buffer, GraphBinaryReader context) throws
SerializationException {
+ final int length = buffer.readInt();
+
+ final Tree result = new Tree();
+ for (int i = 0; i < length; i++) {
+ result.put(context.read(buffer), context.readValue(buffer,
Tree.class, false));
+ }
+
+ return result;
+ }
+
+ @Override
+ public ByteBuf writeValue(Tree value, ByteBufAllocator allocator,
GraphBinaryWriter context) throws SerializationException {
+ final CompositeByteBuf result = allocator.compositeBuffer(1 +
value.size() * 2);
+ result.addComponent(true, allocator.buffer(4).writeInt(value.size()));
+
+ for (Object key : value.keySet()) {
+ result.addComponents(
+ true,
+ context.write(key, allocator),
+ context.writeValue(value.get(key), allocator, false));
+ }
+
+ return result;
+ }
+}
diff --git
a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/binary/GraphBinaryReaderWriterRoundTripTest.java
b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/binary/GraphBinaryReaderWriterRoundTripTest.java
index 41a21d0..a719d88 100644
---
a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/binary/GraphBinaryReaderWriterRoundTripTest.java
+++
b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/binary/GraphBinaryReaderWriterRoundTripTest.java
@@ -33,12 +33,14 @@ import
org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
import
org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
import
org.apache.tinkerpop.gremlin.process.traversal.step.TraversalOptionParent;
import org.apache.tinkerpop.gremlin.process.traversal.step.util.BulkSet;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
import
org.apache.tinkerpop.gremlin.process.traversal.strategy.TraversalStrategyProxy;
import
org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SubgraphStrategy;
import org.apache.tinkerpop.gremlin.structure.Column;
import org.apache.tinkerpop.gremlin.structure.Direction;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.T;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.apache.tinkerpop.gremlin.structure.VertexProperty;
import org.apache.tinkerpop.gremlin.structure.io.IoTest;
import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceEdge;
@@ -111,6 +113,14 @@ public class GraphBinaryReaderWriterRoundTripTest {
bulkSet.add("marko", 1);
bulkSet.add("josh", 3);
+ final Tree<Vertex> tree = new Tree<>();
+ final Tree<Vertex> subTree = new Tree<>();
+ final Tree<Vertex> subSubTree = new Tree<>();
+ subSubTree.put(new ReferenceVertex(1, "animal"), new Tree<>());
+ subSubTree.put(new ReferenceVertex(2, "animal"), new Tree<>());
+ subTree.put(new ReferenceVertex(100, "animal"), subSubTree);
+ tree.put(new ReferenceVertex(1000, "animal"), subTree);
+
return Arrays.asList(
new Object[] {"String", "ABC", null},
new Object[] {"Char", '£', null},
@@ -206,6 +216,7 @@ public class GraphBinaryReaderWriterRoundTripTest {
assertEquals(hasLabel("person").asAdmin().getBytecode(),
strategy.getConfiguration().getProperty(SubgraphStrategy.VERTICES));
}},
new Object[] {"BulkSet", bulkSet, null},
+ new Object[] {"Tree", tree, null},
// collections
new Object[] {"ListSingle", listSingle, null},
diff --git
a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphBinaryRemoteGraphProvider.java
b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphBinaryRemoteGraphProvider.java
index 30f7a43..a5f8f88 100644
---
a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphBinaryRemoteGraphProvider.java
+++
b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/GraphBinaryRemoteGraphProvider.java
@@ -19,15 +19,10 @@
package org.apache.tinkerpop.gremlin.driver.remote;
import org.apache.tinkerpop.gremlin.driver.ser.Serializers;
-import org.apache.tinkerpop.gremlin.structure.Graph;
/**
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
[email protected](
- test =
"org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.TreeTest",
- method = "*",
- reason = "No support for Tree serialization in GraphBinary")
public class GraphBinaryRemoteGraphProvider extends
AbstractRemoteGraphProvider implements AutoCloseable {
public GraphBinaryRemoteGraphProvider() {
super(createClusterBuilder(Serializers.GRAPHBINARY_V1D0).create());
