Skip to content

Commit a4d6489

Browse files
committed
Merge branch '3.7-dev' into 3.8-dev
2 parents ae5c1cb + e754180 commit a4d6489

File tree

2 files changed

+56
-0
lines changed

2 files changed

+56
-0
lines changed

gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/graph-traversal.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1762,6 +1762,7 @@ const statics = {
17621762
as: (...args) => callOnEmptyTraversal('as', args),
17631763
asBool: (...args) => callOnEmptyTraversal('asBool', args),
17641764
asDate: (...args) => callOnEmptyTraversal('asDate', args),
1765+
asNumber: (...args) => callOnEmptyTraversal('asNumber', args),
17651766
asString: (...args) => callOnEmptyTraversal('asString', args),
17661767
barrier: (...args) => callOnEmptyTraversal('barrier', args),
17671768
both: (...args) => callOnEmptyTraversal('both', args),
@@ -1773,13 +1774,16 @@ const statics = {
17731774
choose: (...args) => callOnEmptyTraversal('choose', args),
17741775
coalesce: (...args) => callOnEmptyTraversal('coalesce', args),
17751776
coin: (...args) => callOnEmptyTraversal('coin', args),
1777+
combine: (...args) => callOnEmptyTraversal('combine', args),
17761778
concat: (...args) => callOnEmptyTraversal('concat', args),
1779+
conjoin: (...args) => callOnEmptyTraversal('conjoin', args),
17771780
constant: (...args) => callOnEmptyTraversal('constant', args),
17781781
count: (...args) => callOnEmptyTraversal('count', args),
17791782
cyclicPath: (...args) => callOnEmptyTraversal('cyclicPath', args),
17801783
dateAdd: (...args) => callOnEmptyTraversal('dateAdd', args),
17811784
dateDiff: (...args) => callOnEmptyTraversal('dateDiff', args),
17821785
dedup: (...args) => callOnEmptyTraversal('dedup', args),
1786+
difference: (...args) => callOnEmptyTraversal('difference', args),
17831787
discard: (...args) => callOnEmptyTraversal('discard', args),
17841788
disjunct: (...args) => callOnEmptyTraversal('disjunct', args),
17851789
drop: (...args) => callOnEmptyTraversal('drop', args),
@@ -1806,6 +1810,7 @@ const statics = {
18061810
inV: (...args) => callOnEmptyTraversal('inV', args),
18071811
index: (...args) => callOnEmptyTraversal('index', args),
18081812
inject: (...args) => callOnEmptyTraversal('inject', args),
1813+
intersect: (...args) => callOnEmptyTraversal('intersect', args),
18091814
is: (...args) => callOnEmptyTraversal('is', args),
18101815
key: (...args) => callOnEmptyTraversal('key', args),
18111816
label: (...args) => callOnEmptyTraversal('label', args),
@@ -1819,6 +1824,7 @@ const statics = {
18191824
math: (...args) => callOnEmptyTraversal('math', args),
18201825
max: (...args) => callOnEmptyTraversal('max', args),
18211826
mean: (...args) => callOnEmptyTraversal('mean', args),
1827+
merge: (...args) => callOnEmptyTraversal('merge', args),
18221828
mergeE: (...args) => callOnEmptyTraversal('mergeE', args),
18231829
mergeV: (...args) => callOnEmptyTraversal('mergeV', args),
18241830
min: (...args) => callOnEmptyTraversal('min', args),
@@ -1832,6 +1838,7 @@ const statics = {
18321838
outE: (...args) => callOnEmptyTraversal('outE', args),
18331839
outV: (...args) => callOnEmptyTraversal('outV', args),
18341840
path: (...args) => callOnEmptyTraversal('path', args),
1841+
product: (...args) => callOnEmptyTraversal('product', args),
18351842
project: (...args) => callOnEmptyTraversal('project', args),
18361843
properties: (...args) => callOnEmptyTraversal('properties', args),
18371844
property: (...args) => callOnEmptyTraversal('property', args),

gremlin-python/src/main/python/gremlin_python/process/graph_traversal.py

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1875,10 +1875,18 @@ def aggregate(*args):
18751875
return __.aggregate(*args)
18761876

18771877

1878+
def all_(*args):
1879+
return __.all_(*args)
1880+
1881+
18781882
def and_(*args):
18791883
return __.and_(*args)
18801884

18811885

1886+
def any_(*args):
1887+
return __.any_(*args)
1888+
1889+
18821890
def as_(*args):
18831891
return __.as_(*args)
18841892

@@ -1947,10 +1955,18 @@ def coin(*args):
19471955
return __.coin(*args)
19481956

19491957

1958+
def combine(*args):
1959+
return __.combine(*args)
1960+
1961+
19501962
def concat(*args):
19511963
return __.concat(*args)
19521964

19531965

1966+
def conjoin(*args):
1967+
return __.conjoin(*args)
1968+
1969+
19541970
def constant(*args):
19551971
return __.constant(*args)
19561972

@@ -1979,6 +1995,10 @@ def dedup(*args):
19791995
return __.dedup(*args)
19801996

19811997

1998+
def difference(*args):
1999+
return __.difference(*args)
2000+
2001+
19822002
def discard(*args):
19832003
return __.discard(*args)
19842004

@@ -2125,6 +2145,10 @@ def inject(*args):
21252145
return __.inject(*args)
21262146

21272147

2148+
def intersect(*args):
2149+
return __.intersect(*args)
2150+
2151+
21282152
def is_(*args):
21292153
return __.is_(*args)
21302154

@@ -2181,6 +2205,10 @@ def mean(*args):
21812205
return __.mean(*args)
21822206

21832207

2208+
def merge(*args):
2209+
return __.merge(*args)
2210+
2211+
21842212
def merge_e(*args):
21852213
return __.merge_e(*args)
21862214

@@ -2245,6 +2273,10 @@ def path(*args):
22452273
return __.path(*args)
22462274

22472275

2276+
def product(*args):
2277+
return __.product(*args)
2278+
2279+
22482280
def project(*args):
22492281
return __.project(*args)
22502282

@@ -2420,6 +2452,7 @@ def values(*args):
24202452
def where(*args):
24212453
return __.where(*args)
24222454

2455+
statics.add_static('E', E)
24232456

24242457
statics.add_static('V', V)
24252458

@@ -2433,8 +2466,12 @@ def where(*args):
24332466

24342467
statics.add_static('aggregate', aggregate)
24352468

2469+
statics.add_static('all_', all_)
2470+
24362471
statics.add_static('and_', and_)
24372472

2473+
statics.add_static('any_', any_)
2474+
24382475
statics.add_static('as_', as_)
24392476

24402477
statics.add_static('as_bool', as_bool)
@@ -2469,8 +2506,12 @@ def where(*args):
24692506

24702507
statics.add_static('coin', coin)
24712508

2509+
statics.add_static('combine', combine)
2510+
24722511
statics.add_static('concat', concat)
24732512

2513+
statics.add_static('conjoin', conjoin)
2514+
24742515
statics.add_static('constant', constant)
24752516

24762517
statics.add_static('count', count)
@@ -2485,6 +2526,8 @@ def where(*args):
24852526

24862527
statics.add_static('dedup', dedup)
24872528

2529+
statics.add_static('difference', difference)
2530+
24882531
statics.add_static('discard', discard)
24892532

24902533
statics.add_static('disjunct', disjunct)
@@ -2555,6 +2598,8 @@ def where(*args):
25552598

25562599
statics.add_static('inject', inject)
25572600

2601+
statics.add_static('intersect', intersect)
2602+
25582603
statics.add_static('is_', is_)
25592604

25602605
statics.add_static('key', key)
@@ -2583,6 +2628,8 @@ def where(*args):
25832628

25842629
statics.add_static('mean', mean)
25852630

2631+
statics.add_static('merge', merge)
2632+
25862633
statics.add_static('merge_e', merge_e)
25872634

25882635
statics.add_static('merge_v', merge_v)
@@ -2615,6 +2662,8 @@ def where(*args):
26152662

26162663
statics.add_static('path', path)
26172664

2665+
statics.add_static('product', product)
2666+
26182667
statics.add_static('project', project)
26192668

26202669
statics.add_static('properties', properties)

0 commit comments

Comments
 (0)