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
The following commit(s) were added to refs/heads/master by this push:
new a77ea19232 Fix broken test in neo4j CTR
new cdbebda7d3 Merge branch '3.6-dev'
a77ea19232 is described below
commit a77ea192325ae2d3e7b4430e3e9f6484f1c06928
Author: Stephen Mallette <[email protected]>
AuthorDate: Tue Sep 5 18:40:03 2023 -0400
Fix broken test in neo4j CTR
---
gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs | 2 +-
gremlin-go/driver/cucumber/gremlin.go | 2 +-
.../src/main/javascript/gremlin-javascript/test/cucumber/gremlin.js | 2 +-
gremlin-python/src/main/python/radish/gremlin.py | 2 +-
.../org/apache/tinkerpop/gremlin/test/features/map/MergeEdge.feature | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs
index c52358d8ec..81240d933a 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs
@@ -650,7 +650,7 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
{"g_withSideEffectXc_created_YX_withSideEffectXm_matchedX_mergeEXlabel_knows_out_marko1_in_vadas1X_optionXonCreate_selectXcXX_optionXonMatch_selectXmXX",
new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>>
{(g,p)
=>g.AddV("person").Property("name","marko").As("a").AddV("person").Property("name","vadas").As("b"),
(g,p)
=>g.WithSideEffect("c",p["xx2"]).WithSideEffect("m",p["xx3"]).MergeE((IDictionary<object,object>)
p["xx1"]).Option(Merge.OnCreate, [...]
{"g_mergeEXlabel_knows_out_marko_in_vadasX_aliased_direction",
new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>>
{(g,p)
=>g.AddV("person").Property("name","marko").AddV("person").Property("name","vadas"),
(g,p) =>g.MergeE((IDictionary<object,object>) p["xx1"]), (g,p)
=>g.V().Has("person","name","marko").Out("knows").Has("person","name","vadas")}},
{"g_injectXlabel_knows_out_marko_in_vadas_label_self_out_vadas_in_vadasX", new
List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>>
{(g,p)
=>g.AddV("person").Property("name","marko").AddV("person").Property("name","vadas"),
(g,p) =>g.Inject(p["xx1"],p["xx2"]).MergeE(), (g,p) =>g.V(), (g,p) =>g.E(),
(g,p)
=>g.V().Has("person","name","marko").Out("knows").Has("person","name","vadas"),
(g,p) =>g.V().Has("person","name","vadas").Out("self").Has("person","n [...]
-
{"g_withSideEffectXc_created_YX_withSideEffectXm_matchedX_mergeEXlabel_knows_out_marko_in_vadasX_optionXonCreate_selectXcXX_optionXonMatch_sideEffectXpropertiesXweightX_dropX_selectXmXX_exists",
new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>>
{(g,p)
=>g.AddV("person").Property("name","marko").As("a").AddV("person").Property("name","vadas").As("b").AddE("knows").Property("weight",0.5).From("a").To("b"),
(g,p) =>g.WithSideEffect("c",p["xx2"]).Wi [...]
+
{"g_withSideEffectXc_created_YX_withSideEffectXm_matchedX_mergeEXlabel_knows_out_marko_in_vadasX_optionXonCreate_selectXcXX_optionXonMatch_sideEffectXpropertiesXweightX_dropX_selectXmXX_exists",
new List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>>
{(g,p)
=>g.AddV("person").Property("name","marko").As("a").AddV("person").Property("name","vadas").As("b").AddE("knows").Property("weight",1).From("a").To("b"),
(g,p) =>g.WithSideEffect("c",p["xx2"]).With [...]
{"g_mergeE_with_outVinV_options_map", new
List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>>
{(g,p)
=>g.AddV("person").Property("name","marko").AddV("person").Property("name","vadas"),
(g,p) =>g.MergeE((IDictionary<object,object>) p["xx1"]).Option(Merge.OutV,
(IDictionary<object,object>) p["xx2"]).Option(Merge.InV,
(IDictionary<object,object>) p["xx3"]), (g,p) =>g.V(), (g,p)
=>g.V().Has("name","marko").Out("knows").Has("name","vadas")}},
{"g_mergeE_with_outVinV_options_select", new
List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>>
{(g,p)
=>g.AddV("person").Property("name","marko").AddV("person").Property("name","vadas"),
(g,p)
=>g.V(p["vid1"]).As("x").V(p["vid2"]).As("y").MergeE((IDictionary<object,object>)
p["xx1"]).Option(Merge.OutV, (ITraversal)
__.Select<object>("x")).Option(Merge.InV, (ITraversal) __.Select<object>("y")),
(g,p) =>g.V(), (g,p) =>g.V().Has("name","marko").Out("kn [...]
{"g_mergeE_with_eid_specified_and_inheritance_1", new
List<Func<GraphTraversalSource, IDictionary<string, object>, ITraversal>>
{(g,p)
=>g.AddV("person").Property("name","marko").AddV("person").Property("name","vadas"),
(g,p) =>g.MergeE((IDictionary<object,object>) p["xx1"]).Option(Merge.OnCreate,
(IDictionary<object,object>) p["xx2"]), (g,p) =>g.V(), (g,p) =>g.E(), (g,p)
=>g.E("201"), (g,p)
=>g.V().Has("name","marko").Out("knows").Has("name","vadas")}},
diff --git a/gremlin-go/driver/cucumber/gremlin.go
b/gremlin-go/driver/cucumber/gremlin.go
index 430409410c..93219605f6 100644
--- a/gremlin-go/driver/cucumber/gremlin.go
+++ b/gremlin-go/driver/cucumber/gremlin.go
@@ -621,7 +621,7 @@ var translationMap = map[string][]func(g
*gremlingo.GraphTraversalSource, p map[
"g_withSideEffectXc_created_YX_withSideEffectXm_matchedX_mergeEXlabel_knows_out_marko1_in_vadas1X_optionXonCreate_selectXcXX_optionXonMatch_selectXmXX":
{func(g *gremlingo.GraphTraversalSource, p map[string]interface{})
*gremlingo.GraphTraversal {return g.AddV("person").Property("name",
"marko").As("a").AddV("person").Property("name", "vadas").As("b")}, func(g
*gremlingo.GraphTraversalSource, p map[string]interface{})
*gremlingo.GraphTraversal {return g.WithSideEffect("c", p["xx2"]). [...]
"g_mergeEXlabel_knows_out_marko_in_vadasX_aliased_direction": {func(g
*gremlingo.GraphTraversalSource, p map[string]interface{})
*gremlingo.GraphTraversal {return g.AddV("person").Property("name",
"marko").AddV("person").Property("name", "vadas")}, func(g
*gremlingo.GraphTraversalSource, p map[string]interface{})
*gremlingo.GraphTraversal {return g.MergeE(p["xx1"])}, func(g
*gremlingo.GraphTraversalSource, p map[string]interface{})
*gremlingo.GraphTraversal {return g.V().Has("person" [...]
"g_injectXlabel_knows_out_marko_in_vadas_label_self_out_vadas_in_vadasX":
{func(g *gremlingo.GraphTraversalSource, p map[string]interface{})
*gremlingo.GraphTraversal {return g.AddV("person").Property("name",
"marko").AddV("person").Property("name", "vadas")}, func(g
*gremlingo.GraphTraversalSource, p map[string]interface{})
*gremlingo.GraphTraversal {return g.Inject(p["xx1"], p["xx2"]).MergeE()},
func(g *gremlingo.GraphTraversalSource, p map[string]interface{})
*gremlingo.GraphTrave [...]
-
"g_withSideEffectXc_created_YX_withSideEffectXm_matchedX_mergeEXlabel_knows_out_marko_in_vadasX_optionXonCreate_selectXcXX_optionXonMatch_sideEffectXpropertiesXweightX_dropX_selectXmXX_exists":
{func(g *gremlingo.GraphTraversalSource, p map[string]interface{})
*gremlingo.GraphTraversal {return g.AddV("person").Property("name",
"marko").As("a").AddV("person").Property("name",
"vadas").As("b").AddE("knows").Property("weight", 0.5).From("a").To("b")},
func(g *gremlingo.GraphTraversalSou [...]
+
"g_withSideEffectXc_created_YX_withSideEffectXm_matchedX_mergeEXlabel_knows_out_marko_in_vadasX_optionXonCreate_selectXcXX_optionXonMatch_sideEffectXpropertiesXweightX_dropX_selectXmXX_exists":
{func(g *gremlingo.GraphTraversalSource, p map[string]interface{})
*gremlingo.GraphTraversal {return g.AddV("person").Property("name",
"marko").As("a").AddV("person").Property("name",
"vadas").As("b").AddE("knows").Property("weight", 1).From("a").To("b")}, func(g
*gremlingo.GraphTraversalSourc [...]
"g_mergeE_with_outVinV_options_map": {func(g
*gremlingo.GraphTraversalSource, p map[string]interface{})
*gremlingo.GraphTraversal {return g.AddV("person").Property("name",
"marko").AddV("person").Property("name", "vadas")}, func(g
*gremlingo.GraphTraversalSource, p map[string]interface{})
*gremlingo.GraphTraversal {return
g.MergeE(p["xx1"]).Option(gremlingo.Merge.OutV,
p["xx2"]).Option(gremlingo.Merge.InV, p["xx3"])}, func(g
*gremlingo.GraphTraversalSource, p map[string]interface{}) [...]
"g_mergeE_with_outVinV_options_select": {func(g
*gremlingo.GraphTraversalSource, p map[string]interface{})
*gremlingo.GraphTraversal {return g.AddV("person").Property("name",
"marko").AddV("person").Property("name", "vadas")}, func(g
*gremlingo.GraphTraversalSource, p map[string]interface{})
*gremlingo.GraphTraversal {return
g.V(p["vid1"]).As("x").V(p["vid2"]).As("y").MergeE(p["xx1"]).Option(gremlingo.Merge.OutV,
gremlingo.T__.Select("x")).Option(gremlingo.Merge.InV, gremlingo.T__.Se [...]
"g_mergeE_with_eid_specified_and_inheritance_1": {func(g
*gremlingo.GraphTraversalSource, p map[string]interface{})
*gremlingo.GraphTraversal {return g.AddV("person").Property("name",
"marko").AddV("person").Property("name", "vadas")}, func(g
*gremlingo.GraphTraversalSource, p map[string]interface{})
*gremlingo.GraphTraversal {return
g.MergeE(p["xx1"]).Option(gremlingo.Merge.OnCreate, p["xx2"])}, func(g
*gremlingo.GraphTraversalSource, p map[string]interface{})
*gremlingo.GraphTraver [...]
diff --git
a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/gremlin.js
b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/gremlin.js
index 20dd9442d1..4849cf7b52 100644
---
a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/gremlin.js
+++
b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/gremlin.js
@@ -640,7 +640,7 @@ const gremlins = {
g_withSideEffectXc_created_YX_withSideEffectXm_matchedX_mergeEXlabel_knows_out_marko1_in_vadas1X_optionXonCreate_selectXcXX_optionXonMatch_selectXmXX:
[function({g, xx1, xx3, xx2}) { return
g.addV("person").property("name","marko").as("a").addV("person").property("name","vadas").as("b")
}, function({g, xx1, xx3, xx2}) { return
g.withSideEffect("c",xx2).withSideEffect("m",xx3).mergeE(xx1).option(Merge.onCreate,__.select("c")).option(Merge.onMatch,__.select("m"))
}, function({g, xx1, x [...]
g_mergeEXlabel_knows_out_marko_in_vadasX_aliased_direction: [function({g,
xx1}) { return
g.addV("person").property("name","marko").addV("person").property("name","vadas")
}, function({g, xx1}) { return g.mergeE(xx1) }, function({g, xx1}) { return
g.V().has("person","name","marko").out("knows").has("person","name","vadas")
}],
g_injectXlabel_knows_out_marko_in_vadas_label_self_out_vadas_in_vadasX:
[function({g, xx1, xx2}) { return
g.addV("person").property("name","marko").addV("person").property("name","vadas")
}, function({g, xx1, xx2}) { return g.inject(xx1,xx2).mergeE() }, function({g,
xx1, xx2}) { return g.V() }, function({g, xx1, xx2}) { return g.E() },
function({g, xx1, xx2}) { return
g.V().has("person","name","marko").out("knows").has("person","name","vadas") },
function({g, xx1, xx2}) { return g.V( [...]
-
g_withSideEffectXc_created_YX_withSideEffectXm_matchedX_mergeEXlabel_knows_out_marko_in_vadasX_optionXonCreate_selectXcXX_optionXonMatch_sideEffectXpropertiesXweightX_dropX_selectXmXX_exists:
[function({g, xx1, xx3, xx2}) { return
g.addV("person").property("name","marko").as("a").addV("person").property("name","vadas").as("b").addE("knows").property("weight",0.5).from_("a").to("b")
}, function({g, xx1, xx3, xx2}) { return
g.withSideEffect("c",xx2).withSideEffect("m",xx3).mergeE(xx1). [...]
+
g_withSideEffectXc_created_YX_withSideEffectXm_matchedX_mergeEXlabel_knows_out_marko_in_vadasX_optionXonCreate_selectXcXX_optionXonMatch_sideEffectXpropertiesXweightX_dropX_selectXmXX_exists:
[function({g, xx1, xx3, xx2}) { return
g.addV("person").property("name","marko").as("a").addV("person").property("name","vadas").as("b").addE("knows").property("weight",1).from_("a").to("b")
}, function({g, xx1, xx3, xx2}) { return
g.withSideEffect("c",xx2).withSideEffect("m",xx3).mergeE(xx1).op [...]
g_mergeE_with_outVinV_options_map: [function({g, xx1, xx3, xx2}) { return
g.addV("person").property("name","marko").addV("person").property("name","vadas")
}, function({g, xx1, xx3, xx2}) { return
g.mergeE(xx1).option(Merge.outV,xx2).option(Merge.inV,xx3) }, function({g, xx1,
xx3, xx2}) { return g.V() }, function({g, xx1, xx3, xx2}) { return
g.V().has("name","marko").out("knows").has("name","vadas") }],
g_mergeE_with_outVinV_options_select: [function({g, xx1, vid2, vid1}) {
return
g.addV("person").property("name","marko").addV("person").property("name","vadas")
}, function({g, xx1, vid2, vid1}) { return
g.V(vid1).as("x").V(vid2).as("y").mergeE(xx1).option(Merge.outV,__.select("x")).option(Merge.inV,__.select("y"))
}, function({g, xx1, vid2, vid1}) { return g.V() }, function({g, xx1, vid2,
vid1}) { return g.V().has("name","marko").out("knows").has("name","vadas") }],
g_mergeE_with_eid_specified_and_inheritance_1: [function({g, xx1, xx2}) {
return
g.addV("person").property("name","marko").addV("person").property("name","vadas")
}, function({g, xx1, xx2}) { return g.mergeE(xx1).option(Merge.onCreate,xx2)
}, function({g, xx1, xx2}) { return g.V() }, function({g, xx1, xx2}) { return
g.E() }, function({g, xx1, xx2}) { return g.E("201") }, function({g, xx1, xx2})
{ return g.V().has("name","marko").out("knows").has("name","vadas") }],
diff --git a/gremlin-python/src/main/python/radish/gremlin.py
b/gremlin-python/src/main/python/radish/gremlin.py
index c43fce369c..92a34e48ca 100644
--- a/gremlin-python/src/main/python/radish/gremlin.py
+++ b/gremlin-python/src/main/python/radish/gremlin.py
@@ -622,7 +622,7 @@ world.gremlins = {
'g_withSideEffectXc_created_YX_withSideEffectXm_matchedX_mergeEXlabel_knows_out_marko1_in_vadas1X_optionXonCreate_selectXcXX_optionXonMatch_selectXmXX':
[(lambda g,
xx1=None,xx3=None,xx2=None:g.addV('person').property('name','marko').as_('a').addV('person').property('name','vadas').as_('b')),
(lambda g,
xx1=None,xx3=None,xx2=None:g.withSideEffect('c',xx2).withSideEffect('m',xx3).merge_e(xx1).option(Merge.on_create,__.select('c')).option(Merge.on_match,__.select('m'))),
(lambda g, xx1 [...]
'g_mergeEXlabel_knows_out_marko_in_vadasX_aliased_direction': [(lambda g,
xx1=None:g.addV('person').property('name','marko').addV('person').property('name','vadas')),
(lambda g, xx1=None:g.merge_e(xx1)), (lambda g,
xx1=None:g.V().has('person','name','marko').out('knows').has('person','name','vadas'))],
'g_injectXlabel_knows_out_marko_in_vadas_label_self_out_vadas_in_vadasX':
[(lambda g,
xx1=None,xx2=None:g.addV('person').property('name','marko').addV('person').property('name','vadas')),
(lambda g, xx1=None,xx2=None:g.inject(xx1,xx2).merge_e()), (lambda g,
xx1=None,xx2=None:g.V()), (lambda g, xx1=None,xx2=None:g.E()), (lambda g,
xx1=None,xx2=None:g.V().has('person','name','marko').out('knows').has('person','name','vadas')),
(lambda g, xx1=None,xx2=None:g.V().has('person','name','vad [...]
-
'g_withSideEffectXc_created_YX_withSideEffectXm_matchedX_mergeEXlabel_knows_out_marko_in_vadasX_optionXonCreate_selectXcXX_optionXonMatch_sideEffectXpropertiesXweightX_dropX_selectXmXX_exists':
[(lambda g,
xx1=None,xx3=None,xx2=None:g.addV('person').property('name','marko').as_('a').addV('person').property('name','vadas').as_('b').addE('knows').property('weight',float(0.5)).from_('a').to('b')),
(lambda g,
xx1=None,xx3=None,xx2=None:g.withSideEffect('c',xx2).withSideEffect('m',xx3).me
[...]
+
'g_withSideEffectXc_created_YX_withSideEffectXm_matchedX_mergeEXlabel_knows_out_marko_in_vadasX_optionXonCreate_selectXcXX_optionXonMatch_sideEffectXpropertiesXweightX_dropX_selectXmXX_exists':
[(lambda g,
xx1=None,xx3=None,xx2=None:g.addV('person').property('name','marko').as_('a').addV('person').property('name','vadas').as_('b').addE('knows').property('weight',1).from_('a').to('b')),
(lambda g,
xx1=None,xx3=None,xx2=None:g.withSideEffect('c',xx2).withSideEffect('m',xx3).merge_e(xx1
[...]
'g_mergeE_with_outVinV_options_map': [(lambda g,
xx1=None,xx3=None,xx2=None:g.addV('person').property('name','marko').addV('person').property('name','vadas')),
(lambda g,
xx1=None,xx3=None,xx2=None:g.merge_e(xx1).option(Merge.out_v,xx2).option(Merge.in_v,xx3)),
(lambda g, xx1=None,xx3=None,xx2=None:g.V()), (lambda g,
xx1=None,xx3=None,xx2=None:g.V().has('name','marko').out('knows').has('name','vadas'))],
'g_mergeE_with_outVinV_options_select': [(lambda g,
xx1=None,vid2=None,vid1=None:g.addV('person').property('name','marko').addV('person').property('name','vadas')),
(lambda g,
xx1=None,vid2=None,vid1=None:g.V(vid1).as_('x').V(vid2).as_('y').merge_e(xx1).option(Merge.out_v,__.select('x')).option(Merge.in_v,__.select('y'))),
(lambda g, xx1=None,vid2=None,vid1=None:g.V()), (lambda g,
xx1=None,vid2=None,vid1=None:g.V().has('name','marko').out('knows').has('name','vadas'))],
'g_mergeE_with_eid_specified_and_inheritance_1': [(lambda g,
xx1=None,xx2=None:g.addV('person').property('name','marko').addV('person').property('name','vadas')),
(lambda g, xx1=None,xx2=None:g.merge_e(xx1).option(Merge.on_create,xx2)),
(lambda g, xx1=None,xx2=None:g.V()), (lambda g, xx1=None,xx2=None:g.E()),
(lambda g, xx1=None,xx2=None:g.E('201')), (lambda g,
xx1=None,xx2=None:g.V().has('name','marko').out('knows').has('name','vadas'))],
diff --git
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/MergeEdge.feature
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/MergeEdge.feature
index 000d554988..791f427aa2 100644
---
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/MergeEdge.feature
+++
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/test/features/map/MergeEdge.feature
@@ -619,7 +619,7 @@ Feature: Step - mergeE()
"""
g.addV("person").property("name", "marko").as("a").
addV("person").property("name", "vadas").as("b").
- addE("knows").property("weight", 0.5).from("a").to("b")
+ addE("knows").property("weight", 1).from("a").to("b")
"""
And using the parameter xx1 defined as "m[{\"t[label]\": \"knows\",
\"D[OUT]\":\"v[marko]\", \"D[IN]\":\"v[vadas]\"}]"
And using the parameter xx2 defined as "m[{\"t[label]\": \"knows\",
\"D[OUT]\":\"v[marko]\", \"D[IN]\":\"v[vadas]\",\"created\":\"Y\"}]"
