This is an automated email from the ASF dual-hosted git repository.
kenhuuu pushed a commit to branch v4-io-test
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
The following commit(s) were added to refs/heads/v4-io-test by this push:
new 2e155d735c latest
2e155d735c is described below
commit 2e155d735ceaee01a4c3dfbe97454b8b1a50eb37
Author: Ken Hu <[email protected]>
AuthorDate: Thu Aug 15 13:59:29 2024 -0700
latest
---
.../main/python/gremlin_python/structure/graph.py | 2 +-
.../gremlin_python/structure/io/graphbinaryV4.py | 1 +
.../src/main/python/tests/structure/io/model.py | 78 +++++++---
.../tests/structure/io/test_graphbinaryv4model.py | 159 ++++++++++++---------
.../structure/graphbinary/precision-date-v4.gbin | Bin 0 -> 10 bytes
.../structure/graphbinary/traversal-path-v4.gbin | Bin 575 -> 108 bytes
.../structure/graphbinary/var-type-map-v4.gbin | Bin 79 -> 79 bytes
.../structure/graphbinary/var-type-set-v4.gbin | Bin 29 -> 29 bytes
8 files changed, 150 insertions(+), 90 deletions(-)
diff --git a/gremlin-python/src/main/python/gremlin_python/structure/graph.py
b/gremlin-python/src/main/python/gremlin_python/structure/graph.py
index 1825855705..8c628ebf27 100644
--- a/gremlin-python/src/main/python/gremlin_python/structure/graph.py
+++ b/gremlin-python/src/main/python/gremlin_python/structure/graph.py
@@ -27,7 +27,7 @@ class Graph(object):
class Element(object):
- def __init__(self, id, label, properties=None):
+ def __init__(self, id, label, properties=[]):
self.id = id
self.label = label
self.properties = properties
diff --git
a/gremlin-python/src/main/python/gremlin_python/structure/io/graphbinaryV4.py
b/gremlin-python/src/main/python/gremlin_python/structure/io/graphbinaryV4.py
index ef86445458..9a771f9cec 100644
---
a/gremlin-python/src/main/python/gremlin_python/structure/io/graphbinaryV4.py
+++
b/gremlin-python/src/main/python/gremlin_python/structure/io/graphbinaryV4.py
@@ -590,6 +590,7 @@ class EdgeIO(_GraphBinaryTypeIO):
StringIO.dictify(obj.outV.label, writer, to_extend, True, False)
to_extend.extend(NULL_BYTES)
to_extend.extend(NULL_BYTES)
+ #writer.to_dict([], to_extend)
return to_extend
diff --git a/gremlin-python/src/main/python/tests/structure/io/model.py
b/gremlin-python/src/main/python/tests/structure/io/model.py
index 21aa3b1116..c819df496a 100644
--- a/gremlin-python/src/main/python/tests/structure/io/model.py
+++ b/gremlin-python/src/main/python/tests/structure/io/model.py
@@ -6,7 +6,26 @@ from gremlin_python.structure.io.graphbinaryV4 import
GraphBinaryWriter, GraphBi
from gremlin_python.process.traversal import Barrier, Binding, Bytecode,
Merge, Direction, Traverser, T
from gremlin_python.structure.io.util import HashableDict, Marker
-unsupported = {"tinker-graph", "max-offsetdatetime", "min-offsetdatetime"}
+unsupported = {
+ "tinker-graph", # Graph not implemented
+ "max-offsetdatetime", # Too large for datetime
+ "min-offsetdatetime", # Too small for datetime
+ "min-date", # Too large for datetime
+ "max-date", # Too small for datetime
+ "var-bulkset", # No serializer
+ "empty-bulkset", # No serializer
+ "forever-duration", # Too large for duration
+ "max-float", # single precision float not supported in Python
+ "min-float", # single precision float not supported in Python
+ "neg-max-float", # single precision float not supported in Python
+ "neg-min-float", # single precision float not supported in Python
+ "nan-float", # single precision float not supported in Python
+ "pos-inf-float", # single precision float not supported in Python
+ "neg-inf-float", # single precision float not supported in Python
+ "neg-zero-float", # single precision float not supported in Python
+ "var-type-map" # can't serialize tuple
+}
+
model = {}
model["pos-bigdecimal"] = BigDecimal(33, 123456789987654321123456789987654321)
@@ -26,7 +45,6 @@ model["pos-inf-double"] = float('inf')
model["neg-inf-double"] = float('-inf')
model["neg-zero-double"] = -0.0
model["zero-duration"] = datetime.timedelta()
-#model["forever-duration"] = datetime.timedelta(seconds=2**63-1,
microseconds=999999999)
model["traversal-edge"] = Edge(
13,
Vertex(1, 'person'),
@@ -40,14 +58,6 @@ model["no-prop-edge"] = Edge(
"develops",
Vertex(10, "software")
)
-model["max-float"] = float(3.4028235E38)
-model["min-float"] = float(1.4E-45)
-model["neg-max-float"] = float(-3.4028235E38)
-model["neg-min-float"] = float(-1.4E-45)
-model["nan-float"] = float('nan')
-model["pos-inf-float"] = float('inf')
-model["neg-inf-float"] = float('-inf')
-model["neg-zero-float"] = float(-0.0)
model["max-int"] = 2147483647
model["min-int"] = -2**31
model["max-long"] = long(2**63-1)
@@ -56,18 +66,18 @@ model["var-type-list"] = [1, "person", True, None]
model["empty-list"] = []
model["var-type-map"] = {
"test": 123,
- datetime.datetime.fromtimestamp(1481295): "red",
- (1,2,3): datetime.datetime.fromtimestamp(1481295),
+ datetime.datetime(1970, 1, 1, 0, 24, 41, 295000): "red",
+ (1,2,3): datetime.datetime(1970, 1, 1, 0, 24, 41, 295000),
None: None
}
model["empty-map"] = {}
model["traversal-path"] = Path(
- [{}, {}, {}],
+ [set(), set(), set()],
[Vertex(1, "person"), Vertex(10, "software"), Vertex(11, "software")]
)
model["empty-path"] = Path([], [])
model["prop-path"] = Path(
- [{}, {}, {}],
+ [set(), set(), set()],
[
Vertex(1, "person", VertexProperty(
123,
@@ -84,17 +94,45 @@ model["prop-path"] = Path(
)
model["edge-property"] = Property("since", 2009, None)
model["null-property"] = Property("", None, None)
-model["var-type-set"] = {1, "person", True, None}
+model["var-type-set"] = {2, "person", True, None}
model["empty-set"] = set()
model["max-short"] = short(32767)
model["min-short"] = short(-32768)
-# model["vertex-traverser"]
-model["bulked-traverser"] = Traverser(Vertex(11, "software",
[VertexProperty(5, "name", "tinkergraph", None)]), 7)
-model["empty-traverser"] = Traverser(None, 0)
+#model["bulked-traverser"] = Traverser(Vertex(11, "software",
[VertexProperty(5, "name", "tinkergraph", None)]), 7)
+#model["empty-traverser"] = Traverser(None, 0)
model["specified-uuid"] = uuid.UUID("41d2e28a-20a4-4ab0-b379-d810dede3786")
model["nil-uuid"] = uuid.UUID(int = 0)
-#model["traversal-vertex"]
model["no-prop-vertex"] = Vertex(1, "person")
+model["traversal-vertexproperty"] = VertexProperty(0, "name", "marko", None)
+model["meta-vertexproperty"] = VertexProperty(1, "person", "stephen", None,
[Property("a", "b", None)])
+model["set-cardinality-vertexproperty"] = VertexProperty(1, "person",
{"stephen", "marko"}, None, [Property("a", "b", None)])
model["id-t"] = T.id
model["out-direction"] = Direction.OUT
-#model["zero-date"] = datetime.datetime(1970, 1, 1)
\ No newline at end of file
+model["zero-date"] = datetime.datetime(1970, 1, 1)
+model["precision-date"] = datetime.datetime(1970, 1, 1, 3, 5, 11, 111000)
+
+santa_fe = VertexProperty(
+ 9, "location", "santa fe", None,
+ [Property("startTime", 2005, None)]
+)
+brussels = VertexProperty(
+ 8, "location", "brussels", None,
+ [Property("startTime", 2005, None), Property("endTime", 2005, None)]
+)
+santa_cruz = VertexProperty(
+ 7, "location", "santa cruz", None,
+ [Property("startTime", 2001, None), Property("endTime", 2004, None)]
+)
+san_diego = VertexProperty(
+ 6, "location", "san diego", None,
+ [Property("startTime", 1997, None), Property("endTime", 2001, None)]
+)
+name = VertexProperty(0, "name", "marko", None)
+
+model["traversal-vertex"] = Vertex(1, "person", [
+ Property("name", name, None), Property("location", [
+ san_diego, santa_cruz, brussels, santa_fe
+ ], None)])
+model["vertex-traverser"] = Traverser(model["traversal-vertex"], 1)
+
+#model['tree']
\ No newline at end of file
diff --git
a/gremlin-python/src/main/python/tests/structure/io/test_graphbinaryv4model.py
b/gremlin-python/src/main/python/tests/structure/io/test_graphbinaryv4model.py
index 3df4345024..063077b3f0 100644
---
a/gremlin-python/src/main/python/tests/structure/io/test_graphbinaryv4model.py
+++
b/gremlin-python/src/main/python/tests/structure/io/test_graphbinaryv4model.py
@@ -1,10 +1,14 @@
from gremlin_python.structure.io.graphbinaryV4 import GraphBinaryWriter,
GraphBinaryReader
-from os import environ
+import os
+import binascii
+import math
from .model import model, unsupported
gremlin_test_dir =
"gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/"
-test_resource_directory = environ.get('IO_TEST_DIRECTORY', '../' +
gremlin_test_dir)
+directory_search_pattern = "gremlin-python" + os.sep + "src" + os.sep + "main"
+default_dir = __file__[:__file__.find(directory_search_pattern)]
+test_resource_directory = os.environ.get('IO_TEST_DIRECTORY', default_dir +
gremlin_test_dir)
writer = GraphBinaryWriter()
reader = GraphBinaryReader()
@@ -18,34 +22,32 @@ def read_file_by_name(resource_name):
def test_pos_bigdecimal():
- resource_name = "pos-bigdecimal"
- resource_bytes = read_file_by_name(resource_name)
-
- model = get_entry(resource_name)
- read = reader.read_object(resource_bytes)
- assert model.scale == read.scale
- assert model.unscaled_value == read.unscaled_value
+ def decimal_cmp(x, y):
+ if x.scale == y.scale and x.unscaled_value == y.unscaled_value:
+ return True
+ else:
+ return False
- written = writer.write_object(model)
- assert resource_bytes == written
+ # gremlin-python adds an extra 0 byte to the value.
+ run_unordered("pos-bigdecimal", decimal_cmp)
def test_neg_bigdecimal():
- resource_name = "pos-bigdecimal"
- resource_bytes = read_file_by_name(resource_name)
+ def decimal_cmp(x, y):
+ if x.scale == y.scale and x.unscaled_value == y.unscaled_value:
+ return True
+ else:
+ return False
- model = get_entry(resource_name)
- read = reader.read_object(resource_bytes)
- assert model.scale == read.scale
- assert model.unscaled_value == read.unscaled_value
-
- written = writer.write_object(model)
- assert resource_bytes == written
+ # gremlin-python adds an extra 0 byte to the value.
+ run_unordered("neg-bigdecimal", decimal_cmp)
def test_pos_biginteger():
- run("pos-biginteger")
+ # gremlin-python adds an extra 0 byte to the value.
+ run_unordered("pos-biginteger")
def test_neg_biginteger():
- run("neg-biginteger")
+ # gremlin-python adds an extra 0 byte to the value.
+ run_unordered("neg-biginteger")
def test_min_byte():
run("min-byte")
@@ -72,7 +74,12 @@ def test_neg_min_double():
run("neg-min-double")
def test_nan_double():
- run("nan-double")
+ def nan_cmp(x, y):
+ if math.isnan(x) and math.isnan(y):
+ return True
+ else:
+ return False
+ run("nan-double", nan_cmp)
def test_pos_inf_double():
run("pos-inf-double")
@@ -86,39 +93,13 @@ def test_neg_zero_double():
def test_zero_duration():
run("zero-duration")
-#def test_forever_duration():
-# run("forever-duration")
-
def test_traversal_edge():
- run("traversal-edge")
+ # properties aren't serialized in gremlin-python
+ run_unordered("traversal-edge")
def test_no_prop_edge():
run("no-prop-edge")
-def test_max_float():
- run("max-float")
-
-def test_min_float():
- run("min-float")
-
-def test_neg_max_float():
- run("neg-max-float")
-
-def test_neg_min_float():
- run("neg-min-float")
-
-def test_nan_float():
- run("nan-float")
-
-def test_pos_inf_float():
- run("pos-inf-float")
-
-def test_neg_inf_float():
- run("neg-inf-float")
-
-def test_neg_zero_float():
- run("neg-zero-float")
-
def test_max_int():
run("max-int")
@@ -126,10 +107,12 @@ def test_min_int():
run("min-int")
def test_max_long():
- run("max-long")
+ # attempts to serialize a long as an int
+ run_unordered("max-long")
def test_min_long():
- run("min-long")
+ # attempts to serialize a long as an int
+ run_unordered("min-long")
def test_var_type_list():
run("var-type-list")
@@ -152,7 +135,6 @@ def test_min_offsetdatetime():
def test_traversal_path():
run("traversal-path")
-#TODO: come back
def test_empty_path():
run("empty-path")
@@ -169,29 +151,23 @@ def test_null_property():
run("null-property")
def test_var_type_set():
- run("var-type-set")
+ # ordering within set might be different
+ run_unordered("var-type-set")
def test_empty_set():
run("empty-set")
def test_max_short():
- run("max-short")
+ # short deserialized to int
+ run_unordered("max-short")
def test_min_short():
- run("min-short")
+ # short deserialized to int
+ run_unordered("min-short")
def test_tinker_graph():
run("tinker-graph")
-def test_vertex_traverser():
- run("vertex-traverser")
-
-def test_bulked_traverser():
- run("bulked-traverser")
-
-def test_empty_traverser():
- run("empty-traverser")
-
def test_specified_uuid():
run("specified-uuid")
@@ -201,13 +177,34 @@ def test_nil_uuid():
def test_no_prop_vertex():
run("no-prop-vertex")
+def test_traversal_vertexproperty():
+ # properties aren't serialized in gremlin-python
+ run_unordered("traversal-vertexproperty")
+
+def test_meta_vertexproperty():
+ # properties aren't serialized in gremlin-python
+ run_unordered("meta-vertexproperty")
+
+def test_set_cardinality_vertexproperty():
+ # properties aren't serialized in gremlin-python
+ run_unordered("set-cardinality-vertexproperty")
+
def test_id_t():
run("id-t")
def test_out_direction():
run("out-direction")
-def run(resource_name):
+def test_var_bulkset():
+ run("var-bulkset")
+
+def test_empty_bulkset():
+ run("empty-bulkset")
+
+def test_precision_date():
+ run("precision-date")
+
+def run(resource_name, comparator = None):
if resource_name in unsupported:
return
@@ -215,10 +212,34 @@ def run(resource_name):
model = get_entry(resource_name)
read = reader.read_object(resource_bytes)
- assert model == read
+ if comparator is not None:
+ assert comparator(model, read)
+ else:
+ assert model == read
written = writer.write_object(model)
+ print("written: " + binascii.hexlify(written).decode())
+ print("read: " + binascii.hexlify(resource_bytes).decode())
assert resource_bytes == written
round_tripped = writer.write_object(reader.read_object(resource_bytes))
- assert resource_bytes == round_tripped
\ No newline at end of file
+ print("round_tripped: " + binascii.hexlify(round_tripped).decode())
+ assert resource_bytes == round_tripped
+
+'''
+Use this for types which that contain values whose equality doesn't care about
order.
+This is mostly for sets.
+'''
+def run_unordered(resource_name, comparator = None):
+ resource_bytes = read_file_by_name(resource_name)
+
+ model = get_entry(resource_name)
+ read = reader.read_object(resource_bytes)
+ round_tripped = reader.read_object(writer.write_object(model))
+
+ if comparator is not None:
+ assert comparator(model, read)
+ assert comparator(model, round_tripped)
+ else:
+ assert model == read
+ assert model == round_tripped
\ No newline at end of file
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/precision-date-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/precision-date-v4.gbin
new file mode 100644
index 0000000000..2591cbbfc7
Binary files /dev/null and
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/precision-date-v4.gbin
differ
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/traversal-path-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/traversal-path-v4.gbin
index 9306df5aa8..5a0a2e5ef3 100644
Binary files
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/traversal-path-v4.gbin
and
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/traversal-path-v4.gbin
differ
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/var-type-map-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/var-type-map-v4.gbin
index b91605798e..e2d511ef03 100644
Binary files
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/var-type-map-v4.gbin
and
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/var-type-map-v4.gbin
differ
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/var-type-set-v4.gbin
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/var-type-set-v4.gbin
index 0e528d0729..55e78f60e7 100644
Binary files
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/var-type-set-v4.gbin
and
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/graphbinary/var-type-set-v4.gbin
differ
