Skip to content

Commit dbfe475

Browse files
committed
Merge branch '3.8-dev'
2 parents 6c592f9 + a4d6489 commit dbfe475

File tree

2 files changed

+58
-2
lines changed

2 files changed

+58
-2
lines changed

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1799,6 +1799,7 @@ export const statics = {
17991799
as: (...args: any[]) => callOnEmptyTraversal('as', args),
18001800
asDate: (...args: any[]) => callOnEmptyTraversal('asDate', args),
18011801
asBool: (...args: any[]) => callOnEmptyTraversal('asBool', args),
1802+
asNumber: (...args: any[]) => callOnEmptyTraversal('asNumber', args),
18021803
asString: (...args: any[]) => callOnEmptyTraversal('asString', args),
18031804
barrier: (...args: any[]) => callOnEmptyTraversal('barrier', args),
18041805
both: (...args: any[]) => callOnEmptyTraversal('both', args),
@@ -1810,13 +1811,16 @@ export const statics = {
18101811
choose: (...args: any[]) => callOnEmptyTraversal('choose', args),
18111812
coalesce: (...args: any[]) => callOnEmptyTraversal('coalesce', args),
18121813
coin: (...args: any[]) => callOnEmptyTraversal('coin', args),
1814+
combine: (...args: any[]) => callOnEmptyTraversal('combine', args),
18131815
concat: (...args: any[]) => callOnEmptyTraversal('concat', args),
1816+
conjoin: (...args: any[]) => callOnEmptyTraversal('conjoin', args),
18141817
constant: (...args: any[]) => callOnEmptyTraversal('constant', args),
18151818
count: (...args: any[]) => callOnEmptyTraversal('count', args),
18161819
cyclicPath: (...args: any[]) => callOnEmptyTraversal('cyclicPath', args),
18171820
dateAdd: (...args: any[]) => callOnEmptyTraversal('dateAdd', args),
18181821
dateDiff: (...args: any[]) => callOnEmptyTraversal('dateDiff', args),
18191822
dedup: (...args: any[]) => callOnEmptyTraversal('dedup', args),
1823+
difference: (...args: any[]) => callOnEmptyTraversal('difference', args),
18201824
discard: (...args: any[]) => callOnEmptyTraversal('discard', args),
18211825
disjunct: (...args: any[]) => callOnEmptyTraversal('disjunct', args),
18221826
drop: (...args: any[]) => callOnEmptyTraversal('drop', args),
@@ -1843,6 +1847,7 @@ export const statics = {
18431847
inV: (...args: any[]) => callOnEmptyTraversal('inV', args),
18441848
index: (...args: any[]) => callOnEmptyTraversal('index', args),
18451849
inject: (...args: any[]) => callOnEmptyTraversal('inject', args),
1850+
intersect: (...args: any[]) => callOnEmptyTraversal('intersect', args),
18461851
is: (...args: any[]) => callOnEmptyTraversal('is', args),
18471852
key: (...args: any[]) => callOnEmptyTraversal('key', args),
18481853
label: (...args: any[]) => callOnEmptyTraversal('label', args),
@@ -1856,6 +1861,7 @@ export const statics = {
18561861
math: (...args: any[]) => callOnEmptyTraversal('math', args),
18571862
max: (...args: any[]) => callOnEmptyTraversal('max', args),
18581863
mean: (...args: any[]) => callOnEmptyTraversal('mean', args),
1864+
merge: (...args: any[]) => callOnEmptyTraversal('merge', args),
18591865
mergeE: (...args: any[]) => callOnEmptyTraversal('mergeE', args),
18601866
mergeV: (...args: any[]) => callOnEmptyTraversal('mergeV', args),
18611867
min: (...args: any[]) => callOnEmptyTraversal('min', args),
@@ -1869,6 +1875,7 @@ export const statics = {
18691875
outE: (...args: any[]) => callOnEmptyTraversal('outE', args),
18701876
outV: (...args: any[]) => callOnEmptyTraversal('outV', args),
18711877
path: (...args: any[]) => callOnEmptyTraversal('path', args),
1878+
product: (...args: any[]) => callOnEmptyTraversal('product', args),
18721879
project: (...args: any[]) => callOnEmptyTraversal('project', args),
18731880
properties: (...args: any[]) => callOnEmptyTraversal('properties', args),
18741881
property: (...args: any[]) => callOnEmptyTraversal('property', args),

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

Lines changed: 51 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1872,10 +1872,18 @@ def aggregate(*args):
18721872
return __.aggregate(*args)
18731873

18741874

1875+
def all_(*args):
1876+
return __.all_(*args)
1877+
1878+
18751879
def and_(*args):
18761880
return __.and_(*args)
18771881

18781882

1883+
def any_(*args):
1884+
return __.any_(*args)
1885+
1886+
18791887
def as_(*args):
18801888
return __.as_(*args)
18811889

@@ -1944,10 +1952,18 @@ def coin(*args):
19441952
return __.coin(*args)
19451953

19461954

1955+
def combine(*args):
1956+
return __.combine(*args)
1957+
1958+
19471959
def concat(*args):
19481960
return __.concat(*args)
19491961

19501962

1963+
def conjoin(*args):
1964+
return __.conjoin(*args)
1965+
1966+
19511967
def constant(*args):
19521968
return __.constant(*args)
19531969

@@ -1976,6 +1992,10 @@ def dedup(*args):
19761992
return __.dedup(*args)
19771993

19781994

1995+
def difference(*args):
1996+
return __.difference(*args)
1997+
1998+
19791999
def discard(*args):
19802000
return __.discard(*args)
19812001

@@ -2122,6 +2142,10 @@ def inject(*args):
21222142
return __.inject(*args)
21232143

21242144

2145+
def intersect(*args):
2146+
return __.intersect(*args)
2147+
2148+
21252149
def is_(*args):
21262150
return __.is_(*args)
21272151

@@ -2178,6 +2202,10 @@ def mean(*args):
21782202
return __.mean(*args)
21792203

21802204

2205+
def merge(*args):
2206+
return __.merge(*args)
2207+
2208+
21812209
def merge_e(*args):
21822210
return __.merge_e(*args)
21832211

@@ -2242,6 +2270,10 @@ def path(*args):
22422270
return __.path(*args)
22432271

22442272

2273+
def product(*args):
2274+
return __.product(*args)
2275+
2276+
22452277
def project(*args):
22462278
return __.project(*args)
22472279

@@ -2417,6 +2449,7 @@ def values(*args):
24172449
def where(*args):
24182450
return __.where(*args)
24192451

2452+
statics.add_static('E', E)
24202453

24212454
statics.add_static('V', V)
24222455

@@ -2430,8 +2463,12 @@ def where(*args):
24302463

24312464
statics.add_static('aggregate', aggregate)
24322465

2466+
statics.add_static('all_', all_)
2467+
24332468
statics.add_static('and_', and_)
24342469

2470+
statics.add_static('any_', any_)
2471+
24352472
statics.add_static('as_', as_)
24362473

24372474
statics.add_static('as_bool', as_bool)
@@ -2466,8 +2503,12 @@ def where(*args):
24662503

24672504
statics.add_static('coin', coin)
24682505

2506+
statics.add_static('combine', combine)
2507+
24692508
statics.add_static('concat', concat)
24702509

2510+
statics.add_static('conjoin', conjoin)
2511+
24712512
statics.add_static('constant', constant)
24722513

24732514
statics.add_static('count', count)
@@ -2480,12 +2521,14 @@ def where(*args):
24802521

24812522
statics.add_static('date_diff', date_diff)
24822523

2524+
statics.add_static('dedup', dedup)
2525+
2526+
statics.add_static('difference', difference)
2527+
24832528
statics.add_static('discard', discard)
24842529

24852530
statics.add_static('disjunct', disjunct)
24862531

2487-
statics.add_static('dedup', dedup)
2488-
24892532
statics.add_static('drop', drop)
24902533

24912534
statics.add_static('element', element)
@@ -2552,6 +2595,8 @@ def where(*args):
25522595

25532596
statics.add_static('inject', inject)
25542597

2598+
statics.add_static('intersect', intersect)
2599+
25552600
statics.add_static('is_', is_)
25562601

25572602
statics.add_static('key', key)
@@ -2580,6 +2625,8 @@ def where(*args):
25802625

25812626
statics.add_static('mean', mean)
25822627

2628+
statics.add_static('merge', merge)
2629+
25832630
statics.add_static('merge_e', merge_e)
25842631

25852632
statics.add_static('merge_v', merge_v)
@@ -2612,6 +2659,8 @@ def where(*args):
26122659

26132660
statics.add_static('path', path)
26142661

2662+
statics.add_static('product', product)
2663+
26152664
statics.add_static('project', project)
26162665

26172666
statics.add_static('properties', properties)

0 commit comments

Comments
 (0)