You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by fl...@apache.org on 2018/05/19 09:28:21 UTC
[01/50] tinkerpop git commit: TINKERPOP-1944 Export
DriverRemoteConnection [Forced Update!]
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1897 063b97a06 -> c7a65665e (forced update)
TINKERPOP-1944 Export DriverRemoteConnection
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/d037ef70
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d037ef70
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d037ef70
Branch: refs/heads/TINKERPOP-1897
Commit: d037ef7049f36410caba9362bd60cb8dfc04f857
Parents: 2591302
Author: Jorge Bay Gondra <jo...@gmail.com>
Authored: Mon Apr 23 15:13:32 2018 +0200
Committer: Jorge Bay Gondra <jo...@gmail.com>
Committed: Mon Apr 23 15:13:32 2018 +0200
----------------------------------------------------------------------
.../main/javascript/gremlin-javascript/index.js | 20 +++++++++++---------
.../test/unit/exports-test.js | 2 ++
2 files changed, 13 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d037ef70/gremlin-javascript/src/main/javascript/gremlin-javascript/index.js
----------------------------------------------------------------------
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/index.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/index.js
index 61ab274..2ebae48 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/index.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/index.js
@@ -22,20 +22,22 @@
*/
'use strict';
-var t = require('./lib/process/traversal');
-var gt = require('./lib/process/graph-traversal');
-var strategiesModule = require('./lib/process/traversal-strategy');
-var graph = require('./lib/structure/graph');
-var gs = require('./lib/structure/io/graph-serializer');
-var rc = require('./lib/driver/remote-connection');
-var Bytecode = require('./lib/process/bytecode');
-var utils = require('./lib/utils');
+const t = require('./lib/process/traversal');
+const gt = require('./lib/process/graph-traversal');
+const strategiesModule = require('./lib/process/traversal-strategy');
+const graph = require('./lib/structure/graph');
+const gs = require('./lib/structure/io/graph-serializer');
+const rc = require('./lib/driver/remote-connection');
+const Bytecode = require('./lib/process/bytecode');
+const utils = require('./lib/utils');
+const DriverRemoteConnection = require('./lib/driver/driver-remote-connection');
module.exports = {
driver: {
RemoteConnection: rc.RemoteConnection,
RemoteStrategy: rc.RemoteStrategy,
- RemoteTraversal: rc.RemoteTraversal
+ RemoteTraversal: rc.RemoteTraversal,
+ DriverRemoteConnection: DriverRemoteConnection
},
process: {
Bytecode: Bytecode,
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d037ef70/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/exports-test.js
----------------------------------------------------------------------
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/exports-test.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/exports-test.js
index 53b6577..e0dfb12 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/exports-test.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/exports-test.js
@@ -69,5 +69,7 @@ describe('API', function () {
assert.strictEqual(typeof glvModule.driver.RemoteConnection, 'function');
assert.strictEqual(typeof glvModule.driver.RemoteStrategy, 'function');
assert.strictEqual(typeof glvModule.driver.RemoteTraversal, 'function');
+ assert.strictEqual(typeof glvModule.driver.DriverRemoteConnection, 'function');
+ assert.strictEqual(glvModule.driver.DriverRemoteConnection.name, 'DriverRemoteConnection');
});
});
\ No newline at end of file
[08/50] tinkerpop git commit: Merge branch 'TINKERPOP-1947' into tp32
Posted by fl...@apache.org.
Merge branch 'TINKERPOP-1947' into tp32
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/44c4073f
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/44c4073f
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/44c4073f
Branch: refs/heads/TINKERPOP-1897
Commit: 44c4073f2711cd56948ea9753f94e51897262031
Parents: 42ce7a5 8fbfab7
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Apr 25 06:56:17 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Apr 25 06:56:17 2018 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../process/traversal/step/util/Parameters.java | 30 +++++++++++---------
.../step/map/GroovyAddVertexTest.groovy | 5 ++++
gremlin-test/features/map/AddVertex.feature | 27 ++++++++++++++++++
.../traversal/step/map/AddVertexTest.java | 20 +++++++++++--
5 files changed, 68 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/44c4073f/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --cc CHANGELOG.asciidoc
index 797072d,6f7baa5..f71602a
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -23,9 -23,8 +23,10 @@@ image::https://raw.githubusercontent.co
[[release-3-2-9]]
=== TinkerPop 3.2.9 (Release Date: NOT OFFICIALLY RELEASED YET)
+ * Fixed bug where path history was not being preserved for keys in mutations.
* Bumped to httpclient 4.5.5.
+* Bumped to Groovy 2.4.15 - fixes bug with `Lambda` construction.
+* Improved performance of GraphSON deserialization of `Bytecode`.
[[release-3-2-8]]
=== TinkerPop 3.2.8 (Release Date: April 2, 2018)
[07/50] tinkerpop git commit: Merge branch 'TINKERPOP-1953' into tp32
Posted by fl...@apache.org.
Merge branch 'TINKERPOP-1953' into tp32
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/42ce7a5e
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/42ce7a5e
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/42ce7a5e
Branch: refs/heads/TINKERPOP-1897
Commit: 42ce7a5e8491e247c617e3872963882357765a33
Parents: 8462f85 40dad27
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Apr 25 06:52:52 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Apr 25 06:52:52 2018 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../upgrade/release-3.2.x-incubating.asciidoc | 24 ++++++++++++++++++++
.../jsr223/GremlinGroovyScriptEngineTest.java | 9 ++++++++
pom.xml | 2 +-
4 files changed, 35 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[28/50] tinkerpop git commit: Unify and clean up gmavenplus plugin
configurations for GLVs CTR
Posted by fl...@apache.org.
Unify and clean up gmavenplus plugin configurations for GLVs CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/8a03d50d
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8a03d50d
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/8a03d50d
Branch: refs/heads/TINKERPOP-1897
Commit: 8a03d50dedf31e587fb60e0f7735036a1484cfd4
Parents: d995972
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu May 10 15:13:59 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri May 11 14:10:12 2018 -0400
----------------------------------------------------------------------
gremlin-dotnet/pom.xml | 5 ++---
gremlin-javascript/pom.xml | 45 ++++++++---------------------------------
gremlin-python/pom.xml | 4 ++--
pom.xml | 3 ++-
4 files changed, 14 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8a03d50d/gremlin-dotnet/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/pom.xml b/gremlin-dotnet/pom.xml
index fd2d428..fbc97d4 100644
--- a/gremlin-dotnet/pom.xml
+++ b/gremlin-dotnet/pom.xml
@@ -46,9 +46,8 @@ limitations under the License.
<dependencies>
<dependency>
<groupId>org.apache.tinkerpop</groupId>
- <artifactId>gremlin-core</artifactId>
+ <artifactId>gremlin-server</artifactId>
<version>${project.version}</version>
- <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
@@ -60,7 +59,7 @@ limitations under the License.
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.17</version>
+ <version>${log4j.version}</version>
<scope>runtime</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8a03d50d/gremlin-javascript/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-javascript/pom.xml b/gremlin-javascript/pom.xml
index 0fe6bf4..f91b749 100644
--- a/gremlin-javascript/pom.xml
+++ b/gremlin-javascript/pom.xml
@@ -25,36 +25,6 @@ limitations under the License.
</parent>
<artifactId>gremlin-javascript</artifactId>
<name>Apache TinkerPop :: Gremlin Javascript</name>
- <dependencies>
- <dependency>
- <groupId>org.apache.tinkerpop</groupId>
- <artifactId>gremlin-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tinkerpop</groupId>
- <artifactId>tinkergraph-gremlin</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tinkerpop</groupId>
- <artifactId>gremlin-test</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tinkerpop</groupId>
- <artifactId>gremlin-server</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
<properties>
<maven.test.skip>false</maven.test.skip>
<skipTests>${maven.test.skip}</skipTests>
@@ -81,21 +51,22 @@ limitations under the License.
<artifactId>gmavenplus-plugin</artifactId>
<dependencies>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.17</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-server</artifactId>
<version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-ant</artifactId>
+ <artifactId>groovy-all</artifactId>
<version>${groovy.version}</version>
+ <classifier>indy</classifier>
+ <scope>runtime</scope>
</dependency>
</dependencies>
<executions>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8a03d50d/gremlin-python/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-python/pom.xml b/gremlin-python/pom.xml
index c999877..a2ab516 100644
--- a/gremlin-python/pom.xml
+++ b/gremlin-python/pom.xml
@@ -455,14 +455,14 @@ limitations under the License.
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
- <version>2.4.11</version>
+ <version>${groovy.version}</version>
<classifier>indy</classifier>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.17</version>
+ <version>${log4j.version}</version>
<scope>runtime</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8a03d50d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6b24199..c724e0f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -146,6 +146,7 @@ limitations under the License.
<java.tuples.version>1.2</java.tuples.version>
<javadoc-plugin.version>2.10.4</javadoc-plugin.version>
<jcabi.version>1.1</jcabi.version>
+ <log4j.version>1.2.17</log4j.version>
<metrics.version>3.0.2</metrics.version>
<netty.version>4.0.56.Final</netty.version>
<slf4j.version>1.7.21</slf4j.version>
@@ -659,7 +660,7 @@ limitations under the License.
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.17</version>
+ <version>${log4j.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
[05/50] tinkerpop git commit: Added Pop.all to python gherkin test
support
Posted by fl...@apache.org.
Added Pop.all to python gherkin test support
Pop.all in python is Pop.all_ in python - needed that translation for tests that use that expression CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/8462f857
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8462f857
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/8462f857
Branch: refs/heads/TINKERPOP-1897
Commit: 8462f857d78a11e4d383fdc077fe8bb8688cbe67
Parents: c155818
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Apr 24 09:17:18 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Apr 24 09:17:18 2018 -0400
----------------------------------------------------------------------
gremlin-python/src/main/jython/radish/feature_steps.py | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8462f857/gremlin-python/src/main/jython/radish/feature_steps.py
----------------------------------------------------------------------
diff --git a/gremlin-python/src/main/jython/radish/feature_steps.py b/gremlin-python/src/main/jython/radish/feature_steps.py
index 5cf9059..80137b0 100644
--- a/gremlin-python/src/main/jython/radish/feature_steps.py
+++ b/gremlin-python/src/main/jython/radish/feature_steps.py
@@ -25,6 +25,7 @@ from gremlin_python.process.traversal import Barrier, Cardinality, P, Pop, Scope
from radish import given, when, then
from hamcrest import *
+regex_all = re.compile(r"Pop\.all")
regex_and = re.compile(r"([(.,\s])and\(")
regex_as = re.compile(r"([(.,\s])as\(")
regex_from = re.compile(r"([(.,\s])from\(")
@@ -233,6 +234,7 @@ def _table_assertion(data, result, ctx, ordered):
def _translate(traversal):
replaced = traversal.replace("\n", "")
+ replaced = regex_all.sub(r"Pop.all_", replaced)
replaced = regex_and.sub(r"\1and_(", replaced)
replaced = regex_from.sub(r"\1from_(", replaced)
replaced = regex_global.sub(r"\1global_", replaced)
[49/50] tinkerpop git commit: TINKERPOP-1897 Move snapshot detection
to root pom.xml
Posted by fl...@apache.org.
TINKERPOP-1897 Move snapshot detection to root pom.xml
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b8fec48e
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b8fec48e
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b8fec48e
Branch: refs/heads/TINKERPOP-1897
Commit: b8fec48e70c09d07370e8c8589bf65ed7f6d7f09
Parents: fee7f9c
Author: Florian Hockmann <fh...@florian-hockmann.de>
Authored: Sun Apr 15 14:08:51 2018 +0200
Committer: Florian Hockmann <fh...@florian-hockmann.de>
Committed: Sat May 19 10:51:35 2018 +0200
----------------------------------------------------------------------
gremlin-console/pom.xml | 25 +------------------------
gremlin-server/pom.xml | 25 +------------------------
pom.xml | 29 ++++++++++++++++++++++++-----
3 files changed, 26 insertions(+), 53 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b8fec48e/gremlin-console/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index b24c772..db86d41 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -345,30 +345,7 @@ limitations under the License.
</file>
</activation>
<build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <!-- source: https://stackoverflow.com/a/39139979/6753576 -->
- <!-- sets the only.when.is.snapshot.used property to true if SNAPSHOT was used,
- to the project version otherwise -->
- <id>build-helper-regex-is-snapshot-used</id>
- <phase>validate</phase>
- <goals>
- <goal>regex-property</goal>
- </goals>
- <configuration>
- <name>only.when.is.snapshot.used</name>
- <value>${project.version}</value>
- <regex>.*-SNAPSHOT</regex>
- <replacement>true</replacement>
- <failIfNoMatch>false</failIfNoMatch>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ <plugins>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b8fec48e/gremlin-server/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index e71f79b..ef2e609 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -253,30 +253,7 @@ limitations under the License.
</file>
</activation>
<build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <!-- source: https://stackoverflow.com/a/39139979/6753576 -->
- <!-- sets the only.when.is.snapshot.used property to true if SNAPSHOT was used,
- to the project version otherwise -->
- <id>build-helper-regex-is-snapshot-used</id>
- <phase>validate</phase>
- <goals>
- <goal>regex-property</goal>
- </goals>
- <configuration>
- <name>only.when.is.snapshot.used</name>
- <value>${project.version}</value>
- <regex>.*-SNAPSHOT</regex>
- <replacement>true</replacement>
- <failIfNoMatch>false</failIfNoMatch>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ <plugins>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b8fec48e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 19866f0..9ff3f3a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -264,6 +264,30 @@ limitations under the License.
</executions>
</plugin>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>3.0.0</version>
+ <executions>
+ <execution>
+ <!-- source: https://stackoverflow.com/a/39139979/6753576 -->
+ <!-- sets the only.when.is.snapshot.used property to true if SNAPSHOT was used,
+ to the project version otherwise -->
+ <id>build-helper-regex-is-snapshot-used</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>regex-property</goal>
+ </goals>
+ <configuration>
+ <name>only.when.is.snapshot.used</name>
+ <value>${project.version}</value>
+ <regex>.*-SNAPSHOT</regex>
+ <replacement>true</replacement>
+ <failIfNoMatch>false</failIfNoMatch>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.0.2</version>
@@ -502,11 +526,6 @@ limitations under the License.
<artifactId>dockerfile-maven-plugin</artifactId>
<version>1.3.7</version>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>3.0.0</version>
- </plugin>
</plugins>
</pluginManagement>
</build>
[25/50] tinkerpop git commit: Missed updating NOTICE files for last
two bumps of Groovy CTR
Posted by fl...@apache.org.
Missed updating NOTICE files for last two bumps of Groovy CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/cfbe2ce7
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/cfbe2ce7
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/cfbe2ce7
Branch: refs/heads/TINKERPOP-1897
Commit: cfbe2ce7fedb7de07e2c0760ee31f9a8d8a4b60c
Parents: 2f8f74a
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu May 10 11:27:30 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu May 10 11:27:30 2018 -0400
----------------------------------------------------------------------
gremlin-console/src/main/static/NOTICE | 2 +-
gremlin-server/src/main/static/NOTICE | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cfbe2ce7/gremlin-console/src/main/static/NOTICE
----------------------------------------------------------------------
diff --git a/gremlin-console/src/main/static/NOTICE b/gremlin-console/src/main/static/NOTICE
index 4931f7e..f34965b 100644
--- a/gremlin-console/src/main/static/NOTICE
+++ b/gremlin-console/src/main/static/NOTICE
@@ -18,7 +18,7 @@ This product includes software from the Spring Framework,
under the Apache License 2.0 (see: StringUtils.containsWhitespace())
------------------------------------------------------------------------
-Apache Groovy 2.4.11 (AL ASF)
+Apache Groovy 2.4.15 (AL ASF)
------------------------------------------------------------------------
This product includes/uses ANTLR (http://www.antlr2.org/)
developed by Terence Parr 1989-2006
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cfbe2ce7/gremlin-server/src/main/static/NOTICE
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/static/NOTICE b/gremlin-server/src/main/static/NOTICE
index 72c10cc..0883bc4 100644
--- a/gremlin-server/src/main/static/NOTICE
+++ b/gremlin-server/src/main/static/NOTICE
@@ -11,7 +11,7 @@ This product includes software from the Spring Framework,
under the Apache License 2.0 (see: StringUtils.containsWhitespace())
------------------------------------------------------------------------
-Apache Groovy 2.4.11 (AL ASF)
+Apache Groovy 2.4.15 (AL ASF)
------------------------------------------------------------------------
This product includes/uses ANTLR (http://www.antlr2.org/)
developed by Terence Parr 1989-2006
[20/50] tinkerpop git commit: Merge branch 'TINKERPOP-1944' into tp32
Posted by fl...@apache.org.
Merge branch 'TINKERPOP-1944' into tp32
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/8671622e
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8671622e
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/8671622e
Branch: refs/heads/TINKERPOP-1897
Commit: 8671622ec5da41774e5684ebd3a514211dd27369
Parents: 5fea198 d037ef7
Author: Jorge Bay Gondra <jo...@gmail.com>
Authored: Wed May 2 08:49:28 2018 -0400
Committer: Jorge Bay Gondra <jo...@gmail.com>
Committed: Wed May 2 08:49:28 2018 -0400
----------------------------------------------------------------------
.../main/javascript/gremlin-javascript/index.js | 20 +++++++++++---------
.../test/unit/exports-test.js | 2 ++
2 files changed, 13 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
[10/50] tinkerpop git commit: Merge branch 'pr-856' into tp32
Posted by fl...@apache.org.
Merge branch 'pr-856' into tp32
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/f4dbaff1
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f4dbaff1
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/f4dbaff1
Branch: refs/heads/TINKERPOP-1897
Commit: f4dbaff1c69242dfb8c69da17a9f35d52128c38e
Parents: 44c4073 3792422
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Apr 25 07:44:47 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Apr 25 07:44:47 2018 -0400
----------------------------------------------------------------------
.../tinkerpop/gremlin/process/traversal/TraversalEngine.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[21/50] tinkerpop git commit: CTR: tweaked release validation script
Posted by fl...@apache.org.
CTR: tweaked release validation script
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/e9ab93aa
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e9ab93aa
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/e9ab93aa
Branch: refs/heads/TINKERPOP-1897
Commit: e9ab93aa2df3ddc3d9271ebaa6543a82bc487f62
Parents: 8671622
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Wed May 2 09:38:57 2018 -0700
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Wed May 2 09:38:57 2018 -0700
----------------------------------------------------------------------
bin/validate-distribution.sh | 26 +++++++++++++++++++++-----
1 file changed, 21 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e9ab93aa/bin/validate-distribution.sh
----------------------------------------------------------------------
diff --git a/bin/validate-distribution.sh b/bin/validate-distribution.sh
index b071ea0..76e0974 100755
--- a/bin/validate-distribution.sh
+++ b/bin/validate-distribution.sh
@@ -26,6 +26,7 @@
# curl -L -O https://dist.apache.org/repos/dist/dev/tinkerpop/KEYS
# gpg --import KEYS
+COMMITTERS=$(curl -Ls https://dist.apache.org/repos/dist/dev/tinkerpop/KEYS | grep -Po '(?<=<...@apache.org>)' | uniq)
TMP_DIR="/tmp/tpdv"
# Required. Only the latest version on each release stream is available on dist.
@@ -72,6 +73,8 @@ mkdir -p ${TMP_DIR}
rm -rf ${TMP_DIR}/*
cd ${TMP_DIR}
+curl -Ls https://people.apache.org/keys/committer/ | grep -v invalid > ${TMP_DIR}/.committers
+
# validate downloads
ZIP_FILENAME=`grep -o '[^/]*$' <<< ${URL}`
DIR_NAME=`sed -e 's/-[^-]*$//' <<< ${ZIP_FILENAME}`
@@ -94,11 +97,24 @@ echo "OK"
echo "* validating signatures and checksums ... "
echo -n " * PGP signature ... "
-[ `gpg ${ZIP_FILENAME}.asc 2>&1 | grep -c '^gpg: Good signature from "Stephen Mallette <sp...@apache.org>"$'` -eq 1 ] || \
-[ `gpg ${ZIP_FILENAME}.asc 2>&1 | grep -c '^gpg: Good signature from "Marko Rodriguez <ok...@apache.org>"$'` -eq 1 ] || \
-[ `gpg ${ZIP_FILENAME}.asc 2>&1 | grep -c '^gpg: Good signature from "Theodore Ratte Wilmes (CODE SIGNING KEY) <tw...@apache.org>"'` -eq 1 ] || \
-[ `gpg ${ZIP_FILENAME}.asc 2>&1 | grep -c '^gpg: Good signature from "Jason Plurad (CODE SIGNING KEY) <pl...@apache.org>"'` -eq 1 ] || \
-{ echo "failed"; exit 1; }
+gpg --verify ${ZIP_FILENAME}.asc ${ZIP_FILENAME} > ${TMP_DIR}/.verify 2>&1
+
+verified=0
+
+for committer in ${COMMITTERS[@]}
+do
+ if [[ `grep -F ${committer} ${TMP_DIR}/.verify` ]]; then
+ fp=$(cat ${TMP_DIR}/.committers | grep "id='${committer}'" | grep -Po '(?<=>)[A-Z0-9 ]*(?=<)' 2> /dev/null)
+ if [ ! -z "${fp}" ]; then
+ if [[ `grep -F "${fp}" ${TMP_DIR}/.verify` ]]; then
+ verified=1
+ fi
+ fi
+ fi
+ [ ${verified} -eq 1 ] && break
+done
+
+[ ${verified} -eq 1 ] || { echo "failed"; exit 1; }
echo "OK"
echo -n " * MD5 checksum ... "
[38/50] tinkerpop git commit: Minor updates to the release email
template CTR
Posted by fl...@apache.org.
Minor updates to the release email template CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/4adca20d
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/4adca20d
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/4adca20d
Branch: refs/heads/TINKERPOP-1897
Commit: 4adca20d156e0a939fa0f10edda1525cb09ea17e
Parents: 58d3d40
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon May 14 16:35:56 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon May 14 16:35:56 2018 -0400
----------------------------------------------------------------------
docs/src/dev/developer/release.asciidoc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4adca20d/docs/src/dev/developer/release.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/release.asciidoc b/docs/src/dev/developer/release.asciidoc
index 37aa0df..473e842 100644
--- a/docs/src/dev/developer/release.asciidoc
+++ b/docs/src/dev/developer/release.asciidoc
@@ -348,11 +348,11 @@ link:http://tinkerpop.apache.org/docs/current/upgrade/#_tinkerpop_3_1_0[here] in
[source,text]
----
-Subject: TinkerPop xx.yy.zz Released: [name of release line]
+Subject: Apache TinkerPop xx.yy.zz Released: [name of release line]
Hello,
-TinkerPop xx.yy.zz has just been released. [some text to introduce the release - e.g. whether or not
+Apache TinkerPop xx.yy.zz has just been released. [some text to introduce the release - e.g. whether or not
there is breaking change, an important game-changing feature or two, etc.]
The release artifacts can be found at this location:
@@ -387,7 +387,7 @@ https://www.nuget.org/packages/Gremlin.Net/xx.yy.zz
Javascript artifacts are available in npm:
-https://www.npmjs.com/package/gremlin
+https://www.npmjs.com/package/gremlin/v/xx.yy.zz
[include the release line logo image]
----
[16/50] tinkerpop git commit: Improved javadoc on Gremlin enums CTR
Posted by fl...@apache.org.
Improved javadoc on Gremlin enums CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a4c5a213
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a4c5a213
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a4c5a213
Branch: refs/heads/TINKERPOP-1897
Commit: a4c5a2132f8f0c7824ceddc8adefe06274767071
Parents: 5954525
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Apr 26 09:39:52 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Apr 26 09:39:52 2018 -0400
----------------------------------------------------------------------
.../gremlin/process/traversal/Compare.java | 12 ++++
.../gremlin/process/traversal/Contains.java | 4 ++
.../gremlin/process/traversal/Operator.java | 73 ++++++++++++++++++-
.../tinkerpop/gremlin/process/traversal/P.java | 76 ++++++++++++++++++++
.../gremlin/process/traversal/Pop.java | 14 +++-
.../gremlin/process/traversal/Scope.java | 19 +++--
6 files changed, 188 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a4c5a213/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Compare.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Compare.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Compare.java
index 97b52b8..7d0d071 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Compare.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Compare.java
@@ -36,6 +36,8 @@ public enum Compare implements BiPredicate<Object, Object> {
* {@link BigDecimal} so that it can be evaluated via {@link BigDecimal#compareTo}. Otherwise they are evaluated
* via {@link Object#equals(Object)}. Testing against {@link Number#doubleValue()} enables the compare
* operations to be a bit more forgiving with respect to comparing different number types.
+ *
+ * @since 3.0.0-incubating
*/
eq {
@Override
@@ -61,6 +63,8 @@ public enum Compare implements BiPredicate<Object, Object> {
* {@link BigDecimal} so that it can be evaluated via {@link BigDecimal#equals}. Otherwise they are evaluated
* via {@link Object#equals(Object)}. Testing against {@link Number#doubleValue()} enables the compare
* operations to be a bit more forgiving with respect to comparing different number types.
+ *
+ * @since 3.0.0-incubating
*/
neq {
@Override
@@ -83,6 +87,8 @@ public enum Compare implements BiPredicate<Object, Object> {
* {@link BigDecimal} so that it can be evaluated via {@link BigDecimal#compareTo}. Otherwise they are evaluated
* via {@link Comparable#compareTo(Object)}. Testing against {@link BigDecimal#compareTo} enables the compare
* operations to be a bit more forgiving with respect to comparing different number types.
+ *
+ * @since 3.0.0-incubating
*/
gt {
@Override
@@ -108,6 +114,8 @@ public enum Compare implements BiPredicate<Object, Object> {
* {@link BigDecimal} so that it can be evaluated via {@link BigDecimal#compareTo}. Otherwise they are evaluated
* via {@link Comparable#compareTo(Object)}. Testing against {@link BigDecimal#compareTo} enables the compare
* operations to be a bit more forgiving with respect to comparing different number types.
+ *
+ * @since 3.0.0-incubating
*/
gte {
@Override
@@ -130,6 +138,8 @@ public enum Compare implements BiPredicate<Object, Object> {
* {@link BigDecimal} so that it can be evaluated via {@link BigDecimal#compareTo}. Otherwise they are evaluated
* via {@link Comparable#compareTo(Object)}. Testing against {@link BigDecimal#compareTo} enables the compare
* operations to be a bit more forgiving with respect to comparing different number types.
+ *
+ * @since 3.0.0-incubating
*/
lt {
@Override
@@ -155,6 +165,8 @@ public enum Compare implements BiPredicate<Object, Object> {
* {@link BigDecimal} so that it can be evaluated via {@link BigDecimal#compareTo}. Otherwise they are evaluated
* via {@link Comparable#compareTo(Object)}. Testing against {@link BigDecimal#compareTo} enables the compare
* operations to be a bit more forgiving with respect to comparing different number types.
+ *
+ * @since 3.0.0-incubating
*/
lte {
@Override
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a4c5a213/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Contains.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Contains.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Contains.java
index 2da0436..da46d0b 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Contains.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Contains.java
@@ -38,6 +38,8 @@ public enum Contains implements BiPredicate<Object, Collection> {
/**
* The first object is within the {@link Collection} provided in the second object.
+ *
+ * @since 3.0.0-incubating
*/
within {
@Override
@@ -48,6 +50,8 @@ public enum Contains implements BiPredicate<Object, Collection> {
/**
* The first object is not within the {@link Collection} provided in the second object.
+ *
+ * @since 3.0.0-incubating
*/
without {
@Override
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a4c5a213/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Operator.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Operator.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Operator.java
index a52f34b..f9e0b5c 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Operator.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Operator.java
@@ -23,65 +23,132 @@ import java.util.Map;
import java.util.function.BinaryOperator;
/**
+ * A set of {@link BinaryOperator} instances that handle common operations for traversal steps.
+ *
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
public enum Operator implements BinaryOperator<Object> {
+ /**
+ * An addition function.
+ *
+ * @since 3.0.0-incubating
+ */
sum {
public Object apply(final Object a, Object b) {
return NumberHelper.add((Number) a, (Number) b);
}
},
+
+ /**
+ * A subtraction function.
+ *
+ * @since 3.0.0-incubating
+ */
minus {
public Object apply(final Object a, final Object b) {
return NumberHelper.sub((Number) a, (Number) b);
}
},
+
+ /**
+ * A multiplication function.
+ *
+ * @since 3.0.0-incubating
+ */
mult {
public Object apply(final Object a, final Object b) {
return NumberHelper.mul((Number) a, (Number) b);
}
},
+
+ /**
+ * A division function.
+ *
+ * @since 3.0.0-incubating
+ */
div {
public Object apply(final Object a, final Object b) {
return NumberHelper.div((Number) a, (Number) b);
}
},
+
+ /**
+ * Selects the smaller of the values.
+ *
+ * @since 3.0.0-incubating
+ */
min {
public Object apply(final Object a, final Object b) {
return NumberHelper.min((Number) a, (Number) b);
}
},
+
+ /**
+ * Selects the larger of the values.
+ *
+ * @since 3.0.0-incubating
+ */
max {
public Object apply(final Object a, final Object b) {
return NumberHelper.max((Number) a, (Number) b);
}
},
+
+ /**
+ * The new incoming value (i.e. the second value to the function) is returned unchanged result in the assignment
+ * of that value to the object of the {@code Operator}.
+ *
+ * @since 3.1.0-incubating
+ */
assign {
public Object apply(final Object a, final Object b) {
return b;
}
},
+
+ /**
+ * Applies "and" to boolean values.
+ *
+ * @since 3.2.0-incubating
+ */
and {
public Object apply(final Object a, final Object b) {
return ((boolean) a) && ((boolean) b);
}
},
+
+ /**
+ * Applies "or" to boolean values.
+ *
+ * @since 3.2.0-incubating
+ */
or {
public Object apply(final Object a, final Object b) {
return ((boolean) a) || ((boolean) b);
}
},
+
+ /**
+ * Takes all objects in the second {@code Collection} and adds them to the first.
+ *
+ * @since 3.2.0-incubating
+ */
addAll {
public Object apply(final Object a, final Object b) {
if (a instanceof Map)
- ((Map) a).putAll((Map) b);
+ ((Map<?,?>) a).putAll((Map) b);
else
- ((Collection) a).addAll((Collection) b);
+ ((Collection<?>) a).addAll((Collection) b);
return a;
}
},
- //////
+
+ /**
+ * Sums and adds long values.
+ *
+ * @since 3.2.0-incubating
+ */
sumLong {
public Object apply(final Object a, final Object b) {
return (long) a + (long) b;
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a4c5a213/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/P.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/P.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/P.java
index 3b2d0c2..8454f33 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/P.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/P.java
@@ -28,6 +28,7 @@ import java.util.function.BiPredicate;
import java.util.function.Predicate;
/**
+ * Predefined {@code Predicate} values that can be used with
* @author Marko A. Rodriguez (http://markorodriguez.com)
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
@@ -121,62 +122,137 @@ public class P<V> implements Predicate<V>, Serializable, Cloneable {
//////////////// statics
+ /**
+ * Determines if values are equal.
+ *
+ * @since 3.0.0-incubating
+ */
public static <V> P<V> eq(final V value) {
return new P(Compare.eq, value);
}
+ /**
+ * Determines if values are not equal.
+ *
+ * @since 3.0.0-incubating
+ */
public static <V> P<V> neq(final V value) {
return new P(Compare.neq, value);
}
+ /**
+ * Determines if a value is less than another.
+ *
+ * @since 3.0.0-incubating
+ */
public static <V> P<V> lt(final V value) {
return new P(Compare.lt, value);
}
+ /**
+ * Determines if a value is less than or equal to another.
+ *
+ * @since 3.0.0-incubating
+ */
public static <V> P<V> lte(final V value) {
return new P(Compare.lte, value);
}
+ /**
+ * Determines if a value is greater than another.
+ *
+ * @since 3.0.0-incubating
+ */
public static <V> P<V> gt(final V value) {
return new P(Compare.gt, value);
}
+ /**
+ * Determines if a value is greater than or equal to another.
+ *
+ * @since 3.0.0-incubating
+ */
public static <V> P<V> gte(final V value) {
return new P(Compare.gte, value);
}
+ /**
+ * Determines if a value is within (exclusive) the range of the two specified values.
+ *
+ * @since 3.0.0-incubating
+ */
public static <V> P<V> inside(final V first, final V second) {
return new AndP<V>(Arrays.asList(new P(Compare.gt, first), new P(Compare.lt, second)));
}
+ /**
+ * Determines if a value is not within (exclusive) of the range of the two specified values.
+ *
+ * @since 3.0.0-incubating
+ */
public static <V> P<V> outside(final V first, final V second) {
return new OrP<V>(Arrays.asList(new P(Compare.lt, first), new P(Compare.gt, second)));
}
+ /**
+ * Determines if a value is within (inclusive) of the range of the two specified values.
+ *
+ * @since 3.0.0-incubating
+ */
public static <V> P<V> between(final V first, final V second) {
return new AndP<V>(Arrays.asList(new P(Compare.gte, first), new P(Compare.lt, second)));
}
+ /**
+ * Determines if a value is within the specified list of values.
+ *
+ * @since 3.0.0-incubating
+ */
public static <V> P<V> within(final V... values) {
return P.within(Arrays.asList(values));
}
+ /**
+ * Determines if a value is within the specified list of values.
+ *
+ * @since 3.0.0-incubating
+ */
public static <V> P<V> within(final Collection<V> value) {
return new P(Contains.within, value);
}
+ /**
+ * Determines if a value is not within the specified list of values.
+ *
+ * @since 3.0.0-incubating
+ */
public static <V> P<V> without(final V... values) {
return P.without(Arrays.asList(values));
}
+ /**
+ * Deermines if a value is not within the specified list of values.
+ *
+ * @since 3.0.0-incubating
+ */
public static <V> P<V> without(final Collection<V> value) {
return new P(Contains.without, value);
}
+ /**
+ * Construct an instance of {@code P} from a {@code BiPredicate}.
+ *
+ * @since 3.0.0-incubating
+ */
public static P test(final BiPredicate biPredicate, final Object value) {
return new P(biPredicate, value);
}
+ /**
+ * The opposite of the specified {@code P}.
+ *
+ * @since 3.0.0-incubating
+ */
public static <V> P<V> not(final P<V> predicate) {
return predicate.negate();
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a4c5a213/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Pop.java
----------------------------------------------------------------------
diff --git 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
index c9eab94..b2fe2b9 100644
--- 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
@@ -19,20 +19,28 @@
package org.apache.tinkerpop.gremlin.process.traversal;
/**
+ * Methods for extracting an item from a collection.
+ *
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
public enum Pop {
/**
- * The first item in an ordered collection (i.e. <code>collection[0]</code>)
+ * The first item in an ordered collection (i.e. {@code collection[0]}).
+ *
+ * @since 3.0.0-incubating
*/
first,
/**
- * The last item in an ordered collection (i.e. <code>collection[collection.size()-1]</code>)
+ * The last item in an ordered collection (i.e. {@code collection[collection.size()-1]}).
+ *
+ * @since 3.0.0-incubating
*/
last,
/**
- * Get all the items and return them as a list
+ * Get all the items and return them as a list.
+ *
+ * @since 3.0.0-incubating
*/
all
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a4c5a213/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Scope.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Scope.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Scope.java
index 11979de..c454922 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Scope.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Scope.java
@@ -19,15 +19,26 @@
package org.apache.tinkerpop.gremlin.process.traversal;
/**
- * Many {@link Step} instance can have a variable scope.
- * {@link Scope#global}: the step operates on the entire traversal.
- * {@link Scope#local}: the step operates on the current object in the step.
+ * Many {@link Step} instance can have a variable scope which alter the manner in which the step will behave in
+ * relation to how the traversers are processed.
*
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
public enum Scope {
- global, local;
+ /**
+ * Informs the step to operate on the entire traversal.
+ *
+ * @since 3.0.0-incubating
+ */
+ global,
+
+ /**
+ * Informs the step to operate on the current object in the step.
+ *
+ * @since 3.0.0-incubating
+ */
+ local;
public Scope opposite() {
return global.equals(this) ? local : global;
[23/50] tinkerpop git commit: TinkerPop 3.2.9 release
Posted by fl...@apache.org.
TinkerPop 3.2.9 release
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/fde136b1
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/fde136b1
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/fde136b1
Branch: refs/heads/TINKERPOP-1897
Commit: fde136b1dd707398803fe337344d1ba5969a66bb
Parents: f64afe5
Author: Robert Dale <ro...@gmail.com>
Authored: Tue May 8 08:48:16 2018 -0400
Committer: Robert Dale <ro...@gmail.com>
Committed: Tue May 8 08:48:16 2018 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 17 ++++++++++++++++-
docs/src/upgrade/release-3.2.x-incubating.asciidoc | 4 ++--
giraph-gremlin/pom.xml | 2 +-
gremlin-archetype/gremlin-archetype-dsl/pom.xml | 2 +-
gremlin-archetype/gremlin-archetype-server/pom.xml | 2 +-
.../gremlin-archetype-tinkergraph/pom.xml | 2 +-
gremlin-archetype/pom.xml | 2 +-
gremlin-benchmark/pom.xml | 2 +-
gremlin-console/bin/gremlin.sh | 2 +-
gremlin-console/pom.xml | 2 +-
gremlin-core/pom.xml | 2 +-
gremlin-dotnet/pom.xml | 2 +-
gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj | 2 +-
gremlin-dotnet/src/pom.xml | 2 +-
gremlin-dotnet/test/pom.xml | 2 +-
gremlin-driver/pom.xml | 2 +-
gremlin-groovy-test/pom.xml | 2 +-
gremlin-groovy/pom.xml | 2 +-
gremlin-javascript/pom.xml | 2 +-
.../javascript/gremlin-javascript/package.json | 2 +-
gremlin-python/pom.xml | 2 +-
gremlin-server/pom.xml | 2 +-
gremlin-shaded/pom.xml | 2 +-
gremlin-test/pom.xml | 2 +-
hadoop-gremlin/pom.xml | 2 +-
neo4j-gremlin/pom.xml | 2 +-
pom.xml | 2 +-
spark-gremlin/pom.xml | 2 +-
tinkergraph-gremlin/pom.xml | 2 +-
29 files changed, 45 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fde136b1/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index f6ca111..18f36ed 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -21,7 +21,7 @@ limitations under the License.
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/images/nine-inch-gremlins.png[width=185]
[[release-3-2-9]]
-=== TinkerPop 3.2.9 (Release Date: NOT OFFICIALLY RELEASED YET)
+=== TinkerPop 3.2.9 (Release Date: May 8, 2018)
* Fixed bug where path history was not being preserved for keys in mutations.
* Bumped to httpclient 4.5.5.
@@ -29,6 +29,21 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
* Improved performance of GraphSON deserialization of `Bytecode`.
* Improved performance of traversal construction.
+==== Bugs
+
+* TINKERPOP-1947 Path history isn't preserved for keys in mutations
+
+==== Improvements
+
+* TINKERPOP-1755 No docs for ReferenceElements
+* TINKERPOP-1912 Remove MD5 checksums
+* TINKERPOP-1934 Bump to latest version of httpclient
+* TINKERPOP-1936 Performance enhancement to Bytecode deserialization
+* TINKERPOP-1944 JavaScript GLV: DriverRemoteConnection is not exported in the root module
+* TINKERPOP-1950 Traversal construction performance enhancements
+* TINKERPOP-1953 Bump to Groovy 2.4.15
+
+
[[release-3-2-8]]
=== TinkerPop 3.2.8 (Release Date: April 2, 2018)
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fde136b1/docs/src/upgrade/release-3.2.x-incubating.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/upgrade/release-3.2.x-incubating.asciidoc b/docs/src/upgrade/release-3.2.x-incubating.asciidoc
index 51b85d3..06e4f59 100644
--- a/docs/src/upgrade/release-3.2.x-incubating.asciidoc
+++ b/docs/src/upgrade/release-3.2.x-incubating.asciidoc
@@ -23,9 +23,9 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
== TinkerPop 3.2.9
-*Release Date: NOT OFFICIALLY RELEASED YET*
+*Release Date: May 8, 2018*
-Please see the link:https://github.com/apache/tinkerpop/blob/3.2.8/CHANGELOG.asciidoc#release-3-2-9[changelog] for a complete list of all the modifications that are part of this release.
+Please see the link:https://github.com/apache/tinkerpop/blob/3.2.9/CHANGELOG.asciidoc#release-3-2-9[changelog] for a complete list of all the modifications that are part of this release.
=== Upgrading for Users
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fde136b1/giraph-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/giraph-gremlin/pom.xml b/giraph-gremlin/pom.xml
index 9ca6687..69355be 100644
--- a/giraph-gremlin/pom.xml
+++ b/giraph-gremlin/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.2.9-SNAPSHOT</version>
+ <version>3.2.9</version>
</parent>
<artifactId>giraph-gremlin</artifactId>
<name>Apache TinkerPop :: Giraph Gremlin</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fde136b1/gremlin-archetype/gremlin-archetype-dsl/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-archetype/gremlin-archetype-dsl/pom.xml b/gremlin-archetype/gremlin-archetype-dsl/pom.xml
index 242ea07..4dd6297 100644
--- a/gremlin-archetype/gremlin-archetype-dsl/pom.xml
+++ b/gremlin-archetype/gremlin-archetype-dsl/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-archetype</artifactId>
- <version>3.2.9-SNAPSHOT</version>
+ <version>3.2.9</version>
</parent>
<artifactId>gremlin-archetype-dsl</artifactId>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fde136b1/gremlin-archetype/gremlin-archetype-server/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-archetype/gremlin-archetype-server/pom.xml b/gremlin-archetype/gremlin-archetype-server/pom.xml
index 83fa7ad..eedbd56 100644
--- a/gremlin-archetype/gremlin-archetype-server/pom.xml
+++ b/gremlin-archetype/gremlin-archetype-server/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-archetype</artifactId>
- <version>3.2.9-SNAPSHOT</version>
+ <version>3.2.9</version>
</parent>
<artifactId>gremlin-archetype-server</artifactId>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fde136b1/gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml b/gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml
index cb3b0eb..ecf5a50 100644
--- a/gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml
+++ b/gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-archetype</artifactId>
- <version>3.2.9-SNAPSHOT</version>
+ <version>3.2.9</version>
</parent>
<artifactId>gremlin-archetype-tinkergraph</artifactId>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fde136b1/gremlin-archetype/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-archetype/pom.xml b/gremlin-archetype/pom.xml
index 12043c0..9f929af 100644
--- a/gremlin-archetype/pom.xml
+++ b/gremlin-archetype/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<artifactId>tinkerpop</artifactId>
<groupId>org.apache.tinkerpop</groupId>
- <version>3.2.9-SNAPSHOT</version>
+ <version>3.2.9</version>
</parent>
<artifactId>gremlin-archetype</artifactId>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fde136b1/gremlin-benchmark/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-benchmark/pom.xml b/gremlin-benchmark/pom.xml
index 571bc0d..bcce1ef 100644
--- a/gremlin-benchmark/pom.xml
+++ b/gremlin-benchmark/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<artifactId>tinkerpop</artifactId>
<groupId>org.apache.tinkerpop</groupId>
- <version>3.2.9-SNAPSHOT</version>
+ <version>3.2.9</version>
</parent>
<artifactId>gremlin-benchmark</artifactId>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fde136b1/gremlin-console/bin/gremlin.sh
----------------------------------------------------------------------
diff --git a/gremlin-console/bin/gremlin.sh b/gremlin-console/bin/gremlin.sh
index ae28f7b..cdf1153 120000
--- a/gremlin-console/bin/gremlin.sh
+++ b/gremlin-console/bin/gremlin.sh
@@ -1 +1 @@
-../target/apache-tinkerpop-gremlin-console-3.2.9-SNAPSHOT-standalone/bin/gremlin.sh
\ No newline at end of file
+../target/apache-tinkerpop-gremlin-console-3.2.9-standalone/bin/gremlin.sh
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fde136b1/gremlin-console/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index 51ad5ca..7581397 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<artifactId>tinkerpop</artifactId>
<groupId>org.apache.tinkerpop</groupId>
- <version>3.2.9-SNAPSHOT</version>
+ <version>3.2.9</version>
</parent>
<artifactId>gremlin-console</artifactId>
<name>Apache TinkerPop :: Gremlin Console</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fde136b1/gremlin-core/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-core/pom.xml b/gremlin-core/pom.xml
index a170f8b..78bffa5 100644
--- a/gremlin-core/pom.xml
+++ b/gremlin-core/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.2.9-SNAPSHOT</version>
+ <version>3.2.9</version>
</parent>
<artifactId>gremlin-core</artifactId>
<name>Apache TinkerPop :: Gremlin Core</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fde136b1/gremlin-dotnet/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/pom.xml b/gremlin-dotnet/pom.xml
index 20b4fab..10f5791 100644
--- a/gremlin-dotnet/pom.xml
+++ b/gremlin-dotnet/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.2.9-SNAPSHOT</version>
+ <version>3.2.9</version>
</parent>
<artifactId>gremlin-dotnet</artifactId>
<name>Apache TinkerPop :: Gremlin.Net</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fde136b1/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj b/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
index fc75b83..ad85e56 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
+++ b/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
@@ -25,7 +25,7 @@ limitations under the License.
</PropertyGroup>
<PropertyGroup Label="Package">
- <Version>3.2.9-SNAPSHOT</Version>
+ <Version>3.2.9</Version>
<FileVersion>3.2.9.0</FileVersion>
<AssemblyVersion>3.2.0.0</AssemblyVersion>
<Title>Gremlin.Net</Title>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fde136b1/gremlin-dotnet/src/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/pom.xml b/gremlin-dotnet/src/pom.xml
index aabd43b..9769b62 100644
--- a/gremlin-dotnet/src/pom.xml
+++ b/gremlin-dotnet/src/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-dotnet</artifactId>
- <version>3.2.9-SNAPSHOT</version>
+ <version>3.2.9</version>
</parent>
<artifactId>gremlin-dotnet-source</artifactId>
<name>Apache TinkerPop :: Gremlin.Net - Source</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fde136b1/gremlin-dotnet/test/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/test/pom.xml b/gremlin-dotnet/test/pom.xml
index e7e7aac..8c49ae9 100644
--- a/gremlin-dotnet/test/pom.xml
+++ b/gremlin-dotnet/test/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-dotnet</artifactId>
- <version>3.2.9-SNAPSHOT</version>
+ <version>3.2.9</version>
</parent>
<artifactId>gremlin-dotnet-tests</artifactId>
<name>Apache TinkerPop :: Gremlin.Net - Tests</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fde136b1/gremlin-driver/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-driver/pom.xml b/gremlin-driver/pom.xml
index cc826a5..4ba9339 100644
--- a/gremlin-driver/pom.xml
+++ b/gremlin-driver/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.2.9-SNAPSHOT</version>
+ <version>3.2.9</version>
</parent>
<artifactId>gremlin-driver</artifactId>
<name>Apache TinkerPop :: Gremlin Driver</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fde136b1/gremlin-groovy-test/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/pom.xml b/gremlin-groovy-test/pom.xml
index a915f7d..cc21f8b 100644
--- a/gremlin-groovy-test/pom.xml
+++ b/gremlin-groovy-test/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.2.9-SNAPSHOT</version>
+ <version>3.2.9</version>
</parent>
<artifactId>gremlin-groovy-test</artifactId>
<name>Apache TinkerPop :: Gremlin Groovy Test</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fde136b1/gremlin-groovy/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-groovy/pom.xml b/gremlin-groovy/pom.xml
index 14efe86..627893a 100644
--- a/gremlin-groovy/pom.xml
+++ b/gremlin-groovy/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.2.9-SNAPSHOT</version>
+ <version>3.2.9</version>
</parent>
<artifactId>gremlin-groovy</artifactId>
<name>Apache TinkerPop :: Gremlin Groovy</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fde136b1/gremlin-javascript/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-javascript/pom.xml b/gremlin-javascript/pom.xml
index 89fb930..29da33d 100644
--- a/gremlin-javascript/pom.xml
+++ b/gremlin-javascript/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.2.9-SNAPSHOT</version>
+ <version>3.2.9</version>
</parent>
<artifactId>gremlin-javascript</artifactId>
<name>Apache TinkerPop :: Gremlin Javascript</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fde136b1/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
----------------------------------------------------------------------
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json b/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
index 9a6197c..aa64bfb 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
@@ -1,6 +1,6 @@
{
"name": "gremlin",
- "version": "3.2.9-alpha1",
+ "version": "3.2.9",
"description": "JavaScript Gremlin Language Variant",
"author": "Apache TinkerPop team",
"keywords": [
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fde136b1/gremlin-python/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-python/pom.xml b/gremlin-python/pom.xml
index 649f3ae..8340560 100644
--- a/gremlin-python/pom.xml
+++ b/gremlin-python/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.2.9-SNAPSHOT</version>
+ <version>3.2.9</version>
</parent>
<artifactId>gremlin-python</artifactId>
<name>Apache TinkerPop :: Gremlin Python</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fde136b1/gremlin-server/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index dd04865..1b38dff 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.2.9-SNAPSHOT</version>
+ <version>3.2.9</version>
</parent>
<artifactId>gremlin-server</artifactId>
<name>Apache TinkerPop :: Gremlin Server</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fde136b1/gremlin-shaded/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-shaded/pom.xml b/gremlin-shaded/pom.xml
index a74a91a..f40a3ed 100644
--- a/gremlin-shaded/pom.xml
+++ b/gremlin-shaded/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.2.9-SNAPSHOT</version>
+ <version>3.2.9</version>
</parent>
<artifactId>gremlin-shaded</artifactId>
<name>Apache TinkerPop :: Gremlin Shaded</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fde136b1/gremlin-test/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-test/pom.xml b/gremlin-test/pom.xml
index 3c04c9f..66e1a3e 100644
--- a/gremlin-test/pom.xml
+++ b/gremlin-test/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.2.9-SNAPSHOT</version>
+ <version>3.2.9</version>
</parent>
<artifactId>gremlin-test</artifactId>
<name>Apache TinkerPop :: Gremlin Test</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fde136b1/hadoop-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/pom.xml b/hadoop-gremlin/pom.xml
index a0f0cc7..a596db5 100644
--- a/hadoop-gremlin/pom.xml
+++ b/hadoop-gremlin/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.2.9-SNAPSHOT</version>
+ <version>3.2.9</version>
</parent>
<artifactId>hadoop-gremlin</artifactId>
<name>Apache TinkerPop :: Hadoop Gremlin</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fde136b1/neo4j-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/neo4j-gremlin/pom.xml b/neo4j-gremlin/pom.xml
index a65a30f..e77f83e 100644
--- a/neo4j-gremlin/pom.xml
+++ b/neo4j-gremlin/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.2.9-SNAPSHOT</version>
+ <version>3.2.9</version>
</parent>
<artifactId>neo4j-gremlin</artifactId>
<name>Apache TinkerPop :: Neo4j Gremlin</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fde136b1/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4ec1ab4..379db49 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@ limitations under the License.
</parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.2.9-SNAPSHOT</version>
+ <version>3.2.9</version>
<packaging>pom</packaging>
<name>Apache TinkerPop</name>
<description>A Graph Computing Framework</description>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fde136b1/spark-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/spark-gremlin/pom.xml b/spark-gremlin/pom.xml
index 913357c..feb339b 100644
--- a/spark-gremlin/pom.xml
+++ b/spark-gremlin/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.2.9-SNAPSHOT</version>
+ <version>3.2.9</version>
</parent>
<artifactId>spark-gremlin</artifactId>
<name>Apache TinkerPop :: Spark Gremlin</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fde136b1/tinkergraph-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/pom.xml b/tinkergraph-gremlin/pom.xml
index f23a716..c842275 100644
--- a/tinkergraph-gremlin/pom.xml
+++ b/tinkergraph-gremlin/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.2.9-SNAPSHOT</version>
+ <version>3.2.9</version>
</parent>
<artifactId>tinkergraph-gremlin</artifactId>
<name>Apache TinkerPop :: TinkerGraph Gremlin</name>
[06/50] tinkerpop git commit: Fixed typo in JavaDoc: TraversalEngine
Posted by fl...@apache.org.
Fixed typo in JavaDoc: TraversalEngine
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/37924222
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/37924222
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/37924222
Branch: refs/heads/TINKERPOP-1897
Commit: 379242222a9381359986031285cc19250816effd
Parents: 682f298
Author: Justin Chu <15...@users.noreply.github.com>
Authored: Tue Apr 24 22:46:33 2018 -0400
Committer: Justin Chu <15...@users.noreply.github.com>
Committed: Tue Apr 24 22:46:33 2018 -0400
----------------------------------------------------------------------
.../tinkerpop/gremlin/process/traversal/TraversalEngine.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/37924222/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalEngine.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalEngine.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalEngine.java
index 052b99b..d58c988 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalEngine.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalEngine.java
@@ -33,7 +33,7 @@ import java.util.Optional;
* Every {@link TraversalSource} should be provided a {@link TraversalEngine.Builder} so it can construct an engine for each spawned {@link Traversal}.
*
* @author Marko A. Rodriguez (http://markorodriguez.com)
- * @deprecated As of release 3.2.0, replaced by {@code Computer}.
+ * @deprecated As of release 3.2.0, replaced by {@link org.apache.tinkerpop.gremlin.process.computer.Computer}.
*/
@Deprecated
public interface TraversalEngine extends Serializable {
[30/50] tinkerpop git commit: TINKERPOP-1961 Removed duplication of
images in binaries.
Posted by fl...@apache.org.
TINKERPOP-1961 Removed duplication of images in binaries.
The asciidoc plugin copies all files in the source directories of its execution. The asciidoc plugin was upgraded between 3.2.5 and 3.2.6 which introduced this new behavior.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/288b455a
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/288b455a
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/288b455a
Branch: refs/heads/TINKERPOP-1897
Commit: 288b455a731bbc2f062b2cfe043f8c775dee9700
Parents: 3635ff6
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed May 9 07:03:13 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri May 11 20:03:31 2018 -0400
----------------------------------------------------------------------
pom.xml | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/288b455a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9737fef..9c4b507 100644
--- a/pom.xml
+++ b/pom.xml
@@ -811,9 +811,14 @@ limitations under the License.
<goal>process-asciidoc</goal>
</goals>
<configuration>
- <sourceDirectory>${asciidoc.input.dir}/</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>${asciidoc.input.dir}/</directory>
+ <targetPath>${htmlsingle.output.dir}/</targetPath>
+ <excludes>${asciidoc.input.dir}/static/*.*</excludes>
+ </resource>
+ </resources>
<sourceDocumentName>index.asciidoc</sourceDocumentName>
- <outputDirectory>${htmlsingle.output.dir}/</outputDirectory>
<backend>html5</backend>
<doctype>article</doctype>
<attributes>
[34/50] tinkerpop git commit: Fixed some minor asciidoc formatting
problems CTR
Posted by fl...@apache.org.
Fixed some minor asciidoc formatting problems CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/770375d4
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/770375d4
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/770375d4
Branch: refs/heads/TINKERPOP-1897
Commit: 770375d4dad8dd57b6265a464e9346f63083072c
Parents: 90e7476
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon May 14 11:52:03 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon May 14 11:52:03 2018 -0400
----------------------------------------------------------------------
docs/src/dev/developer/release.asciidoc | 2 +-
docs/src/upgrade/release-3.2.x-incubating.asciidoc | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/770375d4/docs/src/dev/developer/release.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/release.asciidoc b/docs/src/dev/developer/release.asciidoc
index 8631a74..37aa0df 100644
--- a/docs/src/dev/developer/release.asciidoc
+++ b/docs/src/dev/developer/release.asciidoc
@@ -34,7 +34,7 @@ execute.
IMPORTANT: The following instructions assume that the release manager's <<development-environment,environment>> is setup
properly for release and includes a `.glv` files in the various GLV modules, so that they all build in full.
-=== Development Versions
+== Development Versions
A "development version" or "snapshot" (in Java parlance) is not an "official" release. Artifacts produced for a
snapshot are solely for the convenience of providers and other developers who want to use the latest releases of
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/770375d4/docs/src/upgrade/release-3.2.x-incubating.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/upgrade/release-3.2.x-incubating.asciidoc b/docs/src/upgrade/release-3.2.x-incubating.asciidoc
index b5eb3b3..112ce22 100644
--- a/docs/src/upgrade/release-3.2.x-incubating.asciidoc
+++ b/docs/src/upgrade/release-3.2.x-incubating.asciidoc
@@ -509,6 +509,8 @@ See: link:https://issues.apache.org/jira/browse/TINKERPOP-1599[TINKERPOP-1599]
IMPORTANT: It is recommended that providers also review all the upgrade instructions specified for users. Many of the
changes there may prove important for the provider's implementation.
+==== Graph Database Providers
+
===== SimplePathStep and CyclicPathStep now PathFilterStep
The Gremlin traversal machine use to support two step instructions: `SimplePathStep` and `CyclicPathStep`. These have
@@ -636,14 +638,12 @@ removed.
See: link:https://issues.apache.org/jira/browse/TINKERPOP-1562[TINKERPOP-1562]
-
==== SSL Client Authentication
Added new server configuration option `ssl.needClientAuth`.
See: link:https://issues.apache.org/jira/browse/TINKERPOP-1602[TINKERPOP-1602]
-
=== Upgrading for Providers
IMPORTANT: It is recommended that providers also review all the upgrade instructions specified for users. Many of the
@@ -692,7 +692,6 @@ public void addHasContainer(final HasContainer hasContainer) {
See: link:https://issues.apache.org/jira/browse/TINKERPOP-1482[TINKERPOP-1482],
link:https://issues.apache.org/jira/browse/TINKERPOP-1502[TINKERPOP-1502]
-
===== Duplicate Multi-Properties
Added `supportsDuplicateMultiProperties` to `VertexFeatures` so that graph provider who only support unique values as
[45/50] tinkerpop git commit: Remove verbose log output TINKERPOP-1897
Posted by fl...@apache.org.
Remove verbose log output TINKERPOP-1897
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1066f63c
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1066f63c
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1066f63c
Branch: refs/heads/TINKERPOP-1897
Commit: 1066f63c8a9ab7015485d6ddfc1925854936427b
Parents: 80b1fc2
Author: Florian Hockmann <fh...@florian-hockmann.de>
Authored: Thu Mar 1 17:19:39 2018 +0100
Committer: Florian Hockmann <fh...@florian-hockmann.de>
Committed: Sat May 19 10:51:35 2018 +0200
----------------------------------------------------------------------
.../src/reference/gremlin-applications.asciidoc | 26 +-------------------
1 file changed, 1 insertion(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1066f63c/docs/src/reference/gremlin-applications.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/gremlin-applications.asciidoc b/docs/src/reference/gremlin-applications.asciidoc
index 800164b..f20ee72 100644
--- a/docs/src/reference/gremlin-applications.asciidoc
+++ b/docs/src/reference/gremlin-applications.asciidoc
@@ -1945,31 +1945,7 @@ $ docker run tinkerpop/gremlin-server:x.y.z
-----oOOo-(3)-oOOo-----
[INFO] GremlinServer - Configuring Gremlin Server from conf/gremlin-server.yaml
-[INFO] MetricManager - Configured Metrics ConsoleReporter configured with report interval=180000ms
-[INFO] MetricManager - Configured Metrics CsvReporter configured with report interval=180000ms to fileName=/tmp/gremlin-server-metrics.csv
-[INFO] MetricManager - Configured Metrics JmxReporter configured with domain= and agentId=
-[INFO] MetricManager - Configured Metrics Slf4jReporter configured with interval=180000ms and loggerName=org.apache.tinkerpop.gremlin.server.Settings$Slf4jReporterMetrics
-[INFO] DefaultGraphManager - Graph [graph] was successfully configured via [conf/tinkergraph-empty.properties].
-[INFO] ServerGremlinExecutor - Initialized Gremlin thread pool. Threads in pool named with pattern gremlin-*
-[INFO] ScriptEngines - Loaded gremlin-groovy ScriptEngine
-[INFO] GremlinExecutor - Initialized gremlin-groovy ScriptEngine with scripts/empty-sample.groovy
-[INFO] ServerGremlinExecutor - Initialized GremlinExecutor and preparing GremlinScriptEngines instances.
-[INFO] ServerGremlinExecutor - Initialized gremlin-groovy GremlinScriptEngine and registered metrics
-[INFO] ServerGremlinExecutor - A GraphTraversalSource is now bound to [g] with graphtraversalsource[tinkergraph[vertices:0 edges:0], standard]
-[INFO] OpLoader - Adding the standard OpProcessor.
-[INFO] OpLoader - Adding the control OpProcessor.
-[INFO] OpLoader - Adding the session OpProcessor.
-[INFO] OpLoader - Adding the traversal OpProcessor.
-[INFO] TraversalOpProcessor - Initialized cache for TraversalOpProcessor with size 1000 and expiration time of 600000 ms
-[INFO] GremlinServer - Executing start up LifeCycleHook
-[INFO] Logger$info - Executed once at startup of Gremlin Server.
-[INFO] GremlinServer - idleConnectionTimeout was set to 0 which resolves to 0 seconds when configuring this value - this feature will be disabled
-[INFO] GremlinServer - keepAliveInterval was set to 0 which resolves to 0 seconds when configuring this value - this feature will be disabled
-[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-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/json with org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0
+...
[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 - Channel started at port 8182.
----
[37/50] tinkerpop git commit: TINKERPOP-1841 Configure python tests
in travis
Posted by fl...@apache.org.
TINKERPOP-1841 Configure python tests in travis
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a2feb2a5
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a2feb2a5
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a2feb2a5
Branch: refs/heads/TINKERPOP-1897
Commit: a2feb2a518d550091b5c2cbaf0ef32db18956f21
Parents: 58d3d40
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon May 14 15:51:57 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon May 14 15:51:57 2018 -0400
----------------------------------------------------------------------
.travis.yml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a2feb2a5/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 96cfe6a..6c98950 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,5 +29,6 @@ jobs:
include:
- script: "mvn clean install -Dci --batch-mode -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
- script: "touch gremlin-dotnet/src/.glv && touch gremlin-dotnet/test/.glv && mvn clean install -q -DskipTests && mvn verify -pl :gremlin-dotnet,:gremlin-dotnet-tests -P gremlin-dotnet -DskipIntegrationTests=false"
+ - script: "touch gremlin-python/.glv && mvn clean install -q -DskipTests && mvn verify -pl gremlin-python -DskipIntegrationTests=false"
- script: "mvn clean install -q -DskipTests && mvn verify -pl :gremlin-javascript -DskipIntegrationTests=false"
- script: "mvn clean install -q -DskipTests && mvn verify -pl :spark-gremlin -DskipIntegrationTests=false"
[19/50] tinkerpop git commit: Added javadoc in Order CTR
Posted by fl...@apache.org.
Added javadoc in Order CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/5fea198c
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5fea198c
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/5fea198c
Branch: refs/heads/TINKERPOP-1897
Commit: 5fea198c836c9886e7a8cc8abc9ead44956ad2b6
Parents: 0694cd7
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Apr 27 08:34:34 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Apr 27 08:34:34 2018 -0400
----------------------------------------------------------------------
.../tinkerpop/gremlin/process/traversal/Order.java | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5fea198c/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java
----------------------------------------------------------------------
diff --git 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
index 3710396..c9111f0 100644
--- 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,6 +67,7 @@ public enum Order implements Comparator<Object> {
return incr;
}
},
+
/**
* @since 3.0.0-incubating
* @deprecated As of release 3.1.1-incubating, replaced by {@link org.apache.tinkerpop.gremlin.structure.Column#keys}.
@@ -83,6 +84,7 @@ public enum Order implements Comparator<Object> {
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}.
@@ -99,6 +101,7 @@ public enum Order implements Comparator<Object> {
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}.
@@ -115,6 +118,7 @@ public enum Order implements Comparator<Object> {
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}.
@@ -130,7 +134,14 @@ public enum Order implements Comparator<Object> {
public Order reversed() {
return valueIncr;
}
- }, shuffle {
+ },
+
+ /**
+ * 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;
[33/50] tinkerpop git commit: Added more release manager docs CTR
Posted by fl...@apache.org.
Added more release manager docs CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/90e74768
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/90e74768
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/90e74768
Branch: refs/heads/TINKERPOP-1897
Commit: 90e747688a860fdcbe5ae52d025144e52c9f4f4c
Parents: cc7d2e2
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon May 14 10:55:18 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon May 14 10:55:18 2018 -0400
----------------------------------------------------------------------
.../developer/development-environment.asciidoc | 56 ++++++++++----------
docs/src/dev/developer/release.asciidoc | 46 ++++++++--------
2 files changed, 51 insertions(+), 51 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/90e74768/docs/src/dev/developer/development-environment.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/development-environment.asciidoc b/docs/src/dev/developer/development-environment.asciidoc
index 3e3edad..4dfbcaa 100644
--- a/docs/src/dev/developer/development-environment.asciidoc
+++ b/docs/src/dev/developer/development-environment.asciidoc
@@ -97,6 +97,8 @@ integration tests and therefore must be actively switched on with `-DskipIntegra
[source,text]
mvn clean install -pl gremlin-console -DskipIntegrationTests=false
+See the <<release-environment,Release Environment>> section for more information on release manager configurations.
+
[[dotnet-environment]]
=== DotNet Environment
@@ -114,33 +116,16 @@ and `test` directories of the `gremlin-dotnet` module  which will signify to Ma
The `.glv` file need not have any contents and is ignored by Git. A standard `mvn clean install` will then build
`gremlin-dotnet` in full.
-For those who will release TinkerPop, it is also necessary to install link:http://www.mono-project.com/[Mono]. The
-release process is known to work with 5.0.1, so it is best to probably install that version. Release managers should
-probably also do an install of link:https://dist.nuget.org/win-x86-commandline/v3.4.4/nuget.exe[nuget 3.4.4] as it
-will help with environmental setup. To get an environment ready to deploy to NuGet, it is necessary to have a
-NuGet API key (PMC members who have NuGet accounts can help with that). The API key should be added to `NuGet.Config`
-with the following:
-
-[source,text]
-----
-mono nuget.exe setApiKey [your-api-key]
-----
-
-This should update `~/.config/NuGet/NuGet.Config` a file with an entry containing the encrypted API key. On
-`mvn deploy`, this file will be referenced on the automated `nuget push`.
-
-See release documentation for more information on configuration for release.
-
+See the <<release-environment,Release Environment>> section for more information on release manager configurations.
[[nodejs-environment]]
=== JavaScript Environment
+
When building `gremlin-javascript`, mvn command will include a local copy of Node.js runtime and npm inside your project
using `com.github.eirslett:frontend-maven-plugin` plugin. This copy of the Node.js runtime will not affect any
other existing Node.js runtime instances in your machine.
-The release manager should have the authentication token set, for more information see the Release Environment
-section below.
-
+See the <<release-environment,Release Environment>> section for more information on release manager configurations.
[[release-environment]]
=== Release Environment
@@ -152,9 +137,9 @@ link:https://dist.apache.org/repos/dist/dev/tinkerpop/KEYS[development] and
link:https://dist.apache.org/repos/dist/release/tinkerpop/KEYS[release] distribution directories and committed
using Apache Subversion (SVN).
-Uploading to pypi uses link:https://pypi.python.org/pypi/twine[twine] which is automatically installed by the build
-process in maven. Twine refers to `HOME/.pypirc` file for configuration on the pypi deploy environments and username
-and password combinations. The file typically looks like this:
+For Python releases, uploading to pypi uses link:https://pypi.python.org/pypi/twine[twine] which is automatically
+installed by the build process in maven. Twine refers to `HOME/.pypirc` file for configuration on the pypi deploy
+environments and username and password combinations. The file typically looks like this:
[source,text]
----
@@ -164,7 +149,6 @@ index-servers=
pypitest
[pypitest]
-repository = https://testpypi.python.org/pypi
username = <username>
password =
@@ -174,12 +158,30 @@ username = <username>
password =
----
-The release manager shall use the project's pypi credentials, which are available in the PMC repository.
-The `password` should be left blank so the deployment process in Maven will prompt for it at deployment time.
+The release manager shall use the project's pypi credentials, which are available in the
+link:https://svn.apache.org/repos/private/pmc/tinkerpop[PMC SVN repository]. The `password` should be left blank so
+the deployment process in Maven will prompt for it at deployment time.
+
+For .NET releases, install link:http://www.mono-project.com/[Mono]. The release process is known to work with 5.0.1,
+so it is best to probably install that version. Release managers should probably also do an install of
+link:https://dist.nuget.org/win-x86-commandline/v3.4.4/nuget.exe[nuget 3.4.4] as it will help with environmental setup.
+To get an environment ready to deploy to NuGet, it is necessary to have a NuGet API key. First, create an account with
+link:https://www.nuget.org[nuget] and request that a PMC member add your account to the Gremlin.Net package in nuget
+so that you can deploy. Next, generate an API key for your account on the nuget website. The API key should be added
+to `NuGet.Config` with the following:
+
+[source,text]
+----
+mono nuget.exe setApiKey [your-api-key]
+----
+
+This should update `~/.config/NuGet/NuGet.Config` a file with an entry containing the encrypted API key. On
+`mvn deploy`, this file will be referenced on the automated `nuget push`.
To deploy `gremlin-javascript` on the link:https://www.npmjs.com[npm registry], the release manager must set the
authentication information on the ~/.npmrc file. The easiest way to do that is to use the `npm adduser` command. This
-must be done only once, as the auth token doesn't have an expiration date and it's stored on your file system.
+must be done only once, as the auth token doesn't have an expiration date and it's stored on your file system. If
+this account is newly created then request that a PMC member add your account to the "gremlin" package on npm.
[[building-testing]]
== Building and Testing
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/90e74768/docs/src/dev/developer/release.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/release.asciidoc b/docs/src/dev/developer/release.asciidoc
index 1a7ef82..8631a74 100644
--- a/docs/src/dev/developer/release.asciidoc
+++ b/docs/src/dev/developer/release.asciidoc
@@ -27,18 +27,16 @@ feedback. Once a release point has been identified, the following phases repres
* Submit the official release for PMC vote.
* Release and promote.
-NOTE: It might be helpful to use this document as generated from the currently release as opposed to one generate
-from a previous version or from recent `SNAPSHOT`. When using one generated for release, all the "versions" in the
-commands end up being set to the version that is being released, making cut and paste of those commands less labor
-intensive and error prone.
+IMPORTANT: During release, it is best to use the current SNAPSHOT version of this documentation to ensure that you have
+the latest updates as almost every release includes improved documentation that may involve new or revised steps to
+execute.
IMPORTANT: The following instructions assume that the release manager's <<development-environment,environment>> is setup
-properly for release and includes a `.glv` file in `gremlin-python` as described in the <<python-environment,Python Environment>>
-section, so that the `gremlin-python` module builds in full.
+properly for release and includes a `.glv` files in the various GLV modules, so that they all build in full.
=== Development Versions
-A "development version" or snapshot (in Java parlance) is not an "official" release. Artifacts produced for a
+A "development version" or "snapshot" (in Java parlance) is not an "official" release. Artifacts produced for a
snapshot are solely for the convenience of providers and other developers who want to use the latest releases of
TinkerPop. These releases do not require a VOTE and do not require a "release manager". Any PMC member can deploy them.
It is important to note that these releases cannot be promoted outside of the developer mailing list and should not be
@@ -51,34 +49,32 @@ For JVM-based artifacts, simply use the following command:
[source,text]
mvn clean deploy
-and artifacts will be pushed to the link:http://repository.apache.org/snapshots/[Apache Snapshot Repository]. Python
+and artifacts will be pushed to the link:http://repository.apache.org/snapshots/[Apache Snapshot Repository]. GLV
development artifacts must be generated and deployed separately with additional commands:
[source,text]
+----
mvn clean install -Pglv-python
mvn deploy -pl gremlin-python -Dpypi
+mvn clean install -pl :gremlin-dotnet,:gremlin-dotnet-source -Dnuget
+mvn deploy -pl :gremlin-dotnet-source -Dnuget
+mvn deploy -pl gremlin-javascript -Dnpm`
+----
+
+Python, .NET and Javascript do not use the snapshot model the JVM does, however, the build is smart in that it will
+dynamically generate a development version number for the GLV artifacts when "-SNAPSHOT" is in the `pom.xml`.
+
+If you wish to verify that `mvn deploy` works before doing it officially then:
-Python does not use the snapshot model the JVM does, however, the build is smart in that it will dynamically
-generate a development version number for the Python artifacts when "-SNAPSHOT" is in the `pom.xml`. The previous
-command will push the development version to link:https://pypi.python.org/pypi/gremlinpython/[pypi] for distribution.
-Use the `testpypi` test environment by updating the `gremlin-python/pom.xml` to verify the `mvn deploy` command works.
+* For Python, use the `testpypi` test environment by updating the `gremlin-python/pom.xml`.
+* For .NET, use the `staging.nuget.org` environment by updating the `gremlin-dot-source/pom.xml`
IMPORTANT: The `clean` in the above commands is more important to the pypi deployment because the process will deploy
anything found in the `target/python-packaged/dist` directory. Since the names of the artifacts are based on
timestamps, they will not overwrite one another and multiple artifacts will get uploaded.
-For .NET and NuGet, development artifacts can be created as follows:
-
-[source,text]
-mvn clean install -pl :gremlin-dotnet,:gremlin-dotnet-source -Dnuget
-mvn deploy -pl :gremlin-dotnet-source -Dnuget
-
-As with PyPi, NuGet does not support a snapshot model as Java does. The commands above will dynamically generate a
-version number when "-SNAPSHOT" is in the `pom.xml`. Use the `staging.nuget.org` environment by updating the
-`gremlin-dot-source/pom.xml` to ensure the `mvn deploy` command works.
-
-IMPORTANT: These commands will dynamically edit the `gremlin-dotnet-source/Gremlin.Net.csproj`. Take care to commit
-or not commit changes related to that as necessary.
+WARNING: These commands will dynamically edit certain files in the various GLVs given automated version number changes.
+Take care to commit or not commit changes related to that as necessary.
== Release Manager Requirements
@@ -235,6 +231,8 @@ for generating javadoc and without that the binary distributions won't contain t
.. `mvn deploy -pl gremlin-python -DskipTests -Dpypi`
.. `mvn deploy -pl :gremlin-dotnet-source -DskipTests -Dnuget`
.. `mvn deploy -pl gremlin-javascript -DskipTests -Dnpm`
+. Review the GLV releases at link:https://pypi.org/project/gremlinpython/[PyPi],
+link:https://www.nuget.org/packages/Gremlin.Net/[nuget] and link:https://www.npmjs.com/package/gremlin[npm]
. `svn co --depth empty https://dist.apache.org/repos/dist/dev/tinkerpop dev; svn up dev/xx.yy.zz`
. `svn co --depth empty https://dist.apache.org/repos/dist/release/tinkerpop release; mkdir release/xx.yy.zz`
. Copy release files from `dev/xx.yy.zz` to `release/xx.yy.zz`.
[40/50] tinkerpop git commit: Fixed some bad javadoc CTR
Posted by fl...@apache.org.
Fixed some bad javadoc CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ae562c18
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ae562c18
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ae562c18
Branch: refs/heads/TINKERPOP-1897
Commit: ae562c183eee1d708759413e8c31b5db5db07295
Parents: 699a5aa
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu May 17 15:42:06 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu May 17 15:42:06 2018 -0400
----------------------------------------------------------------------
.../computer/traversal/TraversalVertexProgram.java | 17 +++++++++--------
.../traversal/dsl/graph/GraphTraversal.java | 6 +++---
2 files changed, 12 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ae562c18/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgram.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgram.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgram.java
index 3cb4d00..8694974 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgram.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgram.java
@@ -63,6 +63,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMatrix;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMetrics;
import org.apache.tinkerpop.gremlin.structure.Direction;
+import org.apache.tinkerpop.gremlin.structure.Edge;
import org.apache.tinkerpop.gremlin.structure.Element;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.Vertex;
@@ -82,15 +83,15 @@ import java.util.List;
import java.util.Optional;
import java.util.Set;
-
/**
- * TraversalVertexProgram enables the evaluation of a {@link Traversal} on a {@link org.apache.tinkerpop.gremlin.process.computer.GraphComputer}.
- * At the start of the computation, each {@link Vertex} (or {@link org.apache.tinkerpop.gremlin.structure.Edge}) is assigned a single {@link Traverser}.
- * For each traverser that is local to the vertex, the vertex looks up its current location in the traversal and processes that step.
- * If the outputted traverser of the step references a local structure on the vertex (e.g. the vertex, an incident edge, its properties, or an arbitrary object),
- * then the vertex continues to compute the next traverser. If the traverser references another location in the graph,
- * then the traverser is sent to that location in the graph via a message. The messages of TraversalVertexProgram are traversers.
- * This continues until all traversers in the computation have halted.
+ * {@code TraversalVertexProgram} enables the evaluation of a {@link Traversal} on a {@link GraphComputer}.
+ * At the start of the computation, each {@link Vertex} (or {@link Edge}) is assigned a single {@link Traverser}.
+ * For each traverser that is local to the vertex, the vertex looks up its current location in the traversal and
+ * processes that step. If the outputted traverser of the step references a local structure on the vertex (e.g. the
+ * vertex, an incident edge, its properties, or an arbitrary object), then the vertex continues to compute the next
+ * traverser. If the traverser references another location in the graph, then the traverser is sent to that location
+ * in the graph via a message. The messages of TraversalVertexProgram are traversers. This continues until all
+ * traversers in the computation have halted.
*
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ae562c18/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
index 222fdab..1dccead 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
@@ -2406,10 +2406,10 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
}
/**
- * Executes a Peer Pressure community detection algorithm over the graph.
+ * Executes an arbitrary {@link VertexProgram} over the graph.
*
- * @return the traversal with the appended {@link PeerPressureVertexProgramStep}
- * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#peerpressure-step" target="_blank">Reference Documentation - PeerPressure Step</a>
+ * @return the traversal with the appended {@link ProgramVertexProgramStep}
+ * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#program-step" target="_blank">Reference Documentation - Program Step</a>
* @since 3.2.0-incubating
*/
public default GraphTraversal<S, E> program(final VertexProgram<?> vertexProgram) {
[09/50] tinkerpop git commit: TINKERPOP-1950 Cached global strategy
lookups during traversal construction
Posted by fl...@apache.org.
TINKERPOP-1950 Cached global strategy lookups during traversal construction
This change leads to a 1.5x to 2x speed improvement in traversal construction. It is especially effective when processing traversals that have many child traversals within them as this method is called for not only the parent traversal but all the children as well.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/cd20298d
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/cd20298d
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/cd20298d
Branch: refs/heads/TINKERPOP-1897
Commit: cd20298d3f4ee5f66fe4f037e8aa64daf32254b4
Parents: 44c4073
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Apr 20 16:18:13 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Apr 25 07:41:38 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/cd20298d/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index f71602a..f6ca111 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -27,6 +27,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
* Bumped to httpclient 4.5.5.
* Bumped to Groovy 2.4.15 - fixes bug with `Lambda` construction.
* Improved performance of GraphSON deserialization of `Bytecode`.
+* Improved performance of traversal construction.
[[release-3-2-8]]
=== TinkerPop 3.2.8 (Release Date: April 2, 2018)
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cd20298d/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java
index c7ee5bf..e84737c 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java
@@ -52,6 +52,7 @@ import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
/**
@@ -198,6 +199,12 @@ public interface TraversalStrategies extends Serializable, Cloneable {
public static final class GlobalCache {
+ /**
+ * Keeps track of {@link GraphComputer} and/or {@link Graph} classes that have been initialized to the
+ * classloader so that they do not have to be reflected again.
+ */
+ private static Set<Class> LOADED = ConcurrentHashMap.newKeySet();
+
private static final Map<Class<? extends Graph>, TraversalStrategies> GRAPH_CACHE = new HashMap<>();
private static final Map<Class<? extends GraphComputer>, TraversalStrategies> GRAPH_COMPUTER_CACHE = new HashMap<>();
@@ -244,20 +251,33 @@ public interface TraversalStrategies extends Serializable, Cloneable {
public static TraversalStrategies getStrategies(final Class graphOrGraphComputerClass) {
try {
// be sure to load the class so that its static{} traversal strategy registration component is loaded.
- // this is more important for GraphComputer classes as they are typically not instantiated prior to strategy usage like Graph classes.
- final String graphComputerClassName = null != graphOrGraphComputerClass.getDeclaringClass() ?
+ // this is more important for GraphComputer classes as they are typically not instantiated prior to
+ // strategy usage like Graph classes.
+ if (!LOADED.contains(graphOrGraphComputerClass)) {
+ final String graphComputerClassName = null != graphOrGraphComputerClass.getDeclaringClass() ?
graphOrGraphComputerClass.getCanonicalName().replace("." + graphOrGraphComputerClass.getSimpleName(), "$" + graphOrGraphComputerClass.getSimpleName()) :
graphOrGraphComputerClass.getCanonicalName();
- Class.forName(graphComputerClassName);
+ Class.forName(graphComputerClassName);
+
+ // keep track of stuff we already loaded once - stuff in this if/statement isn't cheap and this
+ // method gets called a lot, basically every time a new traversal gets spun up (that includes
+ // child traversals. perhaps it is possible to just check the cache keys for this information, but
+ // it's not clear if this method will be called with something not in the cache and if it is and
+ // it results in error, then we'd probably not want to deal with this block again anyway
+ LOADED.add(graphOrGraphComputerClass);
+ }
} catch (final ClassNotFoundException e) {
throw new IllegalStateException(e.getMessage(), e);
}
- if (Graph.class.isAssignableFrom(graphOrGraphComputerClass)) {
- final TraversalStrategies traversalStrategies = GRAPH_CACHE.get(graphOrGraphComputerClass);
- return null == traversalStrategies ? GRAPH_CACHE.get(Graph.class) : traversalStrategies;
+
+ if (GRAPH_CACHE.containsKey(graphOrGraphComputerClass)) {
+ return GRAPH_CACHE.get(graphOrGraphComputerClass);
+ } else if (Graph.class.isAssignableFrom(graphOrGraphComputerClass)) {
+ return GRAPH_CACHE.get(Graph.class);
+ } else if (GRAPH_COMPUTER_CACHE.containsKey(graphOrGraphComputerClass)) {
+ return GRAPH_COMPUTER_CACHE.get(graphOrGraphComputerClass);
} else if (GraphComputer.class.isAssignableFrom(graphOrGraphComputerClass)) {
- final TraversalStrategies traversalStrategies = GRAPH_COMPUTER_CACHE.get(graphOrGraphComputerClass);
- return null == traversalStrategies ? GRAPH_COMPUTER_CACHE.get(GraphComputer.class) : traversalStrategies;
+ return GRAPH_COMPUTER_CACHE.get(GraphComputer.class);
} else {
throw new IllegalArgumentException("The TraversalStrategies.GlobalCache only supports Graph and GraphComputer strategy caching: " + graphOrGraphComputerClass.getCanonicalName());
}
[14/50] tinkerpop git commit: Reverted change from
1d9e6dc6d30c5c7d56e4007527365793eb1f223e
Posted by fl...@apache.org.
Reverted change from 1d9e6dc6d30c5c7d56e4007527365793eb1f223e
Not sure why, but the above referenced change seemed to hang various integration tests. CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/789e5752
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/789e5752
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/789e5752
Branch: refs/heads/TINKERPOP-1897
Commit: 789e5752d8f6f781272a7c56f0d2b491849d4ca9
Parents: 6096a4c
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Apr 25 18:38:53 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Apr 25 18:38:53 2018 -0400
----------------------------------------------------------------------
.../process/traversal/TraversalStrategies.java | 43 +++++++++-----------
1 file changed, 20 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/789e5752/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java
index 37cd1a6..091687a 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java
@@ -203,7 +203,7 @@ public interface TraversalStrategies extends Serializable, Cloneable {
* Keeps track of {@link GraphComputer} and/or {@link Graph} classes that have been initialized to the
* classloader so that they do not have to be reflected again.
*/
- private static Map<Class, Boolean> LOADED = new ConcurrentHashMap<>();
+ private static Set<Class> LOADED = ConcurrentHashMap.newKeySet();
private static final Map<Class<? extends Graph>, TraversalStrategies> GRAPH_CACHE = new HashMap<>();
private static final Map<Class<? extends GraphComputer>, TraversalStrategies> GRAPH_COMPUTER_CACHE = new HashMap<>();
@@ -249,28 +249,27 @@ public interface TraversalStrategies extends Serializable, Cloneable {
}
public static TraversalStrategies getStrategies(final Class graphOrGraphComputerClass) {
- // be sure to load the class so that its static{} traversal strategy registration component is loaded.
- // this is more important for GraphComputer classes as they are typically not instantiated prior to
- // strategy usage like Graph classes.
- LOADED.computeIfAbsent(graphOrGraphComputerClass, unused -> {
- final String graphComputerClassName = null != graphOrGraphComputerClass.getDeclaringClass() ?
- graphOrGraphComputerClass.getCanonicalName().replace("." + graphOrGraphComputerClass.getSimpleName(), "$" + graphOrGraphComputerClass.getSimpleName()) :
- graphOrGraphComputerClass.getCanonicalName();
-
- try {
+ try {
+ // be sure to load the class so that its static{} traversal strategy registration component is loaded.
+ // this is more important for GraphComputer classes as they are typically not instantiated prior to
+ // strategy usage like Graph classes.
+ if (!LOADED.contains(graphOrGraphComputerClass)) {
+ final String graphComputerClassName = null != graphOrGraphComputerClass.getDeclaringClass() ?
+ graphOrGraphComputerClass.getCanonicalName().replace("." + graphOrGraphComputerClass.getSimpleName(), "$" + graphOrGraphComputerClass.getSimpleName()) :
+ graphOrGraphComputerClass.getCanonicalName();
Class.forName(graphComputerClassName);
- } catch (ClassNotFoundException e) {
- throw new IllegalStateException(e.getMessage(), e);
+
+ // keep track of stuff we already loaded once - stuff in this if/statement isn't cheap and this
+ // method gets called a lot, basically every time a new traversal gets spun up (that includes
+ // child traversals. perhaps it is possible to just check the cache keys for this information, but
+ // it's not clear if this method will be called with something not in the cache and if it is and
+ // it results in error, then we'd probably not want to deal with this block again anyway
+ LOADED.add(graphOrGraphComputerClass);
}
+ } catch (final ClassNotFoundException e) {
+ throw new IllegalStateException(e.getMessage(), e);
+ }
- // keep track of stuff we already loaded once - stuff in this if/statement isn't cheap and this
- // method gets called a lot, basically every time a new traversal gets spun up (that includes
- // child traversals. perhaps it is possible to just check the cache keys for this information, but
- // it's not clear if this method will be called with something not in the cache and if it is and
- // it results in error, then we'd probably not want to deal with this block again anyway
- return true;
- });
-
if (GRAPH_CACHE.containsKey(graphOrGraphComputerClass)) {
return GRAPH_CACHE.get(graphOrGraphComputerClass);
} else if (Graph.class.isAssignableFrom(graphOrGraphComputerClass)) {
@@ -284,6 +283,4 @@ public interface TraversalStrategies extends Serializable, Cloneable {
}
}
}
-
-
-}
+}
\ No newline at end of file
[15/50] tinkerpop git commit: Added unit tests for Order and improved
javadoc CTR
Posted by fl...@apache.org.
Added unit tests for Order and improved javadoc CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/59545254
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/59545254
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/59545254
Branch: refs/heads/TINKERPOP-1897
Commit: 59545254930c502c8acfe470dd919f36c87cf78c
Parents: 789e575
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Apr 26 08:42:13 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Apr 26 08:42:13 2018 -0400
----------------------------------------------------------------------
.../gremlin/process/traversal/Order.java | 29 ++++++--
.../gremlin/process/traversal/OrderTest.java | 76 ++++++++++++++++++++
2 files changed, 100 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/59545254/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java
----------------------------------------------------------------------
diff --git 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
index 7c3475a..3710396 100644
--- 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
@@ -23,10 +23,18 @@ import java.util.Map;
import java.util.Random;
/**
+ * 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<Object> {
+ /**
+ * Order in ascending fashion
+ *
+ * @since 3.0.0-incubating
+ */
incr {
@Override
public int compare(final Object first, final Object second) {
@@ -39,7 +47,14 @@ public enum Order implements Comparator<Object> {
public Order reversed() {
return decr;
}
- }, decr {
+ },
+
+ /**
+ * Order in descending fashion.
+ *
+ * @since 3.0.0-incubating
+ */
+ decr {
@Override
public int compare(final Object first, final Object second) {
return first instanceof Number && second instanceof Number
@@ -53,7 +68,8 @@ public enum Order implements Comparator<Object> {
}
},
/**
- * @deprecated Use {@link org.apache.tinkerpop.gremlin.structure.Column#keys};
+ * @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 {
@@ -68,7 +84,8 @@ public enum Order implements Comparator<Object> {
}
},
/**
- * @deprecated Use {@link org.apache.tinkerpop.gremlin.structure.Column#values};
+ * @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 {
@@ -83,7 +100,8 @@ public enum Order implements Comparator<Object> {
}
},
/**
- * @deprecated Use {@link org.apache.tinkerpop.gremlin.structure.Column#keys};
+ * @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 {
@@ -98,7 +116,8 @@ public enum Order implements Comparator<Object> {
}
},
/**
- * @deprecated Use {@link org.apache.tinkerpop.gremlin.structure.Column#values};
+ * @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 {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/59545254/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/OrderTest.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/OrderTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/OrderTest.java
new file mode 100644
index 0000000..01d93ea
--- /dev/null
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/OrderTest.java
@@ -0,0 +1,76 @@
+/*
+ * 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.process.traversal;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+@RunWith(Parameterized.class)
+public class OrderTest {
+
+ private static final SimpleDateFormat formatter = new SimpleDateFormat("dd-MMM-yyyy");
+
+ @Parameterized.Parameters(name = "{0}.test({1},{2})")
+ public static Iterable<Object[]> data() throws ParseException {
+ return new ArrayList<>(Arrays.asList(new Object[][]{
+ {Order.incr, Arrays.asList("b", "a", "c", "d"), Arrays.asList("a", "b", "c", "d")},
+ {Order.decr, Arrays.asList("b", "a", "c", "d"), Arrays.asList("d", "c", "b", "a")},
+ {Order.incr, Arrays.asList(formatter.parse("1-Jan-2018"), formatter.parse("1-Jan-2020"), formatter.parse("1-Jan-2008")),
+ Arrays.asList(formatter.parse("1-Jan-2008"), formatter.parse("1-Jan-2018"), formatter.parse("1-Jan-2020"))},
+ {Order.decr, Arrays.asList(formatter.parse("1-Jan-2018"), formatter.parse("1-Jan-2020"), formatter.parse("1-Jan-2008")),
+ Arrays.asList(formatter.parse("1-Jan-2020"), formatter.parse("1-Jan-2018"), formatter.parse("1-Jan-2008"))},
+ {Order.decr, Arrays.asList(100L, 1L, -1L, 0L), Arrays.asList(100L, 1L, 0L, -1L)},
+ {Order.incr, Arrays.asList(100.1f, 1.1f, -1.1f, 0.1f), Arrays.asList(-1.1f, 0.1f, 1.1f, 100.1f)},
+ {Order.decr, Arrays.asList(100.1f, 1.1f, -1.1f, 0.1f), Arrays.asList(100.1f, 1.1f, 0.1f, -1.1f)},
+ {Order.incr, Arrays.asList(100.1d, 1.1d, -1.1d, 0.1d), Arrays.asList(-1.1d, 0.1d, 1.1d, 100.1d)},
+ {Order.decr, Arrays.asList(100.1d, 1.1d, -1.1d, 0.1d), Arrays.asList(100.1d, 1.1d, 0.1d, -1.1d)},
+ {Order.incr, Arrays.asList(100L, 1L, -1L, 0L), Arrays.asList(-1L, 0L, 1L, 100L)},
+ {Order.decr, Arrays.asList(100L, 1L, -1L, 0L), Arrays.asList(100L, 1L, 0L, -1L)},
+ {Order.incr, Arrays.asList(100, 1, -1, 0), Arrays.asList(-1, 0, 1, 100)},
+ {Order.decr, Arrays.asList(100, 1, -1, 0), Arrays.asList(100, 1, 0, -1)}}));
+ }
+
+ @Parameterized.Parameter(value = 0)
+ public Order order;
+
+ @Parameterized.Parameter(value = 1)
+ public Object toBeOrdered;
+
+ @Parameterized.Parameter(value = 2)
+ public Object expectedOrder;
+
+ @Test
+ public void shouldOrder() {
+ Collections.sort((List) toBeOrdered, order);
+ assertEquals(expectedOrder, toBeOrdered);
+ }
+}
[26/50] tinkerpop git commit: Minor fix to formatting of header in
CHANGELOG CTR
Posted by fl...@apache.org.
Minor fix to formatting of header in CHANGELOG CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ac161fa8
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ac161fa8
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ac161fa8
Branch: refs/heads/TINKERPOP-1897
Commit: ac161fa8cd613f3a0052debd460e5c363777ce2e
Parents: cfbe2ce
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu May 10 11:57:12 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu May 10 11:57:12 2018 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ac161fa8/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 18f36ed..62c412e 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -2396,7 +2396,6 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
* Changed `GIRAPH_GREMLIN_HOME` to `GIRAPH_GREMLIN_LIB` to reference directory where jars are to be loaded.
* Updated README with release instructions.
-TinkerPop 3.0.0.M1 (Release Date: August 12, 2014)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+=== TinkerPop 3.0.0.M1 (Release Date: August 12, 2014)
* First official release of TinkerPop3 and thus, no changes.
[42/50] tinkerpop git commit: Add docker images for console and
server TINKERPOP-1897
Posted by fl...@apache.org.
Add docker images for console and server TINKERPOP-1897
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/d31320ac
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d31320ac
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d31320ac
Branch: refs/heads/TINKERPOP-1897
Commit: d31320ac3426e7bd4d2fb1784519202193dee041
Parents: e398373
Author: Florian Hockmann <fh...@florian-hockmann.de>
Authored: Sun Feb 25 18:14:03 2018 +0100
Committer: Florian Hockmann <fh...@florian-hockmann.de>
Committed: Sat May 19 10:51:34 2018 +0200
----------------------------------------------------------------------
.dockerignore | 2 +
.gitignore | 1 +
CHANGELOG.asciidoc | 2 +-
.../developer/development-environment.asciidoc | 16 +++-
.../src/reference/gremlin-applications.asciidoc | 89 ++++++++++++++++++++
gremlin-console/Dockerfile | 31 +++++++
gremlin-console/pom.xml | 34 ++++++++
.../src/main/docker/docker-entrypoint.sh | 24 ++++++
gremlin-server/Dockerfile | 35 ++++++++
gremlin-server/pom.xml | 34 ++++++++
.../src/main/docker/docker-entrypoint.sh | 31 +++++++
pom.xml | 6 ++
12 files changed, 303 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d31320ac/.dockerignore
----------------------------------------------------------------------
diff --git a/.dockerignore b/.dockerignore
index afe0e54..50d6801 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,5 +1,7 @@
**/*.log
**/target
+!gremlin-server/target/apache-tinkerpop-gremlin-server-*
+!gremlin-console/target/apache-tinkerpop-gremlin-console-*
*.iml
.idea
**/*.DS_Store
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d31320ac/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 0109f82..10e5b4f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,7 @@ __pycache__/
*.py[cdo]
__version__.py
.glv
+.docker
settings.xml
tools/
[Dd]ebug/
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d31320ac/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index b286dcb..794d725 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -23,6 +23,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
[[release-3-2-10]]
=== TinkerPop 3.2.10 (Release Date: NOT OFFICIALLY RELEASED YET)
+* Added Docker images for Gremlin Console and Gremlin Server
* Removed recursive handling of streaming results from Gremlin-Python driver to avoid max recursion depth errors.
* Fixed bug in `GroovyTranslator` that didn't properly handle empty `Map` objects.
@@ -49,7 +50,6 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
* TINKERPOP-1950 Traversal construction performance enhancements
* TINKERPOP-1953 Bump to Groovy 2.4.15
-
[[release-3-2-8]]
=== TinkerPop 3.2.8 (Release Date: April 2, 2018)
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d31320ac/docs/src/dev/developer/development-environment.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/development-environment.asciidoc b/docs/src/dev/developer/development-environment.asciidoc
index 4dfbcaa..cb19a65 100644
--- a/docs/src/dev/developer/development-environment.asciidoc
+++ b/docs/src/dev/developer/development-environment.asciidoc
@@ -106,7 +106,7 @@ The build optionally requires link:https://www.microsoft.com/net/core[.NET Core
`gremlin-dotnet` module. If .NET Core SDK is not installed, TinkerPop will still build with Maven, but .NET projects
will be skipped.
-`gremlin-dotnet` can be build and tested from the command line with:
+`gremlin-dotnet` can be built and tested from the command line with:
[source,text]
mvn clean install -Pgremlin-dotnet
@@ -127,6 +127,20 @@ other existing Node.js runtime instances in your machine.
See the <<release-environment,Release Environment>> section for more information on release manager configurations.
+[[docker-environment]]
+=== Docker Environment
+The build optionally requires Docker to build Docker images of Gremlin Server and Gremlin Console.
+
+The Docker images can be built from the command line with:
+[source,text]
+----
+mvn clean install -Pdocker-images
+----
+which enables the "docker-images" Maven profile or in a more automated fashion simply add a `.docker` file to the
+directories of the `gremlin-server` and/or `gremlin-console` modules which will signify to Maven that Docker is present
+in the environment.
+
+
[[release-environment]]
=== Release Environment
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d31320ac/docs/src/reference/gremlin-applications.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/gremlin-applications.asciidoc b/docs/src/reference/gremlin-applications.asciidoc
index 1a68ad8..800164b 100644
--- a/docs/src/reference/gremlin-applications.asciidoc
+++ b/docs/src/reference/gremlin-applications.asciidoc
@@ -353,6 +353,38 @@ variable initialization code into the console.
Like, execution mode, it is also possible to pass multiple scripts by specifying multiple `-i` options. See the
<<execution-mode, Execution Mode Section>> for more information on the specifics of that capability.
+[[gremlin-console-docker-image]]
+=== Docker Image
+The Gremlin Console can also be started as a link:https://hub.docker.com/r/tinkerpop/gremlin-console/[Docker image]:
+
+[source,text]
+----
+$ docker run -it tinkerpop/gremlin-console:x.y.z
+Feb 25, 2018 3:47:24 PM java.util.prefs.FileSystemPreferences$1 run
+INFO: Created user preferences directory.
+
+ \,,,/
+ (o o)
+-----oOOo-(3)-oOOo-----
+plugin activated: tinkerpop.server
+plugin activated: tinkerpop.utilities
+plugin activated: tinkerpop.tinkergraph
+gremlin>
+----
+
+The Docker image offers the same options as the standalone Console. It can be used for example to execute scripts:
+
+[source,bash]
+----
+$ docker run -it tinkerpop/gremlin-console:x.y.z -e gremlin.groovy
+v[1]
+v[2]
+v[3]
+v[4]
+v[5]
+v[6]
+----
+
[[gremlin-server]]
== Gremlin Server
@@ -1900,6 +1932,63 @@ $ curl -X POST -d "{\"gremlin\":\"divideIt(8, 2)\"}" "http://localhost:8182"
In the above REST-based requests, the bindings contain a special parameter that tells the `ScriptEngine` cache to
immediately forget the script after execution. In this way, the function does not end up being globally available.
+[[gremlin-server-docker-image]]
+=== Docker Image
+The Gremlin Server can also be started as a link:https://hub.docker.com/r/tinkerpop/gremlin-server/[Docker image]:
+
+[source,text]
+----
+$ docker run tinkerpop/gremlin-server:x.y.z
+[INFO] GremlinServer -
+ \,,,/
+ (o o)
+-----oOOo-(3)-oOOo-----
+
+[INFO] GremlinServer - Configuring Gremlin Server from conf/gremlin-server.yaml
+[INFO] MetricManager - Configured Metrics ConsoleReporter configured with report interval=180000ms
+[INFO] MetricManager - Configured Metrics CsvReporter configured with report interval=180000ms to fileName=/tmp/gremlin-server-metrics.csv
+[INFO] MetricManager - Configured Metrics JmxReporter configured with domain= and agentId=
+[INFO] MetricManager - Configured Metrics Slf4jReporter configured with interval=180000ms and loggerName=org.apache.tinkerpop.gremlin.server.Settings$Slf4jReporterMetrics
+[INFO] DefaultGraphManager - Graph [graph] was successfully configured via [conf/tinkergraph-empty.properties].
+[INFO] ServerGremlinExecutor - Initialized Gremlin thread pool. Threads in pool named with pattern gremlin-*
+[INFO] ScriptEngines - Loaded gremlin-groovy ScriptEngine
+[INFO] GremlinExecutor - Initialized gremlin-groovy ScriptEngine with scripts/empty-sample.groovy
+[INFO] ServerGremlinExecutor - Initialized GremlinExecutor and preparing GremlinScriptEngines instances.
+[INFO] ServerGremlinExecutor - Initialized gremlin-groovy GremlinScriptEngine and registered metrics
+[INFO] ServerGremlinExecutor - A GraphTraversalSource is now bound to [g] with graphtraversalsource[tinkergraph[vertices:0 edges:0], standard]
+[INFO] OpLoader - Adding the standard OpProcessor.
+[INFO] OpLoader - Adding the control OpProcessor.
+[INFO] OpLoader - Adding the session OpProcessor.
+[INFO] OpLoader - Adding the traversal OpProcessor.
+[INFO] TraversalOpProcessor - Initialized cache for TraversalOpProcessor with size 1000 and expiration time of 600000 ms
+[INFO] GremlinServer - Executing start up LifeCycleHook
+[INFO] Logger$info - Executed once at startup of Gremlin Server.
+[INFO] GremlinServer - idleConnectionTimeout was set to 0 which resolves to 0 seconds when configuring this value - this feature will be disabled
+[INFO] GremlinServer - keepAliveInterval was set to 0 which resolves to 0 seconds when configuring this value - this feature will be disabled
+[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-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/json with org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0
+[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 - Channel started at port 8182.
+----
+
+By default, Gremlin Server listens on port 8182. So that port should be exposed if it should be reachable on the host:
+
+[source,bash]
+----
+$ docker run -p 8182:8182 tinkerpop/gremlin-server:x.y.z
+----
+
+Arguments provided with `docker run` are forwarded to the script that starts Gremlin Server. This allows for example
+to use an alternative config file:
+
+[source,bash]
+----
+$ docker run tinkerpop/gremlin-server:x.y.z conf/gremlin-server-secure.yaml
+----
+
[[gremlin-plugins]]
== Gremlin Plugins
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d31320ac/gremlin-console/Dockerfile
----------------------------------------------------------------------
diff --git a/gremlin-console/Dockerfile b/gremlin-console/Dockerfile
new file mode 100644
index 0000000..909952f
--- /dev/null
+++ b/gremlin-console/Dockerfile
@@ -0,0 +1,31 @@
+# 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.
+
+FROM openjdk:8u151-jre-alpine3.7
+
+ARG GREMLIN_CONSOLE_DIR
+
+RUN apk add --update \
+ bash \
+ && rm -rf /var/cache/apk/*
+
+COPY src/main/docker/docker-entrypoint.sh /
+COPY ${GREMLIN_CONSOLE_DIR} /opt/gremlin-console
+
+WORKDIR /opt/gremlin-console
+
+ENTRYPOINT ["/docker-entrypoint.sh"]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d31320ac/gremlin-console/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index 49e7f4a..b7933fb 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -335,5 +335,39 @@ limitations under the License.
</plugins>
</build>
</profile>
+
+ <profile>
+ <id>docker-images</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <file>
+ <exists>.docker</exists>
+ </file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.spotify</groupId>
+ <artifactId>dockerfile-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>docker-image</id>
+ <goals>
+ <goal>build</goal>
+ <goal>push</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <repository>tinkerpop/gremlin-console</repository>
+ <tag>${project.version}</tag>
+ <buildArgs>
+ <GREMLIN_CONSOLE_DIR>target/apache-tinkerpop-${project.artifactId}-${project.version}-standalone</GREMLIN_CONSOLE_DIR>
+ </buildArgs>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d31320ac/gremlin-console/src/main/docker/docker-entrypoint.sh
----------------------------------------------------------------------
diff --git a/gremlin-console/src/main/docker/docker-entrypoint.sh b/gremlin-console/src/main/docker/docker-entrypoint.sh
new file mode 100644
index 0000000..2c8d204
--- /dev/null
+++ b/gremlin-console/src/main/docker/docker-entrypoint.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+#
+#
+# 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.
+#
+
+set -e
+
+exec /opt/gremlin-console/bin/gremlin.sh "$@"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d31320ac/gremlin-server/Dockerfile
----------------------------------------------------------------------
diff --git a/gremlin-server/Dockerfile b/gremlin-server/Dockerfile
new file mode 100644
index 0000000..c47e0cf
--- /dev/null
+++ b/gremlin-server/Dockerfile
@@ -0,0 +1,35 @@
+# 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.
+
+FROM openjdk:8u151-jre-alpine3.7
+
+ARG GREMLIN_SERVER_DIR
+
+RUN apk add --update \
+ bash \
+ perl \
+ && rm -rf /var/cache/apk/*
+
+COPY src/main/docker/docker-entrypoint.sh /
+COPY ${GREMLIN_SERVER_DIR} /opt/gremlin-server
+
+WORKDIR /opt/gremlin-server
+
+EXPOSE 8182
+
+ENTRYPOINT ["/docker-entrypoint.sh"]
+CMD ["conf/gremlin-server.yaml"]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d31320ac/gremlin-server/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index 68733a9..dfc6570 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -243,5 +243,39 @@ limitations under the License.
</plugins>
</build>
</profile>
+
+ <profile>
+ <id>docker-images</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <file>
+ <exists>.docker</exists>
+ </file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.spotify</groupId>
+ <artifactId>dockerfile-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>docker-image</id>
+ <goals>
+ <goal>build</goal>
+ <goal>push</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <repository>tinkerpop/gremlin-server</repository>
+ <tag>${project.version}</tag>
+ <buildArgs>
+ <GREMLIN_SERVER_DIR>target/apache-tinkerpop-${project.artifactId}-${project.version}-standalone</GREMLIN_SERVER_DIR>
+ </buildArgs>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d31320ac/gremlin-server/src/main/docker/docker-entrypoint.sh
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/docker/docker-entrypoint.sh b/gremlin-server/src/main/docker/docker-entrypoint.sh
new file mode 100644
index 0000000..d869b8c
--- /dev/null
+++ b/gremlin-server/src/main/docker/docker-entrypoint.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+#
+#
+# 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.
+#
+
+set -e
+
+CONF_FILE=$1
+
+# IP substitution hack borrowed from:
+# https://github.com/htaox/NEAT/blob/94a004831cf89767e116d955192fc14ac82e5069/docker-scripts/gremlin-server-3.0.0/files/default_cmd#L5
+IP=$(ip -o -4 addr list eth0 | perl -n -e 'if (m{inet\s([\d\.]+)\/\d+\s}xms) { print $1 }')
+sed -i "s|^host:.*|host: $IP|" $CONF_FILE
+
+exec /opt/gremlin-server/bin/gremlin-server.sh "$@"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d31320ac/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9c4b507..5251de3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -319,6 +319,7 @@ limitations under the License.
<exclude>**/_bsp/**</exclude>
<exclude>DEPENDENCIES</exclude>
<exclude>**/.glv</exclude>
+ <exclude>**/.docker</exclude>
<exclude>bin/gremlin.sh</exclude>
<exclude>gremlin-console/bin/gremlin.sh</exclude>
<exclude>**/Debug/**</exclude>
@@ -496,6 +497,11 @@ limitations under the License.
<artifactId>maven-jar-plugin</artifactId>
<version>3.0.2</version>
</plugin>
+ <plugin>
+ <groupId>com.spotify</groupId>
+ <artifactId>dockerfile-maven-plugin</artifactId>
+ <version>1.3.7</version>
+ </plugin>
</plugins>
</pluginManagement>
</build>
[43/50] tinkerpop git commit: Increase test timeout for slow systems
TINKERPOP-1897
Posted by fl...@apache.org.
Increase test timeout for slow systems TINKERPOP-1897
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/80b1fc20
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/80b1fc20
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/80b1fc20
Branch: refs/heads/TINKERPOP-1897
Commit: 80b1fc209c1d9b70dc60e9361d732e9702a38987
Parents: eacc411
Author: Florian Hockmann <fh...@florian-hockmann.de>
Authored: Thu Mar 1 17:17:11 2018 +0100
Committer: Florian Hockmann <fh...@florian-hockmann.de>
Committed: Sat May 19 10:51:35 2018 +0200
----------------------------------------------------------------------
.../java/org/apache/tinkerpop/gremlin/driver/ResultQueueTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/80b1fc20/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultQueueTest.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultQueueTest.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultQueueTest.java
index a7e6066..43442be 100644
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultQueueTest.java
+++ b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultQueueTest.java
@@ -281,7 +281,7 @@ public class ResultQueueTest extends AbstractResultQueueTest {
latch.countDown();
});
- assertThat(latch.await(3000, TimeUnit.MILLISECONDS), is(true));
+ assertThat(latch.await(10000, TimeUnit.MILLISECONDS), is(true));
assertEquals(500, count1.get());
assertEquals(150, count2.get());
[41/50] tinkerpop git commit: Merge branch 'TINKERPOP-1962' into tp32
Posted by fl...@apache.org.
Merge branch 'TINKERPOP-1962' into tp32
Conflicts:
CHANGELOG.asciidoc
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/e3983733
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e3983733
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/e3983733
Branch: refs/heads/TINKERPOP-1897
Commit: e39837330235bf9598077707234c25ad29e77742
Parents: ae562c1 4e8b4cf
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri May 18 18:49:30 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri May 18 18:49:30 2018 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 2 +-
.../gremlin/groovy/jsr223/GroovyTranslatorTest.java | 16 +++++++++++++---
.../gremlin/groovy/jsr223/GroovyTranslator.java | 6 +++++-
3 files changed, 19 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e3983733/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --cc CHANGELOG.asciidoc
index b407288,c7717d7..b286dcb
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -23,8 -23,7 +23,8 @@@ image::https://raw.githubusercontent.co
[[release-3-2-10]]
=== TinkerPop 3.2.10 (Release Date: NOT OFFICIALLY RELEASED YET)
+* Removed recursive handling of streaming results from Gremlin-Python driver to avoid max recursion depth errors.
-
+ * Fixed bug in `GroovyTranslator` that didn't properly handle empty `Map` objects.
[[release-3-2-9]]
=== TinkerPop 3.2.9 (Release Date: May 8, 2018)
[48/50] tinkerpop git commit: Don't build docker images in docker
build TINKERPOP-1897
Posted by fl...@apache.org.
Don't build docker images in docker build TINKERPOP-1897
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/eacc411c
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/eacc411c
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/eacc411c
Branch: refs/heads/TINKERPOP-1897
Commit: eacc411c6082fe83c101f8ddca090d4d20fef178
Parents: d31320a
Author: Florian Hockmann <fh...@florian-hockmann.de>
Authored: Mon Feb 26 21:17:46 2018 +0100
Committer: Florian Hockmann <fh...@florian-hockmann.de>
Committed: Sat May 19 10:51:35 2018 +0200
----------------------------------------------------------------------
docker/scripts/build.sh | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/eacc411c/docker/scripts/build.sh
----------------------------------------------------------------------
diff --git a/docker/scripts/build.sh b/docker/scripts/build.sh
index 5ef74fc..3d8f0d3 100755
--- a/docker/scripts/build.sh
+++ b/docker/scripts/build.sh
@@ -67,6 +67,9 @@ touch gremlin-python/.glv
touch gremlin-dotnet/src/.glv
touch gremlin-dotnet/test/.glv
+rm gremlin-console/.docker
+rm gremlin-server/.docker
+
# use a custom maven settings.xml
if [ -r "settings.xml" ]; then
echo "Copying settings.xml"
[27/50] tinkerpop git commit: Bump to 3.2.10-SNAPSHOT - double
digits!! CTR
Posted by fl...@apache.org.
Bump to 3.2.10-SNAPSHOT - double digits!! CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/d9959725
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d9959725
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d9959725
Branch: refs/heads/TINKERPOP-1897
Commit: d995972524cdb168e897cad4e85bb9a1a2310ab9
Parents: ac161fa
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri May 11 14:09:00 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri May 11 14:09:00 2018 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 4 ++++
docs/src/upgrade/release-3.2.x-incubating.asciidoc | 7 +++++++
giraph-gremlin/pom.xml | 2 +-
gremlin-archetype/gremlin-archetype-dsl/pom.xml | 2 +-
gremlin-archetype/gremlin-archetype-server/pom.xml | 2 +-
gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml | 2 +-
gremlin-archetype/pom.xml | 2 +-
gremlin-benchmark/pom.xml | 2 +-
gremlin-console/bin/gremlin.sh | 2 +-
gremlin-console/pom.xml | 2 +-
gremlin-core/pom.xml | 2 +-
gremlin-dotnet/pom.xml | 2 +-
gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj | 4 ++--
gremlin-dotnet/src/pom.xml | 2 +-
gremlin-dotnet/test/pom.xml | 2 +-
gremlin-driver/pom.xml | 2 +-
gremlin-groovy-test/pom.xml | 2 +-
gremlin-groovy/pom.xml | 2 +-
gremlin-javascript/pom.xml | 2 +-
.../src/main/javascript/gremlin-javascript/package.json | 2 +-
gremlin-python/pom.xml | 2 +-
gremlin-server/pom.xml | 2 +-
gremlin-shaded/pom.xml | 2 +-
gremlin-test/pom.xml | 2 +-
hadoop-gremlin/pom.xml | 2 +-
neo4j-gremlin/pom.xml | 2 +-
pom.xml | 2 +-
spark-gremlin/pom.xml | 2 +-
tinkergraph-gremlin/pom.xml | 2 +-
29 files changed, 39 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d9959725/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 62c412e..41d83c4 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -20,6 +20,10 @@ limitations under the License.
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/images/nine-inch-gremlins.png[width=185]
+[[release-3-2-10]]
+=== TinkerPop 3.2.10 (Release Date: NOT OFFICIALLY RELEASED YET)
+
+
[[release-3-2-9]]
=== TinkerPop 3.2.9 (Release Date: May 8, 2018)
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d9959725/docs/src/upgrade/release-3.2.x-incubating.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/upgrade/release-3.2.x-incubating.asciidoc b/docs/src/upgrade/release-3.2.x-incubating.asciidoc
index 06e4f59..b5eb3b3 100644
--- a/docs/src/upgrade/release-3.2.x-incubating.asciidoc
+++ b/docs/src/upgrade/release-3.2.x-incubating.asciidoc
@@ -21,6 +21,13 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
*Nine Inch Gremlins*
+== TinkerPop 3.2.10
+
+*Release Date: NOT OFFICIALLY RELEASED YET*
+
+Please see the link:https://github.com/apache/tinkerpop/blob/3.2.10/CHANGELOG.asciidoc#release-3-2-10[changelog] for a complete list of all the modifications that are part of this release.
+
+
== TinkerPop 3.2.9
*Release Date: May 8, 2018*
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d9959725/giraph-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/giraph-gremlin/pom.xml b/giraph-gremlin/pom.xml
index 69355be..21f7389 100644
--- a/giraph-gremlin/pom.xml
+++ b/giraph-gremlin/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.2.9</version>
+ <version>3.2.10-SNAPSHOT</version>
</parent>
<artifactId>giraph-gremlin</artifactId>
<name>Apache TinkerPop :: Giraph Gremlin</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d9959725/gremlin-archetype/gremlin-archetype-dsl/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-archetype/gremlin-archetype-dsl/pom.xml b/gremlin-archetype/gremlin-archetype-dsl/pom.xml
index 4dd6297..9e412b1 100644
--- a/gremlin-archetype/gremlin-archetype-dsl/pom.xml
+++ b/gremlin-archetype/gremlin-archetype-dsl/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-archetype</artifactId>
- <version>3.2.9</version>
+ <version>3.2.10-SNAPSHOT</version>
</parent>
<artifactId>gremlin-archetype-dsl</artifactId>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d9959725/gremlin-archetype/gremlin-archetype-server/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-archetype/gremlin-archetype-server/pom.xml b/gremlin-archetype/gremlin-archetype-server/pom.xml
index eedbd56..5f07170 100644
--- a/gremlin-archetype/gremlin-archetype-server/pom.xml
+++ b/gremlin-archetype/gremlin-archetype-server/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-archetype</artifactId>
- <version>3.2.9</version>
+ <version>3.2.10-SNAPSHOT</version>
</parent>
<artifactId>gremlin-archetype-server</artifactId>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d9959725/gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml b/gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml
index ecf5a50..f7b1b5a 100644
--- a/gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml
+++ b/gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-archetype</artifactId>
- <version>3.2.9</version>
+ <version>3.2.10-SNAPSHOT</version>
</parent>
<artifactId>gremlin-archetype-tinkergraph</artifactId>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d9959725/gremlin-archetype/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-archetype/pom.xml b/gremlin-archetype/pom.xml
index 9f929af..81c54ff 100644
--- a/gremlin-archetype/pom.xml
+++ b/gremlin-archetype/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<artifactId>tinkerpop</artifactId>
<groupId>org.apache.tinkerpop</groupId>
- <version>3.2.9</version>
+ <version>3.2.10-SNAPSHOT</version>
</parent>
<artifactId>gremlin-archetype</artifactId>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d9959725/gremlin-benchmark/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-benchmark/pom.xml b/gremlin-benchmark/pom.xml
index bcce1ef..9405392 100644
--- a/gremlin-benchmark/pom.xml
+++ b/gremlin-benchmark/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<artifactId>tinkerpop</artifactId>
<groupId>org.apache.tinkerpop</groupId>
- <version>3.2.9</version>
+ <version>3.2.10-SNAPSHOT</version>
</parent>
<artifactId>gremlin-benchmark</artifactId>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d9959725/gremlin-console/bin/gremlin.sh
----------------------------------------------------------------------
diff --git a/gremlin-console/bin/gremlin.sh b/gremlin-console/bin/gremlin.sh
index cdf1153..14dda62 120000
--- a/gremlin-console/bin/gremlin.sh
+++ b/gremlin-console/bin/gremlin.sh
@@ -1 +1 @@
-../target/apache-tinkerpop-gremlin-console-3.2.9-standalone/bin/gremlin.sh
\ No newline at end of file
+../target/apache-tinkerpop-gremlin-console-3.2.10-SNAPSHOT-standalone/bin/gremlin.sh
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d9959725/gremlin-console/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index 7581397..49e7f4a 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<artifactId>tinkerpop</artifactId>
<groupId>org.apache.tinkerpop</groupId>
- <version>3.2.9</version>
+ <version>3.2.10-SNAPSHOT</version>
</parent>
<artifactId>gremlin-console</artifactId>
<name>Apache TinkerPop :: Gremlin Console</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d9959725/gremlin-core/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-core/pom.xml b/gremlin-core/pom.xml
index 78bffa5..bf81ca1 100644
--- a/gremlin-core/pom.xml
+++ b/gremlin-core/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.2.9</version>
+ <version>3.2.10-SNAPSHOT</version>
</parent>
<artifactId>gremlin-core</artifactId>
<name>Apache TinkerPop :: Gremlin Core</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d9959725/gremlin-dotnet/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/pom.xml b/gremlin-dotnet/pom.xml
index 10f5791..fd2d428 100644
--- a/gremlin-dotnet/pom.xml
+++ b/gremlin-dotnet/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.2.9</version>
+ <version>3.2.10-SNAPSHOT</version>
</parent>
<artifactId>gremlin-dotnet</artifactId>
<name>Apache TinkerPop :: Gremlin.Net</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d9959725/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj b/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
index ad85e56..ff3b2a2 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
+++ b/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
@@ -25,8 +25,8 @@ limitations under the License.
</PropertyGroup>
<PropertyGroup Label="Package">
- <Version>3.2.9</Version>
- <FileVersion>3.2.9.0</FileVersion>
+ <Version>3.2.10-SNAPSHOT</Version>
+ <FileVersion>3.2.10.0</FileVersion>
<AssemblyVersion>3.2.0.0</AssemblyVersion>
<Title>Gremlin.Net</Title>
<Authors>Apache TinkerPop</Authors>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d9959725/gremlin-dotnet/src/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/pom.xml b/gremlin-dotnet/src/pom.xml
index 9769b62..f913692 100644
--- a/gremlin-dotnet/src/pom.xml
+++ b/gremlin-dotnet/src/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-dotnet</artifactId>
- <version>3.2.9</version>
+ <version>3.2.10-SNAPSHOT</version>
</parent>
<artifactId>gremlin-dotnet-source</artifactId>
<name>Apache TinkerPop :: Gremlin.Net - Source</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d9959725/gremlin-dotnet/test/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/test/pom.xml b/gremlin-dotnet/test/pom.xml
index 8c49ae9..db1f8ad 100644
--- a/gremlin-dotnet/test/pom.xml
+++ b/gremlin-dotnet/test/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-dotnet</artifactId>
- <version>3.2.9</version>
+ <version>3.2.10-SNAPSHOT</version>
</parent>
<artifactId>gremlin-dotnet-tests</artifactId>
<name>Apache TinkerPop :: Gremlin.Net - Tests</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d9959725/gremlin-driver/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-driver/pom.xml b/gremlin-driver/pom.xml
index 4ba9339..a7835ab 100644
--- a/gremlin-driver/pom.xml
+++ b/gremlin-driver/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.2.9</version>
+ <version>3.2.10-SNAPSHOT</version>
</parent>
<artifactId>gremlin-driver</artifactId>
<name>Apache TinkerPop :: Gremlin Driver</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d9959725/gremlin-groovy-test/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/pom.xml b/gremlin-groovy-test/pom.xml
index cc21f8b..a04f3b2 100644
--- a/gremlin-groovy-test/pom.xml
+++ b/gremlin-groovy-test/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.2.9</version>
+ <version>3.2.10-SNAPSHOT</version>
</parent>
<artifactId>gremlin-groovy-test</artifactId>
<name>Apache TinkerPop :: Gremlin Groovy Test</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d9959725/gremlin-groovy/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-groovy/pom.xml b/gremlin-groovy/pom.xml
index 627893a..64405f5 100644
--- a/gremlin-groovy/pom.xml
+++ b/gremlin-groovy/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.2.9</version>
+ <version>3.2.10-SNAPSHOT</version>
</parent>
<artifactId>gremlin-groovy</artifactId>
<name>Apache TinkerPop :: Gremlin Groovy</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d9959725/gremlin-javascript/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-javascript/pom.xml b/gremlin-javascript/pom.xml
index 29da33d..0fe6bf4 100644
--- a/gremlin-javascript/pom.xml
+++ b/gremlin-javascript/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.2.9</version>
+ <version>3.2.10-SNAPSHOT</version>
</parent>
<artifactId>gremlin-javascript</artifactId>
<name>Apache TinkerPop :: Gremlin Javascript</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d9959725/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
----------------------------------------------------------------------
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json b/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
index aa64bfb..62b53ef 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
@@ -1,6 +1,6 @@
{
"name": "gremlin",
- "version": "3.2.9",
+ "version": "3.2.10-alpha1",
"description": "JavaScript Gremlin Language Variant",
"author": "Apache TinkerPop team",
"keywords": [
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d9959725/gremlin-python/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-python/pom.xml b/gremlin-python/pom.xml
index 8340560..c999877 100644
--- a/gremlin-python/pom.xml
+++ b/gremlin-python/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.2.9</version>
+ <version>3.2.10-SNAPSHOT</version>
</parent>
<artifactId>gremlin-python</artifactId>
<name>Apache TinkerPop :: Gremlin Python</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d9959725/gremlin-server/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index 1b38dff..68733a9 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.2.9</version>
+ <version>3.2.10-SNAPSHOT</version>
</parent>
<artifactId>gremlin-server</artifactId>
<name>Apache TinkerPop :: Gremlin Server</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d9959725/gremlin-shaded/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-shaded/pom.xml b/gremlin-shaded/pom.xml
index f40a3ed..192262d 100644
--- a/gremlin-shaded/pom.xml
+++ b/gremlin-shaded/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.2.9</version>
+ <version>3.2.10-SNAPSHOT</version>
</parent>
<artifactId>gremlin-shaded</artifactId>
<name>Apache TinkerPop :: Gremlin Shaded</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d9959725/gremlin-test/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-test/pom.xml b/gremlin-test/pom.xml
index 66e1a3e..652b346 100644
--- a/gremlin-test/pom.xml
+++ b/gremlin-test/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.2.9</version>
+ <version>3.2.10-SNAPSHOT</version>
</parent>
<artifactId>gremlin-test</artifactId>
<name>Apache TinkerPop :: Gremlin Test</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d9959725/hadoop-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/pom.xml b/hadoop-gremlin/pom.xml
index a596db5..b094470 100644
--- a/hadoop-gremlin/pom.xml
+++ b/hadoop-gremlin/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.2.9</version>
+ <version>3.2.10-SNAPSHOT</version>
</parent>
<artifactId>hadoop-gremlin</artifactId>
<name>Apache TinkerPop :: Hadoop Gremlin</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d9959725/neo4j-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/neo4j-gremlin/pom.xml b/neo4j-gremlin/pom.xml
index e77f83e..b0a5e5f 100644
--- a/neo4j-gremlin/pom.xml
+++ b/neo4j-gremlin/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.2.9</version>
+ <version>3.2.10-SNAPSHOT</version>
</parent>
<artifactId>neo4j-gremlin</artifactId>
<name>Apache TinkerPop :: Neo4j Gremlin</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d9959725/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 379db49..6b24199 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@ limitations under the License.
</parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.2.9</version>
+ <version>3.2.10-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache TinkerPop</name>
<description>A Graph Computing Framework</description>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d9959725/spark-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/spark-gremlin/pom.xml b/spark-gremlin/pom.xml
index feb339b..ff0b11d 100644
--- a/spark-gremlin/pom.xml
+++ b/spark-gremlin/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.2.9</version>
+ <version>3.2.10-SNAPSHOT</version>
</parent>
<artifactId>spark-gremlin</artifactId>
<name>Apache TinkerPop :: Spark Gremlin</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d9959725/tinkergraph-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/pom.xml b/tinkergraph-gremlin/pom.xml
index c842275..1ff0aa0 100644
--- a/tinkergraph-gremlin/pom.xml
+++ b/tinkergraph-gremlin/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.2.9</version>
+ <version>3.2.10-SNAPSHOT</version>
</parent>
<artifactId>tinkergraph-gremlin</artifactId>
<name>Apache TinkerPop :: TinkerGraph Gremlin</name>
[04/50] tinkerpop git commit: Merge branch 'js-doc-example' into tp32
Posted by fl...@apache.org.
Merge branch 'js-doc-example' into tp32
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/c1558187
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c1558187
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c1558187
Branch: refs/heads/TINKERPOP-1897
Commit: c155818793c38a144edfa5bc803284ff82c2e8ca
Parents: 268423d e08651b
Author: Jorge Bay Gondra <jo...@gmail.com>
Authored: Tue Apr 24 10:39:17 2018 +0200
Committer: Jorge Bay Gondra <jo...@gmail.com>
Committed: Tue Apr 24 10:39:17 2018 +0200
----------------------------------------------------------------------
docs/src/reference/gremlin-variants.asciidoc | 47 +++++++++++++++++------
1 file changed, 36 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
[36/50] tinkerpop git commit: CTR changelog entry for TINKERPOP-1933
Posted by fl...@apache.org.
CTR changelog entry for TINKERPOP-1933
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/58d3d403
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/58d3d403
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/58d3d403
Branch: refs/heads/TINKERPOP-1897
Commit: 58d3d403f09d09651828fe216a58cc1e8c624797
Parents: fa3fb9e
Author: davebshow <da...@gmail.com>
Authored: Mon May 14 12:42:49 2018 -0700
Committer: davebshow <da...@gmail.com>
Committed: Mon May 14 12:42:49 2018 -0700
----------------------------------------------------------------------
CHANGELOG.asciidoc | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/58d3d403/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 41d83c4..b407288 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -23,6 +23,8 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
[[release-3-2-10]]
=== TinkerPop 3.2.10 (Release Date: NOT OFFICIALLY RELEASED YET)
+* Removed recursive handling of streaming results from Gremlin-Python driver to avoid max recursion depth errors.
+
[[release-3-2-9]]
=== TinkerPop 3.2.9 (Release Date: May 8, 2018)
[02/50] tinkerpop git commit: TINKERPOP-1953 Bump to Groovy 2.4.15
Posted by fl...@apache.org.
TINKERPOP-1953 Bump to Groovy 2.4.15
Fixes a bug in Lambda construction for remote traversals
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/40dad278
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/40dad278
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/40dad278
Branch: refs/heads/TINKERPOP-1897
Commit: 40dad27880189ffb8c901a8d7bdcf3d505325693
Parents: 682f298
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Apr 23 09:33:25 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Apr 23 09:33:25 2018 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../upgrade/release-3.2.x-incubating.asciidoc | 24 ++++++++++++++++++++
.../jsr223/GremlinGroovyScriptEngineTest.java | 9 ++++++++
pom.xml | 2 +-
4 files changed, 35 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/40dad278/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 51c9f68..797072d 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -24,6 +24,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
=== TinkerPop 3.2.9 (Release Date: NOT OFFICIALLY RELEASED YET)
* Bumped to httpclient 4.5.5.
+* Bumped to Groovy 2.4.15 - fixes bug with `Lambda` construction.
* Improved performance of GraphSON deserialization of `Bytecode`.
[[release-3-2-8]]
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/40dad278/docs/src/upgrade/release-3.2.x-incubating.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/upgrade/release-3.2.x-incubating.asciidoc b/docs/src/upgrade/release-3.2.x-incubating.asciidoc
index b57a657..51b85d3 100644
--- a/docs/src/upgrade/release-3.2.x-incubating.asciidoc
+++ b/docs/src/upgrade/release-3.2.x-incubating.asciidoc
@@ -21,6 +21,30 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
*Nine Inch Gremlins*
+== TinkerPop 3.2.9
+
+*Release Date: NOT OFFICIALLY RELEASED YET*
+
+Please see the link:https://github.com/apache/tinkerpop/blob/3.2.8/CHANGELOG.asciidoc#release-3-2-9[changelog] for a complete list of all the modifications that are part of this release.
+
+=== Upgrading for Users
+
+==== Lambda Construction
+
+It was realized quite shortly after release of 3.2.8 that there was a bug in construction of `Lambda` instances:
+
+[source,text]
+----
+gremlin> org.apache.tinkerpop.gremlin.util.function.Lambda.function("{ it.get() }")
+(class: org/apache/tinkerpop/gremlin/util/function/Lambda$function, method: callStatic signature: (Ljava/lang/Class;[Ljava/lang/Object;)Ljava/lang/Object;) Illegal type in constant pool
+Type ':help' or ':h' for help.
+Display stack trace? [yN]n
+----
+
+The problem was related to a bug in Groovy 2.4.14 and was fixed in 2.4.15.
+
+See: link:https://issues.apache.org/jira/browse/TINKERPOP-1953[TINKERPOP-1953]
+
== TinkerPop 3.2.8
*Release Date: April 2, 2018*
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/40dad278/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTest.java
----------------------------------------------------------------------
diff --git 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
index 0606721..54e997f 100644
--- 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
@@ -26,6 +26,7 @@ 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;
@@ -603,4 +604,12 @@ public class GremlinGroovyScriptEngineTest {
assertEquals(1, engine.getClassCacheLoadFailureCount());
assertEquals(100, engine.getClassCacheLoadSuccessCount());
}
+
+ @Test
+ public void shouldEvalForLambda() throws Exception {
+ // https://issues.apache.org/jira/browse/TINKERPOP-1953
+ final GremlinGroovyScriptEngine engine = new GremlinGroovyScriptEngine();
+ final Lambda l = (Lambda) engine.eval(" org.apache.tinkerpop.gremlin.util.function.Lambda.function(\"{ it.get() }\")");
+ assertEquals("{ it.get() }", l.getLambdaScript());
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/40dad278/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5ac2d88..4ec1ab4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -141,7 +141,7 @@ limitations under the License.
<commons.configuration.version>1.10</commons.configuration.version>
<commons.lang.version>2.6</commons.lang.version>
<commons.lang3.version>3.3.1</commons.lang3.version>
- <groovy.version>2.4.14</groovy.version>
+ <groovy.version>2.4.15</groovy.version>
<hadoop.version>2.7.2</hadoop.version>
<java.tuples.version>1.2</java.tuples.version>
<javadoc-plugin.version>2.10.4</javadoc-plugin.version>
[11/50] tinkerpop git commit: Merge branch 'TINKERPOP-1950' into tp32
Posted by fl...@apache.org.
Merge branch 'TINKERPOP-1950' into tp32
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0d6f8fcb
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0d6f8fcb
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/0d6f8fcb
Branch: refs/heads/TINKERPOP-1897
Commit: 0d6f8fcb208f850155fddbc1f140c1890a6757d7
Parents: f4dbaff cd20298
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Apr 25 08:21:46 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Apr 25 08:21:46 2018 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../process/traversal/TraversalStrategies.java | 36 +++++++++++++++-----
2 files changed, 29 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
[31/50] tinkerpop git commit: TINKERPOP-1962 GroovyTranslator handles
empty maps properly now.
Posted by fl...@apache.org.
TINKERPOP-1962 GroovyTranslator handles empty maps properly now.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/4e8b4cff
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/4e8b4cff
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/4e8b4cff
Branch: refs/heads/TINKERPOP-1897
Commit: 4e8b4cff058298d0cb43be1402a14d77f22a53ac
Parents: 288b455
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed May 9 09:16:45 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Sun May 13 11:24:02 2018 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../gremlin/groovy/jsr223/GroovyTranslatorTest.java | 16 +++++++++++++---
.../gremlin/groovy/jsr223/GroovyTranslator.java | 6 +++++-
3 files changed, 19 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4e8b4cff/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 41d83c4..c7717d7 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -23,6 +23,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
[[release-3-2-10]]
=== TinkerPop 3.2.10 (Release Date: NOT OFFICIALLY RELEASED YET)
+* Fixed bug in `GroovyTranslator` that didn't properly handle empty `Map` objects.
[[release-3-2-9]]
=== TinkerPop 3.2.9 (Release Date: May 8, 2018)
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4e8b4cff/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GroovyTranslatorTest.java
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GroovyTranslatorTest.java b/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GroovyTranslatorTest.java
index 08451a4..56f9699 100644
--- a/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GroovyTranslatorTest.java
+++ b/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GroovyTranslatorTest.java
@@ -38,9 +38,11 @@ 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;
@@ -119,12 +121,20 @@ public class GroovyTranslatorTest extends AbstractGremlinTest {
@Test
@LoadGraphWith(LoadGraphWith.GraphData.MODERN)
public void shouldHandleMaps() {
- GraphTraversalSource g = graph.traversal();
- String script = GroovyTranslator.of("g").translate(g.V().id().is(new LinkedHashMap() {{
+ final GraphTraversalSource g = graph.traversal();
+ final String script = GroovyTranslator.of("g").translate(g.V().id().is(new LinkedHashMap<Object,Object>() {{
put(3, "32");
put(Arrays.asList(1, 2, 3.1d), 4);
}}).asAdmin().getBytecode());
- assertEquals(script, "g.V().id().is([((int) 3):(\"32\"),([(int) 1, (int) 2, 3.1d]):((int) 4)])");
+ assertEquals("g.V().id().is([((int) 3):(\"32\"),([(int) 1, (int) 2, 3.1d]):((int) 4)])", script);
+ }
+
+ @Test
+ public void shouldHandleEmptyMaps() {
+ final Function identity = new Lambda.OneArgLambda("it.get()", "gremlin-groovy");
+ final GraphTraversalSource g = graph.traversal();
+ final String script = GroovyTranslator.of("g").translate(g.inject(Collections.emptyMap()).map(identity).asAdmin().getBytecode());
+ assertEquals("g.inject([]).map({it.get()})", script);
}
@Test
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4e8b4cff/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GroovyTranslator.java
----------------------------------------------------------------------
diff --git a/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GroovyTranslator.java b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GroovyTranslator.java
index b6410ec..6e86ce9 100644
--- a/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GroovyTranslator.java
+++ b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GroovyTranslator.java
@@ -137,7 +137,11 @@ public final class GroovyTranslator implements Translator.ScriptTranslator {
append(convertToString(entry.getValue())).
append("),");
}
- map.deleteCharAt(map.length() - 1);
+
+ // only need to remove this last bit if entries were added
+ if (!((Map<?, ?>) object).isEmpty())
+ map.deleteCharAt(map.length() - 1);
+
return map.append("]").toString();
} else if (object instanceof Long)
return object + "L";
[39/50] tinkerpop git commit: Merge branch 'TINKERPOP-1841' into tp32
Posted by fl...@apache.org.
Merge branch 'TINKERPOP-1841' into tp32
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/699a5aa6
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/699a5aa6
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/699a5aa6
Branch: refs/heads/TINKERPOP-1897
Commit: 699a5aa63942c49ea677d311062d05095866a7ed
Parents: 4adca20 a2feb2a
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue May 15 15:41:59 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue May 15 15:41:59 2018 -0400
----------------------------------------------------------------------
.travis.yml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
[46/50] tinkerpop git commit: TINKERPOP-1897 Avoid pushing of Docker
images for SNAPSHOT versions
Posted by fl...@apache.org.
TINKERPOP-1897 Avoid pushing of Docker images for SNAPSHOT versions
This also adds the minor version as an additional tag for Docker images
when the version is not a SNAPSHOT version.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/02208a58
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/02208a58
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/02208a58
Branch: refs/heads/TINKERPOP-1897
Commit: 02208a587d87d498d53f6b7fb8e90506784f764c
Parents: 41a3472
Author: Florian Hockmann <fh...@florian-hockmann.de>
Authored: Wed Mar 14 22:41:55 2018 +0100
Committer: Florian Hockmann <fh...@florian-hockmann.de>
Committed: Sat May 19 10:51:35 2018 +0200
----------------------------------------------------------------------
gremlin-console/pom.xml | 61 +++++++++++++++++++++++++++++++++++++-------
gremlin-server/pom.xml | 53 ++++++++++++++++++++++++++++++++++----
pom.xml | 5 ++++
3 files changed, 105 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/02208a58/gremlin-console/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index b7933fb..b24c772 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -347,23 +347,66 @@ limitations under the License.
<build>
<plugins>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <!-- source: https://stackoverflow.com/a/39139979/6753576 -->
+ <!-- sets the only.when.is.snapshot.used property to true if SNAPSHOT was used,
+ to the project version otherwise -->
+ <id>build-helper-regex-is-snapshot-used</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>regex-property</goal>
+ </goals>
+ <configuration>
+ <name>only.when.is.snapshot.used</name>
+ <value>${project.version}</value>
+ <regex>.*-SNAPSHOT</regex>
+ <replacement>true</replacement>
+ <failIfNoMatch>false</failIfNoMatch>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
<executions>
<execution>
- <id>docker-image</id>
- <goals>
- <goal>build</goal>
- <goal>push</goal>
- </goals>
+ <id>docker-image-build</id>
+ <goals>
+ <goal>build</goal>
+ </goals>
+ <configuration>
+ <tag>${project.version}</tag>
+ <buildArgs>
+ <GREMLIN_CONSOLE_DIR>target/apache-tinkerpop-${project.artifactId}-${project.version}-standalone</GREMLIN_CONSOLE_DIR>
+ </buildArgs>
+ </configuration>
+ </execution>
+ <execution>
+ <id>docker-image-tag-minor-version</id>
+ <goals>
+ <goal>tag</goal>
+ </goals>
+ <configuration>
+ <tag>3.2</tag>
+ <skip>${only.when.is.snapshot.used}</skip>
+ </configuration>
+ </execution>
+ <execution>
+ <id>docker-image-push</id>
+ <goals>
+ <goal>push</goal>
+ </goals>
+ <configuration>
+ <skip>${only.when.is.snapshot.used}</skip>
+ </configuration>
</execution>
</executions>
<configuration>
<repository>tinkerpop/gremlin-console</repository>
- <tag>${project.version}</tag>
- <buildArgs>
- <GREMLIN_CONSOLE_DIR>target/apache-tinkerpop-${project.artifactId}-${project.version}-standalone</GREMLIN_CONSOLE_DIR>
- </buildArgs>
</configuration>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/02208a58/gremlin-server/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index dfc6570..e71f79b 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -255,23 +255,66 @@ limitations under the License.
<build>
<plugins>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <!-- source: https://stackoverflow.com/a/39139979/6753576 -->
+ <!-- sets the only.when.is.snapshot.used property to true if SNAPSHOT was used,
+ to the project version otherwise -->
+ <id>build-helper-regex-is-snapshot-used</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>regex-property</goal>
+ </goals>
+ <configuration>
+ <name>only.when.is.snapshot.used</name>
+ <value>${project.version}</value>
+ <regex>.*-SNAPSHOT</regex>
+ <replacement>true</replacement>
+ <failIfNoMatch>false</failIfNoMatch>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
<executions>
<execution>
- <id>docker-image</id>
+ <id>docker-image-build</id>
<goals>
<goal>build</goal>
+ </goals>
+ <configuration>
+ <tag>${project.version}</tag>
+ <buildArgs>
+ <GREMLIN_SERVER_DIR>target/apache-tinkerpop-${project.artifactId}-${project.version}-standalone</GREMLIN_SERVER_DIR>
+ </buildArgs>
+ </configuration>
+ </execution>
+ <execution>
+ <id>docker-image-tag-minor-version</id>
+ <goals>
+ <goal>tag</goal>
+ </goals>
+ <configuration>
+ <tag>3.2</tag>
+ <skip>${only.when.is.snapshot.used}</skip>
+ </configuration>
+ </execution>
+ <execution>
+ <id>docker-image-push</id>
+ <goals>
<goal>push</goal>
</goals>
+ <configuration>
+ <skip>${only.when.is.snapshot.used}</skip>
+ </configuration>
</execution>
</executions>
<configuration>
<repository>tinkerpop/gremlin-server</repository>
- <tag>${project.version}</tag>
- <buildArgs>
- <GREMLIN_SERVER_DIR>target/apache-tinkerpop-${project.artifactId}-${project.version}-standalone</GREMLIN_SERVER_DIR>
- </buildArgs>
</configuration>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/02208a58/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5251de3..19866f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -502,6 +502,11 @@ limitations under the License.
<artifactId>dockerfile-maven-plugin</artifactId>
<version>1.3.7</version>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>3.0.0</version>
+ </plugin>
</plugins>
</pluginManagement>
</build>
[24/50] tinkerpop git commit: CTR: Some necessary changes in the
release validation script to make it work on all systems.
Posted by fl...@apache.org.
CTR: Some necessary changes in the release validation script to make it work on all systems.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/2f8f74a7
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/2f8f74a7
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/2f8f74a7
Branch: refs/heads/TINKERPOP-1897
Commit: 2f8f74a780356850cb6cb0ef6ac96e4a024a6d41
Parents: fde136b
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Tue May 8 12:43:11 2018 -0700
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Tue May 8 12:43:11 2018 -0700
----------------------------------------------------------------------
bin/validate-distribution.sh | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2f8f74a7/bin/validate-distribution.sh
----------------------------------------------------------------------
diff --git a/bin/validate-distribution.sh b/bin/validate-distribution.sh
index 76e0974..3622905 100755
--- a/bin/validate-distribution.sh
+++ b/bin/validate-distribution.sh
@@ -22,11 +22,7 @@
# artifacts. You must have gpg installed and must import the
# published KEYS file in order for that aspect of the validation
# to pass.
-#
-# curl -L -O https://dist.apache.org/repos/dist/dev/tinkerpop/KEYS
-# gpg --import KEYS
-COMMITTERS=$(curl -Ls https://dist.apache.org/repos/dist/dev/tinkerpop/KEYS | grep -Po '(?<=<...@apache.org>)' | uniq)
TMP_DIR="/tmp/tpdv"
# Required. Only the latest version on each release stream is available on dist.
@@ -73,6 +69,9 @@ mkdir -p ${TMP_DIR}
rm -rf ${TMP_DIR}/*
cd ${TMP_DIR}
+COMMITTERS=$(curl -Ls https://dist.apache.org/repos/dist/dev/tinkerpop/KEYS | tee ${TMP_DIR}/KEYS | grep -Po '(?<=<...@apache.org>)' | uniq)
+gpg --import ${TMP_DIR}/KEYS 2> /dev/null && rm ${TMP_DIR}/KEYS
+
curl -Ls https://people.apache.org/keys/committer/ | grep -v invalid > ${TMP_DIR}/.committers
# validate downloads
@@ -97,7 +96,7 @@ echo "OK"
echo "* validating signatures and checksums ... "
echo -n " * PGP signature ... "
-gpg --verify ${ZIP_FILENAME}.asc ${ZIP_FILENAME} > ${TMP_DIR}/.verify 2>&1
+gpg --verify --with-fingerprint ${ZIP_FILENAME}.asc ${ZIP_FILENAME} > ${TMP_DIR}/.verify 2>&1
verified=0
@@ -117,11 +116,11 @@ done
[ ${verified} -eq 1 ] || { echo "failed"; exit 1; }
echo "OK"
-echo -n " * MD5 checksum ... "
-EXPECTED=`cat ${ZIP_FILENAME}.md5`
-ACTUAL=`md5sum ${ZIP_FILENAME} | awk '{print $1}'`
-[ "$ACTUAL" = "${EXPECTED}" ] || { echo "failed"; exit 1; }
-echo "OK"
+#echo -n " * MD5 checksum ... "
+#EXPECTED=`cat ${ZIP_FILENAME}.md5`
+#ACTUAL=`md5sum ${ZIP_FILENAME} | awk '{print $1}'`
+#[ "$ACTUAL" = "${EXPECTED}" ] || { echo "failed"; exit 1; }
+#echo "OK"
echo -n " * SHA1 checksum ... "
EXPECTED=`cat ${ZIP_FILENAME}.sha1`
[32/50] tinkerpop git commit: Polish up the release docs a bit for
3.2.x
Posted by fl...@apache.org.
Polish up the release docs a bit for 3.2.x
Not sure why we kinda let those docs die a bit. I think that maybe I figured that we'd always use the /current docs for release but that's not realistic. We probably should try to keep release docs stable to the version being released. CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/cc7d2e24
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/cc7d2e24
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/cc7d2e24
Branch: refs/heads/TINKERPOP-1897
Commit: cc7d2e24e1fcac3adfb34fe9b0429458e22f4ad1
Parents: 288b455
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon May 14 08:51:44 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon May 14 09:01:09 2018 -0400
----------------------------------------------------------------------
docs/src/dev/developer/release.asciidoc | 59 +++++++++++++++++-----------
1 file changed, 36 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cc7d2e24/docs/src/dev/developer/release.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/release.asciidoc b/docs/src/dev/developer/release.asciidoc
index 608bb31..1a7ef82 100644
--- a/docs/src/dev/developer/release.asciidoc
+++ b/docs/src/dev/developer/release.asciidoc
@@ -180,22 +180,30 @@ formatted properly - the easiest way to is to view the `CHANGELOG.asciidoc` to b
GitHub viewer.
.. Generate the JIRA release notes report for the current version and append them to the `CHANGELOG.asciidoc`.
... Use an "advanced" search to filter out JIRA issues already released on other versions. For example:
-`project = TINKERPOP and status = Closed AND fixVersion = 3.2.0 AND fixVersion not in (3.1.3, 3.1.2, 3.1.1, 3.1.0) ORDER BY type, Id ASC`.
+`project = TINKERPOP and status = Closed AND fixVersion = 3.2.0 ORDER BY type, Id ASC`.
... Consider use of an "Excel" export to organize and prepare the JIRA tickets to be pasted to `CHANGELOG.asciidoc`.
This formula can help construct each line item for the CHANGELOG if column `A` is the issue number, `B` is the
issue title and `D` is the label field: `="* "&A2&" "&B2&(IF(D2="breaking"," \*(breaking)*",""))`
... Be sure to include a link to other versions in the `CHANGELOG.asciidoc` that were previously released while the
current release was under development as this new release will have those changes included within it. Please see
3.2.1 for an example.
-.. Format "breaking" changes to be clearly marked (use JIRA and the "breaking" label to identify those)
+.. Format "breaking" changes to be clearly marked (use JIRA and the "breaking" label to identify those - already accounted for if using the suggested formula above)
. Update "upgrade documentation":
.. Update the release date.
.. Update the link to `CHANGELOG.asciidoc` - this link may already be correct but will not exist until the repository is tagged.
+. Update homepage with references in `/site` to latest distribution and to other internal links elsewhere on the page.
+.. This step should only be performed by the release manager for the newest line of code (i.e. if release 3.3.x, 3.2.x and 3.1.x,
+then only do this step for 3.3.x (tp33 branch), and update the site for all releases).
+.. Update the `template/header-footer.html`.
+.. Update `index.html`.
+.. Update link:http://tinkerpop.apache.org/downloads.html[Downloads] page, when moving "Current Releases" to "Archived
+Releases" recall that the hyperlink must change to point to version in the link:https://archive.apache.org/dist/tinkerpop/[Apache Archives].
+.. Preview changes locally with `bin/generate-home.sh` then commit changes to git.
. `mvn versions:set -DnewVersion=xx.yy.zz -DgenerateBackupPoms=false` to update project files to reference the non-SNAPSHOT version
. `pushd gremlin-console/bin; ln -fs ../target/apache-tinkerpop-gremlin-console-xx.yy.zz-standalone/bin/gremlin.sh gremlin.sh; popd`
. `git diff` and review the updated files
. `mvn clean install` - need to build first so that the right version of the console is used with `bin/publish-docs.sh`
-.. This step should update the Gremlin.Net project file with the newly bumped version.
+.. This step should update the Gremlin.Net project file and Gremlin Javascript package file with the newly bumped version.
. `git commit -a -m "TinkerPop xx.yy.zz release"` and push
. `bin/process-docs.sh` and validate the generated documentation locally. Don't rely on "BUILD SUCCESS" - scroll up through logs to ensure there were no errors and view the HTML directly. Code blocks that did not execute properly have a gray background and do not show the results of the commands.
. `bin/publish-docs.sh <username>` - Note that this step requires no additional processing as the previous step handled
@@ -209,26 +217,12 @@ for generating javadoc and without that the binary distributions won't contain t
.. `cp ~/.m2/repository/org/apache/tinkerpop/gremlin-console/xx.yy.zz/gremlin-console-xx.yy.zz-distribution.zip* dev/xx.yy.zz`
.. `cp ~/.m2/repository/org/apache/tinkerpop/gremlin-server/xx.yy.zz/gremlin-server-xx.yy.zz-distribution.zip* dev/xx.yy.zz`
.. `cp ~/.m2/repository/org/apache/tinkerpop/tinkerpop/xx.yy.zz/tinkerpop-xx.yy.zz-source-release.zip* dev/xx.yy.zz`
-.. `rm -f dev/*.md5
+.. `rm -f dev/*.md5`
.. `cd dev/xx.yy.zz`
.. pass:[<code>ls * | xargs -n1 -I {} echo "mv apache-tinkerpop-{} {}" | sed -e 's/distribution/bin/' -e 's/source-release/src/' -e 's/tinkerpop-tinkerpop/tinkerpop/' -e s'/^\(.*\) \(.*\) \(.*\)$/\1 \3 \2/' | /bin/bash</code>]
.. `cd ..; svn add xx.yy.zz/; svn ci -m "TinkerPop xx.yy.zz release"`
. Execute `bin/validate-distribution.sh` and any other relevant testing.
. `git tag -a -m "TinkerPop xx.yy.zz release" xx.yy.zz` and `git push --tags`
-. Perform JIRA administration tasks:
-.. "Release" the current version and set the "release date"
-.. If there is to be a follow on release in the current line of code, create that new version specifying the "start date"
-. Prepare Git administration tasks. Note that this work can be performed at the release manager's discretion. It may be wise to wait until a successful VOTE is eminent before reopening development. Apply the following steps as needed per release branch:
-.. Make the appropriate branching changes as required by the release and bump the version to `SNAPSHOT` with
-`mvn versions:set -DnewVersion=xx.yy.zz-SNAPSHOT -DgenerateBackupPoms=false`.
-.. `pushd gremlin-console/bin; ln -fs ../target/apache-tinkerpop-gremlin-console-xx.yy.zz-SNAPSHOT-standalone/bin/gremlin.sh gremlin.sh; popd`
-.. Update CHANGELOG and upgrade docs to have the appropriate headers for the next version.
-.. `mvn clean install -DskipTests` - need to build first so that the right version of the console is used with `bin/publish-docs.sh`
-.. `mvn deploy -DskipTests` - deploy the new `SNAPSHOT`
-.. `bin/process-docs.sh` and validate the generated `SNAPSHOT` documentation locally and then `bin/publish-docs.sh <username>`
-.. Commit and push the `SNAPSHOT` changes to git
-.. Send email to advise that code freeze is lifted.
-.. Generate a list of dead branches that will be automatically deleted and post them as a DISCUSS thread for review, then once consensus is reached removed those branches.
. Submit for `[VOTE]` at `dev@tinkerpop.apache.org` (see email template below)
. *Wait for vote acceptance* (72 hours)
@@ -248,11 +242,7 @@ for generating javadoc and without that the binary distributions won't contain t
. Wait for Apache Sonatype to sync the artifacts to Maven Central at (link:http://repo1.maven.org/maven2/org/apache/tinkerpop/tinkerpop/[http://repo1.maven.org/maven2/org/apache/tinkerpop/tinkerpop/]).
. Report the release through link:https://reporter.apache.org/addrelease.html?tinkerpop[reporter.apache.org] (an email reminder should arrive shortly following the svn command above to do the release)
. Wait for zip distributions to to sync to the Apache mirrors (i.e ensure the download links work from a mirror).
-. Update home page site with references to latest distribution - specifically:
-.. Update the `template/header-footer.html`.
-.. Update `index.html`.
-.. Update link:http://tinkerpop.apache.org/downloads.html[Downloads] page, when moving "Current Releases" to "Archived
-Releases" recall that the hyperlink must change to point to version in the link:https://archive.apache.org/dist/tinkerpop/[Apache Archives].
+. `bin/publish-home.sh <username>` to publish the updated web site with new releases.
. Execute `bin/update-current-docs.sh` to migrate to the latest documentation set for `/current`.
. This step should only occur after the website is updated and all links are working. If there are releases present in
SVN that represents lines of code that are no longer under development, then remove those releases. In other words,
@@ -260,6 +250,29 @@ if `3.2.0` is present and `3.2.1` is released then remove `3.2.0`. However, if
code is still under potential development, it may stay.
. Announce release on `dev@`/`gremlin-users@` mailing lists and tweet from `@apachetinkerpop`
+== Post-release Tasks
+
+A number of administration tasks should be taken care of after release is public. Some of these items can be performed
+during the VOTE period at the release manager's discretion, though it may be wise to wait until a successful VOTE is
+eminent before reopening development. When there are multiple release managers, it's best to coordinate these tasks
+as one individual may simply just handle them all.
+
+. Perform JIRA administration tasks:
+.. "Release" the current version and set the "release date"
+.. If there is to be a follow on release in the current line of code, create that new version specifying the "start date"
+. Prepare Git administration tasks. Apply the following steps as needed per release branch:
+.. Make the appropriate branching changes as required by the release and bump the version to `SNAPSHOT` with
+`mvn versions:set -DnewVersion=xx.yy.zz-SNAPSHOT -DgenerateBackupPoms=false`.
+.. `pushd gremlin-console/bin; ln -fs ../target/apache-tinkerpop-gremlin-console-xx.yy.zz-SNAPSHOT-standalone/bin/gremlin.sh gremlin.sh; popd`
+.. Update CHANGELOG and upgrade docs to have the appropriate headers for the next version.
+.. `mvn clean install -DskipTests` - need to build first so that the right version of the console is used with `bin/publish-docs.sh`
+.. `mvn deploy -DskipTests` - deploy the new `SNAPSHOT`
+.. `bin/process-docs.sh` and validate the generated `SNAPSHOT` documentation locally and then `bin/publish-docs.sh <username>`
+.. Commit and push the `SNAPSHOT` changes to git
+. Send email to advise that code freeze is lifted.
+. Generate a list of dead branches that will be automatically deleted and post them as a DISCUSS thread for review,
+then once consensus is reached removed those branches.
+
== Email Templates
=== Release VOTE
[03/50] tinkerpop git commit: Don't use recursive calls for streaming
response
Posted by fl...@apache.org.
Don't use recursive calls for streaming response
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/4c8717dd
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/4c8717dd
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/4c8717dd
Branch: refs/heads/TINKERPOP-1897
Commit: 4c8717dd4e94ec248a959911d8c11f3b45b2d7b3
Parents: 268423d
Author: davebshow <da...@gmail.com>
Authored: Mon Apr 23 16:21:48 2018 -0700
Committer: davebshow <da...@gmail.com>
Committed: Mon Apr 23 16:21:48 2018 -0700
----------------------------------------------------------------------
.../src/main/jython/gremlin_python/driver/connection.py | 7 +++++--
.../src/main/jython/gremlin_python/driver/protocol.py | 8 ++++----
2 files changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4c8717dd/gremlin-python/src/main/jython/gremlin_python/driver/connection.py
----------------------------------------------------------------------
diff --git a/gremlin-python/src/main/jython/gremlin_python/driver/connection.py b/gremlin-python/src/main/jython/gremlin_python/driver/connection.py
index abc4545..bff1904 100644
--- a/gremlin-python/src/main/jython/gremlin_python/driver/connection.py
+++ b/gremlin-python/src/main/jython/gremlin_python/driver/connection.py
@@ -73,6 +73,9 @@ class Connection:
return future
def _receive(self):
- data = self._transport.read()
- self._protocol.data_received(data, self._results)
+ while True:
+ data = self._transport.read()
+ status_code = self._protocol.data_received(data, self._results)
+ if status_code != 206:
+ break
self._pool.put_nowait(self)
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4c8717dd/gremlin-python/src/main/jython/gremlin_python/driver/protocol.py
----------------------------------------------------------------------
diff --git a/gremlin-python/src/main/jython/gremlin_python/driver/protocol.py b/gremlin-python/src/main/jython/gremlin_python/driver/protocol.py
index 84a7d82..2fc7c1b 100644
--- a/gremlin-python/src/main/jython/gremlin_python/driver/protocol.py
+++ b/gremlin-python/src/main/jython/gremlin_python/driver/protocol.py
@@ -80,21 +80,21 @@ class GremlinServerWSProtocol(AbstractBaseProtocol):
{'sasl': base64.b64encode(auth).decode()})
self.write(request_id, request_message)
data = self._transport.read()
+ # Allow recursive call for auth
self.data_received(data, results_dict)
elif status_code == 204:
result_set.stream.put_nowait([])
del results_dict[request_id]
+ return status_code
elif status_code in [200, 206]:
results = []
for msg in data["result"]["data"]:
results.append(
self._message_serializer.deserialize_message(msg))
result_set.stream.put_nowait(results)
- if status_code == 206:
- data = self._transport.read()
- self.data_received(data, results_dict)
- else:
+ if status_code == 200:
del results_dict[request_id]
+ return status_code
else:
del results_dict[request_id]
raise GremlinServerError(
[22/50] tinkerpop git commit: fix list item index: expected 2 got 1 -
CTR
Posted by fl...@apache.org.
fix list item index: expected 2 got 1 - CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/f64afe52
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f64afe52
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/f64afe52
Branch: refs/heads/TINKERPOP-1897
Commit: f64afe52acbdafaa281f072b953a7c41d25ce800
Parents: e9ab93a
Author: Robert Dale <ro...@gmail.com>
Authored: Sun May 6 10:36:57 2018 -0400
Committer: Robert Dale <ro...@gmail.com>
Committed: Sun May 6 10:37:10 2018 -0400
----------------------------------------------------------------------
docs/src/reference/the-traversal.asciidoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f64afe52/docs/src/reference/the-traversal.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/the-traversal.asciidoc b/docs/src/reference/the-traversal.asciidoc
index 86fb324..e2e3be2 100644
--- a/docs/src/reference/the-traversal.asciidoc
+++ b/docs/src/reference/the-traversal.asciidoc
@@ -421,7 +421,7 @@ g.V().both().both().both().count().iterate().toString() <2>
----
<1> `LazyBarrierStrategy` is a default strategy and thus, does not need to be explicitly activated.
-<1> With `LazyBarrierStrategy` activated, `barrier()` steps are automatically inserted where appropriate.
+<2> With `LazyBarrierStrategy` activated, `barrier()` steps are automatically inserted where appropriate.
*Additional References*
[47/50] tinkerpop git commit: Add description about Docker
credentials TINKERPOP-1897
Posted by fl...@apache.org.
Add description about Docker credentials TINKERPOP-1897
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/41a34723
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/41a34723
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/41a34723
Branch: refs/heads/TINKERPOP-1897
Commit: 41a347237e544887f668eda8969901e02927c769
Parents: 1066f63
Author: Florian Hockmann <fh...@florian-hockmann.de>
Authored: Mon Mar 5 19:52:28 2018 +0100
Committer: Florian Hockmann <fh...@florian-hockmann.de>
Committed: Sat May 19 10:51:35 2018 +0200
----------------------------------------------------------------------
docs/src/dev/developer/development-environment.asciidoc | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/41a34723/docs/src/dev/developer/development-environment.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/development-environment.asciidoc b/docs/src/dev/developer/development-environment.asciidoc
index cb19a65..c50b189 100644
--- a/docs/src/dev/developer/development-environment.asciidoc
+++ b/docs/src/dev/developer/development-environment.asciidoc
@@ -197,6 +197,11 @@ authentication information on the ~/.npmrc file. The easiest way to do that is t
must be done only once, as the auth token doesn't have an expiration date and it's stored on your file system. If
this account is newly created then request that a PMC member add your account to the "gremlin" package on npm.
+Deploying Docker images to link:https://hub.docker.com/[Docker Hub] requires authentication information in the
+`~/.docker/config.json` file. This information can simply be added with the `docker login` command which will ask for
+credentials. This must be done only once. Afterwards, `docker push` can be used to push images to Docker Hub which will
+be done automatically on `mvn deploy` or it can be triggered manually with `mvn dockerfile:push`.
+
[[building-testing]]
== Building and Testing
[17/50] tinkerpop git commit: Remove obsolete
NamingConversions.template TINKERPOP-1901 CTR
Posted by fl...@apache.org.
Remove obsolete NamingConversions.template TINKERPOP-1901 CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/09fd327a
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/09fd327a
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/09fd327a
Branch: refs/heads/TINKERPOP-1897
Commit: 09fd327abbe142e6ca33d78148d9c1820f85a197
Parents: a4c5a21
Author: Florian Hockmann <fh...@florian-hockmann.de>
Authored: Fri Apr 27 09:22:51 2018 +0200
Committer: Florian Hockmann <fh...@florian-hockmann.de>
Committed: Fri Apr 27 09:22:51 2018 +0200
----------------------------------------------------------------------
gremlin-dotnet/glv/NamingConversions.template | 50 ----------------------
1 file changed, 50 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/09fd327a/gremlin-dotnet/glv/NamingConversions.template
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/glv/NamingConversions.template b/gremlin-dotnet/glv/NamingConversions.template
deleted file mode 100644
index 201e74b..0000000
--- a/gremlin-dotnet/glv/NamingConversions.template
+++ /dev/null
@@ -1,50 +0,0 @@
-#region License
-
-/*
- * 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.
- */
-
-#endregion
-
-using System.Collections.Generic;
-
-// THIS IS A GENERATED FILE - DO NOT MODIFY THIS FILE DIRECTLY - see pom.xml
-namespace Gremlin.Net.Process.Traversal
-{
- internal static class NamingConversions
- {
- /// <summary>
- /// Gets the Java name equivalent for a given enum value
- /// </summary>
- internal static string GetEnumJavaName(string typeName, string value)
- {
- var key = \$"{typeName}.{value}";
- string javaName;
- if (!CSharpToJavaEnums.TryGetValue(key, out javaName))
- {
- throw new KeyNotFoundException(\$"Java name for {key} not found");
- }
- return javaName;
- }
-
- internal static readonly IDictionary<string, string> CSharpToJavaEnums = new Dictionary<string, string>
- {
- <%= body %>
- };
- }
-}
\ No newline at end of file
[29/50] tinkerpop git commit: Bumped build plugin versions to latest.
Posted by fl...@apache.org.
Bumped build plugin versions to latest.
True of all plugins identified by the versions-maven-plugin except for the dotnet-maven-plugin which fails the build. Not sure why it fails, but I'm guessing that it has to do with some incompatibilty with dotnet command line or something. No longer need hyracs repo for anything so removed that entry from gremlin-groovy CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/3635ff69
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/3635ff69
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/3635ff69
Branch: refs/heads/TINKERPOP-1897
Commit: 3635ff69e2dfb40ec29788b426029e021a5c7f32
Parents: 8a03d50
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue May 8 07:32:47 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri May 11 14:11:07 2018 -0400
----------------------------------------------------------------------
.../dev/developer/development-environment.asciidoc | 3 ++-
gremlin-dotnet/pom.xml | 14 ++++++++++++--
gremlin-groovy/pom.xml | 6 ------
gremlin-javascript/pom.xml | 2 +-
pom.xml | 16 ++++++++++------
5 files changed, 25 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3635ff69/docs/src/dev/developer/development-environment.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/development-environment.asciidoc b/docs/src/dev/developer/development-environment.asciidoc
index 0cceb5e..3e3edad 100644
--- a/docs/src/dev/developer/development-environment.asciidoc
+++ b/docs/src/dev/developer/development-environment.asciidoc
@@ -25,7 +25,7 @@ configure a development environment for TinkerPop.
== System Configuration
At a minimum, development of TinkerPop requires link:http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html[Java 1.8.0_40+]
-and link:https://maven.apache.org/download.cgi[Maven 3.0.5+]. Maven is used as the common build system, which even
+and link:https://maven.apache.org/download.cgi[Maven 3.1.0+]. Maven is used as the common build system, which even
controls the builds of non-JVM link:http://tinkerpop.apache.org/docs/current/tutorials/gremlin-language-variants/[GLVs]
such as `gremlin-python`. Java and Maven are described as a "minimum" for a development environment, because they
will only build JVM portions of TinkerPop and many integration tests will not fire with this simple setup. It is
@@ -209,6 +209,7 @@ mvn -Dmaven.javadoc.skip=true --projects tinkergraph-gremlin test
* Build JavaDocs: `mvn process-resources -Djavadoc`
* Check for Apache License headers: `mvn apache-rat:check`
* Check for newer dependencies: `mvn versions:display-dependency-updates` or `mvn versions:display-plugin-updates`
+* Check the effective `pom.xml`: `mvn -pl gremlin-python -Pglv-python help:effective-pom -Doutput=withProfilePom.xml`
* Deploy JavaDocs/AsciiDocs: `bin/publish-docs.sh svn-username`
* Integration Tests: `mvn verify -DskipIntegrationTests=false`
** Execute with the `-DincludeNeo4j` option to include transactional tests.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3635ff69/gremlin-dotnet/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/pom.xml b/gremlin-dotnet/pom.xml
index fbc97d4..de41d38 100644
--- a/gremlin-dotnet/pom.xml
+++ b/gremlin-dotnet/pom.xml
@@ -31,14 +31,13 @@ limitations under the License.
<module>src</module>
<module>test</module>
</modules>
-
+
<build>
<plugins>
<plugin>
<groupId>org.eobjects.build</groupId>
<artifactId>dotnet-maven-plugin</artifactId>
<extensions>true</extensions>
- <version>0.14</version>
</plugin>
<plugin>
<groupId>org.codehaus.gmavenplus</groupId>
@@ -99,5 +98,16 @@ limitations under the License.
</configuration>
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <!-- bumping past 0.20 yields build errors - not sure what is amiss there -->
+ <plugin>
+ <groupId>org.eobjects.build</groupId>
+ <artifactId>dotnet-maven-plugin</artifactId>
+ <extensions>true</extensions>
+ <version>0.20</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3635ff69/gremlin-groovy/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-groovy/pom.xml b/gremlin-groovy/pom.xml
index 64405f5..3c7a122 100644
--- a/gremlin-groovy/pom.xml
+++ b/gremlin-groovy/pom.xml
@@ -88,12 +88,6 @@ limitations under the License.
<scope>test</scope>
</dependency>
</dependencies>
- <repositories>
- <repository>
- <id>hyracks-releases</id>
- <url>http://obelix.ics.uci.edu/nexus/content/groups/hyracks-public-releases/</url>
- </repository>
- </repositories>
<build>
<directory>${basedir}/target</directory>
<finalName>${project.artifactId}-${project.version}</finalName>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3635ff69/gremlin-javascript/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-javascript/pom.xml b/gremlin-javascript/pom.xml
index f91b749..4736576 100644
--- a/gremlin-javascript/pom.xml
+++ b/gremlin-javascript/pom.xml
@@ -169,7 +169,7 @@ limitations under the License.
<plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
- <version>1.4</version>
+ <version>1.6</version>
<executions>
<execution>
<id>install node and npm</id>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3635ff69/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c724e0f..9737fef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -110,7 +110,7 @@ limitations under the License.
</contributor>
</contributors>
<prerequisites>
- <maven>3.0.5</maven>
+ <maven>3.1.0</maven>
</prerequisites>
<modules>
<module>gremlin-shaded</module>
@@ -172,6 +172,11 @@ limitations under the License.
<directory>${basedir}/target</directory>
<plugins>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>versions-maven-plugin</artifactId>
+ <version>2.5</version>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
@@ -353,7 +358,7 @@ limitations under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.6.1</version>
+ <version>3.7.0</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
@@ -370,7 +375,7 @@ limitations under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.20</version>
+ <version>2.21.0</version>
<configuration>
<argLine>-Dlog4j.configuration=${log4j-test.properties} -Dbuild.dir=${project.build.directory}
-Dis.testing=true
@@ -384,7 +389,7 @@ limitations under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.20</version>
+ <version>2.21.0</version>
<executions>
<execution>
<id>integration-test</id>
@@ -455,7 +460,7 @@ limitations under the License.
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
- <version>3.0.2</version>
+ <version>3.1.0</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -1332,7 +1337,6 @@ limitations under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.17</version>
<configuration>
<argLine>-Dlog4j.configuration=${log4j-silent.properties}
-Dbuild.dir=${project.build.directory} -Dis.testing=true
[18/50] tinkerpop git commit: Fix title formatting in olap/spark/yarn
recipe CTR
Posted by fl...@apache.org.
Fix title formatting in olap/spark/yarn recipe CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0694cd7c
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0694cd7c
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/0694cd7c
Branch: refs/heads/TINKERPOP-1897
Commit: 0694cd7cf7368752ddac041218a76c2db921983b
Parents: 09fd327
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Apr 27 08:33:03 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Apr 27 08:33:03 2018 -0400
----------------------------------------------------------------------
docs/src/recipes/olap-spark-yarn.asciidoc | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0694cd7c/docs/src/recipes/olap-spark-yarn.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/recipes/olap-spark-yarn.asciidoc b/docs/src/recipes/olap-spark-yarn.asciidoc
index 1543829..54ecf77 100644
--- a/docs/src/recipes/olap-spark-yarn.asciidoc
+++ b/docs/src/recipes/olap-spark-yarn.asciidoc
@@ -15,8 +15,7 @@ See the License for the specific language governing permissions and
limitations under the License.
////
[[olap-spark-yarn]]
-OLAP traversals with Spark on YARN
-----------------------------------
+== OLAP traversals with Spark on YARN
TinkerPop's combination of link:http://tinkerpop.apache.org/docs/x.y.z/reference/#sparkgraphcomputer[SparkGraphComputer]
and link:http://tinkerpop.apache.org/docs/x.y.z/reference/#_properties_files[HadoopGraph] allows for running
@@ -26,8 +25,7 @@ where Spark runs locally or where the cluster is managed by a Spark server. Howe
via the http://hadoop.apache.org/[Hadoop 2.x] Resource Manager (YARN), which requires `SparkGraphComputer` to be
configured differently. This recipe describes this configuration.
-Approach
-~~~~~~~~
+=== Approach
Most configuration problems of TinkerPop with Spark on YARN stem from three reasons:
@@ -40,8 +38,8 @@ The current recipe follows a minimalist approach in which no dependencies are ad
included in the TinkerPop binary distribution. The Hadoop cluster's Spark installation is completely ignored. This
approach minimizes the chance of dependency version conflicts.
-Prerequisites
-~~~~~~~~~~~~~
+=== Prerequisites
+
This recipe is suitable for both a real external and a local pseudo Hadoop cluster. While the recipe is maintained
for the vanilla Hadoop pseudo-cluster, it has been reported to work on real clusters with Hadoop distributions
from various vendors.
@@ -79,8 +77,7 @@ export HADOOP_GREMLIN_LIBS=$GREMLIN_HOME/empty
bin/gremlin.sh
----
-Running the job
-~~~~~~~~~~~~~~~
+=== Running the job
You can now run a gremlin OLAP query with Spark on YARN:
@@ -118,8 +115,7 @@ the YARN Resource Manager UI (e.g. \http://rm.your.domain:8088/cluster), provide
`yarn.log-aggregation-enable` property set to `true`. See the Spark documentation for
https://spark.apache.org/docs/latest/running-on-yarn.html#debugging-your-application[additional hints].
-Explanation
-~~~~~~~~~~~
+=== Explanation
This recipe does not require running the `bin/hadoop/init-tp-spark.sh` script described in the
link:http://tinkerpop.apache.org/docs/x.y.z/reference/#sparkgraphcomputer[reference documentation] and thus is also
@@ -138,8 +134,8 @@ The `gremlin.spark.persistContext` property is explained in the reference docume
link:http://tinkerpop.apache.org/docs/x.y.z/reference/#sparkgraphcomputer[SparkGraphComputer]: it helps in getting
follow-up OLAP queries answered faster, because you skip the overhead for getting resources from YARN.
-Additional configuration options
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+=== Additional configuration options
+
This recipe does most of the graph configuration in the Gremlin Console so that environment variables can be used and
the chance of configuration mistakes is minimal. Once you have your setup working, it is probably easier to make a copy
of the `conf/hadoop/hadoop-gryo.properties` file and put the property values specific to your environment there. This is
[50/50] tinkerpop git commit: Replace hardcoded version tags by
parsed version TINKERPOP-1897
Posted by fl...@apache.org.
Replace hardcoded version tags by parsed version TINKERPOP-1897
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/c7a65665
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c7a65665
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c7a65665
Branch: refs/heads/TINKERPOP-1897
Commit: c7a65665e6ba610d74d10b3461f54a64d0cceaa9
Parents: b8fec48
Author: Florian Hockmann <fh...@florian-hockmann.de>
Authored: Sat May 19 11:27:57 2018 +0200
Committer: Florian Hockmann <fh...@florian-hockmann.de>
Committed: Sat May 19 11:27:57 2018 +0200
----------------------------------------------------------------------
gremlin-console/pom.xml | 10 +++++-----
gremlin-server/pom.xml | 10 +++++-----
pom.xml | 6 ++++++
3 files changed, 16 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c7a65665/gremlin-console/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index db86d41..8e8b357 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -367,9 +367,9 @@ limitations under the License.
<goals>
<goal>tag</goal>
</goals>
- <configuration>
- <tag>3.2</tag>
- <skip>${only.when.is.snapshot.used}</skip>
+ <configuration>
+ <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}</tag>
+ <skip>${only.when.is.snapshot.used}</skip>
</configuration>
</execution>
<execution>
@@ -377,9 +377,9 @@ limitations under the License.
<goals>
<goal>push</goal>
</goals>
- <configuration>
+ <configuration>
<skip>${only.when.is.snapshot.used}</skip>
- </configuration>
+ </configuration>
</execution>
</executions>
<configuration>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c7a65665/gremlin-server/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index ef2e609..b2c3435 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -275,9 +275,9 @@ limitations under the License.
<goals>
<goal>tag</goal>
</goals>
- <configuration>
- <tag>3.2</tag>
- <skip>${only.when.is.snapshot.used}</skip>
+ <configuration>
+ <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}</tag>
+ <skip>${only.when.is.snapshot.used}</skip>
</configuration>
</execution>
<execution>
@@ -285,9 +285,9 @@ limitations under the License.
<goals>
<goal>push</goal>
</goals>
- <configuration>
+ <configuration>
<skip>${only.when.is.snapshot.used}</skip>
- </configuration>
+ </configuration>
</execution>
</executions>
<configuration>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c7a65665/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9ff3f3a..398b931 100644
--- a/pom.xml
+++ b/pom.xml
@@ -285,6 +285,12 @@ limitations under the License.
<failIfNoMatch>false</failIfNoMatch>
</configuration>
</execution>
+ <execution>
+ <id>parse-version</id>
+ <goals>
+ <goal>parse-version</goal>
+ </goals>
+ </execution>
</executions>
</plugin>
<plugin>
[12/50] tinkerpop git commit: Minor refacoring of cache access in
TraversalStrategies CTR
Posted by fl...@apache.org.
Minor refacoring of cache access in TraversalStrategies CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1d9e6dc6
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1d9e6dc6
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1d9e6dc6
Branch: refs/heads/TINKERPOP-1897
Commit: 1d9e6dc6d30c5c7d56e4007527365793eb1f223e
Parents: 0d6f8fc
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Apr 25 09:18:08 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Apr 25 09:18:08 2018 -0400
----------------------------------------------------------------------
.../process/traversal/TraversalStrategies.java | 39 ++++++++++----------
1 file changed, 20 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1d9e6dc6/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java
index e84737c..37cd1a6 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java
@@ -203,7 +203,7 @@ public interface TraversalStrategies extends Serializable, Cloneable {
* Keeps track of {@link GraphComputer} and/or {@link Graph} classes that have been initialized to the
* classloader so that they do not have to be reflected again.
*/
- private static Set<Class> LOADED = ConcurrentHashMap.newKeySet();
+ private static Map<Class, Boolean> LOADED = new ConcurrentHashMap<>();
private static final Map<Class<? extends Graph>, TraversalStrategies> GRAPH_CACHE = new HashMap<>();
private static final Map<Class<? extends GraphComputer>, TraversalStrategies> GRAPH_COMPUTER_CACHE = new HashMap<>();
@@ -249,26 +249,27 @@ public interface TraversalStrategies extends Serializable, Cloneable {
}
public static TraversalStrategies getStrategies(final Class graphOrGraphComputerClass) {
- try {
- // be sure to load the class so that its static{} traversal strategy registration component is loaded.
- // this is more important for GraphComputer classes as they are typically not instantiated prior to
- // strategy usage like Graph classes.
- if (!LOADED.contains(graphOrGraphComputerClass)) {
- final String graphComputerClassName = null != graphOrGraphComputerClass.getDeclaringClass() ?
- graphOrGraphComputerClass.getCanonicalName().replace("." + graphOrGraphComputerClass.getSimpleName(), "$" + graphOrGraphComputerClass.getSimpleName()) :
- graphOrGraphComputerClass.getCanonicalName();
+ // be sure to load the class so that its static{} traversal strategy registration component is loaded.
+ // this is more important for GraphComputer classes as they are typically not instantiated prior to
+ // strategy usage like Graph classes.
+ LOADED.computeIfAbsent(graphOrGraphComputerClass, unused -> {
+ final String graphComputerClassName = null != graphOrGraphComputerClass.getDeclaringClass() ?
+ graphOrGraphComputerClass.getCanonicalName().replace("." + graphOrGraphComputerClass.getSimpleName(), "$" + graphOrGraphComputerClass.getSimpleName()) :
+ graphOrGraphComputerClass.getCanonicalName();
+
+ try {
Class.forName(graphComputerClassName);
-
- // keep track of stuff we already loaded once - stuff in this if/statement isn't cheap and this
- // method gets called a lot, basically every time a new traversal gets spun up (that includes
- // child traversals. perhaps it is possible to just check the cache keys for this information, but
- // it's not clear if this method will be called with something not in the cache and if it is and
- // it results in error, then we'd probably not want to deal with this block again anyway
- LOADED.add(graphOrGraphComputerClass);
+ } catch (ClassNotFoundException e) {
+ throw new IllegalStateException(e.getMessage(), e);
}
- } catch (final ClassNotFoundException e) {
- throw new IllegalStateException(e.getMessage(), e);
- }
+
+ // keep track of stuff we already loaded once - stuff in this if/statement isn't cheap and this
+ // method gets called a lot, basically every time a new traversal gets spun up (that includes
+ // child traversals. perhaps it is possible to just check the cache keys for this information, but
+ // it's not clear if this method will be called with something not in the cache and if it is and
+ // it results in error, then we'd probably not want to deal with this block again anyway
+ return true;
+ });
if (GRAPH_CACHE.containsKey(graphOrGraphComputerClass)) {
return GRAPH_CACHE.get(graphOrGraphComputerClass);
[13/50] tinkerpop git commit: TINKERPOP-1755 Added some docs about
detachment CTR
Posted by fl...@apache.org.
TINKERPOP-1755 Added some docs about detachment CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/6096a4c7
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/6096a4c7
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/6096a4c7
Branch: refs/heads/TINKERPOP-1897
Commit: 6096a4c7db50d733254760243a28902db7a81704
Parents: 1d9e6dc
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Apr 25 15:20:00 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Apr 25 15:20:00 2018 -0400
----------------------------------------------------------------------
.../src/reference/gremlin-applications.asciidoc | 70 ++++++++++++++++++++
1 file changed, 70 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6096a4c7/docs/src/reference/gremlin-applications.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/gremlin-applications.asciidoc b/docs/src/reference/gremlin-applications.asciidoc
index 380ff4e..1a68ad8 100644
--- a/docs/src/reference/gremlin-applications.asciidoc
+++ b/docs/src/reference/gremlin-applications.asciidoc
@@ -1646,6 +1646,76 @@ section. It controls the maximum number of parameters that can be passed to the
Use of this setting can prevent accidental long run compilations, which individually are not terribly oppressive to
the server, but taken as a group under high concurrency would be considered detrimental.
+==== Properties of Elements
+
+It was mentioned above at the start of this "Best Practices" section that serialization of graph elements (i.e.
+`Vertex`, `Edge`, and `VertexProperty`) can be expensive and that it is best to only return the data that is required
+by the requesting system. This point begs for further clarification as there are a number of ways to use and configure
+Gremlin Server which might influence its interpretation.
+
+To begin to discuss these nuances, first consider the method of making requests to Gremlin Server: script or bytecode.
+For scripts, that will mean that users are sending string representation of Gremlin to the server directly through a
+driver over websockets or through the HTTP. For bytecode, users will be utilize a <<gremlin-variants, Gremlin GLV>>
+which will construct bytecode for them and submit the request to the server upon iteration of their traversal.
+
+In either case, it is important to also consider the method of "detachment". Detachment refers to the manner in which
+a graph element is disconnected from the graph for purpose of serialization. Depending on the case and configuration,
+graph elements may be detached with or without properties. Cases where they include properties is generally referred
+to as "detached elements" and cases where properties are not included are "reference elements".
+
+With the type of request and detachment model in mind, it is now possible to discuss how best to consider element
+properties in relation to them all in concert.
+
+For script-based requests, users should take care when returning graph elements. By default, elements will be returned
+as detached elements and will thus serialize with all properties that are bound to them. As such, Gryo and GraphSON
+serializers will write all properties in the return payload. Script-based requests should definitely follow the best
+practice of only returning the data required by the application.
+
+NOTE: Gryo does have the exception for the `GryoMessageSerializerGremlinV1d0` with the `serializeResultToString`
+option enabled, which will simply convert all results using the Java `toString()` method prior to serialization and
+is typically only use by the Gremlin Console for remote sessions where the actual object from the server is not of use.
+
+For bytecode-based requests, graph elements have reference detachment and thus only return the `id` and `label` of
+the elements. While this approach alleviates a potential performance problem that the script approach exposes, it is
+still important to follow the practice of being specific about the data that is required by the requesting application
+as it won't arrive on the client side without that declaration.
+
+Ultimately, the detachment model should have little impact to Gremlin usage if the best practice of specifying only
+the data required by the application is adhered to. In other words, while there may be a difference in the contents
+of return values for these traversals:
+
+[source,java]
+----
+// properties returned from g.V().hasLabel('person') because this is using the
+// Script API with full detachment
+Cluster cluster = Cluster.open();
+Client client = cluster.connect();
+ResultSet results = client.submit("g.V().hasLabel('person')");
+
+// no properties returned from g.V().hasLabel("person") because this is using
+// Bytecode API with reference detachment
+Graph graph = EmptyGraph.instance();
+GraphTraversalSource g = graph.traversal().
+ withRemote('conf/remote-graph.properties');
+List<Vertex> results = g.V().hasLabel("person").toList();
+----
+
+There is no difference if re-written using the best practice of requesting only the data the application needs:
+
+[source,java]
+----
+Cluster cluster = Cluster.open();
+Client client = cluster.connect();
+ResultSet results = client.submit("g.V().hasLabel('person').valueMap(true,'name')");
+
+Graph graph = EmptyGraph.instance();
+GraphTraversalSource g = graph.traversal().
+ withRemote('conf/remote-graph.properties');
+List<Vertex> results = g.V().hasLabel("person").valueMap(true,'name').toList();
+----
+
+Both of the above requests return a list of `Map` instances that contain the `id`, `label` and the "name" property.
+
==== Cache Management
If Gremlin Server processes a large number of unique scripts, the global function cache will grow beyond the memory
[44/50] tinkerpop git commit: TINKERPOP-1897 Small rewording
Posted by fl...@apache.org.
TINKERPOP-1897 Small rewording
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/fee7f9cc
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/fee7f9cc
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/fee7f9cc
Branch: refs/heads/TINKERPOP-1897
Commit: fee7f9cc4146f87ada29b4f7cdd60e5fdeee27dc
Parents: 02208a5
Author: Florian Hockmann <fh...@florian-hockmann.de>
Authored: Thu Mar 15 00:00:07 2018 +0100
Committer: Florian Hockmann <fh...@florian-hockmann.de>
Committed: Sat May 19 10:51:35 2018 +0200
----------------------------------------------------------------------
docs/src/reference/gremlin-applications.asciidoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fee7f9cc/docs/src/reference/gremlin-applications.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/gremlin-applications.asciidoc b/docs/src/reference/gremlin-applications.asciidoc
index f20ee72..35f86a4 100644
--- a/docs/src/reference/gremlin-applications.asciidoc
+++ b/docs/src/reference/gremlin-applications.asciidoc
@@ -1950,7 +1950,7 @@ $ docker run tinkerpop/gremlin-server:x.y.z
[INFO] GremlinServer$1 - Channel started at port 8182.
----
-By default, Gremlin Server listens on port 8182. So that port should be exposed if it should be reachable on the host:
+By default, Gremlin Server listens on port 8182. So that port needs to be exposed if it should be reachable on the host:
[source,bash]
----
[35/50] tinkerpop git commit: Merge branch 'TINKERPOP-1933' into tp32
Posted by fl...@apache.org.
Merge branch 'TINKERPOP-1933' into tp32
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/fa3fb9ea
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/fa3fb9ea
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/fa3fb9ea
Branch: refs/heads/TINKERPOP-1897
Commit: fa3fb9eac88ca7b7f3669b18d097f0e69e09bfaf
Parents: 770375d 4c8717d
Author: davebshow <da...@gmail.com>
Authored: Mon May 14 12:09:21 2018 -0700
Committer: davebshow <da...@gmail.com>
Committed: Mon May 14 12:09:21 2018 -0700
----------------------------------------------------------------------
.../src/main/jython/gremlin_python/driver/connection.py | 7 +++++--
.../src/main/jython/gremlin_python/driver/protocol.py | 8 ++++----
2 files changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------