You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2019/09/26 15:03:22 UTC
[tinkerpop] branch master updated (483dd90 -> 928541f)
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git.
from 483dd90 Merge branch 'TINKERPOP-2295'
add 08add20 Initial setup for GraphBinary in Python
add e5eac6b Add graphbinary support for list in python
add eb59c5c Added int graphbinary serialization for python
add d28f22e Added Long graphbinary support to python
add e319ff3 Added date graphbinary type to python
add 686d867 Added timestamp for graphbinary in python
add ce2d7f5 Fixed the graphbinary g;Date serialization - wasn't account for timezone stuff properly (still)
add 5fd1432 Added double and float graphbinary serialization in python
add 623a295 Added Dict/Set serialization for graphbinary in python
add de1bd69 Added uuid/edge to python graphbinary derser
add 7030b58 Added property/path to python graphbinary
add 3a98aff Added Graph/Vertex/VertexProperty to python graphbinary
add 00d954b Add enum graphbinary support in python
add e14a966 Aded Binding and fixed up enum derser in python graphbinary
add d5186a9 Added bytecode graphbinary serialization to python
add 6fac616 Added P/T/Scope graphbinary serialization for python
add f837f07 Added traverser, byte, bytearray to python graphbinary
add 8424887 Added boolean and textp to python graphbinary
add 92a93ee Added BulkSet support to python graphbinary
add d2e7708 Added graphbinary test files in gremlin-io-test for 3.4.3
add 59f4ff3 Major refactoring of GraphBinary
add e3fff7d Improved null handling in graphbinary for python
add b56dfdf Major refactoring for nullable writes.
add 0892f25 Added fqcn to TraversalStrategy in python to allow GraphBinary serialization to work properly
add 3a474ed Fixed a basic integration test runs for python 2.
add b87f3a8 Fixed handling of the null type in python graphbinary
add c3ea927 Fixed lambda serialization in python graphbinary
add c788e8a Cleaned up enum derser for python graphbinary a bit further
add db1fb06 Fixed up BulkSet python graphbinary serialization
add 0036012 All GLV tests passing for GraphBinary
add 9957fd8 Renamed python graphbinary "IO" to der or ser depending on function
add e548cd5 Generalized refactoring to python graphbinary.
add f883406 Refactored python graphbinary to stop using special means of string conversion
add 45f1b2d Factor away non-standard method of reading non-null strings for graphbinary in python
add 46fc458 Rename python function to use underscore
add 8d82602 Added SingleChar support to python graphbinary
add 4b81931 Added duration derser to python graphbinary
add 6b50ec5 Need to measure the byte length of string after utf-8 conversion
add 4235cd9 Factor away varargs in as_bytes in GraphBinary for python
add 86de6d3 Create less bytearray() instances - gave a decent performance bump
add 8e108f3 Better reused bytearray in writes to enhance performance
add 3caee38 Prevented more bytearray creation on writes
add ed130b4 Allow serializer to re-use the initialized bytearray avoiding creation of new ones
add 4c9282e Fixed bad graphbinary serialization of TraversalStrategy
add 60e94d8 Close the BytesIO stream when done processing it.
add 752992f Imported struct functions more directly
add eaf8338 Extracted structs to functions to improve performance
add 20ea4f3 Convert RequestMessage header to compiled Struct
add f92479d Moved requestId to header compiled Struct
add 0ce7827 Converted more pack calls to compiled Struct
add c2208d1 More use of compiled struct as well as faster methods for appending to bytearray
add 9760746 change test config back to localhost
add 5cdeef3 Fixed bug in python 2.7 support for request message serialization
add df3a6f4 Minor refactoring for graphbinary in python
add 414265f Added upgrade docs for python graphbinary
add 4a770a7 Added back some tests that were inadvertantly removed from python
new 5803c26 Merge branch 'TINKERPOP-2279' into tp34
new 928541f Merge branch 'tp34'
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGELOG.asciidoc | 1 +
docs/src/dev/io/graphbinary.asciidoc | 8 +-
docs/src/upgrade/release-3.4.x.asciidoc | 17 +
.../driver/ser/binary/types/PSerializer.java | 18 +-
.../GraphBinaryReaderWriterRoundTripTest.java | 4 +
gremlin-python/glv/TraversalSource.template | 5 +-
gremlin-python/pom.xml | 7 +
.../main/jython/gremlin_python/driver/protocol.py | 5 +-
.../jython/gremlin_python/driver/serializer.py | 132 ++-
.../jython/gremlin_python/process/strategies.py | 51 +-
.../jython/gremlin_python/process/traversal.py | 5 +-
.../src/main/jython/gremlin_python/statics.py | 15 +-
.../gremlin_python/structure/io/graphbinaryV1.py | 1083 ++++++++++++++++++++
.../gremlin_python/structure/io/graphsonV3d0.py | 1 +
gremlin-python/src/main/jython/radish/terrain.py | 2 +
gremlin-python/src/main/jython/tests/conftest.py | 37 +-
.../tests/driver/test_driver_remote_connection.py | 19 +-
.../main/jython/tests/driver/test_serializer.py | 20 +-
.../tests/structure/io/test_functionalityio.py | 97 ++
.../tests/structure/io/test_graphbinaryV1.py | 215 ++++
.../jython/tests/structure/io/test_graphsonV3d0.py | 45 +-
gremlin-tools/gremlin-io-test/pom.xml | 26 +
.../scripts/generate-graphbinary-resources.groovy | 81 ++
.../tinkerpop/gremlin/structure/io/Model.java | 16 +-
.../io/graphbinary/GraphBinaryCompatibility.java | 86 ++
.../structure/io/AbstractCompatibilityTest.java | 51 +-
.../graphbinary/GraphBinaryCompatibilityTest.java | 90 ++
.../io/graphbinary/_3_4_3/barrier-v1.gbin | Bin 0 -> 16 bytes
.../io/graphbinary/_3_4_3/bigdecimal-v1.gbin | Bin 0 -> 25 bytes
.../io/graphbinary/_3_4_3/biginteger-v1.gbin | Bin 0 -> 21 bytes
.../io/graphbinary/_3_4_3/binding-v1.gbin | Bin 0 -> 13 bytes
.../io/graphbinary/_3_4_3/bulkset-v1.gbin | Bin 0 -> 43 bytes
.../structure/io/graphbinary/_3_4_3/byte-v1.gbin | Bin 0 -> 3 bytes
.../io/graphbinary/_3_4_3/bytebuffer-v1.gbin | Bin 0 -> 24 bytes
.../io/graphbinary/_3_4_3/bytecode-v1.gbin | Bin 0 -> 80 bytes
.../io/graphbinary/_3_4_3/cardinality-v1.gbin | Bin 0 -> 12 bytes
.../structure/io/graphbinary/_3_4_3/char-v1.gbin | Bin 0 -> 3 bytes
.../structure/io/graphbinary/_3_4_3/class-v1.gbin | Bin 0 -> 18 bytes
.../structure/io/graphbinary/_3_4_3/column-v1.gbin | Bin 0 -> 12 bytes
.../structure/io/graphbinary/_3_4_3/date-v1.gbin | Bin 0 -> 10 bytes
.../io/graphbinary/_3_4_3/direction-v1.gbin | Bin 0 -> 11 bytes
.../structure/io/graphbinary/_3_4_3/double-v1.gbin | Bin 0 -> 10 bytes
.../io/graphbinary/_3_4_3/duration-v1.gbin | Bin 0 -> 14 bytes
.../structure/io/graphbinary/_3_4_3/edge-v1.gbin | Bin 0 -> 58 bytes
.../structure/io/graphbinary/_3_4_3/float-v1.gbin | Bin 0 -> 6 bytes
.../io/graphbinary/_3_4_3/inetaddress-v1.gbin | Bin 0 -> 10 bytes
.../io/graphbinary/_3_4_3/instant-v1.gbin | Bin 0 -> 14 bytes
.../io/graphbinary/_3_4_3/integer-v1.gbin | Bin 0 -> 6 bytes
.../structure/io/graphbinary/_3_4_3/lambda-v1.gbin | Bin 0 -> 40 bytes
.../structure/io/graphbinary/_3_4_3/list-v1.gbin | Bin 0 -> 27 bytes
.../io/graphbinary/_3_4_3/localdate-v1.gbin | Bin 0 -> 8 bytes
.../io/graphbinary/_3_4_3/localdatetime-v1.gbin | Bin 0 -> 16 bytes
.../io/graphbinary/_3_4_3/localtime-v1.gbin | Bin 0 -> 10 bytes
.../structure/io/graphbinary/_3_4_3/long-v1.gbin | Bin 0 -> 10 bytes
.../structure/io/graphbinary/_3_4_3/map-v1.gbin | Bin 0 -> 75 bytes
.../io/graphbinary/_3_4_3/metrics-v1.gbin | Bin 0 -> 307 bytes
.../io/graphbinary/_3_4_3/monthday-v1.gbin | Bin 0 -> 4 bytes
.../io/graphbinary/_3_4_3/offsetdatetime-v1.gbin | Bin 0 -> 20 bytes
.../io/graphbinary/_3_4_3/offsettime-v1.gbin | Bin 0 -> 14 bytes
.../io/graphbinary/_3_4_3/operator-v1.gbin | Bin 0 -> 11 bytes
.../structure/io/graphbinary/_3_4_3/order-v1.gbin | Bin 0 -> 15 bytes
.../structure/io/graphbinary/_3_4_3/p-v1.gbin | Bin 0 -> 18 bytes
.../structure/io/graphbinary/_3_4_3/pand-v1.gbin | Bin 0 -> 49 bytes
.../structure/io/graphbinary/_3_4_3/path-v1.gbin | Bin 0 -> 96 bytes
.../structure/io/graphbinary/_3_4_3/period-v1.gbin | Bin 0 -> 14 bytes
.../structure/io/graphbinary/_3_4_3/pick-v1.gbin | Bin 0 -> 11 bytes
.../structure/io/graphbinary/_3_4_3/pop-v1.gbin | Bin 0 -> 11 bytes
.../structure/io/graphbinary/_3_4_3/por-v1.gbin | Bin 0 -> 64 bytes
.../io/graphbinary/_3_4_3/property-v1.gbin | Bin 0 -> 19 bytes
.../io/graphbinary/_3_4_3/pwithin-v1.gbin | Bin 0 -> 22 bytes
.../io/graphbinary/_3_4_3/pwithout-v1.gbin | Bin 0 -> 29 bytes
.../structure/io/graphbinary/_3_4_3/scope-v1.gbin | Bin 0 -> 13 bytes
.../structure/io/graphbinary/_3_4_3/set-v1.gbin | Bin 0 -> 27 bytes
.../structure/io/graphbinary/_3_4_3/short-v1.gbin | Bin 0 -> 4 bytes
.../structure/io/graphbinary/_3_4_3/t-v1.gbin | Bin 0 -> 13 bytes
.../structure/io/graphbinary/_3_4_3/textp-v1.gbin | Bin 0 -> 29 bytes
.../io/graphbinary/_3_4_3/timestamp-v1.gbin | Bin 0 -> 10 bytes
.../io/graphbinary/_3_4_3/tinkergraph-v1.gbin | Bin 0 -> 2264 bytes
.../io/graphbinary/_3_4_3/traversalmetrics-v1.gbin | Bin 0 -> 593 bytes
.../io/graphbinary/_3_4_3/traverser-v1.gbin | Bin 0 -> 30 bytes
.../structure/io/graphbinary/_3_4_3/uuid-v1.gbin | Bin 0 -> 18 bytes
.../structure/io/graphbinary/_3_4_3/vertex-v1.gbin | Bin 0 -> 20 bytes
.../io/graphbinary/_3_4_3/vertexproperty-v1.gbin | Bin 0 -> 35 bytes
.../structure/io/graphbinary/_3_4_3/year-v1.gbin | Bin 0 -> 6 bytes
.../io/graphbinary/_3_4_3/yearmonth-v1.gbin | Bin 0 -> 7 bytes
.../io/graphbinary/_3_4_3/zoneddatetime-v1.gbin | Bin 0 -> 20 bytes
.../io/graphbinary/_3_4_3/zoneoffset-v1.gbin | Bin 0 -> 6 bytes
pom.xml | 1 +
88 files changed, 1998 insertions(+), 140 deletions(-)
create mode 100644 gremlin-python/src/main/jython/gremlin_python/structure/io/graphbinaryV1.py
create mode 100644 gremlin-python/src/main/jython/tests/structure/io/test_functionalityio.py
create mode 100644 gremlin-python/src/main/jython/tests/structure/io/test_graphbinaryV1.py
create mode 100644 gremlin-tools/gremlin-io-test/scripts/generate-graphbinary-resources.groovy
create mode 100644 gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphbinary/GraphBinaryCompatibility.java
create mode 100644 gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphbinary/GraphBinaryCompatibilityTest.java
create mode 100644 gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/barrier-v1.gbin
create mode 100644 gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/bigdecimal-v1.gbin
create mode 100644 gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/biginteger-v1.gbin
create mode 100644 gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/binding-v1.gbin
create mode 100644 gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/bulkset-v1.gbin
create mode 100644 gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/byte-v1.gbin
create mode 100644 gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/bytebuffer-v1.gbin
create mode 100644 gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/bytecode-v1.gbin
create mode 100644 gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/cardinality-v1.gbin
create mode 100644 gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/char-v1.gbin
create mode 100644 gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/class-v1.gbin
create mode 100644 gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/column-v1.gbin
create mode 100644 gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/date-v1.gbin
create mode 100644 gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/direction-v1.gbin
create mode 100644 gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/double-v1.gbin
create mode 100644 gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/duration-v1.gbin
create mode 100644 gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/edge-v1.gbin
create mode 100644 gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/float-v1.gbin
create mode 100644 gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/inetaddress-v1.gbin
create mode 100644 gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/instant-v1.gbin
create mode 100644 gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/integer-v1.gbin
create mode 100644 gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/lambda-v1.gbin
create mode 100644 gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/list-v1.gbin
create mode 100644 gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/localdate-v1.gbin
create mode 100644 gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/localdatetime-v1.gbin
create mode 100644 gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/localtime-v1.gbin
create mode 100644 gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/long-v1.gbin
create mode 100644 gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/map-v1.gbin
create mode 100644 gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/metrics-v1.gbin
create mode 100644 gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/monthday-v1.gbin
create mode 100644 gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/offsetdatetime-v1.gbin
create mode 100644 gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/offsettime-v1.gbin
create mode 100644 gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/operator-v1.gbin
create mode 100644 gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/order-v1.gbin
create mode 100644 gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/p-v1.gbin
create mode 100644 gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/pand-v1.gbin
create mode 100644 gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/path-v1.gbin
create mode 100644 gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/period-v1.gbin
create mode 100644 gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/pick-v1.gbin
create mode 100644 gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/pop-v1.gbin
create mode 100644 gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/por-v1.gbin
create mode 100644 gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/property-v1.gbin
create mode 100644 gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/pwithin-v1.gbin
create mode 100644 gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/pwithout-v1.gbin
create mode 100644 gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/scope-v1.gbin
create mode 100644 gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/set-v1.gbin
create mode 100644 gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/short-v1.gbin
create mode 100644 gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/t-v1.gbin
create mode 100644 gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/textp-v1.gbin
create mode 100644 gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/timestamp-v1.gbin
create mode 100644 gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/tinkergraph-v1.gbin
create mode 100644 gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/traversalmetrics-v1.gbin
create mode 100644 gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/traverser-v1.gbin
create mode 100644 gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/uuid-v1.gbin
create mode 100644 gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/vertex-v1.gbin
create mode 100644 gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/vertexproperty-v1.gbin
create mode 100644 gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/year-v1.gbin
create mode 100644 gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/yearmonth-v1.gbin
create mode 100644 gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/zoneddatetime-v1.gbin
create mode 100644 gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphbinary/_3_4_3/zoneoffset-v1.gbin
[tinkerpop] 02/02: Merge branch 'tp34'
Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 928541febf66644122b16bc8e71143aec76d7b3b
Merge: 483dd90 5803c26
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Thu Sep 26 11:03:08 2019 -0400
Merge branch 'tp34'
CHANGELOG.asciidoc | 1 +
docs/src/dev/io/graphbinary.asciidoc | 8 +-
docs/src/upgrade/release-3.4.x.asciidoc | 17 +
.../driver/ser/binary/types/PSerializer.java | 18 +-
.../GraphBinaryReaderWriterRoundTripTest.java | 4 +
gremlin-python/glv/TraversalSource.template | 5 +-
gremlin-python/pom.xml | 7 +
.../main/jython/gremlin_python/driver/protocol.py | 5 +-
.../jython/gremlin_python/driver/serializer.py | 132 ++-
.../jython/gremlin_python/process/strategies.py | 51 +-
.../jython/gremlin_python/process/traversal.py | 5 +-
.../src/main/jython/gremlin_python/statics.py | 15 +-
.../gremlin_python/structure/io/graphbinaryV1.py | 1083 ++++++++++++++++++++
.../gremlin_python/structure/io/graphsonV3d0.py | 1 +
gremlin-python/src/main/jython/radish/terrain.py | 2 +
gremlin-python/src/main/jython/tests/conftest.py | 37 +-
.../tests/driver/test_driver_remote_connection.py | 19 +-
.../main/jython/tests/driver/test_serializer.py | 20 +-
.../tests/structure/io/test_functionalityio.py | 97 ++
.../tests/structure/io/test_graphbinaryV1.py | 215 ++++
.../jython/tests/structure/io/test_graphsonV3d0.py | 45 +-
gremlin-tools/gremlin-io-test/pom.xml | 26 +
.../scripts/generate-graphbinary-resources.groovy | 81 ++
.../tinkerpop/gremlin/structure/io/Model.java | 16 +-
.../io/graphbinary/GraphBinaryCompatibility.java | 86 ++
.../structure/io/AbstractCompatibilityTest.java | 51 +-
.../graphbinary/GraphBinaryCompatibilityTest.java | 90 ++
.../io/graphbinary/_3_4_3/barrier-v1.gbin | Bin 0 -> 16 bytes
.../io/graphbinary/_3_4_3/bigdecimal-v1.gbin | Bin 0 -> 25 bytes
.../io/graphbinary/_3_4_3/biginteger-v1.gbin | Bin 0 -> 21 bytes
.../io/graphbinary/_3_4_3/binding-v1.gbin | Bin 0 -> 13 bytes
.../io/graphbinary/_3_4_3/bulkset-v1.gbin | Bin 0 -> 43 bytes
.../structure/io/graphbinary/_3_4_3/byte-v1.gbin | Bin 0 -> 3 bytes
.../io/graphbinary/_3_4_3/bytebuffer-v1.gbin | Bin 0 -> 24 bytes
.../io/graphbinary/_3_4_3/bytecode-v1.gbin | Bin 0 -> 80 bytes
.../io/graphbinary/_3_4_3/cardinality-v1.gbin | Bin 0 -> 12 bytes
.../structure/io/graphbinary/_3_4_3/char-v1.gbin | Bin 0 -> 3 bytes
.../structure/io/graphbinary/_3_4_3/class-v1.gbin | Bin 0 -> 18 bytes
.../structure/io/graphbinary/_3_4_3/column-v1.gbin | Bin 0 -> 12 bytes
.../structure/io/graphbinary/_3_4_3/date-v1.gbin | Bin 0 -> 10 bytes
.../io/graphbinary/_3_4_3/direction-v1.gbin | Bin 0 -> 11 bytes
.../structure/io/graphbinary/_3_4_3/double-v1.gbin | Bin 0 -> 10 bytes
.../io/graphbinary/_3_4_3/duration-v1.gbin | Bin 0 -> 14 bytes
.../structure/io/graphbinary/_3_4_3/edge-v1.gbin | Bin 0 -> 58 bytes
.../structure/io/graphbinary/_3_4_3/float-v1.gbin | Bin 0 -> 6 bytes
.../io/graphbinary/_3_4_3/inetaddress-v1.gbin | Bin 0 -> 10 bytes
.../io/graphbinary/_3_4_3/instant-v1.gbin | Bin 0 -> 14 bytes
.../io/graphbinary/_3_4_3/integer-v1.gbin | Bin 0 -> 6 bytes
.../structure/io/graphbinary/_3_4_3/lambda-v1.gbin | Bin 0 -> 40 bytes
.../structure/io/graphbinary/_3_4_3/list-v1.gbin | Bin 0 -> 27 bytes
.../io/graphbinary/_3_4_3/localdate-v1.gbin | Bin 0 -> 8 bytes
.../io/graphbinary/_3_4_3/localdatetime-v1.gbin | Bin 0 -> 16 bytes
.../io/graphbinary/_3_4_3/localtime-v1.gbin | Bin 0 -> 10 bytes
.../structure/io/graphbinary/_3_4_3/long-v1.gbin | Bin 0 -> 10 bytes
.../structure/io/graphbinary/_3_4_3/map-v1.gbin | Bin 0 -> 75 bytes
.../io/graphbinary/_3_4_3/metrics-v1.gbin | Bin 0 -> 307 bytes
.../io/graphbinary/_3_4_3/monthday-v1.gbin | Bin 0 -> 4 bytes
.../io/graphbinary/_3_4_3/offsetdatetime-v1.gbin | Bin 0 -> 20 bytes
.../io/graphbinary/_3_4_3/offsettime-v1.gbin | Bin 0 -> 14 bytes
.../io/graphbinary/_3_4_3/operator-v1.gbin | Bin 0 -> 11 bytes
.../structure/io/graphbinary/_3_4_3/order-v1.gbin | Bin 0 -> 15 bytes
.../structure/io/graphbinary/_3_4_3/p-v1.gbin | Bin 0 -> 18 bytes
.../structure/io/graphbinary/_3_4_3/pand-v1.gbin | Bin 0 -> 49 bytes
.../structure/io/graphbinary/_3_4_3/path-v1.gbin | Bin 0 -> 96 bytes
.../structure/io/graphbinary/_3_4_3/period-v1.gbin | Bin 0 -> 14 bytes
.../structure/io/graphbinary/_3_4_3/pick-v1.gbin | Bin 0 -> 11 bytes
.../structure/io/graphbinary/_3_4_3/pop-v1.gbin | Bin 0 -> 11 bytes
.../structure/io/graphbinary/_3_4_3/por-v1.gbin | Bin 0 -> 64 bytes
.../io/graphbinary/_3_4_3/property-v1.gbin | Bin 0 -> 19 bytes
.../io/graphbinary/_3_4_3/pwithin-v1.gbin | Bin 0 -> 22 bytes
.../io/graphbinary/_3_4_3/pwithout-v1.gbin | Bin 0 -> 29 bytes
.../structure/io/graphbinary/_3_4_3/scope-v1.gbin | Bin 0 -> 13 bytes
.../structure/io/graphbinary/_3_4_3/set-v1.gbin | Bin 0 -> 27 bytes
.../structure/io/graphbinary/_3_4_3/short-v1.gbin | Bin 0 -> 4 bytes
.../structure/io/graphbinary/_3_4_3/t-v1.gbin | Bin 0 -> 13 bytes
.../structure/io/graphbinary/_3_4_3/textp-v1.gbin | Bin 0 -> 29 bytes
.../io/graphbinary/_3_4_3/timestamp-v1.gbin | Bin 0 -> 10 bytes
.../io/graphbinary/_3_4_3/tinkergraph-v1.gbin | Bin 0 -> 2264 bytes
.../io/graphbinary/_3_4_3/traversalmetrics-v1.gbin | Bin 0 -> 593 bytes
.../io/graphbinary/_3_4_3/traverser-v1.gbin | Bin 0 -> 30 bytes
.../structure/io/graphbinary/_3_4_3/uuid-v1.gbin | Bin 0 -> 18 bytes
.../structure/io/graphbinary/_3_4_3/vertex-v1.gbin | Bin 0 -> 20 bytes
.../io/graphbinary/_3_4_3/vertexproperty-v1.gbin | Bin 0 -> 35 bytes
.../structure/io/graphbinary/_3_4_3/year-v1.gbin | Bin 0 -> 6 bytes
.../io/graphbinary/_3_4_3/yearmonth-v1.gbin | Bin 0 -> 7 bytes
.../io/graphbinary/_3_4_3/zoneddatetime-v1.gbin | Bin 0 -> 20 bytes
.../io/graphbinary/_3_4_3/zoneoffset-v1.gbin | Bin 0 -> 6 bytes
pom.xml | 1 +
88 files changed, 1998 insertions(+), 140 deletions(-)
diff --cc gremlin-python/src/main/jython/tests/driver/test_driver_remote_connection.py
index 1ea1cdf,52c272b..e95a267
--- a/gremlin-python/src/main/jython/tests/driver/test_driver_remote_connection.py
+++ b/gremlin-python/src/main/jython/tests/driver/test_driver_remote_connection.py
@@@ -179,8 -181,118 +181,8 @@@ class TestDriverRemoteConnection(object
assert 6 == g.V().count().next()
assert 6 == g.E().count().next()
- def test_side_effects(self, remote_connection):
- statics.load_statics(globals())
- #
- g = traversal().withRemote(remote_connection)
- ###
- t = g.V().hasLabel("project").name.iterate()
- assert 0 == len(t.side_effects.keys())
- with pytest.raises(Exception):
- m = t.side_effects["m"]
- ###
- t = g.V().out("created").groupCount("m").by("name")
- results = t.toSet()
- assert 2 == len(results)
- assert Vertex(3) in results
- assert Vertex(5) in results
- assert 1 == len(t.side_effects.keys())
- assert "m" in t.side_effects.keys()
- m = t.side_effects["m"]
- assert isinstance(m, dict)
- assert 2 == len(m)
- assert 3 == m["lop"]
- assert 1 == m["ripple"]
-
- # check status attributes
- assert "host" in t.side_effects.status_attributes
-
- ##
- t = g.V().out("created").groupCount("m").by("name").name.aggregate("n")
- results = t.toSet()
- assert 2 == len(results)
- assert "lop" in results
- assert "ripple" in results
- assert 2 == len(t.side_effects.keys())
- assert "m" in t.side_effects.keys()
- assert "n" in t.side_effects.keys()
- n = t.side_effects.get("n")
- assert isinstance(n, dict)
- assert 2 == len(n)
- assert "lop" in n.keys()
- assert "ripple" in n.keys()
- assert 3 == n["lop"]
- assert 1 == n["ripple"]
-
- t = g.withSideEffect('m', 32).V().map(lambda: "x: x.sideEffects('m')")
- results = t.toSet()
- assert 1 == len(results)
- assert 32 == list(results)[0]
- assert 32 == t.side_effects['m']
- assert 1 == len(t.side_effects.keys())
- with pytest.raises(Exception):
- x = t.side_effects["x"]
-
- a = g.V().has("name", "marko").next()
- b = g.V().has("name", "peter").next()
- edge = g.withSideEffect("b", b).V(a).addE("knows").to("b").next()
- assert "knows" == edge.label
- assert a == edge.outV
- assert b == edge.inV
- g.V().has("name", "marko").outE("knows").where(__.inV().has("name", "peter")).drop().iterate()
- ##
- edge = g.withSideEffect("a", a).withSideEffect("b", b).V().limit(1).addE("knows").from_("a").to("b").next()
- assert "knows" == edge.label
- assert a == edge.outV
- assert b == edge.inV
- g.V().has("name", "marko").outE("knows").where(__.inV().has("name", "peter")).drop().iterate()
-
- def test_side_effect_close(self, remote_connection):
- g = traversal().withRemote(remote_connection)
- t = g.V().aggregate('a').aggregate('b')
- t.toList()
-
- # The 'a' key should return some side effects
- results = t.side_effects.get('a')
- assert results
-
- # Close result is None
- results = t.side_effects.close()
- assert not results
-
- # Shouldn't get any new info from server
- # 'b' isn't in local cache
- results = t.side_effects.get('b')
- assert not results
-
- # But 'a' should still be cached locally
- results = t.side_effects.get('a')
- assert results
-
- # 'a' should have been added to local keys cache, but not 'b'
- results = t.side_effects.keys()
- assert len(results) == 1
- a, = results
- assert a == 'a'
-
- # Try to get 'b' directly from server, should throw error
- with pytest.raises(Exception):
- t.side_effects.value_lambda('b')
-
- def test_promise(self, remote_connection):
- g = traversal().withRemote(remote_connection)
- future = g.V().aggregate('a').promise()
- t = future.result()
- assert len(t.toList()) == 6
- a, = t.side_effects.keys()
- assert a == 'a'
- results = t.side_effects.get('a')
- assert results
- results = t.side_effects.close()
- assert not results
-
- def test_in_tornado_app(remote_connection):
+ def test_in_tornado_app():
# Make sure nothing weird with loops
@gen.coroutine
def go():
[tinkerpop] 01/02: Merge branch 'TINKERPOP-2279' into tp34
Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 5803c265a79470684c56a4a01bdda22c8a99e756
Merge: 8a236d3 4a770a7
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Thu Sep 26 11:02:11 2019 -0400
Merge branch 'TINKERPOP-2279' into tp34
CHANGELOG.asciidoc | 1 +
docs/src/dev/io/graphbinary.asciidoc | 8 +-
docs/src/upgrade/release-3.4.x.asciidoc | 17 +
.../driver/ser/binary/types/PSerializer.java | 18 +-
.../GraphBinaryReaderWriterRoundTripTest.java | 4 +
gremlin-python/glv/TraversalSource.template | 5 +-
gremlin-python/pom.xml | 7 +
.../main/jython/gremlin_python/driver/protocol.py | 5 +-
.../jython/gremlin_python/driver/serializer.py | 132 ++-
.../jython/gremlin_python/process/strategies.py | 51 +-
.../jython/gremlin_python/process/traversal.py | 5 +-
.../src/main/jython/gremlin_python/statics.py | 15 +-
.../gremlin_python/structure/io/graphbinaryV1.py | 1083 ++++++++++++++++++++
.../gremlin_python/structure/io/graphsonV3d0.py | 1 +
gremlin-python/src/main/jython/radish/terrain.py | 2 +
gremlin-python/src/main/jython/tests/conftest.py | 37 +-
.../tests/driver/test_driver_remote_connection.py | 21 +-
.../main/jython/tests/driver/test_serializer.py | 20 +-
.../tests/structure/io/test_functionalityio.py | 97 ++
.../tests/structure/io/test_graphbinaryV1.py | 215 ++++
.../jython/tests/structure/io/test_graphsonV3d0.py | 45 +-
gremlin-tools/gremlin-io-test/pom.xml | 26 +
.../scripts/generate-graphbinary-resources.groovy | 81 ++
.../tinkerpop/gremlin/structure/io/Model.java | 16 +-
.../io/graphbinary/GraphBinaryCompatibility.java | 86 ++
.../structure/io/AbstractCompatibilityTest.java | 51 +-
.../graphbinary/GraphBinaryCompatibilityTest.java | 90 ++
.../io/graphbinary/_3_4_3/barrier-v1.gbin | Bin 0 -> 16 bytes
.../io/graphbinary/_3_4_3/bigdecimal-v1.gbin | Bin 0 -> 25 bytes
.../io/graphbinary/_3_4_3/biginteger-v1.gbin | Bin 0 -> 21 bytes
.../io/graphbinary/_3_4_3/binding-v1.gbin | Bin 0 -> 13 bytes
.../io/graphbinary/_3_4_3/bulkset-v1.gbin | Bin 0 -> 43 bytes
.../structure/io/graphbinary/_3_4_3/byte-v1.gbin | Bin 0 -> 3 bytes
.../io/graphbinary/_3_4_3/bytebuffer-v1.gbin | Bin 0 -> 24 bytes
.../io/graphbinary/_3_4_3/bytecode-v1.gbin | Bin 0 -> 80 bytes
.../io/graphbinary/_3_4_3/cardinality-v1.gbin | Bin 0 -> 12 bytes
.../structure/io/graphbinary/_3_4_3/char-v1.gbin | Bin 0 -> 3 bytes
.../structure/io/graphbinary/_3_4_3/class-v1.gbin | Bin 0 -> 18 bytes
.../structure/io/graphbinary/_3_4_3/column-v1.gbin | Bin 0 -> 12 bytes
.../structure/io/graphbinary/_3_4_3/date-v1.gbin | Bin 0 -> 10 bytes
.../io/graphbinary/_3_4_3/direction-v1.gbin | Bin 0 -> 11 bytes
.../structure/io/graphbinary/_3_4_3/double-v1.gbin | Bin 0 -> 10 bytes
.../io/graphbinary/_3_4_3/duration-v1.gbin | Bin 0 -> 14 bytes
.../structure/io/graphbinary/_3_4_3/edge-v1.gbin | Bin 0 -> 58 bytes
.../structure/io/graphbinary/_3_4_3/float-v1.gbin | Bin 0 -> 6 bytes
.../io/graphbinary/_3_4_3/inetaddress-v1.gbin | Bin 0 -> 10 bytes
.../io/graphbinary/_3_4_3/instant-v1.gbin | Bin 0 -> 14 bytes
.../io/graphbinary/_3_4_3/integer-v1.gbin | Bin 0 -> 6 bytes
.../structure/io/graphbinary/_3_4_3/lambda-v1.gbin | Bin 0 -> 40 bytes
.../structure/io/graphbinary/_3_4_3/list-v1.gbin | Bin 0 -> 27 bytes
.../io/graphbinary/_3_4_3/localdate-v1.gbin | Bin 0 -> 8 bytes
.../io/graphbinary/_3_4_3/localdatetime-v1.gbin | Bin 0 -> 16 bytes
.../io/graphbinary/_3_4_3/localtime-v1.gbin | Bin 0 -> 10 bytes
.../structure/io/graphbinary/_3_4_3/long-v1.gbin | Bin 0 -> 10 bytes
.../structure/io/graphbinary/_3_4_3/map-v1.gbin | Bin 0 -> 75 bytes
.../io/graphbinary/_3_4_3/metrics-v1.gbin | Bin 0 -> 307 bytes
.../io/graphbinary/_3_4_3/monthday-v1.gbin | Bin 0 -> 4 bytes
.../io/graphbinary/_3_4_3/offsetdatetime-v1.gbin | Bin 0 -> 20 bytes
.../io/graphbinary/_3_4_3/offsettime-v1.gbin | Bin 0 -> 14 bytes
.../io/graphbinary/_3_4_3/operator-v1.gbin | Bin 0 -> 11 bytes
.../structure/io/graphbinary/_3_4_3/order-v1.gbin | Bin 0 -> 15 bytes
.../structure/io/graphbinary/_3_4_3/p-v1.gbin | Bin 0 -> 18 bytes
.../structure/io/graphbinary/_3_4_3/pand-v1.gbin | Bin 0 -> 49 bytes
.../structure/io/graphbinary/_3_4_3/path-v1.gbin | Bin 0 -> 96 bytes
.../structure/io/graphbinary/_3_4_3/period-v1.gbin | Bin 0 -> 14 bytes
.../structure/io/graphbinary/_3_4_3/pick-v1.gbin | Bin 0 -> 11 bytes
.../structure/io/graphbinary/_3_4_3/pop-v1.gbin | Bin 0 -> 11 bytes
.../structure/io/graphbinary/_3_4_3/por-v1.gbin | Bin 0 -> 64 bytes
.../io/graphbinary/_3_4_3/property-v1.gbin | Bin 0 -> 19 bytes
.../io/graphbinary/_3_4_3/pwithin-v1.gbin | Bin 0 -> 22 bytes
.../io/graphbinary/_3_4_3/pwithout-v1.gbin | Bin 0 -> 29 bytes
.../structure/io/graphbinary/_3_4_3/scope-v1.gbin | Bin 0 -> 13 bytes
.../structure/io/graphbinary/_3_4_3/set-v1.gbin | Bin 0 -> 27 bytes
.../structure/io/graphbinary/_3_4_3/short-v1.gbin | Bin 0 -> 4 bytes
.../structure/io/graphbinary/_3_4_3/t-v1.gbin | Bin 0 -> 13 bytes
.../structure/io/graphbinary/_3_4_3/textp-v1.gbin | Bin 0 -> 29 bytes
.../io/graphbinary/_3_4_3/timestamp-v1.gbin | Bin 0 -> 10 bytes
.../io/graphbinary/_3_4_3/tinkergraph-v1.gbin | Bin 0 -> 2264 bytes
.../io/graphbinary/_3_4_3/traversalmetrics-v1.gbin | Bin 0 -> 593 bytes
.../io/graphbinary/_3_4_3/traverser-v1.gbin | Bin 0 -> 30 bytes
.../structure/io/graphbinary/_3_4_3/uuid-v1.gbin | Bin 0 -> 18 bytes
.../structure/io/graphbinary/_3_4_3/vertex-v1.gbin | Bin 0 -> 20 bytes
.../io/graphbinary/_3_4_3/vertexproperty-v1.gbin | Bin 0 -> 35 bytes
.../structure/io/graphbinary/_3_4_3/year-v1.gbin | Bin 0 -> 6 bytes
.../io/graphbinary/_3_4_3/yearmonth-v1.gbin | Bin 0 -> 7 bytes
.../io/graphbinary/_3_4_3/zoneddatetime-v1.gbin | Bin 0 -> 20 bytes
.../io/graphbinary/_3_4_3/zoneoffset-v1.gbin | Bin 0 -> 6 bytes
pom.xml | 1 +
88 files changed, 1998 insertions(+), 142 deletions(-)