subject:"\[3\/3\] tinkerpop git commit\: Merge branch 'tp32'"

[3/3] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-10-05 Thread dkuppitz

Merge branch 'tp32' into tp33


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/02e0b8b3
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/02e0b8b3
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/02e0b8b3

Branch: refs/heads/tp33
Commit: 02e0b8b33c6698cefa62d03f237f5dbe0b1ab9e3
Parents: d9ccefc 21059b9
Author: Daniel Kuppitz 
Authored: Fri Oct 5 09:59:58 2018 -0700
Committer: Daniel Kuppitz 
Committed: Fri Oct 5 09:59:58 2018 -0700

--
 .../gremlin/process/traversal/Compare.java  | 63 ++--
 .../gremlin/process/traversal/PTest.java| 10 +++-
 2 files changed, 27 insertions(+), 46 deletions(-)
--

[3/3] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-10-02 Thread rdale

Merge branch 'tp32' into tp33


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/7148a4b4
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/7148a4b4
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/7148a4b4

Branch: refs/heads/tp33
Commit: 7148a4b4635a7d338e895640afeac492f26ffb67
Parents: 8b4f86f d0659bd
Author: Robert Dale 
Authored: Tue Oct 2 03:47:48 2018 -0400
Committer: Robert Dale 
Committed: Tue Oct 2 03:47:48 2018 -0400

--
 CHANGELOG.asciidoc |  1 +
 gremlin-driver/pom.xml | 14 ++
 gremlin-groovy/pom.xml | 21 +
 3 files changed, 36 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7148a4b4/CHANGELOG.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7148a4b4/gremlin-driver/pom.xml
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7148a4b4/gremlin-groovy/pom.xml
--

[3/3] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-09-27 Thread spmallette

Merge branch 'tp32' into tp33


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/393a8b1d
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/393a8b1d
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/393a8b1d

Branch: refs/heads/tp33
Commit: 393a8b1d1a1ce74d3a799ed30bd213d078d22614
Parents: 90e39f0 2250a85
Author: Stephen Mallette 
Authored: Thu Sep 27 15:37:04 2018 -0400
Committer: Stephen Mallette 
Committed: Thu Sep 27 15:37:04 2018 -0400

--
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

[3/3] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-09-27 Thread jorgebg

Merge branch 'tp32' into tp33


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/2783134b
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/2783134b
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/2783134b

Branch: refs/heads/tp33
Commit: 2783134b23851882ead67fb3b6c8a75ce6214fbd
Parents: b78c688 d516c68
Author: Jorge Bay Gondra 
Authored: Thu Sep 27 13:00:08 2018 +0200
Committer: Jorge Bay Gondra 
Committed: Thu Sep 27 13:00:08 2018 +0200

--
 .../gremlin-javascript/lib/driver/driver-remote-connection.js  | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2783134b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/driver-remote-connection.js
--

[3/3] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-09-19 Thread rdale

Merge branch 'tp32' into tp33


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/834be921
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/834be921
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/834be921

Branch: refs/heads/tp33
Commit: 834be921796ccc1aa5bcf7386c102d3ea896664a
Parents: 9f0dbd8 a494516
Author: Robert Dale 
Authored: Wed Sep 19 08:44:00 2018 -0400
Committer: Robert Dale 
Committed: Wed Sep 19 08:44:00 2018 -0400

--
 CHANGELOG.asciidoc | 1 +
 gremlin-python/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/834be921/CHANGELOG.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/834be921/gremlin-python/pom.xml
--

[3/3] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-09-14 Thread spmallette

Merge branch 'tp32' into tp33


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/2cc92195
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/2cc92195
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/2cc92195

Branch: refs/heads/tp33
Commit: 2cc9219541cc650ea3e29e7a968ed06426424806
Parents: e481ced 6787978
Author: Stephen Mallette 
Authored: Fri Sep 14 09:30:29 2018 -0400
Committer: Stephen Mallette 
Committed: Fri Sep 14 09:30:29 2018 -0400

--
 CHANGELOG.asciidoc  |  1 +
 gremlin-python/glv/TraversalSource.template | 40 
 .../jython/gremlin_python/process/traversal.py  | 40 
 .../driver/test_driver_remote_connection.py | 39 +++
 4 files changed, 120 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2cc92195/CHANGELOG.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2cc92195/gremlin-python/src/main/jython/gremlin_python/process/traversal.py
--

[3/3] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-08-13 Thread spmallette

Merge branch 'tp32' into tp33


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/5676e861
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5676e861
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/5676e861

Branch: refs/heads/tp33
Commit: 5676e8612b66c43d55aa1d4baa93e5949b1cd5c9
Parents: 0bf76ac 180da8d
Author: Stephen Mallette 
Authored: Mon Aug 13 10:36:19 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Aug 13 10:36:19 2018 -0400

--
 CHANGELOG.asciidoc | 1 +
 .../tinkerpop/gremlin/process/traversal/step/ByModulating.java | 2 ++
 .../tinkerpop/gremlin/process/traversal/step/map/GroupStep.java| 2 ++
 3 files changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5676e861/CHANGELOG.asciidoc
--

[3/3] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-08-04 Thread rdale

Merge branch 'tp32' into tp33


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/3e308f52
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/3e308f52
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/3e308f52

Branch: refs/heads/tp33
Commit: 3e308f5226e6254122f782cb55571e0103f9a9ff
Parents: b779a2a b98ff5e
Author: Robert Dale 
Authored: Sat Aug 4 16:44:41 2018 -0400
Committer: Robert Dale 
Committed: Sat Aug 4 16:44:41 2018 -0400

--
 CHANGELOG.asciidoc | 1 +
 gremlin-shaded/pom.xml | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3e308f52/CHANGELOG.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3e308f52/gremlin-shaded/pom.xml
--

[3/3] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-07-23 Thread dkuppitz

Merge branch 'tp32' into tp33


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/c3981000
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c3981000
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c3981000

Branch: refs/heads/tp33
Commit: c3981000234faf03f4ea4bc1da8086bc34fb3140
Parents: 05432a7 f9ad72a
Author: Daniel Kuppitz 
Authored: Mon Jul 23 10:01:23 2018 -0700
Committer: Daniel Kuppitz 
Committed: Mon Jul 23 10:01:23 2018 -0700

--
 .gitignore  |  1 +
 CHANGELOG.asciidoc  |  1 +
 docker/hadoop/.gitignore|  1 +
 docker/hadoop/Dockerfile| 25 --
 .../traversal/step/branch/BranchStep.java   | 51 +---
 gremlin-test/features/branch/Choose.feature | 15 ++
 .../traversal/step/branch/ChooseTest.java   | 24 +
 7 files changed, 86 insertions(+), 32 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c3981000/.gitignore
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c3981000/CHANGELOG.asciidoc
--

[3/3] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-07-20 Thread jorgebg

Merge branch 'tp32' into tp33


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/f9f0112f
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f9f0112f
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/f9f0112f

Branch: refs/heads/tp33
Commit: f9f0112f2e0e1899223754a9f0cb1377836dd685
Parents: 398ab9c a7aed51
Author: Jorge Bay Gondra 
Authored: Fri Jul 20 10:27:20 2018 +0200
Committer: Jorge Bay Gondra 
Committed: Fri Jul 20 10:27:20 2018 +0200

--
 .../src/main/javascript/gremlin-javascript/index.js   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--

[3/3] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-06-28 Thread spmallette

Merge branch 'tp32' into tp33

Conflicts:

gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/CoreImports.java

gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/AbstractImportCustomizerProvider.java


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ef888a1b
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ef888a1b
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ef888a1b

Branch: refs/heads/tp33
Commit: ef888a1b5380f563d688bd04fae0ea052e11d041
Parents: 4f462c5 4160b04
Author: Stephen Mallette 
Authored: Thu Jun 28 10:08:51 2018 -0400
Committer: Stephen Mallette 
Committed: Thu Jun 28 10:08:51 2018 -0400

--
 CHANGELOG.asciidoc  |  2 +
 docs/src/dev/provider/index.asciidoc| 13 +++
 .../reference/implementations-spark.asciidoc| 64 ++---
 docs/src/reference/the-graphcomputer.asciidoc   | 85 -
 .../upgrade/release-3.2.x-incubating.asciidoc   | 27 ++
 .../tinkerpop/gremlin/jsr223/CoreImports.java   |  2 +
 .../bulkdumping/BulkDumperVertexProgram.java|  3 +
 .../computer/bulkloading/BulkLoader.java|  2 +
 .../bulkloading/BulkLoaderVertexProgram.java|  2 +
 .../bulkloading/IncrementalBulkLoader.java  |  2 +
 .../computer/bulkloading/OneTimeBulkLoader.java |  2 +
 .../computer/clone/CloneVertexProgram.java  | 98 
 .../gremlin/process/remote/RemoteGraph.java |  4 +
 .../gremlin/process/ProcessComputerSuite.java   |  2 +
 .../computer/clone/CloneVertexProgramTest.java  | 98 
 15 files changed, 283 insertions(+), 123 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ef888a1b/CHANGELOG.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ef888a1b/docs/src/dev/provider/index.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ef888a1b/docs/src/reference/the-graphcomputer.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ef888a1b/docs/src/upgrade/release-3.2.x-incubating.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ef888a1b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/CoreImports.java
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ef888a1b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/RemoteGraph.java
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ef888a1b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessComputerSuite.java
--

[3/3] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-06-27 Thread spmallette

Merge branch 'tp32' into tp33


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/84c3ff40
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/84c3ff40
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/84c3ff40

Branch: refs/heads/tp33
Commit: 84c3ff40e19b748886eabbb4f12c74f932d1383d
Parents: b87a555 160c1de
Author: Stephen Mallette 
Authored: Wed Jun 27 12:30:13 2018 -0400
Committer: Stephen Mallette 
Committed: Wed Jun 27 12:30:13 2018 -0400

--
 CHANGELOG.asciidoc  |  1 +
 .../apache/tinkerpop/gremlin/console/Console.groovy | 16 +---
 2 files changed, 10 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/84c3ff40/CHANGELOG.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/84c3ff40/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
--
diff --cc 
gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
index 096d329,ad41d6c..d45b49a
--- 
a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
+++ 
b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
@@@ -111,21 -127,30 +111,23 @@@ class Console 
  
  GremlinLoader.load()
  
- // check for available plugins.  if they are in the "active" plugins 
strategies then "activate" them
+ // check for available plugins on the path and track them by plugin 
class name
  def activePlugins = Mediator.readPluginState()
 -def pluginClass = mediator.useV3d3 ? 
org.apache.tinkerpop.gremlin.jsr223.GremlinPlugin : GremlinPlugin
 -ServiceLoader.load(pluginClass, 
groovy.getInterp().getClassLoader()).each { plugin ->
 +ServiceLoader.load(GremlinPlugin, 
groovy.getInterp().getClassLoader()).each { plugin ->
  if (!mediator.availablePlugins.containsKey(plugin.class.name)) {
 -def pluggedIn
 -
 -if (Mediator.useV3d3) {
 -pluggedIn = new PluggedIn(new 
PluggedIn.GremlinPluginAdapter((org.apache.tinkerpop.gremlin.jsr223.GremlinPlugin)
 plugin, groovy, io), groovy, io, false)
 -} else {
 -pluggedIn = new PluggedIn((GremlinPlugin) plugin, groovy, 
io, false)
 -}
 +def pluggedIn = new PluggedIn((GremlinPlugin) plugin, groovy, 
io, false)
  
  mediator.availablePlugins.put(plugin.class.name, pluggedIn)
+ }
+ }
  
- if (activePlugins.contains(plugin.class.name)) {
- pluggedIn.activate()
+ // if there are active plugins then initialize them in the order that 
they are listed
+ activePlugins.each { pluginName ->
+ def pluggedIn = mediator.availablePlugins[pluginName]
+ pluggedIn.activate()
  
- if (!io.quiet)
- 
io.out.println(Colorizer.render(Preferences.infoColor, "plugin activated: " + 
plugin.getName()))
- }
- }
+ if (!io.quiet)
+ io.out.println(Colorizer.render(Preferences.infoColor, 
"plugin activated: " + pluggedIn.getPlugin().getName()))
  }
  
  // remove any "uninstalled" plugins from plugin state as it means 
they were installed, activated, but not

[3/3] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-06-22 Thread spmallette

Merge branch 'tp32' into tp33


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/49730704
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/49730704
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/49730704

Branch: refs/heads/tp33
Commit: 49730704e3c840f089b674faece506d9a6ab3a69
Parents: 1309777 32aebb8
Author: Stephen Mallette 
Authored: Fri Jun 22 10:51:33 2018 -0400
Committer: Stephen Mallette 
Committed: Fri Jun 22 10:51:33 2018 -0400

--
 docs/src/index.asciidoc  |   2 +-
 docs/static/images/practical-gremlin.png | Bin 0 -> 392179 bytes
 pom.xml  |  13 ++---
 3 files changed, 11 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/49730704/pom.xml
--

[3/3] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-06-04 Thread spmallette

Merge branch 'tp32' into tp33


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/edc0a46d
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/edc0a46d
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/edc0a46d

Branch: refs/heads/tp33
Commit: edc0a46d98904d190a6e17dde927ba80ec4773b8
Parents: 00f77fa 57ac99e
Author: Stephen Mallette 
Authored: Mon Jun 4 13:30:41 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Jun 4 13:30:41 2018 -0400

--
 gremlin-console/src/main/docker/docker-entrypoint.sh | 0
 gremlin-server/src/main/docker/docker-entrypoint.sh  | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
--

[3/3] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-05-31 Thread spmallette

Merge branch 'tp32' into tp33

Conflicts:

gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/branch/GroovyChooseTest.groovy


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/6c98a303
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/6c98a303
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/6c98a303

Branch: refs/heads/tp33
Commit: 6c98a30364021138a2f244edbc88c3c40fc3d189
Parents: d258071 f411f1d
Author: Stephen Mallette 
Authored: Thu May 31 15:51:02 2018 -0400
Committer: Stephen Mallette 
Committed: Thu May 31 15:51:02 2018 -0400

--
 CHANGELOG.asciidoc  |  1 +
 .../traversal/step/branch/BranchStep.java   | 42 +---
 .../step/util/ReducingBarrierStep.java  |  1 -
 .../Gherkin/GherkinTestRunner.cs|  6 ++-
 gremlin-test/features/branch/Choose.feature | 27 +
 .../traversal/step/branch/ChooseTest.java   | 35 
 6 files changed, 104 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6c98a303/CHANGELOG.asciidoc
--

[3/3] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-05-22 Thread dkuppitz

Merge branch 'tp32' into tp33


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/d975e191
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d975e191
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d975e191

Branch: refs/heads/tp33
Commit: d975e1917272ea12c019b77f72953345fa59036f
Parents: 3891777 7c70013
Author: Daniel Kuppitz 
Authored: Tue May 22 08:44:12 2018 -0700
Committer: Daniel Kuppitz 
Committed: Tue May 22 08:44:12 2018 -0700

--
 CHANGELOG.asciidoc  |  1 +
 gremlin-test/features/map/Select.feature| 20 
 .../process/traversal/step/map/SelectTest.java  | 15 
 .../optimization/TinkerGraphCountStrategy.java  |  2 +-
 .../TinkerGraphCountStrategyTest.java   | 25 
 5 files changed, 52 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d975e191/CHANGELOG.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d975e191/gremlin-test/features/map/Select.feature
--
diff --cc gremlin-test/features/map/Select.feature
index 341a378,1e45a0e..788eda7
--- a/gremlin-test/features/map/Select.feature
+++ b/gremlin-test/features/map/Select.feature
@@@ -516,46 -516,22 +516,66 @@@ Feature: Step - select(
| d[2].l |
| d[2].l |
  
 +  Scenario: 
g_V_asXaX_groupXmX_by_byXbothE_countX_barrier_selectXmX_selectXselectXaXX
 +Given the modern graph
 +And the traversal of
 +  """
 +  
g.V().as("a").group("m").by().by(__.bothE().count()).barrier().select("m").select(__.select("a"))
 +  """
 +When iterated to list
 +Then the result should be unordered
 +  | result |
 +  | d[3].l |
 +  | d[1].l |
 +  | d[3].l |
 +  | d[3].l |
 +  | d[1].l |
 +  | d[1].l |
 +
 +  Scenario: 
g_V_asXaX_groupXmX_by_byXbothE_countX_barrier_selectXmX_selectXselectXaXX_byXmathX_plus_XX
 +Given the modern graph
 +And the traversal of
 +  """
 +  
g.V().as("a").group("m").by().by(__.bothE().count()).barrier().select("m").select(__.select("a")).by(__.math("_+_"))
 +  """
 +When iterated to list
 +Then the result should be unordered
 +  | result |
 +  | d[6].d |
 +  | d[2].d |
 +  | d[6].d |
 +  | d[6].d |
 +  | d[2].d |
 +  | d[2].d |
 +
 +  Scenario: g_V_asXaX_outXknowsX_asXaX_selectXall_constantXaXX
 +Given the modern graph
 +And the traversal of
 +  """
 +  g.V().as("a").out("knows").as("a").select(Pop.all, __.constant("a"))
 +  """
 +When iterated to list
 +Then the result should be unordered
 +  | result |
 +  | l[v[marko],v[vadas]] |
 +  | l[v[marko],v[josh]] |
++
+   Scenario: g_V_selectXaX
+ Given the modern graph
+ And the traversal of
+   """
+   g.V().select("a")
+   """
+ When iterated to list
+ Then the result should be empty
+ 
+   Scenario: g_V_selectXaX_count
+ Given the modern graph
+ And the traversal of
+   """
+   g.V().select("a").count()
+   """
+ When iterated to list
+ Then the result should be unordered
+   | result |
+   | d[0].l |

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d975e191/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectTest.java
--
diff --cc 
gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectTest.java
index 72a1872,3d778e4..20eee0f
--- 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectTest.java
+++ 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectTest.java
@@@ -83,12 -83,8 +83,14 @@@ public abstract class SelectTest extend
  
  public abstract Traversal 
get_g_V_chooseXoutE_count_isX0X__asXaX__asXbXX_chooseXselectXaX__selectXaX__selectXbXX();
  
 +public abstract Traversal 
get_g_V_asXaX_groupXmX_by_byXbothE_countX_barrier_selectXmX_selectXselectXaXX();
 +
 +public abstract Traversal 
get_g_V_asXaX_groupXmX_by_byXbothE_countX_barrier_selectXmX_selectXselectXaXX_byXmathX_plus_XX();
 +
 +public abstract Traversal 
get_g_V_asXaX_outXknowsX_asXaX_selectXall_constantXaXX();
 +
+ public abstract Traversal get_g_V_selectXaX_count();
+ 
  // below are original back()-tests
  
  public abstract Traversal 
get_g_VX1X_asXhereX_out_selectXhereX(final Object v1Id);
@@@ -349,31 -348,12

[3/3] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-05-18 Thread spmallette

Merge branch 'tp32' into tp33

Conflicts:

gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GroovyTranslatorTest.java


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/558e8147
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/558e8147
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/558e8147

Branch: refs/heads/tp33
Commit: 558e8147e34d3a2fc616bb520899b7d4a1b65d24
Parents: bf6ff4d e398373
Author: Stephen Mallette 
Authored: Fri May 18 18:55:13 2018 -0400
Committer: Stephen Mallette 
Committed: Fri May 18 18:55:13 2018 -0400

--
 CHANGELOG.asciidoc   |  2 +-
 .../gremlin/groovy/jsr223/GroovyTranslator.java  |  6 +-
 .../gremlin/groovy/jsr223/GroovyTranslatorTest.java  | 15 +--
 3 files changed, 19 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/558e8147/CHANGELOG.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/558e8147/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GroovyTranslator.java
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/558e8147/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GroovyTranslatorTest.java
--
diff --cc 
gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GroovyTranslatorTest.java
index c58f6e7,000..ea832f4
mode 100644,00..100644
--- 
a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GroovyTranslatorTest.java
+++ 
b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GroovyTranslatorTest.java
@@@ -1,134 -1,0 +1,145 @@@
 +/*
 + *  Licensed to the Apache Software Foundation (ASF) under one
 + *  or more contributor license agreements.  See the NOTICE file
 + *  distributed with this work for additional information
 + *  regarding copyright ownership.  The ASF licenses this file
 + *  to you under the Apache License, Version 2.0 (the
 + *  "License"); you may not use this file except in compliance
 + *  with the License.  You may obtain a copy of the License at
 + *
 + *  http://www.apache.org/licenses/LICENSE-2.0
 + *
 + *  Unless required by applicable law or agreed to in writing,
 + *  software distributed under the License is distributed on an
 + *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 + *  KIND, either express or implied.  See the License for the
 + *  specific language governing permissions and limitations
 + *  under the License.
 + */
 +
 +package org.apache.tinkerpop.gremlin.groovy.jsr223;
 +
 +import org.apache.commons.configuration.MapConfiguration;
 +import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
 +import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
 +import 
org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
 +import 
org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
 +import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
 +import 
org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SubgraphStrategy;
 +import 
org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.TranslationStrategy;
 +import 
org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ReadOnlyStrategy;
 +import org.apache.tinkerpop.gremlin.structure.Vertex;
 +import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
 +import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
 +import org.apache.tinkerpop.gremlin.util.function.Lambda;
 +import org.junit.Test;
 +
 +import javax.script.Bindings;
 +import javax.script.SimpleBindings;
 +import java.util.ArrayList;
 +import java.util.Arrays;
++import java.util.Collections;
 +import java.util.HashMap;
 +import java.util.LinkedHashMap;
 +import java.util.List;
++import java.util.function.Function;
 +
 +import static org.junit.Assert.assertEquals;
 +import static org.junit.Assert.assertFalse;
 +
 +/**
 + * @author Marko A. Rodriguez (http://markorodriguez.com)
 + */
 +public class GroovyTranslatorTest {
 +
 +@Test
 +public void shouldHandleStrategies() throws Exception {
 +final TinkerGraph graph = TinkerFactory.createModern();
 +GraphTraversalSource g = graph.traversal();
 +g = g.withStrategies(SubgraphStrategy.create(new MapConfiguration(new 
HashMap() {{
 +put(SubgraphStrategy.VERTICES, __.has("name", "marko"));
 +}})));
 +final Bindings bindings = new

[3/3] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-05-15 Thread spmallette

Merge branch 'tp32' into tp33


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b04e0240
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b04e0240
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b04e0240

Branch: refs/heads/tp33
Commit: b04e02406d8b29fc3967a5aa6842e72e82d90817
Parents: 5171afd 699a5aa
Author: Stephen Mallette 
Authored: Tue May 15 15:42:18 2018 -0400
Committer: Stephen Mallette 
Committed: Tue May 15 15:42:18 2018 -0400

--
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)
--

[3/3] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-05-02 Thread jorgebg

Merge branch 'tp32' into tp33


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/8275e459
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8275e459
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/8275e459

Branch: refs/heads/tp33
Commit: 8275e45981751cdcd80d066f5d68751e7e1c7096
Parents: 99845d4 8671622
Author: Jorge Bay Gondra 
Authored: Wed May 2 08:50:01 2018 -0400
Committer: Jorge Bay Gondra 
Committed: Wed May 2 08:50:01 2018 -0400

--
 .../main/javascript/gremlin-javascript/index.js | 20 +++-
 .../test/unit/exports-test.js   |  2 ++
 2 files changed, 13 insertions(+), 9 deletions(-)
--

[3/3] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-04-27 Thread spmallette

Merge branch 'tp32' into tp33

Conflicts:

gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/71bc37fd
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/71bc37fd
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/71bc37fd

Branch: refs/heads/tp33
Commit: 71bc37fdfe00bb8c6b75d8bf81834713abf8cd22
Parents: a38d68f 5fea198
Author: Stephen Mallette 
Authored: Fri Apr 27 08:35:55 2018 -0400
Committer: Stephen Mallette 
Committed: Fri Apr 27 08:35:55 2018 -0400

--
 docs/src/recipes/olap-spark-yarn.asciidoc   | 20 
 .../gremlin/process/traversal/Order.java|  9 -
 2 files changed, 16 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/71bc37fd/docs/src/recipes/olap-spark-yarn.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/71bc37fd/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java
--
diff --cc 
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java
index 847cc57,c9111f0..0b88bba
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java
@@@ -67,7 -66,82 +67,14 @@@ public enum Order implements Comparator
  public Order reversed() {
  return incr;
  }
- }, shuffle {
+ },
+ 
+ /**
 - * @since 3.0.0-incubating
 - * @deprecated As of release 3.1.1-incubating, replaced by {@link 
org.apache.tinkerpop.gremlin.structure.Column#keys}.
 - */
 -@Deprecated
 -keyIncr {
 -@Override
 -public int compare(final Object first, final Object second) {
 -return 
Comparator.naturalOrder().compare(((Map.Entry) 
first).getKey(), ((Map.Entry) second).getKey());
 -}
 -
 -@Override
 -public Order reversed() {
 -return keyDecr;
 -}
 -},
 -
 -/**
 - * @since 3.0.0-incubating
 - * @deprecated As of release 3.1.1-incubating, replaced by {@link 
org.apache.tinkerpop.gremlin.structure.Column#values}.
 - */
 -@Deprecated
 -valueIncr {
 -@Override
 -public int compare(final Object first, final Object second) {
 -return 
Comparator.naturalOrder().compare(((Map.Entry) 
first).getValue(), ((Map.Entry) second).getValue());
 -}
 -
 -@Override
 -public Order reversed() {
 -return valueDecr;
 -}
 -},
 -
 -/**
 - * @since 3.0.0-incubating
 - * @deprecated As of release 3.1.1-incubating, replaced by {@link 
org.apache.tinkerpop.gremlin.structure.Column#keys}.
 - */
 -@Deprecated
 -keyDecr {
 -@Override
 -public int compare(final Object first, final Object second) {
 -return 
Comparator.reverseOrder().compare(((Map.Entry) 
first).getKey(), ((Map.Entry) second).getKey());
 -}
 -
 -@Override
 -public Order reversed() {
 -return keyIncr;
 -}
 -},
 -
 -/**
 - * @since 3.0.0-incubating
 - * @deprecated As of release 3.1.1-incubating, replaced by {@link 
org.apache.tinkerpop.gremlin.structure.Column#values}.
 - */
 -@Deprecated
 -valueDecr {
 -@Override
 -public int compare(final Object first, final Object second) {
 -return 
Comparator.reverseOrder().compare(((Map.Entry) 
first).getValue(), ((Map.Entry) second).getValue());
 -}
 -
 -@Override
 -public Order reversed() {
 -return valueIncr;
 -}
 -},
 -
 -/**
+  * Order in a random fashion.
+  *
+  * @since 3.0.0-incubating
+  */
+ shuffle {
  @Override
  public int compare(final Object first, final Object second) {
  return RANDOM.nextBoolean() ? -1 : 1;

[3/3] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-04-26 Thread spmallette

Merge branch 'tp32' into tp33

Conflicts:

gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java

gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Pop.java


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/c253e768
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c253e768
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c253e768

Branch: refs/heads/tp33
Commit: c253e768b489cb78c0d90d85c6a933ff59e7d908
Parents: 4eeb178 a4c5a21
Author: Stephen Mallette 
Authored: Thu Apr 26 11:02:04 2018 -0400
Committer: Stephen Mallette 
Committed: Thu Apr 26 11:02:04 2018 -0400

--
 .../gremlin/process/traversal/Compare.java  | 12 
 .../gremlin/process/traversal/Contains.java |  4 ++
 .../gremlin/process/traversal/Operator.java | 73 ++-
 .../gremlin/process/traversal/Order.java| 17 -
 .../tinkerpop/gremlin/process/traversal/P.java  | 76 
 .../gremlin/process/traversal/Pop.java  | 10 ++-
 .../gremlin/process/traversal/Scope.java| 19 +++--
 .../gremlin/process/traversal/OrderTest.java| 76 
 8 files changed, 277 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c253e768/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Operator.java
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c253e768/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java
--
diff --cc 
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java
index dfd8bf2,3710396..847cc57
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java
@@@ -19,12 -19,14 +19,15 @@@
  package org.apache.tinkerpop.gremlin.process.traversal;
  
  import java.util.Comparator;
 -import java.util.Map;
  import java.util.Random;
  
 +import org.apache.tinkerpop.gremlin.util.NumberHelper;
 +
  /**
+  * Provides {@code Comparator} instances for ordering traversers.
+  *
   * @author Marko A. Rodriguez (http://markorodriguez.com)
+  * @author Stephen Mallette (http://stephen.genoprime.com)
   */
  public enum Order implements Comparator {
  

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c253e768/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Pop.java
--
diff --cc 
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Pop.java
index d40fe60,b2fe2b9..45bbf2e
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Pop.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Pop.java
@@@ -39,10 -39,8 +43,12 @@@ public enum Pop 
  last,
  /**
   * Get all the items and return them as a list.
+  *
+  * @since 3.0.0-incubating
   */
 -all
 +all,
 +/**
 + * Get the items as either a list (for multiple) or an object (for 
singles).
 + */
 +mixed
  }

[3/3] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-04-25 Thread spmallette

Merge branch 'tp32' into tp33


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/cfac5690
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/cfac5690
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/cfac5690

Branch: refs/heads/tp33
Commit: cfac56909777030f110474b97b62e06d3c343c93
Parents: b5b9e1a 0d6f8fc
Author: Stephen Mallette 
Authored: Wed Apr 25 08:21:57 2018 -0400
Committer: Stephen Mallette 
Committed: Wed Apr 25 08:21:57 2018 -0400

--
 CHANGELOG.asciidoc  |  1 +
 .../process/traversal/TraversalStrategies.java  | 36 +++-
 2 files changed, 29 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cfac5690/CHANGELOG.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cfac5690/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java
--

[3/3] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-04-25 Thread spmallette

Merge branch 'tp32' into tp33


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b5b9e1af
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b5b9e1af
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b5b9e1af

Branch: refs/heads/tp33
Commit: b5b9e1af8f5da51d396e69877a9d03c061b35f12
Parents: 9d5b722 f4dbaff
Author: Stephen Mallette 
Authored: Wed Apr 25 07:45:04 2018 -0400
Committer: Stephen Mallette 
Committed: Wed Apr 25 07:45:04 2018 -0400

--
 .../tinkerpop/gremlin/process/traversal/TraversalEngine.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

[3/3] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-04-25 Thread spmallette

Merge branch 'tp32' into tp33

Conflicts:

gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyAddVertexTest.groovy
gremlin-test/features/map/AddVertex.feature

gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddVertexTest.java


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/9d5b7229
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/9d5b7229
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/9d5b7229

Branch: refs/heads/tp33
Commit: 9d5b72290bddfbc0b987297626427e2cfedd86d5
Parents: 012eba6 44c4073
Author: Stephen Mallette 
Authored: Wed Apr 25 07:27:29 2018 -0400
Committer: Stephen Mallette 
Committed: Wed Apr 25 07:27:29 2018 -0400

--
 CHANGELOG.asciidoc  |  1 +
 .../process/traversal/step/util/Parameters.java | 30 +++-
 gremlin-test/features/map/AddVertex.feature | 26 +
 .../traversal/step/map/AddVertexTest.java   | 20 +++--
 4 files changed, 62 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9d5b7229/CHANGELOG.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9d5b7229/gremlin-test/features/map/AddVertex.feature
--
diff --cc gremlin-test/features/map/AddVertex.feature
index e58040c,996521b..5d324f3
--- a/gremlin-test/features/map/AddVertex.feature
+++ b/gremlin-test/features/map/AddVertex.feature
@@@ -309,54 -309,29 +309,80 @@@ Feature: Step - addV(
| m[{"temp": ["test"], "name": ["lop"]}] |
| m[{"temp": ["test"], "name": ["ripple"]}] |
  
+   Scenario: g_withSideEffectXa_nameX_addV_propertyXselectXaX_markoX_name
+ Given the empty graph
+ And the graph initializer of
+   """
+   g.addV("person").property(T.id, 1).property("name", 
"marko").property("age", 29).as("marko").
+ addV("person").property(T.id, 2).property("name", 
"vadas").property("age", 27).as("vadas").
+ addV("software").property(T.id, 3).property("name", 
"lop").property("lang", "java").as("lop").
+ addV("person").property(T.id, 
4).property("name","josh").property("age", 32).as("josh").
+ addV("software").property(T.id, 5).property("name", 
"ripple").property("lang", "java").as("ripple").
+ addV("person").property(T.id, 6).property("name", 
"peter").property("age", 35).as('peter').
+ addE("knows").from("marko").to("vadas").property(T.id, 
7).property("weight", 0.5).
+ addE("knows").from("marko").to("josh").property(T.id, 
8).property("weight", 1.0).
+ addE("created").from("marko").to("lop").property(T.id, 
9).property("weight", 0.4).
+ addE("created").from("josh").to("ripple").property(T.id, 
10).property("weight", 1.0).
+ addE("created").from("josh").to("lop").property(T.id, 
11).property("weight", 0.4).
+ addE("created").from("peter").to("lop").property(T.id, 
12).property("weight", 0.2)
+   """
+ And the traversal of
+   """
+   g.withSideEffect("a", "name").addV().property(__.select("a"), 
"marko").values("name")
+   """
+ When iterated to list
+ Then the result should be unordered
+   | result |
+   | marko |
 -And the graph should return 2 for count of "g.V().has(\"name\",\"marko\")"
++And the graph should return 2 for count of "g.V().has(\"name\",\"marko\")"
 +  Scenario: 
g_V_asXaX_hasXname_markoX_outXcreatedX_asXbX_addVXselectXaX_labelX_propertyXtest_selectXbX_labelX_valueMapXtrueX
 +Given the empty graph
 +And the graph initializer of
 +  """
 +  g.addV("person").property(T.id, 1).property("name", 
"marko").property("age", 29).as("marko").
 +addV("person").property(T.id, 2).property("name", 
"vadas").property("age", 27).as("vadas").
 +addV("software").property(T.id, 3).property("name", 
"lop").property("lang", "java").as("lop").
 +addV("person").property(T.id, 
4).property("name","josh").property("age", 32).as("josh").
 +addV("software").property(T.id, 5).property("name", 
"ripple").property("lang", "java").as("ripple").
 +addV("person").property(T.id, 6).property("name", 
"peter").property("age", 35).as('peter').
 +addE("knows").from("marko").to("vadas").property(T.id, 
7).property("weight", 0.5).
 +addE("knows").from("marko").to("josh").property(T.id, 
8).property("weight", 1.0).
 +addE("created").from("marko").to("lop").property(T.id, 
9).property("weight", 0.4).
 +addE("created").from("josh").to("ripple").property(T.id,

[3/3] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-04-25 Thread spmallette

Merge branch 'tp32' into tp33

Conflicts:

gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTest.java


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/012eba66
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/012eba66
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/012eba66

Branch: refs/heads/tp33
Commit: 012eba661fcc5b4bbd27751417e8e51ebdbddcf3
Parents: 8005cb3 42ce7a5
Author: Stephen Mallette 
Authored: Wed Apr 25 06:54:24 2018 -0400
Committer: Stephen Mallette 
Committed: Wed Apr 25 06:54:24 2018 -0400

--
 CHANGELOG.asciidoc  |  1 +
 .../upgrade/release-3.2.x-incubating.asciidoc   | 24 
 .../jsr223/GremlinGroovyScriptEngineTest.java   | 11 +
 pom.xml |  2 +-
 4 files changed, 37 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/012eba66/CHANGELOG.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/012eba66/docs/src/upgrade/release-3.2.x-incubating.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/012eba66/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTest.java
--
diff --cc 
gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTest.java
index d481cbb,54e997f..3e1d153
--- 
a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTest.java
+++ 
b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTest.java
@@@ -22,6 -22,12 +22,9 @@@ import groovy.lang.Closure
  import groovy.lang.MissingPropertyException;
  import org.apache.commons.lang.exception.ExceptionUtils;
  import org.apache.commons.lang3.concurrent.BasicThreadFactory;
 -import org.apache.tinkerpop.gremlin.groovy.CompilerCustomizerProvider;
 -import org.apache.tinkerpop.gremlin.groovy.NoImportCustomizerProvider;
 -import 
org.apache.tinkerpop.gremlin.groovy.jsr223.customizer.InterpreterModeCustomizerProvider;
+ import org.apache.tinkerpop.gremlin.structure.Vertex;
+ import org.apache.tinkerpop.gremlin.util.function.Lambda;
+ import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
  import org.javatuples.Pair;
  import org.junit.Test;
  import org.slf4j.Logger;

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/012eba66/pom.xml
--

[3/3] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-04-24 Thread jorgebg

Merge branch 'tp32' into tp33


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ffaca891
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ffaca891
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ffaca891

Branch: refs/heads/tp33
Commit: ffaca8915e3df4952c02c922045a224176e07037
Parents: ead5659 c155818
Author: Jorge Bay Gondra 
Authored: Tue Apr 24 10:39:31 2018 +0200
Committer: Jorge Bay Gondra 
Committed: Tue Apr 24 10:39:31 2018 +0200

--
 docs/src/reference/gremlin-variants.asciidoc | 47 +--
 1 file changed, 36 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ffaca891/docs/src/reference/gremlin-variants.asciidoc
--

[3/3] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-04-19 Thread spmallette

Merge branch 'tp32' into tp33


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/cd1844ca
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/cd1844ca
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/cd1844ca

Branch: refs/heads/tp33
Commit: cd1844cad93778e68f8f3a29491ffe896f2ba407
Parents: 028aba4 b99c56a
Author: Stephen Mallette 
Authored: Thu Apr 19 07:16:19 2018 -0400
Committer: Stephen Mallette 
Committed: Thu Apr 19 07:16:19 2018 -0400

--
 docs/src/reference/gremlin-variants.asciidoc |   8 
 docs/static/images/gremlin-js.png| Bin 0 -> 78981 bytes
 2 files changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cd1844ca/docs/src/reference/gremlin-variants.asciidoc
--

[3/3] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-04-18 Thread spmallette

Merge branch 'tp32' into tp33


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/028aba45
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/028aba45
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/028aba45

Branch: refs/heads/tp33
Commit: 028aba45cd268ba675711866e3633125dc74ef19
Parents: 358f99b 4dcee1a
Author: Stephen Mallette 
Authored: Wed Apr 18 18:50:22 2018 -0400
Committer: Stephen Mallette 
Committed: Wed Apr 18 18:50:22 2018 -0400

--
 .../process/traversal/step/util/Parameters.java | 16 ++--
 .../driver/remote/DriverRemoteTraversal.java|  6 +++---
 2 files changed, 9 insertions(+), 13 deletions(-)
--

[3/3] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-04-16 Thread spmallette

Merge branch 'tp32' into tp33


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/d63638b8
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d63638b8
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d63638b8

Branch: refs/heads/tp33
Commit: d63638b83f8cfeb4b07410c741ea4f3918e84575
Parents: 01c8954 a7c8ea1
Author: Stephen Mallette 
Authored: Mon Apr 16 07:49:03 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Apr 16 07:49:03 2018 -0400

--
 CHANGELOG.asciidoc | 5 +
 gremlin-console/pom.xml| 1 -
 gremlin-console/src/main/static/NOTICE | 6 --
 gremlin-server/pom.xml | 1 -
 pom.xml| 5 +
 5 files changed, 10 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d63638b8/CHANGELOG.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d63638b8/gremlin-console/pom.xml
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d63638b8/gremlin-console/src/main/static/NOTICE
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d63638b8/gremlin-server/pom.xml
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d63638b8/pom.xml
--

[3/3] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-04-03 Thread spmallette

Merge branch 'tp32' into tp33

Conflicts:
giraph-gremlin/pom.xml
gremlin-archetype/gremlin-archetype-dsl/pom.xml
gremlin-archetype/gremlin-archetype-server/pom.xml
gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml
gremlin-archetype/pom.xml
gremlin-console/bin/gremlin.sh
gremlin-console/pom.xml
gremlin-core/pom.xml
gremlin-dotnet/pom.xml
gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
gremlin-dotnet/src/pom.xml
gremlin-dotnet/test/pom.xml
gremlin-driver/pom.xml
gremlin-groovy-test/pom.xml
gremlin-groovy/pom.xml
gremlin-javascript/pom.xml
gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
gremlin-python/pom.xml
gremlin-server/pom.xml
gremlin-shaded/pom.xml
gremlin-test/pom.xml
gremlin-tools/gremlin-benchmark/pom.xml
hadoop-gremlin/pom.xml
neo4j-gremlin/pom.xml
pom.xml
spark-gremlin/pom.xml
tinkergraph-gremlin/pom.xml


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/6b172738
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/6b172738
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/6b172738

Branch: refs/heads/tp33
Commit: 6b172738e72aa4d337d7b3562404e741cb7e8666
Parents: d40d60a 004e721
Author: Stephen Mallette 
Authored: Tue Apr 3 13:05:37 2018 -0400
Committer: Stephen Mallette 
Committed: Tue Apr 3 13:05:37 2018 -0400

--
 CHANGELOG.asciidoc  | 51 +++-
 .../upgrade/release-3.2.x-incubating.asciidoc   |  2 +-
 .../src/Gremlin.Net/Gremlin.Net.csproj  |  4 +-
 3 files changed, 53 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6b172738/CHANGELOG.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6b172738/docs/src/upgrade/release-3.2.x-incubating.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6b172738/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
--

[3/3] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-03-21 Thread spmallette

Merge branch 'tp32' into tp33


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0f29e7e8
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0f29e7e8
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/0f29e7e8

Branch: refs/heads/tp33
Commit: 0f29e7e8fedfa860fbf663e7398bbaf05e4d30e2
Parents: 38bcdb6 6323f49
Author: Stephen Mallette 
Authored: Tue Mar 20 15:25:39 2018 -0400
Committer: Stephen Mallette 
Committed: Tue Mar 20 15:25:39 2018 -0400

--
 CHANGELOG.asciidoc  |  1 +
 .../strategy/decoration/RemoteStrategy.java | 27 +++-
 .../process/traversal/TraversalStrategies.java  | 22 
 3 files changed, 38 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0f29e7e8/CHANGELOG.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0f29e7e8/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java
--

[3/3] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-03-12 Thread spmallette

Merge branch 'tp32' into tp33


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/097ad015
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/097ad015
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/097ad015

Branch: refs/heads/tp33
Commit: 097ad015ee0595b290824543ebded7558f623a8c
Parents: 7f06a18 d3be13b
Author: Stephen Mallette 
Authored: Mon Mar 12 12:13:10 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 12 12:13:10 2018 -0400

--
 CHANGELOG.asciidoc  |  1 +
 .../jsr223/JavaTranslatorBenchmark.java | 76 
 .../gremlin/jsr223/JavaTranslator.java  | 58 ---
 3 files changed, 125 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/097ad015/CHANGELOG.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/097ad015/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/JavaTranslator.java
--
diff --cc 
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/JavaTranslator.java
index 0806c6d,df12055..2df8db5
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/JavaTranslator.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/JavaTranslator.java
@@@ -50,10 -50,13 +50,11 @@@ import java.util.concurrent.ConcurrentH
   */
  public final class JavaTranslator> implements Translator.StepTranslator {
  
 -private static final boolean IS_TESTING = 
Boolean.valueOf(System.getProperty("is.testing", "false"));
 -
  private final S traversalSource;
- private final Class anonymousTraversal;
+ private final Class anonymousTraversal;
  private static final Map> 
GLOBAL_METHOD_CACHE = new ConcurrentHashMap<>();
- 
+ private final Map> localMethodCache = new 
ConcurrentHashMap<>();
+ private final Method anonymousTraversalStart;
  
  private JavaTranslator(final S traversalSource) {
  this.traversalSource = traversalSource;

[3/3] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-03-12 Thread spmallette

Merge branch 'tp32' into tp33


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/d62e50e5
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d62e50e5
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d62e50e5

Branch: refs/heads/tp33
Commit: d62e50e5c13fcfe6fcd7958727500816c382a200
Parents: 3797c7d f80a542
Author: Stephen Mallette 
Authored: Mon Mar 12 10:04:28 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 12 10:04:28 2018 -0400

--
 CHANGELOG.asciidoc | 1 +
 pom.xml| 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d62e50e5/CHANGELOG.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d62e50e5/pom.xml
--
diff --cc pom.xml
index a29ccf0,da50996..cf1e039
--- a/pom.xml
+++ b/pom.xml
@@@ -146,10 -147,10 +146,10 @@@ limitations under the License
  2.10.4
  1.1
  3.0.2
- 4.0.53.Final
+ 4.0.56.Final
  1.7.21
  1.15
 -1.6.1
 +2.2.0
  
  UTF-8
  
UTF-8

[3/3] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-03-09 Thread spmallette

Merge branch 'tp32' into tp33

Conflicts:

gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineCompileStaticTest.java

gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTypeCheckedTest.java


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/02e47ff9
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/02e47ff9
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/02e47ff9

Branch: refs/heads/tp33
Commit: 02e47ff9634b15f99ef331e80a227ddd3617ae2e
Parents: 4c75266 552820a
Author: Stephen Mallette 
Authored: Fri Mar 9 11:05:37 2018 -0500
Committer: Stephen Mallette 
Committed: Fri Mar 9 11:05:37 2018 -0500

--
 CHANGELOG.asciidoc | 1 +
 .../groovy/jsr223/GremlinGroovyScriptEngineCompileStaticTest.java  | 2 +-
 .../groovy/jsr223/GremlinGroovyScriptEngineTypeCheckedTest.java| 2 +-
 .../tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java   | 2 +-
 .../tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java   | 2 +-
 pom.xml| 2 +-
 6 files changed, 6 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/02e47ff9/CHANGELOG.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/02e47ff9/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineCompileStaticTest.java
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/02e47ff9/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTypeCheckedTest.java
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/02e47ff9/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/02e47ff9/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/02e47ff9/pom.xml
--

[3/3] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-03-08 Thread spmallette

Merge branch 'tp32' into tp33

Conflicts:

gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/AbstractGraphSONTypeSerializer.java

gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperPartialEmbeddedTypeTest.java


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a3624f7e
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a3624f7e
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a3624f7e

Branch: refs/heads/tp33
Commit: a3624f7e2f23d290ac2ad475f88716f98eeb8b7c
Parents: dd3a54e 7bff988
Author: Stephen Mallette 
Authored: Thu Mar 8 08:08:40 2018 -0500
Committer: Stephen Mallette 
Committed: Thu Mar 8 08:08:40 2018 -0500

--
 CHANGELOG.asciidoc  |  1 +
 .../AbstractGraphSONTypeSerializer.java | 80 +---
 .../io/graphson/GraphSONTypeSerializerV2d0.java | 38 ++
 .../io/graphson/GraphSONTypeSerializerV3d0.java | 72 +++---
 .../GraphSONMapperPartialEmbeddedTypeTest.java  | 33 
 gremlin-shaded/pom.xml  |  2 +-
 6 files changed, 120 insertions(+), 106 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a3624f7e/CHANGELOG.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a3624f7e/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/AbstractGraphSONTypeSerializer.java
--
diff --cc 
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/AbstractGraphSONTypeSerializer.java
index 6eb65e1,000..fa90b2c
mode 100644,00..100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/AbstractGraphSONTypeSerializer.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/AbstractGraphSONTypeSerializer.java
@@@ -1,173 -1,0 +1,99 @@@
 +/*
 + * Licensed to the Apache Software Foundation (ASF) under one
 + * or more contributor license agreements.  See the NOTICE file
 + * distributed with this work for additional information
 + * regarding copyright ownership.  The ASF licenses this file
 + * to you under the Apache License, Version 2.0 (the
 + * "License"); you may not use this file except in compliance
 + * with the License.  You may obtain a copy of the License at
 + *
 + * http://www.apache.org/licenses/LICENSE-2.0
 + *
 + * Unless required by applicable law or agreed to in writing,
 + * software distributed under the License is distributed on an
 + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 + * KIND, either express or implied.  See the License for the
 + * specific language governing permissions and limitations
 + * under the License.
 + */
 +package org.apache.tinkerpop.gremlin.structure.io.graphson;
 +
 +import org.apache.tinkerpop.shaded.jackson.annotation.JsonTypeInfo;
 +import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
++import org.apache.tinkerpop.shaded.jackson.core.JsonToken;
++import org.apache.tinkerpop.shaded.jackson.core.type.WritableTypeId;
 +import org.apache.tinkerpop.shaded.jackson.databind.BeanProperty;
 +import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeIdResolver;
 +import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
 +
 +import java.io.IOException;
 +import java.util.HashMap;
 +import java.util.Map;
 +
 +/**
 + * Extension of the Jackson's default TypeSerializer. An instance of this 
object will be passed to the serializers
 + * on which they can safely call the utility methods to serialize types and 
making it compatible with the version
 + * 2.0+ of GraphSON.
 + *
 + * @author Kevin Gallardo (https://kgdo.me)
 + * @author Stephen Mallette (http://stephen.genoprime.com)
 + */
 +public abstract class AbstractGraphSONTypeSerializer extends TypeSerializer {
 +
 +protected final TypeIdResolver idRes;
 +protected final String propertyName;
 +protected final TypeInfo typeInfo;
 +protected final String valuePropertyName;
 +protected final Map classMap = new HashMap<>();
 +
 +AbstractGraphSONTypeSerializer(final TypeIdResolver idRes, final String 
propertyName, final TypeInfo typeInfo,
 +   final String valuePropertyName) {
 +this.idRes = idRes;
 +this.propertyName = propertyName;
 +this.typeInfo = typeInfo;
 +this.valuePropertyName = valuePropertyName;
 +}
 +
 +
 +@Override
 +public TypeSerializer forProperty(final BeanProperty beanProperty) {
 +return this;
 +}
 +
 +@Override

[3/3] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-02-28 Thread spmallette

Merge branch 'tp32' into tp33


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/e1d7f80b
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e1d7f80b
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/e1d7f80b

Branch: refs/heads/tp33
Commit: e1d7f80ba01b7ad186f23979d98c69cb559a24c1
Parents: 032124a d520516
Author: Stephen Mallette 
Authored: Wed Feb 28 15:40:37 2018 -0500
Committer: Stephen Mallette 
Committed: Wed Feb 28 15:40:37 2018 -0500

--
 CHANGELOG.asciidoc  |  1 +
 .../strategy/decoration/SubgraphStrategy.java   | 58 ++
 .../decoration/SubgraphStrategyProcessTest.java | 84 
 3 files changed, 127 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e1d7f80b/CHANGELOG.asciidoc
--

[3/3] tinkerpop git commit: Merge branch 'tp32'

2018-01-24 Thread spmallette

Merge branch 'tp32'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/2ea9a66a
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/2ea9a66a
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/2ea9a66a

Branch: refs/heads/master
Commit: 2ea9a66ac4bf3702f83c9cfeeeba97c6ecd81082
Parents: e533b79 389394c
Author: Stephen Mallette 
Authored: Wed Jan 24 17:06:38 2018 -0500
Committer: Stephen Mallette 
Committed: Wed Jan 24 17:06:38 2018 -0500

--
 CHANGELOG.asciidoc  |   3 +-
 .../traversal/TraversalVertexProgram.java   |  10 +-
 .../computer/traversal/WorkerExecutor.java  |  26 +--
 .../traverser/util/IndexedTraverserSet.java | 112 ++
 .../traversal/traverser/util/TraverserSet.java  |   3 +-
 .../traverser/util/VertexTraverserSet.java  |  71 ---
 .../gremlin/structure/io/gryo/GryoVersion.java  |   4 +-
 .../tinkerpop/gremlin/structure/util/Host.java  |  23 +++
 .../traverser/util/IndexedTraverserSetTest.java | 189 +
 .../util/TraverserSetImplementationTest.java| 207 +++
 .../process/traversal/step/map/ProgramTest.java |   8 +-
 11 files changed, 551 insertions(+), 105 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2ea9a66a/CHANGELOG.asciidoc
--
diff --cc CHANGELOG.asciidoc
index a681a57,7377d24..247d6de
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -273,9 -24,9 +273,10 @@@ image::https://raw.githubusercontent.co
  === TinkerPop 3.2.8 (Release Date: NOT OFFICIALLY RELEASED YET)
  
  * Delayed setting of the request identifier until `RequestMessage` 
construction by the builder.
 +* `ReferenceElement` avoids `UnsupportedOperationException` handling in 
construction thus improving performance.
  * Removed hardcoded expectation in metrics serialization test suite as 
different providers may have different outputs.
- * Added `VertexTraverserSet` which indexes on a `Vertex` thus improving 
performance in `VertexProgram` implementations.
+ * Added `IndexedTraverserSet` which indexes on the value of a `Traverser` 
thus improving performance when used.
+ * Utilized `IndexedTraverserSet` in `TraversalVertexProgram` to avoid extra 
iteration when doing `Vertex` lookups.
  * Fixed a bug in `ComputerAwareStep` that didn't handle `reset()` properly 
and thus occasionally produced some extra traversers.
  
  [[release-3-2-7]]

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2ea9a66a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
--
diff --cc 
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
index 984738c,6d5e99a..4fe68e3
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
@@@ -526,33 -307,8 +526,33 @@@ public enum GryoVersion 
  add(GryoTypeReg.of(RangeGlobalStep.RangeBiOperator.class, 114));
  add(GryoTypeReg.of(OrderGlobalStep.OrderBiOperator.class, 118, 
new JavaSerializer()));
  add(GryoTypeReg.of(ProfileStep.ProfileBiOperator.class, 119));
 +
 +add(GryoTypeReg.of(ConnectiveStrategy.class, 138));
 +add(GryoTypeReg.of(HaltedTraverserStrategy.class, 139));
 +add(GryoTypeReg.of(PartitionStrategy.class, 140, new 
JavaSerializer()));
 +add(GryoTypeReg.of(SubgraphStrategy.class, 141, new 
JavaSerializer()));
 +add(GryoTypeReg.of(VertexProgramStrategy.class, 142, new 
JavaSerializer()));
 +add(GryoTypeReg.of(MatchAlgorithmStrategy.class, 143));
 +add(GryoTypeReg.of(MatchStep.GreedyMatchAlgorithm.class, 144));
 +add(GryoTypeReg.of(AdjacentToIncidentStrategy.class, 145));
 +add(GryoTypeReg.of(FilterRankingStrategy.class, 146));
 +add(GryoTypeReg.of(IdentityRemovalStrategy.class, 147));
 +add(GryoTypeReg.of(IncidentToAdjacentStrategy.class, 148));
 +add(GryoTypeReg.of(InlineFilterStrategy.class, 149));
 +add(GryoTypeReg.of(LazyBarrierStrategy.class, 150));
 +add(GryoTypeReg.of(MatchPredicateStrategy.class, 151));
 +add(GryoTypeReg.of(OrderLimitStrategy.class, 152));
 +add(GryoTypeReg.of(PathProcessorStrategy.class, 153));
 +add(GryoTypeReg.of(PathRetractionStrategy.class, 154));
 +add(GryoTypeReg.of(CountStrategy.class, 155));
 +add(GryoTypeReg.of(RepeatUnrollStrategy.class, 156));
 +

[3/3] tinkerpop git commit: Merge branch 'tp32'

2018-01-20 Thread dkuppitz

Merge branch 'tp32'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/13a82956
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/13a82956
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/13a82956

Branch: refs/heads/master
Commit: 13a829569fc094f2d5b1771f4cbd0b8ff2ce36d3
Parents: 5d7bf84 dd83c78
Author: Daniel Kuppitz 
Authored: Sat Jan 20 18:10:49 2018 -0700
Committer: Daniel Kuppitz 
Committed: Sat Jan 20 18:10:49 2018 -0700

--
 CHANGELOG.asciidoc  |  1 +
 .../traversal/step/util/ComputerAwareStep.java  |  6 +
 .../traversal/util/DefaultTraversal.java|  1 +
 .../traversal/step/branch/UnionTest.java| 23 ++--
 4 files changed, 24 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/13a82956/CHANGELOG.asciidoc
--

[3/3] tinkerpop git commit: Merge branch 'tp32' of https://git-wip-us.apache.org/repos/asf/tinkerpop into tp32

2018-01-20 Thread dkuppitz

Merge branch 'tp32' of https://git-wip-us.apache.org/repos/asf/tinkerpop into 
tp32


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b889ca11
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b889ca11
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b889ca11

Branch: refs/heads/tp32
Commit: b889ca1110c78e5da0015a67b10912f4f83567a7
Parents: dd83c78 1f56cb5
Author: Daniel Kuppitz 
Authored: Sat Jan 20 18:11:19 2018 -0700
Committer: Daniel Kuppitz 
Committed: Sat Jan 20 18:11:19 2018 -0700

--
 docs/src/dev/io/graphson.asciidoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

[3/3] tinkerpop git commit: Merge branch 'tp32'

2018-01-08 Thread spmallette

Merge branch 'tp32'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/2f1a9d09
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/2f1a9d09
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/2f1a9d09

Branch: refs/heads/master
Commit: 2f1a9d09c4d41ad35e9c6fabdeec3c0db1a37e34
Parents: f20e2ed c4b0f9d
Author: Stephen Mallette 
Authored: Mon Jan 8 12:44:27 2018 -0500
Committer: Stephen Mallette 
Committed: Mon Jan 8 12:44:27 2018 -0500

--
 CHANGELOG.asciidoc   | 1 +
 .../apache/tinkerpop/gremlin/driver/message/RequestMessage.java  | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2f1a9d09/CHANGELOG.asciidoc
--

[3/3] tinkerpop git commit: Merge branch 'tp32'

2017-12-27 Thread rdale

Merge branch 'tp32'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/81302550
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/81302550
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/81302550

Branch: refs/heads/master
Commit: 81302550dbc763aa16888c1403e7f52b251b1ace
Parents: fdb7913 189953a
Author: Robert Dale 
Authored: Wed Dec 27 09:53:21 2017 -0500
Committer: Robert Dale 
Committed: Wed Dec 27 09:53:21 2017 -0500

--
 docker/build.sh | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)
--

[3/3] tinkerpop git commit: Merge branch 'tp32'

2017-12-21 Thread spmallette

Merge branch 'tp32'

Conflicts:
docs/preprocessor/preprocess.sh


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/fdb79134
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/fdb79134
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/fdb79134

Branch: refs/heads/master
Commit: fdb791343093deb4798963bbd6aff9903fe8b7a7
Parents: 8eb0aff e042879
Author: Stephen Mallette 
Authored: Thu Dec 21 07:29:03 2017 -0500
Committer: Stephen Mallette 
Committed: Thu Dec 21 07:29:03 2017 -0500

--
 docs/preprocessor/preprocess.sh | 2 +-
 docs/src/dev/developer/release.asciidoc | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fdb79134/docs/src/dev/developer/release.asciidoc
--

[3/3] tinkerpop git commit: Merge branch 'tp32'

2017-12-11 Thread spmallette

Merge branch 'tp32'

Conflicts:

gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1e7b33cd
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1e7b33cd
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1e7b33cd

Branch: refs/heads/master
Commit: 1e7b33cdbcae715c9c9fb323a6c03296797b22da
Parents: 6203e22 97e3d1c
Author: Stephen Mallette 
Authored: Mon Dec 11 13:00:38 2017 -0500
Committer: Stephen Mallette 
Committed: Mon Dec 11 13:00:38 2017 -0500

--
 CHANGELOG.asciidoc  |  1 +
 .../tinkerpop/gremlin/console/Console.groovy|  6 +-
 .../src/test/python/tests/test_console.py   | 68 
 3 files changed, 72 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1e7b33cd/CHANGELOG.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1e7b33cd/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
--
diff --cc 
gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
index c90a0ed,5eb5039..0c0229a
--- 
a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
+++ 
b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
@@@ -449,8 -472,14 +449,8 @@@ class Console 
  System.exit(0)
  }
  
- def scriptAndArgs = parseArgs(options.e ? "-e" : "-i", args, cli)
 -// need to do some up front processing to try to support 
"bin/gremlin.sh init.groovy" until this deprecated
 -// feature can be removed. ultimately this should be removed when a 
breaking change can go in
 -if (args.length == 1 && !args[0].startsWith("-")) {
 -new Console(io, [[args[0]]], true)
 -} else {
 -def scriptAndArgs = parseArgs(options.e ? ["-e", "--execute"] : 
["-i", "--interactive"], args, cli)
 -new Console(io, scriptAndArgs, !options.e)
 -}
++def scriptAndArgs = parseArgs(options.e ? ["-e", "--execute"] : 
["-i", "--interactive"], args, cli)
 +new Console(io, scriptAndArgs, !options.e)
  }
  
  /**

[3/3] tinkerpop git commit: Merge branch 'tp32'

2017-12-06 Thread rdale

Merge branch 'tp32'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/09fb4be0
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/09fb4be0
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/09fb4be0

Branch: refs/heads/master
Commit: 09fb4be0f0d078bf50ae12a2a5abb5e9e093b2c3
Parents: ed34c55 eb69fec
Author: Robert Dale 
Authored: Wed Dec 6 13:00:31 2017 -0500
Committer: Robert Dale 
Committed: Wed Dec 6 13:04:15 2017 -0500

--
 .../jython/gremlin_python/structure/io/graphsonV2d0.py|  3 +--
 .../jython/gremlin_python/structure/io/graphsonV3d0.py|  5 ++---
 .../main/jython/tests/structure/io/test_graphsonV2d0.py   | 10 --
 .../main/jython/tests/structure/io/test_graphsonV3d0.py   | 10 --
 4 files changed, 19 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/09fb4be0/gremlin-python/src/main/jython/gremlin_python/structure/io/graphsonV2d0.py
--
diff --cc 
gremlin-python/src/main/jython/gremlin_python/structure/io/graphsonV2d0.py
index c2510ce,000..d53a080
mode 100644,00..100644
--- a/gremlin-python/src/main/jython/gremlin_python/structure/io/graphsonV2d0.py
+++ b/gremlin-python/src/main/jython/gremlin_python/structure/io/graphsonV2d0.py
@@@ -1,470 -1,0 +1,469 @@@
 +'''
 +Licensed to the Apache Software Foundation (ASF) under one
 +or more contributor license agreements.  See the NOTICE file
 +distributed with this work for additional information
 +regarding copyright ownership.  The ASF licenses this file
 +to you under the Apache License, Version 2.0 (the
 +"License"); you may not use this file except in compliance
 +with the License.  You may obtain a copy of the License at
 +
 +http://www.apache.org/licenses/LICENSE-2.0
 +
 +Unless required by applicable law or agreed to in writing,
 +software distributed under the License is distributed on an
 +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 +KIND, either express or implied.  See the License for the
 +specific language governing permissions and limitations
 +under the License.
 +'''
 +import datetime
 +import json
 +import time
 +import uuid
 +from collections import OrderedDict
 +
 +import six
 +from aenum import Enum
 +
 +from gremlin_python import statics
 +from gremlin_python.statics import FloatType, FunctionType, IntType, 
LongType, TypeType
 +from gremlin_python.process.traversal import Binding, Bytecode, P, Traversal, 
Traverser, TraversalStrategy
 +from gremlin_python.structure.graph import Edge, Property, Vertex, 
VertexProperty, Path
 +
 +# When we fall back to a superclass's serializer, we iterate over this map.
 +# We want that iteration order to be consistent, so we use an OrderedDict,
 +# not a dict.
 +_serializers = OrderedDict()
 +_deserializers = {}
 +
 +
 +class GraphSONTypeType(type):
 +def __new__(mcs, name, bases, dct):
 +cls = super(GraphSONTypeType, mcs).__new__(mcs, name, bases, dct)
 +if not name.startswith('_'):
 +if cls.python_type:
 +_serializers[cls.python_type] = cls
 +if cls.graphson_type:
 +_deserializers[cls.graphson_type] = cls
 +return cls
 +
 +
 +class GraphSONUtil(object):
 +TYPE_KEY = "@type"
 +VALUE_KEY = "@value"
 +
 +@classmethod
 +def typedValue(cls, type_name, value, prefix="g"):
 +out = {cls.TYPE_KEY: cls.formatType(prefix, type_name)}
 +if value is not None:
 +out[cls.VALUE_KEY] = value
 +return out
 +
 +@classmethod
 +def formatType(cls, prefix, type_name):
 +return "%s:%s" % (prefix, type_name)
 +
 +
 +# Read/Write classes split to follow precedence of the Java API
 +class GraphSONWriter(object):
 +def __init__(self, serializer_map=None):
 +"""
 +:param serializer_map: map from Python type to serializer instance 
implementing `dictify`
 +"""
 +self.serializers = _serializers.copy()
 +if serializer_map:
 +self.serializers.update(serializer_map)
 +
 +def writeObject(self, objectData):
 +# to JSON
 +return json.dumps(self.toDict(objectData), separators=(',', ':'))
 +
 +def toDict(self, obj):
 +"""
 +Encodes python objects in GraphSON type-tagged dict values
 +"""
 +try:
 +return self.serializers[type(obj)].dictify(obj, self)
 +except KeyError:
 +for key, serializer in self.serializers.items():
 +if isinstance(obj, key):
 +return serializer.dictify(obj, self)
 +
 +# list and map are treated as normal json objs (could be isolated 
serializers)
 +if

[3/3] tinkerpop git commit: Merge branch 'tp32'

2017-12-05 Thread jorgebg

Merge branch 'tp32'

Conflicts:
gremlin-dotnet/glv/generate.groovy


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/19674097
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/19674097
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/19674097

Branch: refs/heads/master
Commit: 1967409791c7844b3da979ed5ec931234327e1fc
Parents: 1c041d1 b3adadc
Author: Jorge Bay Gondra 
Authored: Tue Dec 5 14:17:11 2017 +0100
Committer: Jorge Bay Gondra 
Committed: Tue Dec 5 14:17:11 2017 +0100

--
 .travis.yml |  2 +-
 gremlin-dotnet/glv/generate.groovy  | 58 +---
 .../Process/Traversal/GraphTraversal.cs |  4 +-
 .../src/Gremlin.Net/Process/Traversal/__.cs |  4 +-
 4 files changed, 44 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/19674097/gremlin-dotnet/glv/generate.groovy
--
diff --cc gremlin-dotnet/glv/generate.groovy
index 791654e,52ca165..9a731d3
--- a/gremlin-dotnet/glv/generate.groovy
+++ b/gremlin-dotnet/glv/generate.groovy
@@@ -25,9 -25,9 +25,10 @@@ import org.apache.tinkerpop.gremlin.pro
  import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__
  import org.apache.tinkerpop.gremlin.structure.Direction
  import java.lang.reflect.Modifier
+ import java.lang.reflect.TypeVariable
  
  def toCSharpTypeMap = ["Long": "long",
 +   "Double": "double",
 "Integer": "int",
 "String": "string",
 "boolean": "bool",
@@@ -221,12 -255,7 +241,12 @@@ def binding = ["pmethods": P.class.getM
  def t1 = toCSharpType(typeNames[0])
  def t2 = toCSharpType(typeNames[1])
  def tParam = getCSharpGenericTypeParam(t2)
 +def specificTypes = 
methodsWithSpecificTypes.get(javaMethod.name)
 +if (specificTypes) {
 +t2 = specificTypes[0]
 +tParam = specificTypes.size() > 1 ? "<" + 
specificTypes[1] + ">" : ""
 +}
- def parameters = getCSharpParamString(javaMethod)
+ def parameters = getCSharpParamString(javaMethod, 
true)
  def paramNames = 
getParamNames(javaMethod.parameters)
  return ["methodName": javaMethod.name, "t1":t1, 
"t2":t2, "tParam":tParam, "parameters":parameters, "paramNames":paramNames]
  },

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/19674097/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/19674097/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/__.cs
--

[3/3] tinkerpop git commit: Merge branch 'tp32'

2017-12-05 Thread jorgebg

Merge branch 'tp32'

Conflicts:

gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphSON/GraphSONReaderTests.cs

gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphSON/GraphSONWriterTests.cs


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1c041d1b
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1c041d1b
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1c041d1b

Branch: refs/heads/master
Commit: 1c041d1bbc8452c1a6b6e2aa266c345cfcb94dd6
Parents: fa0a0ee 7e17d4f
Author: Jorge Bay Gondra 
Authored: Tue Dec 5 14:06:04 2017 +0100
Committer: Jorge Bay Gondra 
Committed: Tue Dec 5 14:06:04 2017 +0100

--
 .../Structure/IO/GraphSON/DateDeserializer.cs   | 43 
 .../Structure/IO/GraphSON/DateSerializer.cs | 16 +---
 .../Structure/IO/GraphSON/GraphSONReader.cs |  4 +-
 .../Structure/IO/GraphSON/GraphSONWriter.cs |  2 +-
 .../IO/GraphSON/GraphSONReaderTests.cs  | 16 
 .../IO/GraphSON/GraphSONWriterTests.cs  |  6 +--
 .../Structure/IO/GraphSON/TestUtils.cs  |  8 ++--
 7 files changed, 28 insertions(+), 67 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1c041d1b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSONReader.cs
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1c041d1b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSONWriter.cs
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1c041d1b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphSON/GraphSONReaderTests.cs
--
diff --cc 
gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphSON/GraphSONReaderTests.cs
index e958e06,cb70530..3a2e21f
--- 
a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphSON/GraphSONReaderTests.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphSON/GraphSONReaderTests.cs
@@@ -92,23 -71,23 +92,23 @@@ namespace Gremlin.Net.UnitTest.Structur
  customSerializerMock.Verify(m => m.Objectify(It.IsAny(), 
It.IsAny()));
  }
  
 -[Fact]
 -public void ShouldDeserializeDateToDateTimeOffset()
 +[Theory, MemberData(nameof(Versions))]
- public void ShouldDeserializeDateToDateTime(int version)
++public void ShouldDeserializeDateToDateTimeOffset(int version)
  {
  var graphSon = "{\"@type\":\"g:Date\",\"@value\":1475583442552}";
 -var reader = CreateStandardGraphSONReader();
 +var reader = CreateStandardGraphSONReader(version);
  
- DateTime readDateTime = reader.ToObject(JObject.Parse(graphSon));
+ DateTimeOffset deserializedValue = 
reader.ToObject(JObject.Parse(graphSon));
  
- var expectedDateTime = TestUtils.FromJavaTime(1475583442552);
- Assert.Equal(expectedDateTime, readDateTime);
+ var expectedDateTimeOffset = 
TestUtils.FromJavaTime(1475583442552);
+ Assert.Equal(expectedDateTimeOffset, deserializedValue);
  }
  
 -[Fact]
 -public void ShouldDeserializeDictionary()
 +[Theory, MemberData(nameof(Versions))]
 +public void ShouldDeserializeDictionary(int version)
  {
  var serializedDict = 
"{\"age\":[{\"@type\":\"g:Int32\",\"@value\":29}],\"name\":[\"marko\"]}";
 -var reader = CreateStandardGraphSONReader();
 +var reader = CreateStandardGraphSONReader(version);
  
  var jObject = JObject.Parse(serializedDict);
  var deserializedDict = reader.ToObject(jObject);
@@@ -247,23 -210,23 +247,23 @@@
  Assert.Equal("y", edge.OutV.Id);
  }
  
 -[Fact]
 -public void ShouldDeserializeTimestampToDateTimeOffset()
 +[Theory, MemberData(nameof(Versions))]
- public void ShouldDeserializeTimestampToDateTime(int version)
++public void ShouldDeserializeTimestampToDateTimeOffset(int version)
  {
  var graphSon = 
"{\"@type\":\"g:Timestamp\",\"@value\":1475583442558}";
 -var reader = CreateStandardGraphSONReader();
 +var reader = CreateStandardGraphSONReader(version);
  
- DateTime readDateTime = reader.ToObject(JObject.Parse(graphSon));
+ DateTimeOffset deserializedValue = 
reader.ToObject(JObject.Parse(graphSon));
  
- var expectedDateTime = TestUtils.FromJavaTime(1475583442558);
- Assert.Equal(expectedDateTime, readDateTime);
+ var

[3/3] tinkerpop git commit: Merge branch 'tp32'

2017-12-04 Thread spmallette

Merge branch 'tp32'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/71f3f633
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/71f3f633
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/71f3f633

Branch: refs/heads/master
Commit: 71f3f633ab688fbff465e05d19f415f14c81b8db
Parents: f82e849 a883746
Author: Stephen Mallette 
Authored: Mon Dec 4 16:08:57 2017 -0500
Committer: Stephen Mallette 
Committed: Mon Dec 4 16:08:57 2017 -0500

--
 CHANGELOG.asciidoc| 1 +
 .../java/org/apache/tinkerpop/gremlin/util/function/Lambda.java   | 2 +-
 .../strategy/verification/LambdaRestrictionStrategyTest.java  | 3 +++
 3 files changed, 5 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/71f3f633/CHANGELOG.asciidoc
--

[3/3] tinkerpop git commit: Merge branch 'tp32'

2017-12-01 Thread spmallette

Merge branch 'tp32'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/5bec4d23
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5bec4d23
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/5bec4d23

Branch: refs/heads/master
Commit: 5bec4d2340c6756d97e113794ece5cdce500a058
Parents: 8605f5a f015341
Author: Stephen Mallette 
Authored: Fri Dec 1 14:26:55 2017 -0500
Committer: Stephen Mallette 
Committed: Fri Dec 1 14:26:55 2017 -0500

--
 docs/src/dev/provider/index.asciidoc |  4 ++--
 docs/src/reference/gremlin-variants.asciidoc | 28 +++
 2 files changed, 16 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5bec4d23/docs/src/dev/provider/index.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5bec4d23/docs/src/reference/gremlin-variants.asciidoc
--

[3/3] tinkerpop git commit: Merge branch 'tp32'

2017-11-30 Thread jorgebg

Merge branch 'tp32'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/347373bd
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/347373bd
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/347373bd

Branch: refs/heads/master
Commit: 347373bd6bc446f9b97284b0414b5885f436cd38
Parents: 56f10c2 fe7b175
Author: Jorge Bay Gondra 
Authored: Thu Nov 30 09:53:44 2017 +0100
Committer: Jorge Bay Gondra 
Committed: Thu Nov 30 09:53:44 2017 +0100

--
 .../Process/Traversal/DefaultTraversal.cs   | 57 +++-
 .../GraphTraversalTests.cs  | 46 
 2 files changed, 101 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/347373bd/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Traversal/DriverRemoteConnection/GraphTraversalTests.cs
--

[3/3] tinkerpop git commit: Merge branch 'tp32'

2017-11-22 Thread jorgebg

Merge branch 'tp32'

Conflicts:
.travis.yml


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/7ded72b2
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/7ded72b2
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/7ded72b2

Branch: refs/heads/master
Commit: 7ded72b2bba83c886c6d19fa1f60051dcc646c0d
Parents: 875e665 76c42fa
Author: Jorge Bay Gondra 
Authored: Wed Nov 22 09:55:52 2017 +0100
Committer: Jorge Bay Gondra 
Committed: Wed Nov 22 09:55:52 2017 +0100

--
 .travis.yml | 29 +
 1 file changed, 5 insertions(+), 24 deletions(-)
--

[3/3] tinkerpop git commit: Merge branch 'tp32'

2017-11-15 Thread spmallette

Merge branch 'tp32'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/d6f031f2
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d6f031f2
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d6f031f2

Branch: refs/heads/master
Commit: d6f031f2505f1c4daf3ed2c9d7f464ee1f3e6dc8
Parents: c05948a ca21532
Author: Stephen Mallette 
Authored: Wed Nov 15 07:31:30 2017 -0500
Committer: Stephen Mallette 
Committed: Wed Nov 15 07:31:30 2017 -0500

--
 CHANGELOG.asciidoc  |1 +
 docs/src/reference/the-traversal.asciidoc   |   12 +
 .../upgrade/release-3.2.x-incubating.asciidoc   |   10 +
 .../process/traversal/step/filter/DropStep.java |   13 +-
 .../process/traversal/step/map/AddEdgeStep.java |4 +-
 .../traversal/step/map/AddVertexStartStep.java  |4 +-
 .../traversal/step/map/AddVertexStep.java   |4 +-
 .../step/sideEffect/AddPropertyStep.java|   21 +-
 .../strategy/decoration/EventStrategy.java  |   68 ++
 .../util/reference/ReferenceProperty.java   |2 +-
 .../util/reference/ReferenceVertexProperty.java |2 +-
 .../decoration/EventStrategyProcessTest.java| 1046 +-
 12 files changed, 1165 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d6f031f2/CHANGELOG.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d6f031f2/docs/src/reference/the-traversal.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d6f031f2/docs/src/upgrade/release-3.2.x-incubating.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d6f031f2/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeStep.java
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d6f031f2/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddVertexStartStep.java
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d6f031f2/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddVertexStep.java
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d6f031f2/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/reference/ReferenceVertexProperty.java
--

[3/3] tinkerpop git commit: Merge branch 'tp32'

2017-11-14 Thread okram

Merge branch 'tp32'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/c05948af
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c05948af
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c05948af

Branch: refs/heads/master
Commit: c05948afc9447eed751653b9ad412563beada84e
Parents: 6e78d5a f3458ee
Author: Marko A. Rodriguez 
Authored: Tue Nov 14 10:10:12 2017 -0700
Committer: Marko A. Rodriguez 
Committed: Tue Nov 14 10:10:12 2017 -0700

--
 .../process/traversal/step/sideEffect/SubgraphTest.java | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)
--

[3/3] tinkerpop git commit: Merge branch 'tp32'

2017-11-13 Thread mp

Merge branch 'tp32'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/6e78d5a2
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/6e78d5a2
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/6e78d5a2

Branch: refs/heads/master
Commit: 6e78d5a2b3d625c54ef212fc55830a364b044321
Parents: fd6adce fd6f6b4
Author: Michael Pollmeier 
Authored: Tue Nov 14 14:25:19 2017 +1300
Committer: Michael Pollmeier 
Committed: Tue Nov 14 14:25:19 2017 +1300

--
 CHANGELOG.asciidoc   |  1 +
 .../gremlin/tinkergraph/structure/TinkerIndex.java   | 11 +--
 2 files changed, 6 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6e78d5a2/CHANGELOG.asciidoc
--

[3/3] tinkerpop git commit: Merge branch 'tp32'

2017-11-09 Thread okram

Merge branch 'tp32'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/fd6adce2
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/fd6adce2
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/fd6adce2

Branch: refs/heads/master
Commit: fd6adce21489603827bed563e81a6f4530d6
Parents: 500c243 ac99e3c
Author: Marko A. Rodriguez 
Authored: Thu Nov 9 10:34:50 2017 -0700
Committer: Marko A. Rodriguez 
Committed: Thu Nov 9 10:34:50 2017 -0700

--
 .../process/traversal/CoreTraversalTest.java| 41 
 .../process/traversal/step/map/AddEdgeTest.java | 45 +++--
 .../PartitionStrategyProcessTest.java   | 66 ++--
 3 files changed, 54 insertions(+), 98 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fd6adce2/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/CoreTraversalTest.java
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fd6adce2/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeTest.java
--

[3/3] tinkerpop git commit: Merge branch 'tp32'

2017-11-07 Thread okram

Merge branch 'tp32'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/500c2435
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/500c2435
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/500c2435

Branch: refs/heads/master
Commit: 500c2435e5da4bdea3d0ae599bd60cd4930cb9eb
Parents: 7057d5f e1e7632
Author: Marko A. Rodriguez 
Authored: Tue Nov 7 12:17:49 2017 -0700
Committer: Marko A. Rodriguez 
Committed: Tue Nov 7 12:17:49 2017 -0700

--
 CHANGELOG.asciidoc  |  3 +-
 .../process/traversal/step/map/GraphStep.java   | 15 +++--
 .../traversal/step/util/HasContainer.java   | 17 --
 .../process/traversal/step/filter/HasTest.java  | 63 +++-
 .../step/sideEffect/Neo4jGraphStep.java |  4 ++
 .../step/sideEffect/TinkerGraphStep.java|  8 ++-
 6 files changed, 95 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/500c2435/CHANGELOG.asciidoc
--

[3/3] tinkerpop git commit: Merge branch 'tp32'

2017-11-02 Thread spmallette

Merge branch 'tp32'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/47b02d2a
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/47b02d2a
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/47b02d2a

Branch: refs/heads/master
Commit: 47b02d2a0e90e88f2554c5882473722aa68b2667
Parents: 04cdd75 44f0a33
Author: Stephen Mallette 
Authored: Thu Nov 2 13:12:39 2017 -0400
Committer: Stephen Mallette 
Committed: Thu Nov 2 13:12:39 2017 -0400

--
 NOTICE | 2 +-
 gremlin-console/src/main/static/NOTICE | 2 +-
 gremlin-server/src/main/static/NOTICE  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/47b02d2a/NOTICE
--

[3/3] tinkerpop git commit: Merge branch 'tp32'

2017-10-26 Thread spmallette

Merge branch 'tp32'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ecd45d53
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ecd45d53
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ecd45d53

Branch: refs/heads/master
Commit: ecd45d53add1f393e0f47e59d55065a74f52e5e3
Parents: 42b44f1 d459c6a
Author: Stephen Mallette 
Authored: Thu Oct 26 06:46:53 2017 -0400
Committer: Stephen Mallette 
Committed: Thu Oct 26 06:46:53 2017 -0400

--
 CHANGELOG.asciidoc  |  1 +
 .../upgrade/release-3.2.x-incubating.asciidoc   | 11 +
 .../bulkloading/BulkLoaderVertexProgram.java|  8 +++-
 .../util/event/ConsoleMutationListener.java |  5 +++
 .../traversal/step/util/event/Event.java|  2 +-
 .../step/util/event/MutationListener.java   | 11 -
 .../decoration/EventStrategyProcessTest.java| 44 +++-
 7 files changed, 78 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ecd45d53/CHANGELOG.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ecd45d53/docs/src/upgrade/release-3.2.x-incubating.asciidoc
--

[3/3] tinkerpop git commit: Merge branch 'tp32'

2017-10-19 Thread okram

Merge branch 'tp32'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/c12f45ca
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c12f45ca
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c12f45ca

Branch: refs/heads/master
Commit: c12f45ca9819b50af4dd993d41b16db782fc6c0f
Parents: 66a7856 ff49cbe
Author: Marko A. Rodriguez 
Authored: Thu Oct 19 11:37:18 2017 -0600
Committer: Marko A. Rodriguez 
Committed: Thu Oct 19 11:37:18 2017 -0600

--
 CHANGELOG.asciidoc  |  2 ++
 .../traversal/step/sideEffect/StartStep.java|  7 -
 .../step/sideEffect/InjectStepTest.java |  5 +++-
 .../gremlin/groovy/jsr223/GroovyTranslator.java | 31 ++--
 .../gremlin/python/jsr223/PythonTranslator.java | 22 +++---
 .../driver/test_driver_remote_connection.py | 12 ++--
 .../traversal/step/sideEffect/InjectTest.java   | 16 +-
 7 files changed, 70 insertions(+), 25 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c12f45ca/CHANGELOG.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c12f45ca/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GroovyTranslator.java
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c12f45ca/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/PythonTranslator.java
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c12f45ca/gremlin-python/src/main/jython/tests/driver/test_driver_remote_connection.py
--

[3/3] tinkerpop git commit: Merge branch 'tp32'

2017-10-12 Thread spmallette

Merge branch 'tp32'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/28c3040b
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/28c3040b
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/28c3040b

Branch: refs/heads/master
Commit: 28c3040b208606af9dee3fd7471625c5d03dff59
Parents: 99d0814 5e4ae46
Author: Stephen Mallette 
Authored: Thu Oct 12 21:06:23 2017 -0400
Committer: Stephen Mallette 
Committed: Thu Oct 12 21:06:23 2017 -0400

--
 gremlin-python/src/main/jython/setup.py | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--

[3/3] tinkerpop git commit: Merge branch 'tp32'

2017-10-12 Thread spmallette

Merge branch 'tp32'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/3181288d
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/3181288d
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/3181288d

Branch: refs/heads/master
Commit: 3181288dcbe2f02a739fb572827ddaf0f91ce441
Parents: 7e3d390 021db56
Author: Stephen Mallette 
Authored: Thu Oct 12 12:47:02 2017 -0400
Committer: Stephen Mallette 
Committed: Thu Oct 12 12:47:02 2017 -0400

--
 CHANGELOG.asciidoc|  3 ++-
 .../gremlin/groovy/engine/GremlinExecutor.java| 14 +-
 .../gremlin/groovy/engine/GremlinExecutorTest.java| 13 +
 3 files changed, 28 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3181288d/CHANGELOG.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3181288d/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutor.java
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3181288d/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutorTest.java
--

[3/3] tinkerpop git commit: Merge branch 'tp32'

2017-10-11 Thread twilmes

Merge branch 'tp32'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/7e3d390b
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/7e3d390b
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/7e3d390b

Branch: refs/heads/master
Commit: 7e3d390bb4b73d69a7080e8f95e3c6e12b6d4168
Parents: 08daa23 1fa01ef
Author: Ted Wilmes 
Authored: Wed Oct 11 14:20:19 2017 -0500
Committer: Ted Wilmes 
Committed: Wed Oct 11 14:20:19 2017 -0500

--
 CHANGELOG.asciidoc| 1 +
 .../gremlin/process/traversal/step/PathProcessor.java | 2 +-
 .../process/traversal/step/filter/DedupGlobalStep.java| 4 ++--
 .../gremlin/process/traversal/step/filter/PathFilterStep.java | 5 +++--
 .../process/traversal/step/filter/WherePredicateStep.java | 4 ++--
 .../process/traversal/step/filter/WhereTraversalStep.java | 2 +-
 .../gremlin/process/traversal/step/map/MatchStep.java | 4 ++--
 .../gremlin/process/traversal/step/map/PathStep.java  | 5 +++--
 .../gremlin/process/traversal/step/map/SelectOneStep.java | 5 +++--
 .../gremlin/process/traversal/step/map/SelectStep.java| 4 ++--
 .../gremlin/process/traversal/step/map/TreeStep.java  | 5 +++--
 .../process/traversal/step/sideEffect/TreeSideEffectStep.java | 5 +++--
 .../strategy/optimization/PathRetractionStrategy.java | 7 ---
 .../strategy/optimization/PathRetractionStrategyTest.java | 6 +-
 14 files changed, 35 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e3d390b/CHANGELOG.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e3d390b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectOneStep.java
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7e3d390b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/PathRetractionStrategyTest.java
--
diff --cc 
gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/PathRetractionStrategyTest.java
index 99a66d8,67264ae..240ff1a
--- 
a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/PathRetractionStrategyTest.java
+++ 
b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/PathRetractionStrategyTest.java
@@@ -207,10 -208,13 +208,13 @@@ public class PathRetractionStrategyTes
  "[[[z, seen]], [[z, seen]]]", null},
  {__.V().as("a").optional(bothE().dedup().as("b")).
  choose(select("b"), select("a","b"), 
project("a").by(select("a"))),
 -"[[[a, b]], [[a, b]], [[a, b]], [[[a, b]]], [[a, 
b]]]", null},
 +"[[[a, b]], [[a, b]], [[[a, b]]], [[a, b]]]", null},
  
{__.V().as("a").out().where(neq("a")).program(labeledPathVertexProgram), 
PATH_RETRACTION_STRATEGY_DISABLED, null},
  
{__.V().as("a").out().where(neq("a")).program(pathVertexProgram).select("a"), 
PATH_RETRACTION_STRATEGY_DISABLED, null},
- 
{__.V().as("a").out().program(emptyRequirementsVertexProgram).select("a"), 
"[[]]", null}
+ 
{__.V().as("a").out().program(emptyRequirementsVertexProgram).select("a"), 
"[[]]", null},
+ 
{__.V().as("a").out().as("b").where(__.as("b").in().count().is(eq(3)).or().where(
+ __.as("b").out("created").and().as("b").has(T.label, 
"person"))).select("a", "b"),
+ "[[a, b], [[[a, b]]], []]", null}
  });
  }
  }

[3/3] tinkerpop git commit: Merge branch 'tp32'

2017-10-10 Thread rdale

Merge branch 'tp32'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/08daa23d
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/08daa23d
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/08daa23d

Branch: refs/heads/master
Commit: 08daa23d8b4b4d245fc495ad6b02f73c65517383
Parents: 9aaf49e dd48dcc
Author: Robert Dale 
Authored: Tue Oct 10 13:01:03 2017 -0400
Committer: Robert Dale 
Committed: Tue Oct 10 13:01:03 2017 -0400

--
 .../org/apache/tinkerpop/gremlin/driver/Settings.java |  9 +
 .../org/apache/tinkerpop/gremlin/driver/SettingsTest.java | 10 --
 2 files changed, 17 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/08daa23d/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Settings.java
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/08daa23d/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/SettingsTest.java
--

[3/3] tinkerpop git commit: Merge branch 'tp32'

2017-10-04 Thread okram

Merge branch 'tp32'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/9aaf49e3
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/9aaf49e3
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/9aaf49e3

Branch: refs/heads/master
Commit: 9aaf49e3eeefd1d3373765f6f0e6fe0005ea6b97
Parents: e215401 a278edd
Author: Marko A. Rodriguez 
Authored: Wed Oct 4 07:58:59 2017 -0600
Committer: Marko A. Rodriguez 
Committed: Wed Oct 4 07:58:59 2017 -0600

--
 CHANGELOG.asciidoc|  1 +
 .../verification/LambdaRestrictionStrategy.java   | 14 +++---
 .../verification/LambdaRestrictionStrategyTest.java   |  6 ++
 3 files changed, 14 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9aaf49e3/CHANGELOG.asciidoc
--

[3/3] tinkerpop git commit: Merge branch 'tp32'

2017-09-29 Thread spmallette

Merge branch 'tp32'

Conflicts:

gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutor.java

gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/ScriptEngines.java


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/87bf0c62
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/87bf0c62
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/87bf0c62

Branch: refs/heads/master
Commit: 87bf0c62ccd30c00aeb8be8306b323ea3ee514c3
Parents: 4c99e53 29b6268
Author: Stephen Mallette 
Authored: Fri Sep 29 07:20:44 2017 -0400
Committer: Stephen Mallette 
Committed: Fri Sep 29 07:20:44 2017 -0400

--
 CHANGELOG.asciidoc  |   2 +
 .../gremlin/jsr223/GremlinScriptEngine.java |  35 +-
 .../gremlin/groovy/engine/GremlinExecutor.java  |   7 +-
 .../jsr223/GremlinGroovyScriptEngine.java   |  33 --
 .../groovy/jsr223/GroovyTranslatorTest.java |   6 +-
 .../jsr223/GremlinJythonScriptEngine.java   |  34 --
 .../op/traversal/TraversalOpProcessor.java  |  13 +--
 .../jsr223/GremlinEnabledScriptEngineTest.java  | 117 +++
 .../gremlin/jsr223/MockGremlinScriptEngine.java |   6 +-
 9 files changed, 215 insertions(+), 38 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87bf0c62/CHANGELOG.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87bf0c62/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutor.java
--
diff --cc 
gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutor.java
index c520751,945719a..cf41b74
--- 
a/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutor.java
+++ 
b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutor.java
@@@ -317,15 -345,47 +317,18 @@@ public class GremlinExecutor implement
  
  /**
   * Evaluates bytecode with bindings for a specific language into a {@link 
Traversal}.
+  *
+  * @deprecated As of release 3.2.7, replaced by {@link #eval(Bytecode, 
Bindings, String, String)}
   */
- public Traversal.Admin eval(final Bytecode bytecode, final Bindings 
boundVars, final String language) throws ScriptException {
+ @Deprecated
 -public Traversal.Admin eval(final Bytecode bytecode, final Bindings 
boundVars, final String language) throws ScriptException {
 -final String lang = 
Optional.ofNullable(language).orElse("gremlin-groovy");
 -
 -final Bindings bindings = new SimpleBindings();
 -bindings.putAll(globalBindings);
 -bindings.putAll(boundVars);
 -
 -return useGremlinScriptEngineManager ?
 -
gremlinScriptEngineManager.getEngineByName(lang).eval(bytecode, bindings) : 
scriptEngines.eval(bytecode, bindings, lang);
 -}
 -
 -/**
 - * Evaluates bytecode with bindings for a specific language into a {@link 
Traversal}.
 - *
 - * @param bytecode to execute as a traversal
 - * @param boundVars local bindings
 - * @param language the scripting language to use to process the bytecode
 - * @param traversalSource the specific traversal source to execute the 
bytecode against
 - */
+ public Traversal.Admin eval(final Bytecode bytecode, final Bindings 
boundVars, final String language, final String traversalSource) throws 
ScriptException {
  final String lang = 
Optional.ofNullable(language).orElse("gremlin-groovy");
  
  final Bindings bindings = new SimpleBindings();
  bindings.putAll(globalBindings);
  bindings.putAll(boundVars);
  
- return 
gremlinScriptEngineManager.getEngineByName(lang).eval(bytecode, bindings);
 -return useGremlinScriptEngineManager ?
 -
gremlinScriptEngineManager.getEngineByName(lang).eval(bytecode, bindings, 
traversalSource) :
 -scriptEngines.eval(bytecode, bindings, lang, traversalSource);
 -}
 -
 -/**
 - * @deprecated As of release 3.2.4, replaced by {@link 
#getScriptEngineManager()}.
 - */
 -@Deprecated
 -public ScriptEngines getScriptEngines() {
 -return this.scriptEngines;
++return 
gremlinScriptEngineManager.getEngineByName(lang).eval(bytecode, bindings, 
traversalSource);
  }
  
  public GremlinScriptEngineManager getScriptEngineManager() {

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87bf0c62/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngine.java

[3/3] tinkerpop git commit: Merge branch 'tp32'

2017-09-22 Thread spmallette

Merge branch 'tp32'

Conflicts:

gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/groovy/plugin/DriverRemoteAcceptor.java

gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/groovy/plugin/DriverRemoteAcceptorIntegrateTest.java


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/63036540
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/63036540
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/63036540

Branch: refs/heads/master
Commit: 630365405176a9317b38aa81e185bd781b132602
Parents: a619eb9 a13f922
Author: Stephen Mallette 
Authored: Fri Sep 22 13:30:33 2017 -0400
Committer: Stephen Mallette 
Committed: Fri Sep 22 13:30:33 2017 -0400

--
 CHANGELOG.asciidoc  |  1 +
 docs/src/reference/gremlin-applications.asciidoc|  9 +
 docs/src/upgrade/release-3.2.x-incubating.asciidoc  | 15 +++
 .../console/jsr223/DriverRemoteAcceptor.java| 16 ++--
 .../jsr223/DriverRemoteAcceptorIntegrateTest.java   |  9 -
 5 files changed, 47 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/63036540/CHANGELOG.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/63036540/docs/src/reference/gremlin-applications.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/63036540/docs/src/upgrade/release-3.2.x-incubating.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/63036540/gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverRemoteAcceptor.java
--

[3/3] tinkerpop git commit: Merge branch 'tp32'

2017-09-19 Thread spmallette

Merge branch 'tp32'

Conflicts:
gremlin-server/src/test/scripts/test-server-start.groovy


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/28e23286
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/28e23286
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/28e23286

Branch: refs/heads/master
Commit: 28e23286740cde935da7b5ba2989cc7d1f8f646c
Parents: 0f6a32c 97aef32
Author: Stephen Mallette 
Authored: Tue Sep 19 11:49:52 2017 -0400
Committer: Stephen Mallette 
Committed: Tue Sep 19 11:49:52 2017 -0400

--
 .../tinkerpop/gremlin/jsr223/CoreImports.java  |  3 +++
 gremlin-dotnet/test/pom.xml|  4 
 gremlin-python/pom.xml |  4 
 gremlin-server/src/test/scripts/README.asciidoc| 17 +
 .../src/test/scripts/test-server-start.groovy  |  6 +++---
 5 files changed, 31 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/28e23286/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/CoreImports.java
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/28e23286/gremlin-dotnet/test/pom.xml
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/28e23286/gremlin-python/pom.xml
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/28e23286/gremlin-server/src/test/scripts/test-server-start.groovy
--
diff --cc gremlin-server/src/test/scripts/test-server-start.groovy
index 76bd8ff,8ea08a9..c187752
--- a/gremlin-server/src/test/scripts/test-server-start.groovy
+++ b/gremlin-server/src/test/scripts/test-server-start.groovy
@@@ -19,15 -19,14 +19,15 @@@
  
  import org.apache.tinkerpop.gremlin.server.GremlinServer
  import org.apache.tinkerpop.gremlin.server.Settings
- import org.apache.tinkerpop.gremlin.server.Settings.SerializerSettings
  
 -import org.apache.tinkerpop.gremlin.server.auth.SimpleAuthenticator
++import org.apache.tinkerpop.gremlin.server.Settings.SerializerSettings
  
  if (Boolean.parseBoolean(skipTests)) return
  
  log.info("Starting Gremlin Server instances for native testing of 
${executionName}")
- def settings = 
Settings.read("${gremlinServerDir}/conf/gremlin-server-modern-py.yaml")
+ def settings = Settings.read("${settingsFile}")
  settings.graphs.graph = gremlinServerDir + 
"/conf/tinkergraph-empty.properties"
 -settings.scriptEngines["gremlin-groovy"].scripts = [gremlinServerDir + 
"/scripts/generate-modern.groovy"]
 
+settings.scriptEngines["gremlin-groovy"].plugins["org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin"].files
 = [gremlinServerDir + "/scripts/generate-modern.groovy"]
 +settings.serializers << new 
SerializerSettings("org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0",
 [:])
  settings.port = 45940
  
  def server = new GremlinServer(settings)
@@@ -36,22 -35,12 +36,22 @@@ server.start().join(
  project.setContextValue("gremlin.server", server)
  log.info("Gremlin Server with no authentication started on port 45940")
  
 +def securePropsFile = new 
File("${projectBaseDir}/target/tinkergraph-credentials.properties")
 +if (!securePropsFile.exists()) {
 +securePropsFile.createNewFile()
 +securePropsFile << 
"gremlin.graph=org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph\n"
 +securePropsFile << "gremlin.tinkergraph.vertexIdManager=LONG\n"
 +securePropsFile << 
"gremlin.tinkergraph.graphLocation=${gremlinServerDir}/data/credentials.kryo\n"
 +securePropsFile << "gremlin.tinkergraph.graphFormat=gryo"
 +}
 +
- def settingsSecure = 
Settings.read("${gremlinServerDir}/conf/gremlin-server-modern.yaml")
+ def settingsSecure = Settings.read("${settingsFile}")
  settingsSecure.graphs.graph = gremlinServerDir + 
"/conf/tinkergraph-empty.properties"
 -settingsSecure.scriptEngines["gremlin-groovy"].scripts = [gremlinServerDir + 
"/scripts/generate-modern.groovy"]
 
+settingsSecure.scriptEngines["gremlin-groovy"].plugins["org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin"].files
 = [gremlinServerDir + "/scripts/generate-modern.groovy"]
 +settingsSecure.serializers << new 
SerializerSettings("org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0",
 [:])
  settingsSecure.port = 45941
 -settingsSecure.authentication.className = SimpleAuthenticator.class.name
 -settingsSecure.authentication.config = [credentialsDb: gremlinServerDir + 
"/conf/tinkergraph-credentials.properties",

[3/3] tinkerpop git commit: Merge branch 'tp32'

2017-09-13 Thread spmallette

Merge branch 'tp32'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/e8230c68
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e8230c68
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/e8230c68

Branch: refs/heads/master
Commit: e8230c68ff88221cbddca0b8f542c6fc1dfc2e57
Parents: cc964e0 736cb26
Author: Stephen Mallette 
Authored: Wed Sep 13 11:16:46 2017 -0400
Committer: Stephen Mallette 
Committed: Wed Sep 13 11:16:46 2017 -0400

--
 docs/src/recipes/appendix.asciidoc | 59 +
 1 file changed, 59 insertions(+)
--

[3/3] tinkerpop git commit: Merge branch 'tp32'

2017-08-28 Thread okram

Merge branch 'tp32'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/8340ca7c
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8340ca7c
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/8340ca7c

Branch: refs/heads/master
Commit: 8340ca7c593f741cad8fc75eb5ad416b1eba2384
Parents: d06967b 6d34054
Author: Marko A. Rodriguez 
Authored: Mon Aug 28 17:31:11 2017 -0600
Committer: Marko A. Rodriguez 
Committed: Mon Aug 28 17:31:11 2017 -0600

--
 .../traversal/step/branch/RepeatTest.java   | 27 ++--
 1 file changed, 25 insertions(+), 2 deletions(-)
--

[3/3] tinkerpop git commit: Merge branch 'tp32'

2017-08-21 Thread spmallette

Merge branch 'tp32'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/3008e734
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/3008e734
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/3008e734

Branch: refs/heads/master
Commit: 3008e734f06d88ea72b6744f2b07b2d89e2decc5
Parents: b64d4e3 23a0885
Author: Stephen Mallette 
Authored: Mon Aug 21 13:03:39 2017 -0400
Committer: Stephen Mallette 
Committed: Mon Aug 21 13:03:39 2017 -0400

--
 CHANGELOG.asciidoc  | 38 ++--
 docs/src/dev/developer/release.asciidoc |  6 +++--
 2 files changed, 40 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3008e734/CHANGELOG.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3008e734/docs/src/dev/developer/release.asciidoc
--

[3/3] tinkerpop git commit: Merge branch 'tp32'

2017-08-21 Thread twilmes

Merge branch 'tp32'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b64d4e34
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b64d4e34
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b64d4e34

Branch: refs/heads/master
Commit: b64d4e34df3299c58eeded84ba00d6ed98729a26
Parents: 9287d01 5357bf6
Author: Ted Wilmes 
Authored: Mon Aug 21 11:44:23 2017 -0500
Committer: Ted Wilmes 
Committed: Mon Aug 21 11:44:23 2017 -0500

--
 CHANGELOG.asciidoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b64d4e34/CHANGELOG.asciidoc
--

[3/3] tinkerpop git commit: Merge branch 'tp32'

2017-08-18 Thread spmallette

Merge branch 'tp32'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/6e6b1a40
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/6e6b1a40
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/6e6b1a40

Branch: refs/heads/master
Commit: 6e6b1a4027d2129094359019461cfe5c02d5b078
Parents: c04f191 fa2eebc
Author: Stephen Mallette 
Authored: Fri Aug 18 22:22:50 2017 -0400
Committer: Stephen Mallette 
Committed: Fri Aug 18 22:22:50 2017 -0400

--
 .../gremlin/hadoop/structure/io/script/ScriptRecordReader.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6e6b1a40/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/script/ScriptRecordReader.java
--
diff --cc 
hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/script/ScriptRecordReader.java
index 7dd4e2b,f119baf..16bc057
--- 
a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/script/ScriptRecordReader.java
+++ 
b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/script/ScriptRecordReader.java
@@@ -84,10 -87,10 +84,10 @@@ public final class ScriptRecordReader e
  final FileSystem fs = FileSystem.get(configuration);
  try (final InputStream stream = fs.open(new 
Path(configuration.get(SCRIPT_FILE)));
   final InputStreamReader reader = new InputStreamReader(stream)) {
 -this.parse = String.join("\n", IOUtils.toString(reader), 
READ_CALL);
 -script = ((Compilable) engine).compile(this.parse);
 +final String parse = String.join("\n", IOUtils.toString(reader), 
READ_CALL);
 +script = ((Compilable) engine).compile(parse);
  } catch (ScriptException e) {
- throw new IOException(e.getMessage(), e);
+ throw new IOException(e.getMessage());
  }
  }

[3/3] tinkerpop git commit: Merge branch 'tp32'

2017-08-08 Thread spmallette

Merge branch 'tp32'

Conflicts:

gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovySackTest.groovy


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/5f865270
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5f865270
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/5f865270

Branch: refs/heads/master
Commit: 5f865270c07f8996f0ac38ca1726e24ca9cecf79
Parents: 122a460 51caf77
Author: Stephen Mallette 
Authored: Tue Aug 8 17:13:39 2017 -0400
Committer: Stephen Mallette 
Committed: Tue Aug 8 17:13:39 2017 -0400

--
 .../structure/io/graphson/GraphSONModule.java   |  4 +-
 .../io/graphson/GraphSONSerializersV2d0.java| 10 +--
 .../step/sideEffect/GroovySackTest.groovy   | 89 
 3 files changed, 96 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5f865270/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5f865270/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV2d0.java
--
diff --cc 
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV2d0.java
index 717dcfa,2ddb37a..6221e05
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV2d0.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV2d0.java
@@@ -703,4 -703,7 +703,4 @@@ class GraphSONSerializersV2d0 
  return true;
  }
  }
- }
+ }
 -
 -
 -

[3/3] tinkerpop git commit: Merge branch 'tp32'

2017-07-26 Thread dkuppitz

Merge branch 'tp32'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/3a4406a5
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/3a4406a5
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/3a4406a5

Branch: refs/heads/master
Commit: 3a4406a5da4676cd59238eeb9209e48ebe2ed26b
Parents: fcd623c d92dd5d
Author: Daniel Kuppitz 
Authored: Wed Jul 26 15:10:34 2017 +0200
Committer: Daniel Kuppitz 
Committed: Wed Jul 26 15:10:34 2017 +0200

--
 CHANGELOG.asciidoc  |  6 +
 .../tinkerpop/gremlin/util/NumberHelper.java| 16 +-
 .../traversal/step/sideEffect/SackTest.java | 23 +++-
 3 files changed, 43 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3a4406a5/CHANGELOG.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3a4406a5/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/NumberHelper.java
--
diff --cc 
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/NumberHelper.java
index 95ab189,000..b560df3
mode 100644,00..100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/NumberHelper.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/NumberHelper.java
@@@ -1,280 -1,0 +1,294 @@@
 +/*
 + * Licensed to the Apache Software Foundation (ASF) under one
 + * or more contributor license agreements.  See the NOTICE file
 + * distributed with this work for additional information
 + * regarding copyright ownership.  The ASF licenses this file
 + * to you under the Apache License, Version 2.0 (the
 + * "License"); you may not use this file except in compliance
 + * with the License.  You may obtain a copy of the License at
 + *
 + * http://www.apache.org/licenses/LICENSE-2.0
 + *
 + * Unless required by applicable law or agreed to in writing,
 + * software distributed under the License is distributed on an
 + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 + * KIND, either express or implied.  See the License for the
 + * specific language governing permissions and limitations
 + * under the License.
 + */
 +package org.apache.tinkerpop.gremlin.util;
 +
 +import java.math.BigDecimal;
 +import java.math.BigInteger;
++import java.math.MathContext;
 +import java.util.function.BiFunction;
 +
 +/**
 + * @author Daniel Kuppitz (http://gremlin.guru)
 + */
 +public final class NumberHelper {
 +
 +static final NumberHelper BYTE_NUMBER_HELPER = new NumberHelper(
 +(a, b) -> a.byteValue() + b.byteValue(),
 +(a, b) -> a.byteValue() - b.byteValue(),
 +(a, b) -> a.byteValue() * b.byteValue(),
 +(a, b) -> a.byteValue() / b.byteValue(),
 +(a, b) -> {
 +final byte x = a.byteValue(), y = b.byteValue();
 +return x <= y ? x : y;
 +},
 +(a, b) -> {
 +final byte x = a.byteValue(), y = b.byteValue();
 +return x >= y ? x : y;
 +});
 +static final NumberHelper SHORT_NUMBER_HELPER = new NumberHelper(
 +(a, b) -> a.shortValue() + b.shortValue(),
 +(a, b) -> a.shortValue() - b.shortValue(),
 +(a, b) -> a.shortValue() * b.shortValue(),
 +(a, b) -> a.shortValue() / b.shortValue(),
 +(a, b) -> {
 +final short x = a.shortValue(), y = b.shortValue();
 +return x <= y ? x : y;
 +},
 +(a, b) -> {
 +final short x = a.shortValue(), y = b.shortValue();
 +return x >= y ? x : y;
 +});
 +static final NumberHelper INTEGER_NUMBER_HELPER = new NumberHelper(
 +(a, b) -> a.intValue() + b.intValue(),
 +(a, b) -> a.intValue() - b.intValue(),
 +(a, b) -> a.intValue() * b.intValue(),
 +(a, b) -> a.intValue() / b.intValue(),
 +(a, b) -> {
 +final int x = a.intValue(), y = b.intValue();
 +return x <= y ? x : y;
 +},
 +(a, b) -> {
 +final int x = a.intValue(), y = b.intValue();
 +return x >= y ? x : y;
 +});
 +static final NumberHelper LONG_NUMBER_HELPER = new NumberHelper(
 +(a, b) -> a.longValue() + b.longValue(),
 +(a, b) -> a.longValue() - b.longValue(),
 +(a, b) -> a.longValue() * b.longValue(),
 +(a, b) -> a.longValue() / b.longValue(),
 +(a, b) -> {
 +final long x = a.longValue(), y = b.longValue();

[3/3] tinkerpop git commit: Merge branch 'tp32'

2017-07-19 Thread twilmes

Merge branch 'tp32'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0ba34be7
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0ba34be7
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/0ba34be7

Branch: refs/heads/master
Commit: 0ba34be72f2bbbd0d2a8c88dedc7d27e37579776
Parents: 4184807 3f06a6a
Author: Ted Wilmes 
Authored: Wed Jul 19 07:34:16 2017 -0500
Committer: Ted Wilmes 
Committed: Wed Jul 19 07:34:16 2017 -0500

--
 CHANGELOG.asciidoc| 1 +
 .../gremlin/process/traversal/util/DefaultTraversal.java  | 3 ++-
 .../gremlin/process/traversal/util/DefaultTraversalTest.java  | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0ba34be7/CHANGELOG.asciidoc
--

[3/3] tinkerpop git commit: Merge branch 'tp32'

2017-07-18 Thread spmallette

Merge branch 'tp32'

Conflicts:

gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/005d2eb4
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/005d2eb4
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/005d2eb4

Branch: refs/heads/master
Commit: 005d2eb42400d5f286c197f978cc241634956258
Parents: 4247e7d 2704245
Author: Stephen Mallette 
Authored: Tue Jul 18 16:58:46 2017 -0400
Committer: Stephen Mallette 
Committed: Tue Jul 18 16:58:46 2017 -0400

--
 .../server/GremlinDriverIntegrateTest.java  | 26 
 1 file changed, 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/005d2eb4/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
--
diff --cc 
gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
index 70e939e,6d4f236..4206cf9
--- 
a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
+++ 
b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
@@@ -800,66 -764,6 +800,40 @@@ public class GremlinDriverIntegrateTes
  }
  
  @Test
 +public void shouldWorkWithGraphSONV3Serialization() throws Exception {
 +final Cluster cluster = 
TestClientFactory.build().serializer(Serializers.GRAPHSON_V3D0).create();
 +final Client client = cluster.connect();
 +
 +final List r = 
client.submit("TinkerFactory.createModern().traversal().V(1)").all().join();
 +assertEquals(1, r.size());
 +
 +final Vertex v = r.get(0).get(DetachedVertex.class);
 +assertEquals(1, v.id());
 +assertEquals("person", v.label());
 +
 +assertEquals(2, IteratorUtils.count(v.properties()));
 +assertEquals("marko", v.value("name"));
 +assertEquals(29, Integer.parseInt(v.value("age").toString()));
 +
 +cluster.close();
 +}
 +
 +@Test
 +public void shouldWorkWithGraphSONExtendedV3Serialization() throws 
Exception {
 +final Cluster cluster = 
TestClientFactory.build().serializer(Serializers.GRAPHSON_V3D0).create();
 +final Client client = cluster.connect();
 +
 +final Instant now = Instant.now();
 +final List r = 
client.submit("java.time.Instant.ofEpochMilli(" + now.toEpochMilli() + 
")").all().join();
 +assertEquals(1, r.size());
 +
 +final Instant then = r.get(0).get(Instant.class);
 +assertEquals(now, then);
 +
 +cluster.close();
 +}
 +
 +@Test
- @org.junit.Ignore("Can't seem to make this test pass consistently")
- public void shouldHandleRequestSentThatNeverReturns() throws Exception {
- final Cluster cluster = TestClientFactory.open();
- final Client client = cluster.connect();
- 
- final ResultSet results = client.submit("Thread.sleep(1); 
'should-not-ever-get-back-coz-we-killed-the-server'");
- 
- stopServer();
- 
- // give the server a chance to kill everything
- Thread.sleep(1000);
- 
- try {
- results.all().get(1, TimeUnit.MILLISECONDS);
- fail("Server was stopped before the request could execute");
- } catch (TimeoutException toe) {
- fail("Should not have tossed a TimeOutException getting the 
result");
- } catch (Exception ex) {
- final Throwable cause = ExceptionUtils.getCause(ex);
- assertThat(cause.getMessage(), containsString("rejected from 
java.util.concurrent.ThreadPoolExecutor"));
- }
- 
- cluster.close();
- }
- 
- @Test
  public void shouldFailClientSideWithTooLargeAResponse() {
  final Cluster cluster = 
TestClientFactory.build().maxContentLength(1).create();
  final Client client = cluster.connect();

[3/3] tinkerpop git commit: Merge branch 'tp32'

2017-07-17 Thread spmallette

Merge branch 'tp32'

Conflicts:

gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutor.java


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/236b2b81
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/236b2b81
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/236b2b81

Branch: refs/heads/master
Commit: 236b2b81a659ceee535068dbea3eb523ea43f40c
Parents: ad1b2f7 a5d60c6
Author: Stephen Mallette 
Authored: Mon Jul 17 12:43:58 2017 -0400
Committer: Stephen Mallette 
Committed: Mon Jul 17 12:43:58 2017 -0400

--
 .../tinkerpop/gremlin/groovy/engine/GremlinExecutor.java| 9 +++--
 .../gremlin/server/GremlinServerIntegrateTest.java  | 4 ++--
 2 files changed, 9 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/236b2b81/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutor.java
--
diff --cc 
gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutor.java
index a08941e,d02d773..f871525
--- 
a/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutor.java
+++ 
b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutor.java
@@@ -35,7 -35,12 +35,11 @@@ import javax.script.Compilable
  import javax.script.CompiledScript;
  import javax.script.ScriptException;
  import javax.script.SimpleBindings;
+ import java.io.File;
+ import java.io.FileReader;
+ import java.io.IOException;
+ import java.lang.ref.WeakReference;
  import java.lang.reflect.Method;
 -import java.util.ArrayList;
  import java.util.Collection;
  import java.util.Collections;
  import java.util.HashMap;

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/236b2b81/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
--

[3/3] tinkerpop git commit: Merge branch 'tp32'

2017-07-14 Thread spmallette

Merge branch 'tp32'

Conflicts:
docs/src/reference/gremlin-applications.asciidoc
docs/src/reference/gremlin-variants.asciidoc

gremlin-python/src/test/resources/org/apache/tinkerpop/gremlin/python/driver/gremlin-server-modern-secure-py.yaml
gremlin-server/conf/gremlin-server-classic.yaml
gremlin-server/conf/gremlin-server-modern-py.yaml
gremlin-server/conf/gremlin-server-modern-readonly.yaml
gremlin-server/conf/gremlin-server-modern.yaml
gremlin-server/conf/gremlin-server-neo4j.yaml
gremlin-server/conf/gremlin-server-secure.yaml
gremlin-server/conf/gremlin-server-spark.yaml
gremlin-server/conf/gremlin-server.yaml


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/8ba3b9fa
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8ba3b9fa
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/8ba3b9fa

Branch: refs/heads/master
Commit: 8ba3b9faae7dc7e0acdeba6a377139af092ec841
Parents: 1de84f8 42c3f40
Author: Stephen Mallette 
Authored: Fri Jul 14 12:11:47 2017 -0400
Committer: Stephen Mallette 
Committed: Fri Jul 14 12:11:47 2017 -0400

--
 CHANGELOG.asciidoc | 1 +
 docs/src/reference/gremlin-applications.asciidoc   | 6 ++
 docs/src/reference/gremlin-variants.asciidoc   | 4 +---
 .../gremlin/driver/ser/GryoLiteMessageSerializerV1d0.java  | 3 +++
 .../gremlin/driver/ser/GryoMessageSerializerV1d0.java  | 2 --
 .../apache/tinkerpop/gremlin/server/AbstractChannelizer.java   | 3 +++
 6 files changed, 10 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8ba3b9fa/CHANGELOG.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8ba3b9fa/docs/src/reference/gremlin-applications.asciidoc
--
diff --cc docs/src/reference/gremlin-applications.asciidoc
index 287c479,00d9c10..b7de7b2
--- a/docs/src/reference/gremlin-applications.asciidoc
+++ b/docs/src/reference/gremlin-applications.asciidoc
@@@ -430,14 -413,10 +430,12 @@@ $ bin/gremlin-server.sh conf/gremlin-se
  [INFO] OpLoader - Adding the traversal OpProcessor.
  [INFO] TraversalOpProcessor - Initialized cache for TraversalOpProcessor with 
size 1000 and expiration time of 60 ms
  [INFO] GremlinServer - Executing start up LifeCycleHook
- [INFO] Logger$info - Executed once at startup of Gremlin Server.
+ [INFO] Logger$info - Loading 'modern' graph data.
 -[INFO] AbstractChannelizer - Configured application/vnd.gremlin-v1.0+gryo 
with org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0
 -[INFO] AbstractChannelizer - Configured 
application/vnd.gremlin-v1.0+gryo-stringd with 
org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0
 +[INFO] AbstractChannelizer - Configured application/vnd.gremlin-v3.0+gryo 
with org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV3d0
 +[INFO] AbstractChannelizer - Configured 
application/vnd.gremlin-v3.0+gryo-stringd with 
org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV3d0
- [INFO] AbstractChannelizer - Configured application/vnd.gremlin-v1.0+json 
with 
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0
- [INFO] AbstractChannelizer - Configured application/vnd.gremlin-v2.0+json 
with 
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0
 +[INFO] AbstractChannelizer - Configured application/vnd.gremlin-v3.0+json 
with org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0
 +[INFO] AbstractChannelizer - Configured application/json with 
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0
- [INFO] GremlinServer$1 - Gremlin Server configured with worker thread pool of 
1, gremlin pool of 4 and boss thread pool of 1.
+ [INFO] GremlinServer$1 - Gremlin Server configured with worker thread pool of 
1, gremlin pool of 8 and boss thread pool of 1.
  [INFO] GremlinServer$1 - Channel started at port 8182.
  
  

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8ba3b9fa/docs/src/reference/gremlin-variants.asciidoc
--
diff --cc docs/src/reference/gremlin-variants.asciidoc
index 2f4e3f5,013e7be..e8fd17e
--- a/docs/src/reference/gremlin-variants.asciidoc
+++ b/docs/src/reference/gremlin-variants.asciidoc
@@@ -148,18 -149,18 +148,16 @@@ $ bin/gremlin-server.sh conf/gremlin-se
  [INFO] OpLoader - Adding the traversal OpProcessor.
  [INFO] TraversalOpProcessor - Initialized cache for TraversalOpProcessor with 
size 1000 and

[3/3] tinkerpop git commit: Merge branch 'tp32'

2017-07-14 Thread spmallette

Merge branch 'tp32'

Conflicts:

gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ProfileTest.java


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1de84f87
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1de84f87
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1de84f87

Branch: refs/heads/master
Commit: 1de84f8740d83b3752d649ab411fda1386e478cb
Parents: 4f7b563 04d4e90
Author: Stephen Mallette 
Authored: Fri Jul 14 12:04:49 2017 -0400
Committer: Stephen Mallette 
Committed: Fri Jul 14 12:04:49 2017 -0400

--
 CHANGELOG.asciidoc  |  1 +
 .../process/traversal/step/map/ProfileTest.java | 34 +++-
 2 files changed, 27 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1de84f87/CHANGELOG.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1de84f87/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ProfileTest.java
--

[3/3] tinkerpop git commit: Merge branch 'tp32'

2017-07-13 Thread okram

Merge branch 'tp32'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/55f7c373
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/55f7c373
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/55f7c373

Branch: refs/heads/master
Commit: 55f7c37373ccd7a4be2a5771ad3ca51614c14475
Parents: 06b47b1 f161f7b
Author: Marko A. Rodriguez 
Authored: Thu Jul 13 13:16:33 2017 -0600
Committer: Marko A. Rodriguez 
Committed: Thu Jul 13 13:16:33 2017 -0600

--
 docs/src/reference/the-traversal.asciidoc | 25 -
 1 file changed, 24 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/55f7c373/docs/src/reference/the-traversal.asciidoc
--

[3/3] tinkerpop git commit: Merge branch 'tp32'

2017-07-12 Thread spmallette

Merge branch 'tp32'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/65d7a82f
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/65d7a82f
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/65d7a82f

Branch: refs/heads/master
Commit: 65d7a82ffd24d2424dc501c439147b34a4220dc4
Parents: 1526c2c fbed57b
Author: Stephen Mallette 
Authored: Wed Jul 12 13:29:37 2017 -0400
Committer: Stephen Mallette 
Committed: Wed Jul 12 13:29:37 2017 -0400

--
 CHANGELOG.asciidoc  |  1 +
 .../gremlin/groovy/engine/GremlinExecutor.java  | 39 ++--
 2 files changed, 13 insertions(+), 27 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/65d7a82f/CHANGELOG.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/65d7a82f/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutor.java
--

[3/3] tinkerpop git commit: Merge branch 'tp32'

2017-07-05 Thread okram

Merge branch 'tp32'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/e4bf0271
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e4bf0271
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/e4bf0271

Branch: refs/heads/master
Commit: e4bf0271bf6b30c112244e84f3d5d7730215b1f1
Parents: 8343072 5f56495
Author: Marko A. Rodriguez 
Authored: Wed Jul 5 08:53:42 2017 -0600
Committer: Marko A. Rodriguez 
Committed: Wed Jul 5 08:53:42 2017 -0600

--
 docs/src/reference/the-traversal.asciidoc | 14 ++
 1 file changed, 14 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e4bf0271/docs/src/reference/the-traversal.asciidoc
--

[3/3] tinkerpop git commit: Merge branch 'tp32'

2017-07-05 Thread spmallette

Merge branch 'tp32'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/4a3eb6d5
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/4a3eb6d5
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/4a3eb6d5

Branch: refs/heads/master
Commit: 4a3eb6d56105c873de7f68008855ae42de6bb990
Parents: e37e2f9 e12cc7c
Author: Stephen Mallette 
Authored: Wed Jul 5 08:11:03 2017 -0400
Committer: Stephen Mallette 
Committed: Wed Jul 5 08:11:03 2017 -0400

--
 docs/src/tutorials/getting-started/index.asciidoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4a3eb6d5/docs/src/tutorials/getting-started/index.asciidoc
--

[3/3] tinkerpop git commit: Merge branch 'tp32'

2017-06-30 Thread okram

Merge branch 'tp32'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/795fb23d
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/795fb23d
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/795fb23d

Branch: refs/heads/master
Commit: 795fb23d9b02ba93e67bfa9d6b17348c0f58df8f
Parents: 1fd2422 16afd9c
Author: Marko A. Rodriguez 
Authored: Fri Jun 30 09:03:37 2017 -0600
Committer: Marko A. Rodriguez 
Committed: Fri Jun 30 09:03:37 2017 -0600

--
 CHANGELOG.asciidoc   |  1 +
 .../tinkerpop/gremlin/jsr223/JavaTranslator.java | 19 +--
 .../gremlin/groovy/jsr223/GroovyTranslator.java  |  2 +-
 3 files changed, 19 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/795fb23d/CHANGELOG.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/795fb23d/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/JavaTranslator.java
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/795fb23d/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GroovyTranslator.java
--

[3/3] tinkerpop git commit: Merge branch 'tp32'

2017-06-27 Thread okram

Merge branch 'tp32'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/55af79f7
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/55af79f7
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/55af79f7

Branch: refs/heads/master
Commit: 55af79f78fb8f1c84be8764728695d95ca8bcf18
Parents: 1ba875b 5ac61b7
Author: Marko A. Rodriguez 
Authored: Tue Jun 27 07:50:39 2017 -0600
Committer: Marko A. Rodriguez 
Committed: Tue Jun 27 07:50:39 2017 -0600

--
 CHANGELOG.asciidoc   | 1 +
 .../gremlin/process/traversal/step/map/EdgeVertexStep.java   | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/55af79f7/CHANGELOG.asciidoc
--

[3/3] tinkerpop git commit: Merge branch 'tp32'

2017-06-23 Thread spmallette

Merge branch 'tp32'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/73468060
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/73468060
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/73468060

Branch: refs/heads/master
Commit: 7346806073fd815111f7c2dcb2d70f04d673e40f
Parents: 099d184 a104680
Author: Stephen Mallette 
Authored: Fri Jun 23 06:20:12 2017 -0400
Committer: Stephen Mallette 
Committed: Fri Jun 23 06:20:12 2017 -0400

--
 CHANGELOG.asciidoc  |  1 +
 .../decoration/EventStrategyProcessTest.java| 28 ++--
 2 files changed, 15 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/73468060/CHANGELOG.asciidoc
--

[3/3] tinkerpop git commit: Merge branch 'tp32'

2017-06-19 Thread spmallette

Merge branch 'tp32'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a51ad1de
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a51ad1de
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a51ad1de

Branch: refs/heads/master
Commit: a51ad1de7bcc851fd2f518909a49e979361430ab
Parents: b0d43b1 b9a439a
Author: Stephen Mallette 
Authored: Mon Jun 19 13:23:22 2017 -0400
Committer: Stephen Mallette 
Committed: Mon Jun 19 13:23:22 2017 -0400

--
 .../process/traversal/TraversalInterruptionComputerTest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--

[3/3] tinkerpop git commit: Merge branch 'tp32'

2017-06-05 Thread twilmes

Merge branch 'tp32'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/2ef70ef5
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/2ef70ef5
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/2ef70ef5

Branch: refs/heads/master
Commit: 2ef70ef53ed338d3e066433fffea9bbbec215e67
Parents: 4b4ab7f e00b5d4
Author: Ted Wilmes 
Authored: Mon Jun 5 17:24:04 2017 -0500
Committer: Ted Wilmes 
Committed: Mon Jun 5 17:24:04 2017 -0500

--
 docs/src/reference/the-traversal.asciidoc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2ef70ef5/docs/src/reference/the-traversal.asciidoc
--

[3/3] tinkerpop git commit: Merge branch 'tp32'

2017-06-03 Thread spmallette

Merge branch 'tp32'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/57e7f702
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/57e7f702
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/57e7f702

Branch: refs/heads/master
Commit: 57e7f702e44356b72ffa7d1d11d526ac5e768812
Parents: f15cf67 b2ef0d4
Author: Stephen Mallette 
Authored: Sat Jun 3 05:57:18 2017 -0400
Committer: Stephen Mallette 
Committed: Sat Jun 3 05:57:18 2017 -0400

--
 .../tinkergraph/structure/TinkerFactory.java  | 18 +++---
 1 file changed, 11 insertions(+), 7 deletions(-)
--

[3/3] tinkerpop git commit: Merge branch 'tp32'

2017-06-02 Thread spmallette

Merge branch 'tp32'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/10f0d408
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/10f0d408
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/10f0d408

Branch: refs/heads/master
Commit: 10f0d4089d2763657410c29ae2e00d6e70c4e849
Parents: 2bd3c53 843f781
Author: Stephen Mallette 
Authored: Fri Jun 2 21:58:18 2017 -0400
Committer: Stephen Mallette 
Committed: Fri Jun 2 21:58:18 2017 -0400

--
 CHANGELOG.asciidoc  |  2 +-
 .../tinkergraph/structure/TinkerFactory.java| 23 +---
 2 files changed, 11 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/10f0d408/CHANGELOG.asciidoc
--

[3/3] tinkerpop git commit: Merge branch 'tp32'

2017-05-30 Thread dkuppitz

Merge branch 'tp32'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/5ceba08c
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5ceba08c
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/5ceba08c

Branch: refs/heads/master
Commit: 5ceba08ce98e5d6ba98edeb3ef0afc14f80eb07a
Parents: 16d35f1 4f7b859
Author: Daniel Kuppitz 
Authored: Tue May 30 13:26:59 2017 +0200
Committer: Daniel Kuppitz 
Committed: Tue May 30 13:26:59 2017 +0200

--

--

[3/3] tinkerpop git commit: Merge branch 'tp32'

2017-05-25 Thread spmallette

Merge branch 'tp32'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/000cba1d
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/000cba1d
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/000cba1d

Branch: refs/heads/master
Commit: 000cba1d81deb9a21bda8ad7074fc44bc69973f4
Parents: 3db39eb 8812f85
Author: Stephen Mallette 
Authored: Thu May 25 09:53:46 2017 -0400
Committer: Stephen Mallette 
Committed: Thu May 25 09:53:46 2017 -0400

--
 .../remote/traversal/step/map/RemoteStep.java| 19 ++-
 1 file changed, 18 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/000cba1d/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/step/map/RemoteStep.java
--

[3/3] tinkerpop git commit: Merge branch 'tp32'

2017-05-22 Thread spmallette

Merge branch 'tp32'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/3352ccea
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/3352ccea
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/3352ccea

Branch: refs/heads/master
Commit: 3352cceaedfbff2f4daf4f8a0493a82992270754
Parents: 4f24321 afa3432
Author: Stephen Mallette 
Authored: Mon May 22 09:51:04 2017 -0400
Committer: Stephen Mallette 
Committed: Mon May 22 09:51:04 2017 -0400

--
 docs/src/reference/the-graph.asciidoc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3352ccea/docs/src/reference/the-graph.asciidoc
--

[3/3] tinkerpop git commit: Merge branch 'tp32'

2017-05-11 Thread rdale

Merge branch 'tp32'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0de49080
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0de49080
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/0de49080

Branch: refs/heads/master
Commit: 0de49080ca31e46b88305dfc2b39414b1399b494
Parents: 2a69504 37e1716
Author: Robert Dale 
Authored: Thu May 11 09:04:39 2017 -0400
Committer: Robert Dale 
Committed: Thu May 11 09:04:39 2017 -0400

--
 .travis.yml | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0de49080/.travis.yml
--

[3/3] tinkerpop git commit: Merge branch 'tp32'

2017-05-11 Thread spmallette

Merge branch 'tp32'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/2a69504e
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/2a69504e
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/2a69504e

Branch: refs/heads/master
Commit: 2a69504efa2411eb70de2db53ab1215cfd9915d4
Parents: 0ba09a8 f3eada1
Author: Stephen Mallette 
Authored: Thu May 11 07:23:19 2017 -0400
Committer: Stephen Mallette 
Committed: Thu May 11 07:23:19 2017 -0400

--
 .../apache/tinkerpop/gremlin/structure/FeatureSupportTest.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--

[3/3] tinkerpop git commit: Merge branch 'tp32'

2017-05-11 Thread spmallette

Merge branch 'tp32'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0ba09a8e
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0ba09a8e
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/0ba09a8e

Branch: refs/heads/master
Commit: 0ba09a8ee5f6a2f8ca7fe8231fb687315c62f51b
Parents: a74fa0a 02b0e12
Author: Stephen Mallette 
Authored: Thu May 11 06:52:42 2017 -0400
Committer: Stephen Mallette 
Committed: Thu May 11 06:52:42 2017 -0400

--
 .../main/java/org/apache/tinkerpop/gremlin/structure/Graph.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0ba09a8e/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Graph.java
--

[3/3] tinkerpop git commit: Merge branch 'tp32'

2017-05-08 Thread spmallette

Merge branch 'tp32'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/7ef0fc5d
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/7ef0fc5d
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/7ef0fc5d

Branch: refs/heads/master
Commit: 7ef0fc5d2448cbcda012782f010e028a97c6e217
Parents: 5199cd1 632c209
Author: Stephen Mallette 
Authored: Mon May 8 14:54:40 2017 -0400
Committer: Stephen Mallette 
Committed: Mon May 8 14:54:40 2017 -0400

--
 .../tinkerpop/gremlin/process/remote/RemoteConnection.java   | 6 +-
 .../tinkerpop/gremlin/process/traversal/Traversal.java   | 2 +-
 .../tinkerpop/gremlin/server/GremlinServerIntegrateTest.java | 8 +---
 3 files changed, 11 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7ef0fc5d/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
--

[3/3] tinkerpop git commit: Merge branch 'tp32'

2017-05-03 Thread spmallette

Merge branch 'tp32'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/de4e9d33
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/de4e9d33
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/de4e9d33

Branch: refs/heads/master
Commit: de4e9d33cb0b0aa99fa4acd9eb49bb60069a8c1b
Parents: 994a19c f228c91
Author: Stephen Mallette 
Authored: Wed May 3 09:54:43 2017 -0400
Committer: Stephen Mallette 
Committed: Wed May 3 09:54:43 2017 -0400

--
 docs/src/dev/developer/development-environment.asciidoc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/de4e9d33/docs/src/dev/developer/development-environment.asciidoc
--

[3/3] tinkerpop git commit: Merge branch 'tp32'

2017-05-03 Thread spmallette

Merge branch 'tp32'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/994a19cf
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/994a19cf
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/994a19cf

Branch: refs/heads/master
Commit: 994a19cf0d99906a29561c9c825458179a4dd767
Parents: dad8b38 feffe79
Author: Stephen Mallette 
Authored: Wed May 3 09:09:32 2017 -0400
Committer: Stephen Mallette 
Committed: Wed May 3 09:09:32 2017 -0400

--
 pom.xml | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/994a19cf/pom.xml
--

[3/3] tinkerpop git commit: Merge branch 'tp32'

2017-05-03 Thread spmallette

Merge branch 'tp32'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/dad8b384
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/dad8b384
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/dad8b384

Branch: refs/heads/master
Commit: dad8b3842c3b04627f8f14480d5b398daab3ef4f
Parents: 453665d cac7f6f
Author: Stephen Mallette 
Authored: Wed May 3 07:58:31 2017 -0400
Committer: Stephen Mallette 
Committed: Wed May 3 07:58:31 2017 -0400

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/dad8b384/pom.xml
--

[3/3] tinkerpop git commit: Merge branch 'tp32'

2017-04-27 Thread spmallette

Merge branch 'tp32'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/453665d3
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/453665d3
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/453665d3

Branch: refs/heads/master
Commit: 453665d34e9a990def47e1ed35d18013b3286cbf
Parents: 3768aba 60ad862
Author: Stephen Mallette 
Authored: Thu Apr 27 13:23:32 2017 -0400
Committer: Stephen Mallette 
Committed: Thu Apr 27 13:23:32 2017 -0400

--
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/453665d3/.travis.yml
--

1 2 >

1 - 100 of 140 matches

Mail list logo