You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by jo...@apache.org on 2019/11/07 09:18:40 UTC
[tinkerpop] 01/01: Merge branch 'tp34'
This is an automated email from the ASF dual-hosted git repository.
jorgebg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit d0838e2cc468e7f4f5c27216692349fad37cbf85
Merge: 172b77b 2b9f40e
Author: Jorge Bay Gondra <jo...@gmail.com>
AuthorDate: Thu Nov 7 10:18:13 2019 +0100
Merge branch 'tp34'
CHANGELOG.asciidoc | 6 +
docs/src/upgrade/release-3.4.x.asciidoc | 25 ++
.../tinkerpop/gremlin/structure/io/Buffer.java | 250 +++++++++++++
.../gremlin/structure/io/BufferFactory.java | 21 +-
.../gremlin/structure/io}/binary/DataType.java | 5 +-
.../structure/io}/binary/GraphBinaryIo.java | 5 +-
.../structure/io}/binary/GraphBinaryReader.java | 15 +-
.../structure/io}/binary/GraphBinaryWriter.java | 30 +-
.../structure/io}/binary/TypeSerializer.java | 16 +-
.../io}/binary/TypeSerializerRegistry.java | 18 +-
.../io}/binary/types/BigDecimalSerializer.java | 16 +-
.../io}/binary/types/BigIntegerSerializer.java | 16 +-
.../io}/binary/types/BindingSerializer.java | 17 +-
.../io}/binary/types/BulkSetSerializer.java | 19 +-
.../io}/binary/types/ByteBufferSerializer.java | 16 +-
.../io}/binary/types/ByteCodeSerializer.java | 24 +-
.../structure/io}/binary/types/CharSerializer.java | 17 +-
.../io}/binary/types/ClassSerializer.java | 17 +-
.../io}/binary/types/CollectionSerializer.java | 16 +-
.../io}/binary/types/CustomTypeSerializer.java | 4 +-
.../structure/io}/binary/types/DateSerializer.java | 14 +-
.../io}/binary/types/DurationSerializer.java | 16 +-
.../structure/io}/binary/types/EdgeSerializer.java | 17 +-
.../structure/io}/binary/types/EnumSerializer.java | 16 +-
.../io}/binary/types/GraphSerializer.java | 24 +-
.../io}/binary/types/InetAddressSerializer.java | 18 +-
.../io}/binary/types/InstantSerializer.java | 16 +-
.../io}/binary/types/LambdaSerializer.java | 17 +-
.../structure/io}/binary/types/ListSerializer.java | 16 +-
.../io}/binary/types/LocalDateSerializer.java | 16 +-
.../io}/binary/types/LocalDateTimeSerializer.java | 16 +-
.../io}/binary/types/LocalTimeSerializer.java | 16 +-
.../io}/binary/types/MapEntrySerializer.java | 18 +-
.../structure/io}/binary/types/MapSerializer.java | 16 +-
.../io}/binary/types/MetricsSerializer.java | 16 +-
.../io}/binary/types/MonthDaySerializer.java | 16 +-
.../io}/binary/types/OffsetDateTimeSerializer.java | 16 +-
.../io}/binary/types/OffsetTimeSerializer.java | 16 +-
.../structure/io}/binary/types/PSerializer.java | 24 +-
.../structure/io}/binary/types/PathSerializer.java | 16 +-
.../io}/binary/types/PeriodSerializer.java | 16 +-
.../io}/binary/types/PropertySerializer.java | 17 +-
.../structure/io}/binary/types/SetSerializer.java | 16 +-
.../io}/binary/types/SimpleTypeSerializer.java | 33 +-
.../io}/binary/types/SingleTypeSerializer.java | 36 +-
.../io}/binary/types/StringSerializer.java | 14 +-
.../io}/binary/types/TransformSerializer.java | 4 +-
.../types/TraversalExplanationSerializer.java | 18 +-
.../binary/types/TraversalMetricsSerializer.java | 16 +-
.../binary/types/TraversalStrategySerializer.java | 16 +-
.../io}/binary/types/TraverserSerializer.java | 17 +-
.../structure/io}/binary/types/TreeSerializer.java | 17 +-
.../structure/io}/binary/types/UUIDSerializer.java | 14 +-
.../io}/binary/types/VertexPropertySerializer.java | 17 +-
.../io}/binary/types/VertexSerializer.java | 17 +-
.../io}/binary/types/YearMonthSerializer.java | 16 +-
.../io}/binary/types/ZoneOffsetSerializer.java | 16 +-
.../io}/binary/types/ZonedDateTimeSerializer.java | 16 +-
.../driver/ser/GraphBinaryMessageSerializerV1.java | 10 +-
.../tinkerpop/gremlin/driver/ser/NettyBuffer.java | 267 ++++++++++++++
.../gremlin/driver/ser/NettyBufferFactory.java | 114 ++++++
.../ser/binary/RequestMessageSerializer.java | 58 +++-
.../ser/binary/ResponseMessageSerializer.java | 65 ++--
.../gremlin/driver/ser/NettyBufferFactoryTest.java | 385 +++++++++++++++++++++
.../binary/GraphBinaryMessageSerializerV1Test.java | 1 +
.../GraphBinaryReaderWriterRoundTripTest.java | 8 +-
.../ser/binary/TypeSerializerFailureTests.java | 11 +-
.../ser/binary/TypeSerializerRegistryTest.java | 29 +-
.../ser/binary/types/CharSerializerTest.java | 23 +-
.../types/sample/SamplePersonSerializer.java | 19 +-
.../types/sample/SamplePersonSerializerTest.java | 25 +-
.../driver/GraphBinaryReaderWriterBenchmark.java | 29 +-
.../gremlin/driver/SerializationBenchmark.java | 2 +-
.../scripts/generate-graphbinary-resources.groovy | 7 +-
.../graphbinary/GraphBinaryCompatibilityTest.java | 21 +-
75 files changed, 1704 insertions(+), 579 deletions(-)
diff --cc gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/TypeSerializerRegistry.java
index 6092e51,39aeaaf..ced0088
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/TypeSerializerRegistry.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/TypeSerializerRegistry.java
@@@ -47,10 -46,9 +46,11 @@@ import org.apache.tinkerpop.gremlin.str
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.IoRegistry;
import org.apache.tinkerpop.gremlin.util.function.Lambda;
+import org.javatuples.Pair;
+ import java.io.IOException;
import java.lang.reflect.Modifier;
import java.math.BigDecimal;
import java.math.BigInteger;
diff --cc gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/GraphSerializer.java
index b986840,d627f18..f107b8a
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/GraphSerializer.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/GraphSerializer.java
@@@ -16,15 -16,13 +16,13 @@@
* specific language governing permissions and limitations
* under the License.
*/
- package org.apache.tinkerpop.gremlin.driver.ser.binary.types;
+ package org.apache.tinkerpop.gremlin.structure.io.binary.types;
- import io.netty.buffer.ByteBuf;
-import org.apache.commons.configuration.BaseConfiguration;
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.BaseConfiguration;
+import org.apache.commons.configuration2.Configuration;
- 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.structure.io.binary.DataType;
+ import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryReader;
+ import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryWriter;
import org.apache.tinkerpop.gremlin.structure.Edge;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.Property;
diff --cc gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/TraversalStrategySerializer.java
index f773f2c,38ea9c9..256e25d
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/TraversalStrategySerializer.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/binary/types/TraversalStrategySerializer.java
@@@ -16,15 -16,13 +16,13 @@@
* specific language governing permissions and limitations
* under the License.
*/
- package org.apache.tinkerpop.gremlin.driver.ser.binary.types;
+ package org.apache.tinkerpop.gremlin.structure.io.binary.types;
- import io.netty.buffer.ByteBuf;
-import org.apache.commons.configuration.ConfigurationConverter;
-import org.apache.commons.configuration.MapConfiguration;
+import org.apache.commons.configuration2.ConfigurationConverter;
+import org.apache.commons.configuration2.MapConfiguration;
- 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.structure.io.binary.DataType;
+ import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryReader;
+ import org.apache.tinkerpop.gremlin.structure.io.binary.GraphBinaryWriter;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.TraversalStrategyProxy;