tinkerpop git commit: Upload only diffs in `publish-docs.sh`.
Repository: tinkerpop Updated Branches: refs/heads/TINKERPOP-927 [created] 5f2d25193 Upload only diffs in `publish-docs.sh`. Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/5f2d2519 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5f2d2519 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/5f2d2519 Branch: refs/heads/TINKERPOP-927 Commit: 5f2d2519373e4df3550bc80d2ab6b936366a3ead Parents: 4ed0095 Author: Daniel KuppitzAuthored: Mon Sep 19 15:20:50 2016 +0200 Committer: Daniel Kuppitz Committed: Mon Sep 19 15:20:50 2016 +0200 -- bin/publish-docs.awk | 31 +++ bin/publish-docs.sh | 42 +- 2 files changed, 56 insertions(+), 17 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5f2d2519/bin/publish-docs.awk -- diff --git a/bin/publish-docs.awk b/bin/publish-docs.awk new file mode 100644 index 000..d3e0d64 --- /dev/null +++ b/bin/publish-docs.awk @@ -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. + +# +# @author Daniel Kuppitz (http://gremlin.guru) +# +/^Files / { + print "U " gensub("^[^/]*/[^/]*/", "", "g", $2) +} + +/^Only in (java)?docs/ { + print "D " gensub(/:$/, "", "g", gensub("^[^/]*/[^/]*/", "", "g", $3)) "/" $4 +} + +/^Only in \.\./ { + print "A " gensub(/:$/, "", "g", gensub("^[^/]*/[^/]*/[^/]*/", "", "g", $3)) "/" $4 +} http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5f2d2519/bin/publish-docs.sh -- diff --git a/bin/publish-docs.sh b/bin/publish-docs.sh index 23e2d4d..43c2cd5 100755 --- a/bin/publish-docs.sh +++ b/bin/publish-docs.sh @@ -39,25 +39,33 @@ mkdir -p target/svn ${SVN_CMD} co --depth immediates https://svn.apache.org/repos/asf/tinkerpop/site target/svn pushd target/svn -${SVN_CMD} update --depth empty "docs/${VERSION}" -${SVN_CMD} update --depth empty "javadocs/${VERSION}" -${SVN_CMD} rm "docs/${VERSION}" -${SVN_CMD} rm "javadocs/${VERSION}" -${SVN_CMD} commit . -m "Docs for TinkerPop ${VERSION} are being replaced." -popd -mkdir -p "target/svn/docs/${VERSION}" -mkdir -p "target/svn/javadocs/${VERSION}/core" -mkdir -p "target/svn/javadocs/${VERSION}/full" +${SVN_CMD} update "docs/${VERSION}" +${SVN_CMD} update "javadocs/${VERSION}" -cp -R target/docs/htmlsingle/. "target/svn/docs/${VERSION}" -cp -R target/site/apidocs/core/. "target/svn/javadocs/${VERSION}/core" -cp -R target/site/apidocs/full/. "target/svn/javadocs/${VERSION}/full" +mkdir -p "docs/${VERSION}" +mkdir -p "javadocs/${VERSION}/core" +mkdir -p "javadocs/${VERSION}/full" -pushd target/svn -rm "docs/${VERSION}/images/tinkerpop3.graffle" -${SVN_CMD} update --depth empty "docs/${VERSION}" -${SVN_CMD} update --depth empty "javadocs/${VERSION}" +diff -rq -I '^Last updated' docs/${VERSION}/ ../docs/htmlsingle/ | awk -f ../../bin/publish-docs.awk | sed 's/^\(.\) \//\1 /g' > ../publish-docs.docs +diff -rq -I 'Generated by javadoc' -I '^ ../publish-docs.javadocs + +# copy new / modified files +for file in $(cat ../publish-docs.docs | awk '/^[AU]/ {print $2}' | grep -v '.graffle$') +do + cp "../docs/htmlsingle/${file}" "docs/${VERSION}/${file}" +done +for file in $(cat ../publish-docs.javadocs | awk '/^[AU]/ {print $2}') +do + cp "../site/apidocs/${file}" "javadocs/${VERSION}/${file}" +done + +pushd "docs/${VERSION}/"; cat ../../../publish-docs.docs | awk '/^A/ {print $2}' | grep -v '.graffle$' | xargs --no-run-if-empty svn add; popd +pushd "javadocs/${VERSION}/"; cat ../../../publish-docs.docs | awk '/^A/ {print $2}' | xargs --no-run-if-empty svn add; popd + +# delete old files +pushd "docs/${VERSION}/"; cat ../../../publish-docs.docs | awk '/^D/ {print $2}' | xargs --no-run-if-empty svn delete; popd +pushd "javadocs/${VERSION}/"; cat ../../../publish-docs.docs | awk '/^D/ {print $2}' | xargs --no-run-if-empty svn delete; popd
svn commit: r1761432 - in /tinkerpop/site: docs/3.1.5-SNAPSHOT/index.html docs/current javadocs/current
Author: dkuppitz Date: Mon Sep 19 13:17:32 2016 New Revision: 1761432 URL: http://svn.apache.org/viewvc?rev=1761432=rev Log: Deploy docs for TinkerPop 3.1.5-SNAPSHOT Added: tinkerpop/site/docs/current (with props) tinkerpop/site/javadocs/current (with props) Modified: tinkerpop/site/docs/3.1.5-SNAPSHOT/index.html Modified: tinkerpop/site/docs/3.1.5-SNAPSHOT/index.html URL: http://svn.apache.org/viewvc/tinkerpop/site/docs/3.1.5-SNAPSHOT/index.html?rev=1761432=1761431=1761432=diff == --- tinkerpop/site/docs/3.1.5-SNAPSHOT/index.html (original) +++ tinkerpop/site/docs/3.1.5-SNAPSHOT/index.html Mon Sep 19 13:17:32 2016 @@ -935,16 +935,13 @@ Documentation for providers who implemen - -this is a test - -Last updated 2016-09-19 01:17:04 +02:00 +Last updated 2016-09-19 15:13:33 +02:00 Added: tinkerpop/site/docs/current URL: http://svn.apache.org/viewvc/tinkerpop/site/docs/current?rev=1761432=auto == --- tinkerpop/site/docs/current (added) +++ tinkerpop/site/docs/current Mon Sep 19 13:17:32 2016 @@ -0,0 +1 @@ +link 3.2.2 \ No newline at end of file Propchange: tinkerpop/site/docs/current -- svn:special = * Added: tinkerpop/site/javadocs/current URL: http://svn.apache.org/viewvc/tinkerpop/site/javadocs/current?rev=1761432=auto == --- tinkerpop/site/javadocs/current (added) +++ tinkerpop/site/javadocs/current Mon Sep 19 13:17:32 2016 @@ -0,0 +1 @@ +link 3.2.2 \ No newline at end of file Propchange: tinkerpop/site/javadocs/current -- svn:special = *
tinkerpop git commit: Fixed bad merge at 2c5733111b2c60b2e17d7ccd1fd83fff727335d4
Repository: tinkerpop Updated Branches: refs/heads/master 4293eb333 -> 54ed33df5 Fixed bad merge at 2c5733111b2c60b2e17d7ccd1fd83fff727335d4 Somehow, the "windows" profile wasn't removed in that conflict. CTR Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/54ed33df Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/54ed33df Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/54ed33df Branch: refs/heads/master Commit: 54ed33df5e1cdd6be77bdb67d759ccba26222843 Parents: 4293eb3 Author: Stephen MalletteAuthored: Mon Sep 19 10:55:08 2016 -0400 Committer: Stephen Mallette Committed: Mon Sep 19 10:55:08 2016 -0400 -- pom.xml | 42 -- 1 file changed, 42 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/54ed33df/pom.xml -- diff --git a/pom.xml b/pom.xml index 7a4c230..020084b 100644 --- a/pom.xml +++ b/pom.xml @@ -1159,47 +1159,5 @@ limitations under the License. - -windows - -false - -windows - - - - - -org.codehaus.mojo -wagon-maven-plugin -1.0 - - -download-hadoop-winutils -generate-test-resources - -download-single - - - http://public-repo-1.hortonworks.com/ - hdp-win-alpha/winutils.exe - ${project.build.directory}/hadoop_home/bin - - - - - -org.apache.maven.plugins -maven-surefire-plugin - - -Dlog4j.configuration=${log4j-test.properties} --Dbuild.dir=${project.build.directory} - -Dhadoop.home.dir=${project.build.directory}/hadoop_home -Dis.testing=true - - - - - -
[34/50] [abbrv] tinkerpop git commit: tweaked CHANGELOG.
tweaked CHANGELOG. Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/2790dbba Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/2790dbba Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/2790dbba Branch: refs/heads/TINKERPOP-1404 Commit: 2790dbbadc9a4b40a59d6975ca29353090abd241 Parents: 8febc4d Author: Marko A. RodriguezAuthored: Thu Sep 15 09:59:35 2016 -0600 Committer: Marko A. Rodriguez Committed: Thu Sep 15 09:59:35 2016 -0600 -- CHANGELOG.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2790dbba/CHANGELOG.asciidoc -- diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 2210ecf..3b1e4b6 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -29,7 +29,7 @@ TinkerPop 3.2.3 (Release Date: NOT OFFICIALLY RELEASED YET) * Fixed a bug in Gremlin-Python `P` where predicates reversed the order of the predicates. * Fixed a naming bug in Gremlin-Python where `P._and` and `P._or` should be `P.and_` and `P.or_`. (*breaking*) * `where()` predicate-based steps now support `by()`-modulation. -* `TraversalRing` returns an null if it does not contain traversals (previously `IdentityTraversal`). +* `TraversalRing` returns a `null` if it does not contain traversals (previously `IdentityTraversal`). * Fixed a `JavaTranslator` bug where `Bytecode` instructions were being mutated during translation. * Added `Path` to Gremlin-Python with respective GraphSON 2.0 deserializer. * VertexPrograms can now declare traverser requirements, e.g. to have access to the path when used with `.program()`.
[12/50] [abbrv] tinkerpop git commit: added the homepage image light box to the graffle so we can reuse it in the future more easily. CTR.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9004b4bd/docs/static/images/tinkerpop3.graffle -- diff --git a/docs/static/images/tinkerpop3.graffle b/docs/static/images/tinkerpop3.graffle index 04307a8..226ddb5 100644 --- a/docs/static/images/tinkerpop3.graffle +++ b/docs/static/images/tinkerpop3.graffle @@ -20,11 +20,3962 @@ GuidesVisible YES ImageCounter - 128 + 134 Images Extension + png + ID + 133 + RawData + + iVBORw0KGgoNSUhEUgAAAlgAAAFtCAYAAADbORRfBGdB + TUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAA + AOpgAAA6mAAAF3CculE8CXBIWXMAAC4jAAAuIwF4pT92AAAB + 1WlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAPHg6eG1wbWV0YSB4 + bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENv + cmUgNS40LjAiPgogICA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6 + Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMi + PgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIgog + ICAgICAgICAgICB4bWxuczp0aWZmPSJodHRwOi8vbnMuYWRvYmUu + Y29tL3RpZmYvMS4wLyI+CiAgICAgICAgIDx0aWZmOkNvbXByZXNz + aW9uPjU8L3RpZmY6Q29tcHJlc3Npb24+CiAgICAgICAgIDx0aWZm + Ok9yaWVudGF0aW9uPjE8L3RpZmY6T3JpZW50YXRpb24+CiAgICAg + ICAgIDx0aWZmOlBob3RvbWV0cmljSW50ZXJwcmV0YXRpb24+Mjwv + dGlmZjpQaG90b21ldHJpY0ludGVycHJldGF0aW9uPgogICAgICA8 + L3JkZjpEZXNjcmlwdGlvbj4KICAgPC9yZGY6UkRGPgo8L3g6eG1w + bWV0YT4Ki08EsgAAQABJREFUeAHsnQecHVd1/8/b97b3rl31YhVL + tlzkDi4Y2wnNQGgBJ6EFSAgEG8I/PUsC/xBiMOA/JAES+0MowaaY + jo0BUwzYltwtq3etpO29v33/7+/eN7sraXe9K+2uFPne3Xkzb+bO + Lb+ZN+c355x7rllIAYGAQEAgIBAQCAgEBAICM4pAfEZLC4UFBCZC + oM4yrJJls6UmyhL2BwQCAgGBgEBAICAQEAgITBWBOktMNWvIFxAI + CAQEAgIBgYBAQCAgMBkCr7W4aVG6i/XNtsHqLCt9Siy9DquAQEAg + IBAQCAgEBAICAYEpIfAOyxzJ9z5bYu+z++wW+9LIPpkMQwoIBAQC + AgGBgMAZikAw3ZyhF/aUdUsaq7X4WdXZIEvC2u3dtOWvrMiq2f4/ + rl0iV3XBF+uUXaNQcUAgIBAQCAjMOgKBYM06xM+bCmKQpjjLkN1N + n99nV0CoPoIe6ypHpTr4zLCnHRrPmMyDw88bZEJHAwIBgYBAQOB5 + h0AgWM+7Sz4LHY7MfSJXdZZnHfbX0KkPWDZ//WiyMpy5sBlatcvV + /lo+RcJCCggEBAICAYGAwBmKQCBYZ+iFnbNuyQwoYqV0i10Oufok + dOoit6fffabcGMIB2wfB2u/yBXLlYAgfAYGAQEAgIHDmIhAcjc/c + azvbPYuZHNkjcnWz/QUV/sSRqwFLYgBM8l0EPsMZBGO21W61btco + +WiFFBAICAQEAgIBgTMYgaDBOoMv7qx1TSZB+VF9DvPfX1uN9dln + IVavdPqqAfZ5YiU/KxEpT+JTtsW1R+fWBf8rh0X4CAgEBAICAYEz + FoFAsM7YSztLHdMowTqnnZJJ8Brrtf/A0+osfK3ktK5lNDyDCFYM + QiXKJQ2WTyJcwcE9DUZYBQQCAgGBgMCZiUAwEZ6Z13V2eiV/q7vT + 5Opmexf06YfQKZEr74OF5uqo6KEpcugOS1oPlGq7a1S9MxjOTvtC + qQGBgEBAICAQEDhNEAgE6zS5EBM2QyY16X9OdYr8rdSem+0TUK1/ + Q5eVjXZqEBqVyIrFMgpiMTbHJH31rT9I/gPuSO3RWcbkDpsBgYBA + QCAgEBA4YxAIJsLT+1IqtpQ3p8nYdgx/mbOmi1zJ3+p9VkJsqzuh + VTeitVKS5iqzKJ5hHclhG9C+bLM4dFAe7i55argbB/eG9J5gHkwD + EVYBgYBAQCAgcOYiEDRYp/e1TaEtmg/JynHkSiRrbpMIXsKRqw/Y + Umq/N02uxJ/cKMGKeNw6+uBMfLvp4sV2YVmRJfG5QqMlZVbU3h2u + 2cHBfW6vXqgtIBAQCAgEBE4ZAoFgnTLoJ61YxMSTkxiu5B34Oyl9 + CKPc3KXRyOzvs/PQo/0YcnWx87fyhr94FeSqqRtmhR70o68+3666 + sNYa+vvc2EE3o7PyeZrl/a/MGQznrgehpoBAQCAgEBAICJwiBALB + OkXAT1qtd2SK3JleCEn5kH3QatEmKVI6dGbWU8xeCxlSfe+3F0D1 + 5My+HHIlf6t4BsZKkauG9qStq863T75+g12wrsL6u4dsf9uAG0eI + 7dAbNaXnsnQE9+DgPusXLlQQEAgIBAQCAqcHAoFgnR7X4ehWvC6t + 6bnFFkJT5lk+UyUP2oddJk+yZvO6eXKl0YI32/Vorr4HuZoXU3yr + lGVmZsRipRmQq9akvXh1pd3ye+vtrMXFNjAwbI3taK8gVJgHnf3Q + 9WIY/ZulI7gHB/ejr3P4FhAICAQEAgJnLAKzKajPWNBmvWOlI6a0 + c6hrAUEOZFx7C8ZCzeKnNFvXbSy5+h3q+QbkqjjGSMEU5CoH1VUe + 6qzmtqS94eKF9taXr7aqslzrH0haigwt7Xi5Q7DyyDekHWol2Vn8 + FDkh/pWuXUgBgYBAQCAg8DxAYLYE9fMAulnsYqTpSdkFlgU9SdmA + 875K2f+1P7dqZ7pTwM+ZTTG7C0rkNVciV1/HGFngyBVGP5GmDIyW + 7R3D9rarltlrrltmRXmZaK6SlsGx4eGUdXXh3U4eOY9BrzwNTBGe + odBaZrapobSAQEAgIBAQCAic3ggEgnX6XR85l0eBOze45uH3hIFu +
[46/50] [abbrv] tinkerpop git commit: Merge branch 'TINKERPOP-1442' into TINKERPOP-1442-master
Merge branch 'TINKERPOP-1442' into TINKERPOP-1442-master Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1e248531 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1e248531 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1e248531 Branch: refs/heads/TINKERPOP-1404 Commit: 1e248531ad2fa0a3a4507ca499214b7a730ec3a8 Parents: 14bca06 75baf01 Author: Stephen MalletteAuthored: Fri Sep 16 07:46:28 2016 -0400 Committer: Stephen Mallette Committed: Fri Sep 16 07:46:28 2016 -0400 -- CHANGELOG.asciidoc | 1 + .../tinkerpop/gremlin/driver/Connection.java| 2 +- .../gremlin/groovy/engine/GremlinExecutor.java | 2 +- .../gremlin/server/op/session/Session.java | 12 +++ .../server/op/session/SessionOpProcessor.java | 9 ++ .../server/GremlinDriverIntegrateTest.java | 2 +- .../server/GremlinServerIntegrateTest.java | 4 +-- .../GremlinServerSessionIntegrateTest.java | 33 8 files changed, 60 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1e248531/CHANGELOG.asciidoc -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1e248531/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1e248531/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutor.java -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1e248531/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1e248531/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java --
[01/50] [abbrv] tinkerpop git commit: CTR: fixed `has(T accessor, Object value, Object... values)` which didn't take into account that `value` can be an array. [Forced Update!]
Repository: tinkerpop Updated Branches: refs/heads/TINKERPOP-1404 4f705dfd7 -> c1556fe82 (forced update) CTR: fixed `has(T accessor, Object value, Object... values)` which didn't take into account that `value` can be an array. Prior this fix we've had this behavior: ``` gremlin> labels = ["software","person"] as String[] ==>software ==>person gremlin> g.V().hasLabel(labels) gremlin> g.V().hasLabel("software","person") ==>v[1] ==>v[2] ==>v[3] ==>v[4] ==>v[5] ==>v[6] ``` Now it's: ``` gremlin> labels = ["software","person"] as String[] ==>software ==>person gremlin> g.V().hasLabel(labels) ==>v[1] ==>v[2] ==>v[3] ==>v[4] ==>v[5] ==>v[6] gremlin> g.V().hasLabel("software","person") ==>v[1] ==>v[2] ==>v[3] ==>v[4] ==>v[5] ==>v[6] ``` Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/dea8e841 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/dea8e841 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/dea8e841 Branch: refs/heads/TINKERPOP-1404 Commit: dea8e84194f619aad7aab3d52f6e0e16974985f2 Parents: 13782aa Author: Daniel KuppitzAuthored: Tue Sep 13 21:24:09 2016 +0200 Committer: Daniel Kuppitz Committed: Tue Sep 13 21:24:09 2016 +0200 -- .../traversal/dsl/graph/GraphTraversal.java | 19 +++ 1 file changed, 15 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/dea8e841/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 e0956c5..1aa5000 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 @@ -968,10 +968,21 @@ public interface GraphTraversal extends Traversal{ } public default GraphTraversalhas(final T accessor, final Object value, final Object... values) { -if (values.length == 0) return has(accessor, value); -final Object[] objects = new Object[values.length + 1]; -objects[0] = value; -System.arraycopy(values, 0, objects, 1, values.length); +final Object[] objects; +if (value instanceof Object[]) { +final Object[] arr = (Object[]) value; +if (values.length == 0) { +objects = arr; +} else { +objects = new Object[arr.length + values.length]; +System.arraycopy(arr, 0, objects, 0, arr.length); +System.arraycopy(values, 0, objects, arr.length, values.length); +} +} else { +objects = new Object[values.length + 1]; +objects[0] = value; +System.arraycopy(values, 0, objects, 1, values.length); +} return has(accessor, P.within(objects)); }
[24/50] [abbrv] tinkerpop git commit: Fix multiple occurrences of 'the'
Fix multiple occurrences of 'the' Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/6cdc5a03 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/6cdc5a03 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/6cdc5a03 Branch: refs/heads/TINKERPOP-1404 Commit: 6cdc5a03f6f649bc11f396f97ca6737788079a4a Parents: d3dd2c1 Author: Mark HoekstraAuthored: Thu Sep 15 13:52:47 2016 +0200 Committer: Mark Hoekstra Committed: Thu Sep 15 14:02:24 2016 +0200 -- docs/src/dev/developer/contributing.asciidoc| 4 +- .../reference/implementations-hadoop.asciidoc | 2 +- .../implementations-tinkergraph.asciidoc| 2 +- docs/src/reference/intro.asciidoc | 2 +- docs/src/reference/the-traversal.asciidoc | 10 +- docs/src/upgrade/index.asciidoc | 2 +- .../gremlin/process/computer/MapReduce.java | 2 +- .../traversal/step/map/VertexProgramStep.java | 135 +++ .../process/remote/RemoteConnection.java| 51 +++ .../tinkerpop/gremlin/driver/Cluster.java | 2 +- .../gremlin/driver/LoadBalancingStrategy.java | 2 +- .../jsr223/GremlinGroovyScriptEngine.java | 2 +- .../gremlin/server/AbstractChannelizer.java | 2 +- .../computer/util/ComputerSubmissionHelper.java | 2 +- .../gremlin/neo4j/structure/Neo4jGraph.java | 2 +- 15 files changed, 204 insertions(+), 18 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6cdc5a03/docs/src/dev/developer/contributing.asciidoc -- diff --git a/docs/src/dev/developer/contributing.asciidoc b/docs/src/dev/developer/contributing.asciidoc index 0c121c8..36124f1 100644 --- a/docs/src/dev/developer/contributing.asciidoc +++ b/docs/src/dev/developer/contributing.asciidoc @@ -27,7 +27,7 @@ Ways to Contribute image:gremlin-apache.png[width=250,float=left] While the concept of an open source contribution can refer to doing development work on the code base, there are many other ways outside of coding to contribute to Apache TinkerPop. Participating on the various mailing lists, offering ideas, reporting bugs, writing documentation are all welcome -contributions to the project that help improve the The TinkerPop. This section of the document is designed to help +contributions to the project that help improve the TinkerPop. This section of the document is designed to help provide some structure for potential contributors and to give them ideas for how they could get started becoming more involved in the TinkerPop community. @@ -112,7 +112,7 @@ Before proceeding, contributors should evaluate if the proposed change is likely * Is it clear that code must change? Proposing a JIRA issue and pull request is appropriate only when a clear problem or change has been identified. When in doubt, email d...@tinkerpop.apache.org first about the possible change. -* Search the the mailing list archives for related discussions. Often, the problem has been discussed before, with +* Search the mailing list archives for related discussions. Often, the problem has been discussed before, with a resolution that doesn't require a code change, or recording what kinds of changes will not be accepted as a resolution. * Search link:https://issues.apache.org/jira/browse/TINKERPOP[JIRA] for existing issues. http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6cdc5a03/docs/src/reference/implementations-hadoop.asciidoc -- diff --git a/docs/src/reference/implementations-hadoop.asciidoc b/docs/src/reference/implementations-hadoop.asciidoc index b89c0a1..6e95c6e 100644 --- a/docs/src/reference/implementations-hadoop.asciidoc +++ b/docs/src/reference/implementations-hadoop.asciidoc @@ -280,7 +280,7 @@ specified in `HADOOP_GREMLIN_LIBS`. export HADOOP_GREMLIN_LIBS=$HADOOP_GREMLIN_LIBS:/usr/local/gremlin-console/ext/spark-gremlin/lib Furthermore the `lib/` directory should be distributed across all machines in the SparkServer cluster. For this purpose TinkerPop -provides a helper script, which takes the Spark installation directory and the the Spark machines as input: +provides a helper script, which takes the Spark installation directory and the Spark machines as input: [source,shell] bin/hadoop/init-tp-spark.sh /usr/local/spark spark@10.0.0.1 spark@10.0.0.2 spark@10.0.0.3 http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6cdc5a03/docs/src/reference/implementations-tinkergraph.asciidoc -- diff --git a/docs/src/reference/implementations-tinkergraph.asciidoc
[05/50] [abbrv] tinkerpop git commit: Merge remote-tracking branch 'origin/tp31'
Merge remote-tracking branch 'origin/tp31' Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/cf8f6f7d Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/cf8f6f7d Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/cf8f6f7d Branch: refs/heads/TINKERPOP-1404 Commit: cf8f6f7dfbe8da1ed571b0e8bbd259e96b9b4635 Parents: 9575251 d3dd2c1 Author: Stephen MalletteAuthored: Tue Sep 13 20:46:01 2016 -0400 Committer: Stephen Mallette Committed: Tue Sep 13 20:46:01 2016 -0400 -- docs/src/tutorials/getting-started/index.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cf8f6f7d/docs/src/tutorials/getting-started/index.asciidoc --
[47/50] [abbrv] tinkerpop git commit: Updated dev docs regarding branching and pull requests CTR
Updated dev docs regarding branching and pull requests CTR Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/4ed00952 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/4ed00952 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/4ed00952 Branch: refs/heads/TINKERPOP-1404 Commit: 4ed009525ba3c0bed01fd2331b54ee1dbb76284c Parents: 75baf01 Author: Stephen MalletteAuthored: Fri Sep 16 10:14:59 2016 -0400 Committer: Stephen Mallette Committed: Fri Sep 16 10:14:59 2016 -0400 -- docs/src/dev/developer/contributing.asciidoc | 6 +- docs/src/dev/developer/for-committers.asciidoc | 83 ++--- 2 files changed, 76 insertions(+), 13 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4ed00952/docs/src/dev/developer/contributing.asciidoc -- diff --git a/docs/src/dev/developer/contributing.asciidoc b/docs/src/dev/developer/contributing.asciidoc index 36124f1..63c40b7 100644 --- a/docs/src/dev/developer/contributing.asciidoc +++ b/docs/src/dev/developer/contributing.asciidoc @@ -179,9 +179,9 @@ link:https://github.com/apache/tinkerpop[GitHub repository] if not already done. . Make changes in the fork .. It is typically best to create a branch for the changes. Consider naming that branch after the JIRA issue number to easily track what that branch is for. -.. Consider which branch to create the branch from in the first place. In other words, is the change to be targetted -at a specific TinkerPop version (e.g. a patch to an older version)? When in doubt, please ask on -d...@tinkerpop.apache.org. +.. Consider which release branch (e.g. `master`, `tp31` etc) to create the development branch from in the first place. +In other words, is the change to be targetted at a specific TinkerPop version (e.g. a patch to an older version)? When +in doubt, please ask on d...@tinkerpop.apache.org. . Build the project and run tests. .. A simple build can be accomplished with maven: `mvn clean install`. .. Often, a "simple build" isn't sufficient and integration tests are required: http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4ed00952/docs/src/dev/developer/for-committers.asciidoc -- diff --git a/docs/src/dev/developer/for-committers.asciidoc b/docs/src/dev/developer/for-committers.asciidoc index fa88070..9c5059c 100644 --- a/docs/src/dev/developer/for-committers.asciidoc +++ b/docs/src/dev/developer/for-committers.asciidoc @@ -60,13 +60,18 @@ change. Changes that break the public APIs should be marked with a "breaking" label and should be distinguished from other changes in the release notes. +[[branches]] Branches -The "master" branch is used for the main line of development and release branches are constructed as needed -for ongoing maintenance work. If new to the project or are returning to it after some time away, it may be good -to send an email to the developer mailing list (or ask on HipChat) to find out what the current operating branches -are. +TinkerPop has several release branches: + +* `tp30` - 3.0.x (no longer maintained) +* `tp31` - 3.1.x (bug fixes and documentation updates only) +* `master` - 3.2.x + +Changes to `tp31` should merge to `master`. Please read more about this process in the < > +section. Other branches may be created for collaborating on features or for RFC's that other developers may want to inspect. It is suggested that the JIRA issue ID be used as the prefix, since that triggers certain automation, and it provides a @@ -200,8 +205,8 @@ Review then Commit -- Code modifications must go through a link:http://www.apache.org/foundation/glossary.html#ReviewThenCommit[review-then-committ] (RTC) -process before being merged into a release branch. All committers should follow the pattern below, where "you" refers to the -committer wanting to put code into a release branch. +process before being merged into a release branch. All committers should follow the pattern below, where "you" refers +to the committer wanting to put code into a release branch. * Make a JIRA ticket for the software problem you want to solve (i.e. a fix). * Fork the release branch that the fix will be put into. @@ -210,7 +215,7 @@ committer wanting to put code into a release branch. * When your fix is complete and ready to merge, issue a link:https://git-scm.com/docs/git-request-pull[pull request]. ** Be certain that the test suite is passing. ** If you updated documentation, be sure that the `process-docs.sh` is building the documentation correctly. -* Before you can merge your branch
[30/50] [abbrv] tinkerpop git commit: updated the complex filtering in traversal-induced-values.asciidoc with a more simple where().by() clause per @spmallette's request.
updated the complex filtering in traversal-induced-values.asciidoc with a more simple where().by() clause per @spmallette's request. Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/82a1bc00 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/82a1bc00 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/82a1bc00 Branch: refs/heads/TINKERPOP-1404 Commit: 82a1bc0083a49716f15f168a1929f3ee3eb4a209 Parents: 9ef30f0 Author: Marko A. RodriguezAuthored: Thu Sep 15 05:35:13 2016 -0600 Committer: Marko A. Rodriguez Committed: Thu Sep 15 09:58:53 2016 -0600 -- .../recipes/traversal-induced-values.asciidoc | 32 +--- 1 file changed, 8 insertions(+), 24 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/82a1bc00/docs/src/recipes/traversal-induced-values.asciidoc -- diff --git a/docs/src/recipes/traversal-induced-values.asciidoc b/docs/src/recipes/traversal-induced-values.asciidoc index 6adefc7..74402b6 100644 --- a/docs/src/recipes/traversal-induced-values.asciidoc +++ b/docs/src/recipes/traversal-induced-values.asciidoc @@ -40,37 +40,21 @@ g.V(marko).out('knows').has('age', gt(marko.value('age'))).values('name') The downside to this approach is that it takes two separate traversals to answer the question. Ideally, there should be a single traversal, that can query "marko" once, determine his `age` and then use that for the value supplied to -filter the people he knows. In this way the _value_ for the `age` filter is _induced_ from the `Traversal` itself. +filter the people he knows. In this way the _value_ for the `age` in the `has()`-filter is _induced_ from the `Traversal` +itself. [gremlin-groovy,modern] -g.V().has('name','marko').as('marko'). <1> - out('knows').as('friend'). <2> - filter(select('marko','friend').by('age'). <3> - where('friend', gt('marko'))).<4> +g.V().has('name','marko').as('marko'). <1> + out('knows').as('friend').<2> +where('friend', gt('marko')).by('age'). <3> values('name') <1> Find the "marko" `Vertex` and label it as "marko". -<2> Traverse out on the "knows" edges to the adjacent `Vertex` and label it as "person". -<3> Filter the incoming "person" vertices. It is within this filter, that the traversal induced values are utilized. -The inner `select` grabs the "marko" vertex and the current "friend". The `by` modulator extracts the "age" from both -of those vertices which yields a `Map` with two keys, "marko" and "friend", where the value of each is the "age". -<4> The `Map` produced in the previous step can then be filtered with `where` to only return a result if the "friend" -age is greater than the "marko" age. If this is successful, then the `filter` step from the previous line will succeed -and allow the "friend" vertex to pass through. - -This traversal could also be written declaratively with `match` step as follows: - -[gremlin-groovy,modern] - -g.V().has('name','marko').match( -__.as('marko').values('age').as('a'), -__.as('marko').out('knows').as('friend'), -__.as('friend').values('age').as('b') - ).where('b', gt('a')).select('friend'). - values('name') - +<2> Traverse out on the "knows" edges to the adjacent `Vertex` and label it as "friend". +<3> Continue to traverser only if Marko's current friend is older than him. +<4> Get the name of Marko's older friend. Traversal induced values are not just for filtering. They can also be used when writing the values of the properties of one `Vertex` to another:
[48/50] [abbrv] tinkerpop git commit: Merge remote-tracking branch 'origin/tp31'
Merge remote-tracking branch 'origin/tp31' Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/4293eb33 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/4293eb33 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/4293eb33 Branch: refs/heads/TINKERPOP-1404 Commit: 4293eb333dfbf3aea19cd326f9f3d13619ac0b54 Parents: 1e24853 4ed0095 Author: Stephen MalletteAuthored: Fri Sep 16 10:16:02 2016 -0400 Committer: Stephen Mallette Committed: Fri Sep 16 10:16:02 2016 -0400 -- docs/src/dev/developer/contributing.asciidoc | 6 +- docs/src/dev/developer/for-committers.asciidoc | 83 ++--- 2 files changed, 76 insertions(+), 13 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4293eb33/docs/src/dev/developer/for-committers.asciidoc --
[36/50] [abbrv] tinkerpop git commit: Print no result line if empty.result.indicator is empty string.
Print no result line if empty.result.indicator is empty string. This seems like a better use of the empty string setting than to actually just print an empty string line. Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/6599159b Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/6599159b Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/6599159b Branch: refs/heads/TINKERPOP-1404 Commit: 6599159bb861fda3464f2004fc2512bf85ca40c9 Parents: 687ae74 Author: Stephen MalletteAuthored: Thu Sep 15 12:30:04 2016 -0400 Committer: Stephen Mallette Committed: Thu Sep 15 12:30:04 2016 -0400 -- CHANGELOG.asciidoc | 1 + docs/src/reference/gremlin-applications.asciidoc | 3 ++- .../tinkerpop/gremlin/console/Console.groovy | 19 ++- 3 files changed, 17 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6599159b/CHANGELOG.asciidoc -- diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 3b1e4b6..15e1bb2 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -32,6 +32,7 @@ TinkerPop 3.2.3 (Release Date: NOT OFFICIALLY RELEASED YET) * `TraversalRing` returns a `null` if it does not contain traversals (previously `IdentityTraversal`). * Fixed a `JavaTranslator` bug where `Bytecode` instructions were being mutated during translation. * Added `Path` to Gremlin-Python with respective GraphSON 2.0 deserializer. +* If `empty.result.indicator` is set to an empty string, then no "result line" is printed in the console. * VertexPrograms can now declare traverser requirements, e.g. to have access to the path when used with `.program()`. * New build options for `gremlin-python` where `-DglvPython` is no longer required. * Added missing `InetAddress` to GraphSON extension module. http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6599159b/docs/src/reference/gremlin-applications.asciidoc -- diff --git a/docs/src/reference/gremlin-applications.asciidoc b/docs/src/reference/gremlin-applications.asciidoc index 1a0fd16..13ac6ff 100644 --- a/docs/src/reference/gremlin-applications.asciidoc +++ b/docs/src/reference/gremlin-applications.asciidoc @@ -173,7 +173,8 @@ Preferences are set with `:set name value`. Values can contain spaces when quot |result.prompt.color | colors | Color of the result prompt. |input.prompt | string | Text of the input prompt. |result.prompt | string | Text of the result prompt. -|empty.result.indicator | string | Text of the void/no results indicator. +|empty.result.indicator | string | Text of the void/no results indicator - setting to empty string (i.e. "" at the +command line) will print no result line in these cases. |= Colors can contain a comma-separated combination of 1 each of foreground, background, and attribute. http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6599159b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy -- diff --git a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy index eeda56d..19ae3c4 100644 --- a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy +++ b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy @@ -199,10 +199,7 @@ class Console { if (this.tempIterator.hasNext()) { int counter = 0; while (this.tempIterator.hasNext() && (Preferences.maxIteration == -1 || counter < Preferences.maxIteration)) { -final Object object = this.tempIterator.next() -String prompt = Colorizer.render(Preferences.resultPromptColor, buildResultPrompt()) -String colorizedResult = colorizeResult(object) -io.out.println(prompt + ((null == object) ? Preferences.emptyResult : colorizedResult)) +printResult(tempIterator.next()) counter++; } if (this.tempIterator.hasNext()) @@ -250,7 +247,7 @@ class Console { io.out.println(Colorizer.render(Preferences.resultPromptColor,(buildResultPrompt() + result.prettyPrint(width < 20 ? 80 : width return null } else { -
[03/50] [abbrv] tinkerpop git commit: reduced complexity by having a single GLOBAL_METHOD_CACHE for both Traversal and TraversalSource methods. Cleaner code with less instanceof stuff.
reduced complexity by having a single GLOBAL_METHOD_CACHE for both Traversal and TraversalSource methods. Cleaner code with less instanceof stuff. Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1fc52cb2 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1fc52cb2 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1fc52cb2 Branch: refs/heads/TINKERPOP-1404 Commit: 1fc52cb2d208fb0949e66f2e1cf2c1307495a537 Parents: ed8feea Author: Marko A. RodriguezAuthored: Tue Sep 13 13:34:47 2016 -0600 Committer: Marko A. Rodriguez Committed: Tue Sep 13 13:34:47 2016 -0600 -- .../tinkerpop/gremlin/jsr223/JavaTranslator.java | 15 +-- 1 file changed, 5 insertions(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1fc52cb2/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/JavaTranslator.java -- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/JavaTranslator.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/JavaTranslator.java index a4f97a1..ed2def2 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/JavaTranslator.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/JavaTranslator.java @@ -42,8 +42,8 @@ public final class JavaTranslator, Map > TRAVERSAL_SOURCE_METHOD_CACHE = new ConcurrentHashMap<>(); -private static final Map > TRAVERSAL_METHOD_CACHE = new ConcurrentHashMap<>(); +private static final Map > GLOBAL_METHOD_CACHE = new ConcurrentHashMap<>(); + private JavaTranslator(final S traversalSource) { this.traversalSource = traversalSource; @@ -105,9 +105,7 @@ public final class JavaTranslator> methodCache = delegate instanceof TraversalSource ? - TRAVERSAL_SOURCE_METHOD_CACHE.getOrDefault(delegate.getClass(), new HashMap<>()) : -TRAVERSAL_METHOD_CACHE.getOrDefault(delegate.getClass(), new HashMap<>()); +final Map methodCache = GLOBAL_METHOD_CACHE.getOrDefault(delegate.getClass(), new HashMap<>()); if (methodCache.isEmpty()) { for (final Method method : delegate.getClass().getMethods()) { if (!(method.getName().equals("addV") && method.getParameterCount() == 1 && method.getParameters()[0].getType().equals(Object[].class))) { // hack cause its hard to tell Object[] vs. String :| @@ -119,10 +117,7 @@ public final class JavaTranslator) delegate.getClass(), methodCache); -else -TRAVERSAL_METHOD_CACHE.put((Class) delegate.getClass(), methodCache); +GLOBAL_METHOD_CACHE.put(delegate.getClass(), methodCache); } // // @@ -133,7 +128,7 @@ public final class JavaTranslator
[44/50] [abbrv] tinkerpop git commit: Improved session cleanup on client close.
Improved session cleanup on client close. While not a perfect implementation, a long run job blocking a close request from the client will now at least get an attempt at interruption rather thant consuming the thread indefinitely. TINKERPOP-1442 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/75baf01e Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/75baf01e Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/75baf01e Branch: refs/heads/TINKERPOP-1404 Commit: 75baf01e83e7db2cfd60850e9facf535cf10d887 Parents: e7e7481 Author: Stephen MalletteAuthored: Tue Sep 13 18:10:09 2016 -0400 Committer: Stephen Mallette Committed: Fri Sep 16 07:29:39 2016 -0400 -- CHANGELOG.asciidoc | 1 + .../tinkerpop/gremlin/driver/Connection.java| 2 +- .../gremlin/groovy/engine/GremlinExecutor.java | 2 +- .../gremlin/server/op/session/Session.java | 12 +++ .../server/op/session/SessionOpProcessor.java | 9 ++ .../server/GremlinDriverIntegrateTest.java | 2 +- .../server/GremlinServerIntegrateTest.java | 4 +-- .../GremlinServerSessionIntegrateTest.java | 33 8 files changed, 60 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/75baf01e/CHANGELOG.asciidoc -- diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 4d990ee..a9dae9d 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -26,6 +26,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima TinkerPop 3.1.5 (Release Date: NOT OFFICIALLY RELEASED YET) ~~~ +* Improved session cleanup when a close is triggered by the client. * Removed the `appveyor.yml` file as the AppVeyor build is no longer enabled by Apache Infrastructure. * Fixed a bug in `RangeByIsCountStrategy` which didn't use the `NotStep` properly. http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/75baf01e/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java -- diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java index 22e48fe..220ad42 100644 --- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java +++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java @@ -92,7 +92,7 @@ final class Connection { connectionLabel = String.format("Connection{host=%s}", pool.host); -if (cluster.isClosing()) throw new IllegalStateException("Cannot open a connection while the cluster after close() is called"); +if (cluster.isClosing()) throw new IllegalStateException("Cannot open a connection with the cluster after close() is called"); final Bootstrap b = this.cluster.getFactory().createBootstrap(); try { http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/75baf01e/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutor.java -- diff --git a/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutor.java b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutor.java index da12e1e..785442a 100644 --- a/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutor.java +++ b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutor.java @@ -312,7 +312,7 @@ public class GremlinExecutor implements AutoCloseable { if (root instanceof InterruptedException) { lifeCycle.getAfterTimeout().orElse(afterTimeout).accept(bindings); evaluationFuture.completeExceptionally(new TimeoutException( -String.format("Script evaluation exceeded the configured 'scriptEvaluationTimeout' threshold of %s ms for request [%s]: %s", scriptEvalTimeOut, script, root.getMessage(; +String.format("Script evaluation exceeded the configured 'scriptEvaluationTimeout' threshold of %s ms or evaluation was otherwise cancelled directly for request [%s]: %s", scriptEvalTimeOut, script, root.getMessage(; } else { lifeCycle.getAfterFailure().orElse(afterFailure).accept(bindings, root); evaluationFuture.completeExceptionally(root);
[50/50] [abbrv] tinkerpop git commit: Removed adding labels to the traverser in AbstractStep. Steps that call traverser.split(r, step) have already added the labels to the traverser. Steps that do not
Removed adding labels to the traverser in AbstractStep. Steps that call traverser.split(r, step) have already added the labels to the traverser. Steps that do not call traverser.split(r, step) add the labels manually by overriding AbstractStep.prepareTraversalForNextStep(). ImmutablePath hold a direct reference to the labels. It no longer makes a copy. Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/c1556fe8 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c1556fe8 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c1556fe8 Branch: refs/heads/TINKERPOP-1404 Commit: c1556fe82c58527dc4425d23d1d69ce324e62cfa Parents: 54ed33d Author: pieterAuthored: Wed Aug 24 12:47:35 2016 +0200 Committer: pieter Committed: Mon Sep 19 19:30:31 2016 +0200 -- .../gremlin/process/GremlinPathBenchmark.java | 70 .../traversal/step/filter/FilterStep.java | 9 +++ .../traversal/step/map/NoOpBarrierStep.java | 9 +++ .../step/sideEffect/AggregateStep.java | 9 +++ .../step/sideEffect/SideEffectStep.java | 9 +++ .../traversal/step/sideEffect/StartStep.java| 9 +++ .../traversal/step/util/AbstractStep.java | 4 +- .../step/util/CollectingBarrierStep.java| 9 +++ .../traversal/step/util/ImmutablePath.java | 5 +- .../structure/util/detached/DetachedPath.java | 11 +-- 10 files changed, 135 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c1556fe8/gremlin-benchmark/src/main/java/org/apache/tinkerpop/gremlin/process/GremlinPathBenchmark.java -- diff --git a/gremlin-benchmark/src/main/java/org/apache/tinkerpop/gremlin/process/GremlinPathBenchmark.java b/gremlin-benchmark/src/main/java/org/apache/tinkerpop/gremlin/process/GremlinPathBenchmark.java new file mode 100644 index 000..5b60f5b --- /dev/null +++ b/gremlin-benchmark/src/main/java/org/apache/tinkerpop/gremlin/process/GremlinPathBenchmark.java @@ -0,0 +1,70 @@ +/* + * 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; + +import org.apache.tinkerpop.benchmark.util.AbstractGraphBenchmark; +import org.apache.tinkerpop.gremlin.process.traversal.Path; +import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal; +import org.apache.tinkerpop.gremlin.structure.T; +import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.BenchmarkMode; +import org.openjdk.jmh.annotations.Mode; +import org.openjdk.jmh.annotations.Setup; + +import java.io.IOException; + +import static org.junit.Assert.assertEquals; + +/** + * Date: 2016/07/22 + * Time: 7:26 AM + */ +public class GremlinPathBenchmark extends AbstractGraphBenchmark { + +private Vertex a; +private final static int COUNT = 1_000_000; + +@Setup +public void prepare() throws IOException { +super.prepare(); +a = graph.addVertex(T.label, "A", "name", "a1"); +for (int i = 1; i < COUNT; i++) { +Vertex b = graph.addVertex(T.label, "B", "name", "name_" + i); +a.addEdge("outB", b); +for (int j = 0; j < 1; j++) { +Vertex c = graph.addVertex(T.label, "C", "name", "name_" + i + " " + j); +b.addEdge("outC", c); +} +} +} + +@Benchmark +@BenchmarkMode(Mode.AverageTime) +public void g_path() throws Exception { +GraphTraversal traversal = g.V(a).as("a").out().as("b").out().as("c").path(); +int count = 1; +while (traversal.hasNext()) { +Path path = traversal.next(); +count++; +} +assertEquals(COUNT, count); +} + +}
[29/50] [abbrv] tinkerpop git commit: added where().by() semantics to Gremlin and fixed a severe bug in Gremlin-Python's P object. Optimized TraversalRing for non-existent modulators.
added where().by() semantics to Gremlin and fixed a severe bug in Gremlin-Python's P object. Optimized TraversalRing for non-existent modulators. Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/68ecda40 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/68ecda40 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/68ecda40 Branch: refs/heads/TINKERPOP-1404 Commit: 68ecda40486650cb9f209b61570485d3c24eed37 Parents: a2ddf8f Author: Marko A. RodriguezAuthored: Wed Sep 14 15:30:34 2016 -0600 Committer: Marko A. Rodriguez Committed: Thu Sep 15 09:58:53 2016 -0600 -- CHANGELOG.asciidoc | 4 + .../step/filter/WherePredicateStep.java | 54 -- .../process/traversal/step/map/PathStep.java| 2 +- .../process/traversal/step/map/ProjectStep.java | 2 +- .../process/traversal/step/map/SelectStep.java | 2 +- .../process/traversal/step/map/TreeStep.java| 2 +- .../step/sideEffect/TreeSideEffectStep.java | 2 +- .../process/traversal/util/TraversalRing.java | 2 +- .../traversal/step/filter/WhereStepTest.java| 6 +- .../step/filter/GroovyWhereTest.groovy | 15 +++ .../python/TraversalSourceGenerator.groovy | 8 +- .../gremlin/python/jsr223/PythonTranslator.java | 2 +- .../jython/gremlin_python/process/traversal.py | 8 +- .../main/jython/tests/process/test_traversal.py | 8 ++ .../jython/tests/structure/io/test_graphson.py | 5 + .../io/graphson/GraphSONWriterTest.java | 2 +- .../traversal/step/filter/WhereTest.java| 104 --- 17 files changed, 188 insertions(+), 40 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/68ecda40/CHANGELOG.asciidoc -- diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index cf1cae8..2210ecf 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -26,6 +26,10 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima TinkerPop 3.2.3 (Release Date: NOT OFFICIALLY RELEASED YET) ~~~ +* Fixed a bug in Gremlin-Python `P` where predicates reversed the order of the predicates. +* Fixed a naming bug in Gremlin-Python where `P._and` and `P._or` should be `P.and_` and `P.or_`. (*breaking*) +* `where()` predicate-based steps now support `by()`-modulation. +* `TraversalRing` returns an null if it does not contain traversals (previously `IdentityTraversal`). * Fixed a `JavaTranslator` bug where `Bytecode` instructions were being mutated during translation. * Added `Path` to Gremlin-Python with respective GraphSON 2.0 deserializer. * VertexPrograms can now declare traverser requirements, e.g. to have access to the path when used with `.program()`. http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/68ecda40/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WherePredicateStep.java -- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WherePredicateStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WherePredicateStep.java index 898a42a..05637f6 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WherePredicateStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WherePredicateStep.java @@ -22,19 +22,30 @@ import org.apache.tinkerpop.gremlin.process.traversal.P; import org.apache.tinkerpop.gremlin.process.traversal.Pop; import org.apache.tinkerpop.gremlin.process.traversal.Traversal; import org.apache.tinkerpop.gremlin.process.traversal.Traverser; +import org.apache.tinkerpop.gremlin.process.traversal.step.ByModulating; import org.apache.tinkerpop.gremlin.process.traversal.step.PathProcessor; import org.apache.tinkerpop.gremlin.process.traversal.step.Scoping; +import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent; import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement; import org.apache.tinkerpop.gremlin.process.traversal.util.ConnectiveP; import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalRing; +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalUtil; import org.apache.tinkerpop.gremlin.structure.util.StringFactory; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import
[13/50] [abbrv] tinkerpop git commit: added the homepage image light box to the graffle so we can reuse it in the future more easily. CTR.
added the homepage image light box to the graffle so we can reuse it in the future more easily. CTR. Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/9004b4bd Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/9004b4bd Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/9004b4bd Branch: refs/heads/TINKERPOP-1404 Commit: 9004b4bda9d0bf15ddb8de113348d5ff0f8929b8 Parents: d4d8297 Author: Marko A. RodriguezAuthored: Wed Sep 14 10:33:37 2016 -0600 Committer: Marko A. Rodriguez Committed: Wed Sep 14 10:33:49 2016 -0600 -- docs/static/images/tinkerpop3.graffle | 4518 +++- 1 file changed, 4500 insertions(+), 18 deletions(-) --
[26/50] [abbrv] tinkerpop git commit: Deleted accidentally added files
Deleted accidentally added files Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/146f36f2 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/146f36f2 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/146f36f2 Branch: refs/heads/TINKERPOP-1404 Commit: 146f36f2fa679f48e520c9f33e833147e407cb74 Parents: 6cdc5a0 Author: Mark HoekstraAuthored: Thu Sep 15 16:11:16 2016 +0200 Committer: Mark Hoekstra Committed: Thu Sep 15 16:11:16 2016 +0200 -- .../traversal/step/map/VertexProgramStep.java | 135 --- .../process/remote/RemoteConnection.java| 51 --- 2 files changed, 186 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/146f36f2/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/VertexProgramStep.java -- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/VertexProgramStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/VertexProgramStep.java deleted file mode 100644 index d005940..000 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/VertexProgramStep.java +++ /dev/null @@ -1,135 +0,0 @@ -/* - * 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.computer.traversal.step.map; - -import org.apache.tinkerpop.gremlin.process.computer.Computer; -import org.apache.tinkerpop.gremlin.process.computer.ComputerResult; -import org.apache.tinkerpop.gremlin.process.computer.GraphComputer; -import org.apache.tinkerpop.gremlin.process.computer.Memory; -import org.apache.tinkerpop.gremlin.process.computer.traversal.TraversalVertexProgram; -import org.apache.tinkerpop.gremlin.process.computer.traversal.step.VertexComputing; -import org.apache.tinkerpop.gremlin.process.computer.util.EmptyMemory; -import org.apache.tinkerpop.gremlin.process.traversal.Step; -import org.apache.tinkerpop.gremlin.process.traversal.Traversal; -import org.apache.tinkerpop.gremlin.process.traversal.TraversalSideEffects; -import org.apache.tinkerpop.gremlin.process.traversal.Traverser; -import org.apache.tinkerpop.gremlin.process.traversal.step.util.AbstractStep; -import org.apache.tinkerpop.gremlin.process.traversal.step.util.EmptyStep; -import org.apache.tinkerpop.gremlin.process.traversal.step.util.ProfileStep; -import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalInterruptedException; -import org.apache.tinkerpop.gremlin.structure.Graph; - -import java.util.NoSuchElementException; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.Future; - -/** - * @author Marko A. Rodriguez (http://markorodriguez.com) - * @author Stephen Mallette (http://stephen.genoprime.com) - */ -public abstract class VertexProgramStep extends AbstractStep implements VertexComputing { - -public static final String ROOT_TRAVERSAL = "gremlin.vertexProgramStep.rootTraversal"; -public static final String STEP_ID = "gremlin.vertexProgramStep.stepId"; - -protected Computer computer = Computer.compute(); - -protected boolean first = true; - -public VertexProgramStep(final Traversal.Admin traversal) { -super(traversal); -} - -@Override -protected Traverser.Admin processNextStart() throws NoSuchElementException { -Future future = null; -try { -if (this.first && this.getPreviousStep() instanceof EmptyStep) { -this.first = false; -final Graph graph = this.getTraversal().getGraph().get(); -future = this.getComputer().apply(graph).program(this.generateProgram(graph, EmptyMemory.instance())).submit(); -final ComputerResult result = future.get(); -
[19/50] [abbrv] tinkerpop git commit: Use an absolute path for `PYTHONPATH`.
Use an absolute path for `PYTHONPATH`. Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a569ea82 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a569ea82 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a569ea82 Branch: refs/heads/TINKERPOP-1404 Commit: a569ea823e2cc179352f1c76dd2959ac9529ee1c Parents: 6467063 Author: Daniel KuppitzAuthored: Wed Sep 14 22:24:32 2016 +0200 Committer: Daniel Kuppitz Committed: Wed Sep 14 22:24:32 2016 +0200 -- docs/preprocessor/preprocess-file.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a569ea82/docs/preprocessor/preprocess-file.sh -- diff --git a/docs/preprocessor/preprocess-file.sh b/docs/preprocessor/preprocess-file.sh index 1e54c8e..c7b4f5e 100755 --- a/docs/preprocessor/preprocess-file.sh +++ b/docs/preprocessor/preprocess-file.sh @@ -133,7 +133,7 @@ if [ ! ${SKIP} ] && [ $(grep -c '^\[gremlin' ${input}) -gt 0 ]; then sed 's/\t//g' ${input} | awk -f ${AWK_SCRIPTS}/prepare.awk | - awk -f ${AWK_SCRIPTS}/init-code-blocks.awk -v TP_HOME="${TP_HOME}" -v PYTHONPATH="./gremlin-python/target/classes/Lib" | + awk -f ${AWK_SCRIPTS}/init-code-blocks.awk -v TP_HOME="${TP_HOME}" -v PYTHONPATH="${TP_HOME}/gremlin-python/target/classes/Lib" | awk -f ${AWK_SCRIPTS}/progressbar.awk -v tpl=${AWK_SCRIPTS}/progressbar.groovy.template | HADOOP_GREMLIN_LIBS="${CONSOLE_HOME}/ext/giraph-gremlin/lib:${CONSOLE_HOME}/ext/tinkergraph-gremlin/lib" bin/gremlin.sh | ${lb} awk -f ${AWK_SCRIPTS}/ignore.awk |
[38/50] [abbrv] tinkerpop git commit: Merge branch 'TINKERPOP-1391-master'
Merge branch 'TINKERPOP-1391-master' Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/3a4f7051 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/3a4f7051 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/3a4f7051 Branch: refs/heads/TINKERPOP-1404 Commit: 3a4f70510b8b2a536748f3f5d85b824e23431d37 Parents: 687ae74 eeb218c Author: Daniel KuppitzAuthored: Thu Sep 15 20:09:23 2016 +0200 Committer: Daniel Kuppitz Committed: Thu Sep 15 20:09:23 2016 +0200 -- CHANGELOG.asciidoc | 3 ++- .../optimization/RangeByIsCountStrategy.java| 20 +--- .../RangeByIsCountStrategyTest.java | 2 ++ 3 files changed, 21 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3a4f7051/CHANGELOG.asciidoc --
[49/50] [abbrv] tinkerpop git commit: Fixed bad merge at 2c5733111b2c60b2e17d7ccd1fd83fff727335d4
Fixed bad merge at 2c5733111b2c60b2e17d7ccd1fd83fff727335d4 Somehow, the "windows" profile wasn't removed in that conflict. CTR Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/54ed33df Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/54ed33df Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/54ed33df Branch: refs/heads/TINKERPOP-1404 Commit: 54ed33df5e1cdd6be77bdb67d759ccba26222843 Parents: 4293eb3 Author: Stephen MalletteAuthored: Mon Sep 19 10:55:08 2016 -0400 Committer: Stephen Mallette Committed: Mon Sep 19 10:55:08 2016 -0400 -- pom.xml | 42 -- 1 file changed, 42 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/54ed33df/pom.xml -- diff --git a/pom.xml b/pom.xml index 7a4c230..020084b 100644 --- a/pom.xml +++ b/pom.xml @@ -1159,47 +1159,5 @@ limitations under the License. - -windows - -false - -windows - - - - - -org.codehaus.mojo -wagon-maven-plugin -1.0 - - -download-hadoop-winutils -generate-test-resources - -download-single - - - http://public-repo-1.hortonworks.com/ - hdp-win-alpha/winutils.exe - ${project.build.directory}/hadoop_home/bin - - - - - -org.apache.maven.plugins -maven-surefire-plugin - - -Dlog4j.configuration=${log4j-test.properties} --Dbuild.dir=${project.build.directory} - -Dhadoop.home.dir=${project.build.directory}/hadoop_home -Dis.testing=true - - - - - -
[02/50] [abbrv] tinkerpop git commit: removed this. from a static field name call. minor nothing.
removed this. from a static field name call. minor nothing. Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ed8feea5 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ed8feea5 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ed8feea5 Branch: refs/heads/TINKERPOP-1404 Commit: ed8feea52e2055edcd45cd5c97f8ef3d60cc6820 Parents: 2a2b59b Author: Marko A. RodriguezAuthored: Tue Sep 13 13:30:27 2016 -0600 Committer: Marko A. Rodriguez Committed: Tue Sep 13 13:30:27 2016 -0600 -- .../java/org/apache/tinkerpop/gremlin/jsr223/JavaTranslator.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ed8feea5/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/JavaTranslator.java -- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/JavaTranslator.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/JavaTranslator.java index d00ad1c..a4f97a1 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/JavaTranslator.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/JavaTranslator.java @@ -106,8 +106,8 @@ public final class JavaTranslator> methodCache = delegate instanceof TraversalSource ? - this.TRAVERSAL_SOURCE_METHOD_CACHE.getOrDefault(delegate.getClass(), new HashMap<>()) : -this.TRAVERSAL_METHOD_CACHE.getOrDefault(delegate.getClass(), new HashMap<>()); + TRAVERSAL_SOURCE_METHOD_CACHE.getOrDefault(delegate.getClass(), new HashMap<>()) : +TRAVERSAL_METHOD_CACHE.getOrDefault(delegate.getClass(), new HashMap<>()); if (methodCache.isEmpty()) { for (final Method method : delegate.getClass().getMethods()) { if (!(method.getName().equals("addV") && method.getParameterCount() == 1 && method.getParameters()[0].getType().equals(Object[].class))) { // hack cause its hard to tell Object[] vs. String :|
[22/50] [abbrv] tinkerpop git commit: This closes #170
This closes #170 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/cedbe9cb Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/cedbe9cb Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/cedbe9cb Branch: refs/heads/TINKERPOP-1404 Commit: cedbe9cb1157ae3a6316b3c8ec802bc46291616a Parents: a0cbe2d Author: Stephen MalletteAuthored: Thu Sep 15 06:58:07 2016 -0400 Committer: Stephen Mallette Committed: Thu Sep 15 06:58:07 2016 -0400 -- --
[17/50] [abbrv] tinkerpop git commit: Udpated dev docs related to release given changes to gremlin-python build
Udpated dev docs related to release given changes to gremlin-python build Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/079cc20d Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/079cc20d Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/079cc20d Branch: refs/heads/TINKERPOP-1404 Commit: 079cc20d9604c7bcbf21496a6fc042374f86b282 Parents: 9b4c788 Author: Stephen MalletteAuthored: Wed Sep 14 14:14:20 2016 -0400 Committer: Stephen Mallette Committed: Wed Sep 14 14:14:20 2016 -0400 -- .../dev/developer/development-environment.asciidoc | 2 ++ docs/src/dev/developer/release.asciidoc | 16 ++-- 2 files changed, 12 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/079cc20d/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 632100c..ade4288 100644 --- a/docs/src/dev/developer/development-environment.asciidoc +++ b/docs/src/dev/developer/development-environment.asciidoc @@ -14,6 +14,7 @@ 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. +[[development-environment]] Development Environment === @@ -21,6 +22,7 @@ TinkerPop is fairly large body of code spread across many modules and covering m this complexity, it remains relatively straightforward a project to build. This following subsections explain how to configure a development environment for TinkerPop. +[[system-configuration]] System Configuration http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/079cc20d/docs/src/dev/developer/release.asciidoc -- diff --git a/docs/src/dev/developer/release.asciidoc b/docs/src/dev/developer/release.asciidoc index e1007e0..f4d29ff 100644 --- a/docs/src/dev/developer/release.asciidoc +++ b/docs/src/dev/developer/release.asciidoc @@ -32,6 +32,10 @@ from a previous version or from recent `SNAPSHOT`. When using one generated for 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: The following instructions assume that the release manager's < is setup +properly for release and includes a `.glv` file in `gremlin-python` as described in the < > +section, so that the `gremlin-python` module builds in full. + Pre-flight Check @@ -46,7 +50,7 @@ and communicating with other members of the community. under release is protected. Tweaks to documentation and other odds and ends related to release are still allowed during this period. . At some point during the week: -.. Run the full integration test suite: `mvn clean install -DskipIntegrationTests=false -DincludeNeo4j -DglvPython` +.. Run the full integration test suite: `mvn clean install -DskipIntegrationTests=false -DincludeNeo4j` .. Deploy a final SNAPSHOT to the snapshot repository. .. Review LICENSE and NOTICE files to make sure that no < >. .. Review javadoc filters on the "Core API" docs to be sure nothing needs to change. @@ -70,7 +74,7 @@ A release candidate is an unofficial release that is represented by a tagged ver offered in cases where there is significant change in a particular version and the potential for upgrades and problems might be high. -. `mvn clean install -DincludeNeo4j -DglvPython` +. `mvn clean install -DincludeNeo4j` .. `mvn verify -DskipIntegrationTests=false -DincludeNeo4j` .. `mvn verify -DskipPerformanceTests=false` . `bin/publish-docs.sh ` - note that under a release candidate the documentation is published as SNAPSHOT @@ -147,14 +151,14 @@ Release & Promote - . Login to link:https://repository.apache.org/[Apache Nexus] and release the previously closed repository. -. Deploy to link:https://pypi.python.org/pypi[pypi] with `mvn clean install -DskipTests -DglvPython -Dpypi`. It is likely necessary -that this build will occur from the tag for the release, so be sure to checkout the tag first before executing this step. +. Deploy to link:https://pypi.python.org/pypi[pypi] +.. This build will likely occur from the tag for the release, so be sure to checkout the tag first before executing this step. +.. `mvn clean install -DskipTests` +.. `mvn deploy -pl gremlin-python -DskipTests
[06/50] [abbrv] tinkerpop git commit: Minor formatting fixes to dev docs CTR
Minor formatting fixes to dev docs CTR Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/d4d8297f Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d4d8297f Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d4d8297f Branch: refs/heads/TINKERPOP-1404 Commit: d4d8297f5e4a2b05aaae78d4db42f18daed086e6 Parents: cf8f6f7 Author: Stephen MalletteAuthored: Wed Sep 14 10:47:10 2016 -0400 Committer: Stephen Mallette Committed: Wed Sep 14 10:47:10 2016 -0400 -- docs/src/dev/developer/development-environment.asciidoc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d4d8297f/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 d6fc9a7..117f792 100644 --- a/docs/src/dev/developer/development-environment.asciidoc +++ b/docs/src/dev/developer/development-environment.asciidoc @@ -106,7 +106,7 @@ Building and Testing The following commands are a mix of Maven flags and shell scripts that handle different build operations * Build project: `mvn clean install` -* Build a specific module (e.g. `gremlin-python`) within the project: `mvn clean install -pl gremlin-python` +** Build a specific module (e.g. `gremlin-server`) within the project: `mvn clean install -pl gremlin-server` ** Specify specific tests in a TinkerPop Suite to run with the `GREMLIN_TESTS` environment variable, along with the Maven project list argument, e.g.: + @@ -117,7 +117,7 @@ mvn -Dmaven.javadoc.skip=true --projects tinkergraph-gremlin test ** Clean the `.groovy/grapes/org.apache.tinkerpop` directory on build: `mvn clean install -DcleanGrapes` ** Turn off "heavy" logging in the "process" tests: `mvn clean install -DargLine="-DmuteTestLogs=true"` ** The test suite for `neo4j-gremlin` is disabled by default - to turn it on: `mvn clean install -DincludeNeo4j` -** Build the `gremlin-python` module with native Python tests (which require that Python be installed on the system): `mvn clean install -DglvPython` +** Build and execute with native Python tests (see < >: `mvn clean install -DglvPython` * Regenerate test data (only necessary given changes to IO classes): `mvn clean install -Dio` from `tinkergraph-gremlin` directory ** If there are changes to the Gryo format, it may be necessary to generate the Grateful Dead dataset from GraphSON (see `IoDataGenerationTest.shouldWriteGratefulDead`) * Check license headers are present: `mvn apache-rat:check` @@ -135,7 +135,6 @@ mvn -Dmaven.javadoc.skip=true --projects tinkergraph-gremlin test ** Execute with the `-DuseEpoll` option to try to use Netty native transport (works on Linux, but will fallback to Java NIO on other OS). * Performance Tests: `mvn verify -DskipPerformanceTests=false` * Benchmarks: `mvn verify -DskipBenchmarks=false` -* Build and execute with native Python tests (see < >: `mvn clean install -DglvPython` [[docker-integration]] Docker Integration
[41/50] [abbrv] tinkerpop git commit: Renamed empty.result.indicator to result.indicator.null
Renamed empty.result.indicator to result.indicator.null Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/75b4f204 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/75b4f204 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/75b4f204 Branch: refs/heads/TINKERPOP-1404 Commit: 75b4f204a973de5f7b9d4271093810d669b85f65 Parents: 6599159 Author: Stephen MalletteAuthored: Thu Sep 15 16:05:07 2016 -0400 Committer: Stephen Mallette Committed: Thu Sep 15 16:05:07 2016 -0400 -- .../src/reference/gremlin-applications.asciidoc | 2 +- .../upgrade/release-3.2.x-incubating.asciidoc | 27 .../gremlin/console/Preferences.groovy | 12 - .../console/commands/GremlinSetCommand.groovy | 2 +- 4 files changed, 35 insertions(+), 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/75b4f204/docs/src/reference/gremlin-applications.asciidoc -- diff --git a/docs/src/reference/gremlin-applications.asciidoc b/docs/src/reference/gremlin-applications.asciidoc index 13ac6ff..bff9f0f 100644 --- a/docs/src/reference/gremlin-applications.asciidoc +++ b/docs/src/reference/gremlin-applications.asciidoc @@ -173,7 +173,7 @@ Preferences are set with `:set name value`. Values can contain spaces when quot |result.prompt.color | colors | Color of the result prompt. |input.prompt | string | Text of the input prompt. |result.prompt | string | Text of the result prompt. -|empty.result.indicator | string | Text of the void/no results indicator - setting to empty string (i.e. "" at the +|result.indicator.null | string | Text of the void/no results indicator - setting to empty string (i.e. "" at the command line) will print no result line in these cases. |= http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/75b4f204/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 2cf8ef2..5db0522 100644 --- a/docs/src/upgrade/release-3.2.x-incubating.asciidoc +++ b/docs/src/upgrade/release-3.2.x-incubating.asciidoc @@ -32,6 +32,33 @@ Please see the link:https://github.com/apache/tinkerpop/blob/3.2.3/CHANGELOG.asc Upgrading for Users ~~~ +Renamed Null Result Preference +^^ + +In 3.2.2, the Gremlin Console introduced a setting called `empty.result.indicator`, which controlled the output that +was presented when no result was returned. For consistency, this setting has been renamed to `result.indicator.null` +and can be set as follows: + +[source,text] + +gremlin> graph = TinkerGraph.open() +==>tinkergraph[vertices:0 edges:0] +gremlin> graph.close() +==>null +gremlin> :set result.indicator.null nil +gremlin> graph = TinkerGraph.open() +==>tinkergraph[vertices:0 edges:0] +gremlin> graph.close() +==>nil +gremlin> :set result.indicator.null "" +gremlin> graph = TinkerGraph.open() +==>tinkergraph[vertices:0 edges:0] +gremlin> graph.close() +gremlin> + + +See: link:https://issues.apache.org/jira/browse/TINKERPOP-1409[TINKERPOP-1409] + Where Step Supports By-Modulation ^ http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/75b4f204/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Preferences.groovy -- diff --git a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Preferences.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Preferences.groovy index 5403ae8..22f5f74 100644 --- a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Preferences.groovy +++ b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Preferences.groovy @@ -73,9 +73,9 @@ public class Preferences { public static final String PREF_RESULT_PROMPT_COLOR_DEFAULT = "reset" public static String resultPromptColor = PREF_RESULT_PROMPT_COLOR_DEFAULT -public static final String PREF_EMPTY_RESULT_IND = "empty.result.indicator" -public static final String PREF_EMPTY_RESULT_IND_DEFAULT = "null" -public static String emptyResult = PREF_EMPTY_RESULT_IND_DEFAULT +public static final String PREF_RESULT_IND_NULL = "result.indicator.null" +public static final String PREF_RESULT_IND_NULL_DEFAULT = "null" +public static String emptyResult = PREF_RESULT_IND_NULL_DEFAULT public static final String PREF_INPUT_PROMPT = "input.prompt" public static
[20/50] [abbrv] tinkerpop git commit: updated setup.py, added six as requirement (for python 3), also added some basic classifiers
updated setup.py, added six as requirement (for python 3), also added some basic classifiers Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1c5e6989 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1c5e6989 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1c5e6989 Branch: refs/heads/TINKERPOP-1404 Commit: 1c5e6989b2b452b14c958ed744fee3d4ebed965a Parents: c7d3da2 Author: davebshowAuthored: Wed Sep 14 18:23:42 2016 -0400 Committer: davebshow Committed: Wed Sep 14 18:23:42 2016 -0400 -- gremlin-python/src/main/jython/setup.py | 11 ++- 1 file changed, 10 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1c5e6989/gremlin-python/src/main/jython/setup.py -- diff --git a/gremlin-python/src/main/jython/setup.py b/gremlin-python/src/main/jython/setup.py index f2472b7..08cfe37 100644 --- a/gremlin-python/src/main/jython/setup.py +++ b/gremlin-python/src/main/jython/setup.py @@ -61,6 +61,15 @@ setup( ], install_requires=[ 'aenum==1.4.5', -'tornado==4.4.1' +'tornado==4.4.1', +'six==1.10.0' +], +classifiers=[ +"Intended Audience :: Developers", +"License :: OSI Approved :: Apache Software License", +"Natural Language :: English", +"Programming Language :: Python :: 2.7", +"Programming Language :: Python :: 3.4", +"Programming Language :: Python :: 3.5", ] )
[28/50] [abbrv] tinkerpop git commit: Merge branch 'pr-420'
Merge branch 'pr-420' Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a2ddf8f0 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a2ddf8f0 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a2ddf8f0 Branch: refs/heads/TINKERPOP-1404 Commit: a2ddf8f06bc0b40b7b47dcba2ac1763b5fea93da Parents: 204da4b 9a6ff99 Author: Daniel KuppitzAuthored: Thu Sep 15 17:35:58 2016 +0200 Committer: Daniel Kuppitz Committed: Thu Sep 15 17:35:58 2016 +0200 -- CHANGELOG.asciidoc | 4 ++-- docs/src/dev/provider/index.asciidoc | 8 docs/src/reference/gremlin-applications.asciidoc | 2 +- docs/src/upgrade/release-3.2.x-incubating.asciidoc | 2 +- .../computer/traversal/step/map/VertexProgramStep.java | 2 +- .../tinkerpop/gremlin/process/remote/RemoteConnection.java | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a2ddf8f0/CHANGELOG.asciidoc --
[15/50] [abbrv] tinkerpop git commit: moved numeric types compat code to statics module
moved numeric types compat code to statics module Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/c7d3da2f Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c7d3da2f Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c7d3da2f Branch: refs/heads/TINKERPOP-1404 Commit: c7d3da2f5eaa2ef3b20dc467bab6e3fe4ecfb5f4 Parents: a1f4497 Author: davebshowAuthored: Wed Sep 14 13:44:15 2016 -0400 Committer: davebshow Committed: Wed Sep 14 13:44:15 2016 -0400 -- .../python/GraphTraversalSourceGenerator.groovy | 2 +- .../python/TraversalSourceGenerator.groovy | 2 +- .../src/main/jython/gremlin_python/compat.py| 34 .../gremlin_python/process/graph_traversal.py | 2 +- .../jython/gremlin_python/process/traversal.py | 2 +- .../src/main/jython/gremlin_python/statics.py | 17 ++ .../gremlin_python/structure/io/graphson.py | 2 +- .../driver/test_driver_remote_connection.py | 2 +- .../jython/tests/structure/io/test_graphson.py | 2 +- .../main/jython/tests/structure/test_graph.py | 2 +- 10 files changed, 25 insertions(+), 42 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c7d3da2f/gremlin-python/src/main/groovy/org/apache/tinkerpop/gremlin/python/GraphTraversalSourceGenerator.groovy -- diff --git a/gremlin-python/src/main/groovy/org/apache/tinkerpop/gremlin/python/GraphTraversalSourceGenerator.groovy b/gremlin-python/src/main/groovy/org/apache/tinkerpop/gremlin/python/GraphTraversalSourceGenerator.groovy index 55f977c..cdca686 100644 --- a/gremlin-python/src/main/groovy/org/apache/tinkerpop/gremlin/python/GraphTraversalSourceGenerator.groovy +++ b/gremlin-python/src/main/groovy/org/apache/tinkerpop/gremlin/python/GraphTraversalSourceGenerator.groovy @@ -61,7 +61,7 @@ under the License. pythonClass.append("from .traversal import Bytecode\n") pythonClass.append("from ..driver.remote_connection import RemoteStrategy\n") pythonClass.append("from .. import statics\n") -pythonClass.append("from ..compat import long\n\n") +pythonClass.append("from ..statics import long\n\n") // // GraphTraversalSource // http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c7d3da2f/gremlin-python/src/main/groovy/org/apache/tinkerpop/gremlin/python/TraversalSourceGenerator.groovy -- diff --git a/gremlin-python/src/main/groovy/org/apache/tinkerpop/gremlin/python/TraversalSourceGenerator.groovy b/gremlin-python/src/main/groovy/org/apache/tinkerpop/gremlin/python/TraversalSourceGenerator.groovy index 35e5b2f..d78d804 100644 --- a/gremlin-python/src/main/groovy/org/apache/tinkerpop/gremlin/python/TraversalSourceGenerator.groovy +++ b/gremlin-python/src/main/groovy/org/apache/tinkerpop/gremlin/python/TraversalSourceGenerator.groovy @@ -57,7 +57,7 @@ under the License. pythonClass.append("import six\n") pythonClass.append("from aenum import Enum\n") pythonClass.append("from .. import statics\n") -pythonClass.append("from ..compat import long\n\n") +pythonClass.append("from ..statics import long\n\n") pythonClass.append(""" class Traversal(object): http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c7d3da2f/gremlin-python/src/main/jython/gremlin_python/compat.py -- diff --git a/gremlin-python/src/main/jython/gremlin_python/compat.py b/gremlin-python/src/main/jython/gremlin_python/compat.py deleted file mode 100644 index 8089d85..000 --- a/gremlin-python/src/main/jython/gremlin_python/compat.py +++ /dev/null @@ -1,34 +0,0 @@ -''' -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 types import FunctionType - -import six - - -if six.PY3: -class long(int): pass -FloatType = float -IntType = int -LongType = long
[45/50] [abbrv] tinkerpop git commit: Merge remote-tracking branch 'origin/tp31'
Merge remote-tracking branch 'origin/tp31' Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/14bca062 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/14bca062 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/14bca062 Branch: refs/heads/TINKERPOP-1404 Commit: 14bca062cf4deb15f00b99b09b1bd746a2dca1e8 Parents: c2c0023 e7e7481 Author: Stephen MalletteAuthored: Fri Sep 16 07:44:14 2016 -0400 Committer: Stephen Mallette Committed: Fri Sep 16 07:44:14 2016 -0400 -- --
[25/50] [abbrv] tinkerpop git commit: Merge remote-tracking branch 'origin/TINKERPOP-1449'
Merge remote-tracking branch 'origin/TINKERPOP-1449' 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/8fc60ad4 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8fc60ad4 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/8fc60ad4 Branch: refs/heads/TINKERPOP-1404 Commit: 8fc60ad455dcab11127f3b78158134aee6468123 Parents: cedbe9c a569ea8 Author: Stephen MalletteAuthored: Thu Sep 15 09:53:05 2016 -0400 Committer: Stephen Mallette Committed: Thu Sep 15 09:53:05 2016 -0400 -- .gitignore | 1 + CHANGELOG.asciidoc | 1 + docs/preprocessor/preprocess-file.sh| 2 +- .../developer/development-environment.asciidoc | 13 - docs/src/dev/developer/release.asciidoc | 16 +++--- giraph-gremlin/pom.xml | 18 --- gremlin-console/pom.xml | 18 --- gremlin-groovy-test/pom.xml | 18 --- gremlin-groovy/pom.xml | 18 --- gremlin-python/pom.xml | 54 +--- hadoop-gremlin/pom.xml | 18 --- neo4j-gremlin/pom.xml | 18 --- pom.xml | 24 + spark-gremlin/pom.xml | 18 --- 14 files changed, 62 insertions(+), 175 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8fc60ad4/CHANGELOG.asciidoc -- diff --cc CHANGELOG.asciidoc index b359f37,ab2f8df..fd9255f --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@@ -28,7 -28,7 +28,8 @@@ TinkerPop 3.2.3 (Release Date: NOT OFFI * Fixed a `JavaTranslator` bug where `Bytecode` instructions were being mutated during translation. * Added `Path` to Gremlin-Python with respective GraphSON 2.0 deserializer. +* VertexPrograms can now declare traverser requirements, e.g. to have access to the path when used with `.program()`. + * New build options for `gremlin-python` where `-DglvPython` is no longer required. * Added missing `InetAddress` to GraphSON extension module. [[release-3-2-2]]
[35/50] [abbrv] tinkerpop git commit: Merge branch 'TINKERPOP-1448'
Merge branch 'TINKERPOP-1448' Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/687ae742 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/687ae742 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/687ae742 Branch: refs/heads/TINKERPOP-1404 Commit: 687ae742d974482881e52c5c05a608d99020383d Parents: 2790dbb 1c5e698 Author: davebshowAuthored: Thu Sep 15 12:14:54 2016 -0400 Committer: davebshow Committed: Thu Sep 15 12:14:54 2016 -0400 -- .../python/GraphTraversalSourceGenerator.groovy| 5 +++-- .../gremlin/python/TraversalSourceGenerator.groovy | 5 - .../driver/driver_remote_connection.py | 2 +- .../gremlin_python/driver/remote_connection.py | 2 +- .../gremlin_python/process/graph_traversal.py | 3 ++- .../jython/gremlin_python/process/traversal.py | 6 +- .../src/main/jython/gremlin_python/statics.py | 17 + .../jython/gremlin_python/structure/io/graphson.py | 10 +- gremlin-python/src/main/jython/setup.py| 11 ++- .../tests/driver/test_driver_remote_connection.py | 12 ++-- .../jython/tests/structure/io/test_graphson.py | 16 +++- .../src/main/jython/tests/structure/test_graph.py | 12 12 files changed, 73 insertions(+), 28 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/687ae742/gremlin-python/src/main/groovy/org/apache/tinkerpop/gremlin/python/TraversalSourceGenerator.groovy -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/687ae742/gremlin-python/src/main/jython/gremlin_python/process/traversal.py -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/687ae742/gremlin-python/src/main/jython/tests/structure/io/test_graphson.py -- diff --cc gremlin-python/src/main/jython/tests/structure/io/test_graphson.py index 6f244f5,675b060..99c9a45 --- a/gremlin-python/src/main/jython/tests/structure/io/test_graphson.py +++ b/gremlin-python/src/main/jython/tests/structure/io/test_graphson.py @@@ -83,15 -88,11 +89,15 @@@ class TestGraphSONReader(TestCase) class TestGraphSONWriter(TestCase): def test_numbers(self): - assert """{"@type":"g:Int32","@value":1}""" == GraphSONWriter.writeObject(1) - assert """{"@type":"g:Int64","@value":2}""" == GraphSONWriter.writeObject(2L) - assert """{"@type":"g:Float","@value":3.2}""" == GraphSONWriter.writeObject(3.2) + assert {"@type":"g:Int64","@value":2} == json.loads(GraphSONWriter.writeObject(long(2))) + assert {"@type":"g:Int32","@value":1} == json.loads(GraphSONWriter.writeObject(1)) + assert {"@type":"g:Float","@value":3.2} == json.loads(GraphSONWriter.writeObject(3.2)) assert """true""" == GraphSONWriter.writeObject(True) +def test_P(self): +assert """{"@type":"g:P","@value":{"predicate":"and","value":[{"@type":"g:P","@value":{"predicate":"or","value":[{"@type":"g:P","@value":{"predicate":"lt","value":"b"}},{"@type":"g:P","@value":{"predicate":"gt","value":"c"}}]}},{"@type":"g:P","@value":{"predicate":"neq","value":"d"}}]}}""" == GraphSONWriter.writeObject( +P.lt("b").or_(P.gt("c")).and_(P.neq("d"))) + if __name__ == '__main__': unittest.main()
[31/50] [abbrv] tinkerpop git commit: forgot a <4> marking.
forgot a <4> marking. Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/fe21ce16 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/fe21ce16 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/fe21ce16 Branch: refs/heads/TINKERPOP-1404 Commit: fe21ce16062b0c03813994d7eb82a5071d463477 Parents: 82a1bc0 Author: Marko A. RodriguezAuthored: Thu Sep 15 05:46:12 2016 -0600 Committer: Marko A. Rodriguez Committed: Thu Sep 15 09:58:53 2016 -0600 -- docs/src/recipes/traversal-induced-values.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fe21ce16/docs/src/recipes/traversal-induced-values.asciidoc -- diff --git a/docs/src/recipes/traversal-induced-values.asciidoc b/docs/src/recipes/traversal-induced-values.asciidoc index 74402b6..5f48591 100644 --- a/docs/src/recipes/traversal-induced-values.asciidoc +++ b/docs/src/recipes/traversal-induced-values.asciidoc @@ -48,7 +48,7 @@ itself. g.V().has('name','marko').as('marko'). <1> out('knows').as('friend').<2> where('friend', gt('marko')).by('age'). <3> - values('name') + values('name')<4> <1> Find the "marko" `Vertex` and label it as "marko".
[42/50] [abbrv] tinkerpop git commit: Updated changelog.
Updated changelog. Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/5bc1c7be Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5bc1c7be Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/5bc1c7be Branch: refs/heads/TINKERPOP-1404 Commit: 5bc1c7be23f08c907a5f75ab3d88ce280274e76c Parents: 75b4f20 Author: Stephen MalletteAuthored: Thu Sep 15 16:06:41 2016 -0400 Committer: Stephen Mallette Committed: Thu Sep 15 16:06:41 2016 -0400 -- CHANGELOG.asciidoc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5bc1c7be/CHANGELOG.asciidoc -- diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 15e1bb2..b57a2c5 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -32,7 +32,8 @@ TinkerPop 3.2.3 (Release Date: NOT OFFICIALLY RELEASED YET) * `TraversalRing` returns a `null` if it does not contain traversals (previously `IdentityTraversal`). * Fixed a `JavaTranslator` bug where `Bytecode` instructions were being mutated during translation. * Added `Path` to Gremlin-Python with respective GraphSON 2.0 deserializer. -* If `empty.result.indicator` is set to an empty string, then no "result line" is printed in the console. +* Renamed the `empty.result.indicator` preference to `result.indicator.null` in Gremlin Console +* If `result.indicator.null` is set to an empty string, then no "result line" is printed in Gremlin Console. * VertexPrograms can now declare traverser requirements, e.g. to have access to the path when used with `.program()`. * New build options for `gremlin-python` where `-DglvPython` is no longer required. * Added missing `InetAddress` to GraphSON extension module.
[33/50] [abbrv] tinkerpop git commit: per @spmallette's request, added where().by() to the upgrading user-docs.
per @spmallette's request, added where().by() to the upgrading user-docs. Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/8febc4da Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8febc4da Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/8febc4da Branch: refs/heads/TINKERPOP-1404 Commit: 8febc4dac44c893dc263a4ca5fd340f4bf7b4d94 Parents: fe21ce1 Author: Marko A. RodriguezAuthored: Thu Sep 15 07:58:09 2016 -0600 Committer: Marko A. Rodriguez Committed: Thu Sep 15 09:58:53 2016 -0600 -- .../upgrade/release-3.2.x-incubating.asciidoc | 27 1 file changed, 27 insertions(+) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8febc4da/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 61e3a58..2cf8ef2 100644 --- a/docs/src/upgrade/release-3.2.x-incubating.asciidoc +++ b/docs/src/upgrade/release-3.2.x-incubating.asciidoc @@ -29,6 +29,33 @@ TinkerPop 3.2.3 Please see the link:https://github.com/apache/tinkerpop/blob/3.2.3/CHANGELOG.asciidoc#release-3-2-3[changelog] for a complete list of all the modifications that are part of this release. +Upgrading for Users +~~~ + +Where Step Supports By-Modulation +^ + +It is now possible to use `by()` with `where()` predicate-based steps. Previously, without using `match()`, if you wanted +to know who was older than their friend, the following traversal would be used. + +[source,text] + +gremlin> g.V().as('a').out('knows').as('b'). +..1> filter(select('a','b').by('age').where('a', lt('b'))) +==>v[4] + + +Now, with `where().by()` support, the above traversal can be expressed more succinctly and more naturally as follows. + +[source,text] + +gremlin> g.V().as('a').out('knows').as('b'). +..1> where('a', lt('b')).by('age') +==>v[4] + + +See: link:https://issues.apache.org/jira/browse/TINKERPOP-1330[TINKERPOP-1330] + TinkerPop 3.2.2 ---
[10/50] [abbrv] tinkerpop git commit: Allow -DskipTests to still produce a valid build of gremlin-python
Allow -DskipTests to still produce a valid build of gremlin-python Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/2106b10e Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/2106b10e Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/2106b10e Branch: refs/heads/TINKERPOP-1404 Commit: 2106b10e74008481b19bba98635f65dda99800bf Parents: 2fbeb59 Author: Stephen MalletteAuthored: Wed Sep 14 12:16:13 2016 -0400 Committer: Stephen Mallette Committed: Wed Sep 14 12:16:13 2016 -0400 -- gremlin-python/pom.xml | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2106b10e/gremlin-python/pom.xml -- diff --git a/gremlin-python/pom.xml b/gremlin-python/pom.xml index 3695c0d..b2ba875 100644 --- a/gremlin-python/pom.xml +++ b/gremlin-python/pom.xml @@ -324,14 +324,13 @@ - net.sf.mavenjython jython-compile-maven-plugin 1.4 -compile +process-resources jython @@ -413,12 +412,11 @@ native-python-build -generate-test-resources +compile run -${skipTests}
[08/50] [abbrv] tinkerpop git commit: Drop -DglvPython as a requirement for building gremlin-python.
Drop -DglvPython as a requirement for building gremlin-python. Now you can just add .glv file to the root of gremlin-python to let Maven know that your environment is python-enabled. Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/e0d7c90d Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e0d7c90d Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/e0d7c90d Branch: refs/heads/TINKERPOP-1404 Commit: e0d7c90d4391e24ae18fdb2cc6a57c978039b29f Parents: fdd70e5 Author: Stephen MalletteAuthored: Wed Sep 14 11:59:07 2016 -0400 Committer: Stephen Mallette Committed: Wed Sep 14 11:59:07 2016 -0400 -- .gitignore | 1 + docs/src/dev/developer/development-environment.asciidoc | 11 ++- gremlin-python/pom.xml | 8 pom.xml | 1 + 4 files changed, 16 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e0d7c90d/.gitignore -- diff --git a/.gitignore b/.gitignore index 9d83c5a..33fb239 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ benchmarks/ __pycache__/ *.py[cdo] __version__.py +.glv http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e0d7c90d/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 117f792..632100c 100644 --- a/docs/src/dev/developer/development-environment.asciidoc +++ b/docs/src/dev/developer/development-environment.asciidoc @@ -65,6 +65,16 @@ As of TinkerPop 3.2.2, the build optionally requires link:https://www.python.org Java tests that require Python code will be skipped. Developers should also install link:https://pypi.python.org/pypi/pip[pip] and link:https://virtualenv.pypa.io/en/stable/[virtualenv]. +Once the Python environment is established, the full building and testing of `gremlin-python` may commence. It can be +done manually from the command line with: + +[source,text] +mvn clean install -Pglv-python + +which enables the "glv-python" Maven profile or in a more automated fashion simply add a `.glv` file to the root of the +`gremlin-python` module which will signify to Maven that the environment is Python-ready. The `.glv` file need not have +any contents and is ignored by Git. A standard `mvn clean install` will then build `gremlin-python` in full. + [[release-environment]] Release Environment ~~~ @@ -117,7 +127,6 @@ mvn -Dmaven.javadoc.skip=true --projects tinkergraph-gremlin test ** Clean the `.groovy/grapes/org.apache.tinkerpop` directory on build: `mvn clean install -DcleanGrapes` ** Turn off "heavy" logging in the "process" tests: `mvn clean install -DargLine="-DmuteTestLogs=true"` ** The test suite for `neo4j-gremlin` is disabled by default - to turn it on: `mvn clean install -DincludeNeo4j` -** Build and execute with native Python tests (see < >: `mvn clean install -DglvPython` * Regenerate test data (only necessary given changes to IO classes): `mvn clean install -Dio` from `tinkergraph-gremlin` directory ** If there are changes to the Gryo format, it may be necessary to generate the Grateful Dead dataset from GraphSON (see `IoDataGenerationTest.shouldWriteGratefulDead`) * Check license headers are present: `mvn apache-rat:check` http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e0d7c90d/gremlin-python/pom.xml -- diff --git a/gremlin-python/pom.xml b/gremlin-python/pom.xml index 50c823d..3695c0d 100644 --- a/gremlin-python/pom.xml +++ b/gremlin-python/pom.xml @@ -275,7 +275,7 @@ - glv-python-standard @@ -307,9 +307,9 @@ glv-python false - -glvPython - + +.glv + http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e0d7c90d/pom.xml -- diff --git a/pom.xml b/pom.xml index fd620e7..e37746c 100644 --- a/pom.xml +++ b/pom.xml @@ -293,6 +293,7 @@ limitations under the License. **/src/main/static/** **/_bsp/** DEPENDENCIES +.glv
[11/50] [abbrv] tinkerpop git commit: Added compatibility support for Python 2/3 in gremlin-python glv
Added compatibility support for Python 2/3 in gremlin-python glv Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b61f0d82 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b61f0d82 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b61f0d82 Branch: refs/heads/TINKERPOP-1404 Commit: b61f0d827ee76b2bde3404d143c01a5edadbae18 Parents: cf8f6f7 Author: davebshowAuthored: Wed Sep 14 12:20:16 2016 -0400 Committer: davebshow Committed: Wed Sep 14 12:20:16 2016 -0400 -- .../python/GraphTraversalSourceGenerator.groovy | 5 +-- .../python/TraversalSourceGenerator.groovy | 5 ++- .../src/main/jython/gremlin_python/compat.py| 34 .../driver/driver_remote_connection.py | 2 +- .../gremlin_python/driver/remote_connection.py | 2 +- .../gremlin_python/process/graph_traversal.py | 3 +- .../jython/gremlin_python/process/traversal.py | 6 +++- .../gremlin_python/structure/io/graphson.py | 10 +++--- .../driver/test_driver_remote_connection.py | 13 .../jython/tests/structure/io/test_graphson.py | 16 ++--- .../main/jython/tests/structure/test_graph.py | 11 --- 11 files changed, 80 insertions(+), 27 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b61f0d82/gremlin-python/src/main/groovy/org/apache/tinkerpop/gremlin/python/GraphTraversalSourceGenerator.groovy -- diff --git a/gremlin-python/src/main/groovy/org/apache/tinkerpop/gremlin/python/GraphTraversalSourceGenerator.groovy b/gremlin-python/src/main/groovy/org/apache/tinkerpop/gremlin/python/GraphTraversalSourceGenerator.groovy index 9187302..55f977c 100644 --- a/gremlin-python/src/main/groovy/org/apache/tinkerpop/gremlin/python/GraphTraversalSourceGenerator.groovy +++ b/gremlin-python/src/main/groovy/org/apache/tinkerpop/gremlin/python/GraphTraversalSourceGenerator.groovy @@ -60,7 +60,8 @@ under the License. pythonClass.append("from .traversal import TraversalStrategies\n") pythonClass.append("from .traversal import Bytecode\n") pythonClass.append("from ..driver.remote_connection import RemoteStrategy\n") -pythonClass.append("from .. import statics\n\n") +pythonClass.append("from .. import statics\n") +pythonClass.append("from ..compat import long\n\n") // // GraphTraversalSource // @@ -128,7 +129,7 @@ under the License. if isinstance(index, int): return self.range(long(index), long(index + 1)) elif isinstance(index, slice): -return self.range(0L if index.start is None else long(index.start), long(sys.maxint) if index.stop is None else long(index.stop)) +return self.range(long(0) if index.start is None else long(index.start), long(sys.maxsize) if index.stop is None else long(index.stop)) else: raise TypeError("Index must be int or slice") def __getattr__(self, key): http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b61f0d82/gremlin-python/src/main/groovy/org/apache/tinkerpop/gremlin/python/TraversalSourceGenerator.groovy -- diff --git a/gremlin-python/src/main/groovy/org/apache/tinkerpop/gremlin/python/TraversalSourceGenerator.groovy b/gremlin-python/src/main/groovy/org/apache/tinkerpop/gremlin/python/TraversalSourceGenerator.groovy index 79a1a4e..35e5b2f 100644 --- a/gremlin-python/src/main/groovy/org/apache/tinkerpop/gremlin/python/TraversalSourceGenerator.groovy +++ b/gremlin-python/src/main/groovy/org/apache/tinkerpop/gremlin/python/TraversalSourceGenerator.groovy @@ -57,6 +57,7 @@ under the License. pythonClass.append("import six\n") pythonClass.append("from aenum import Enum\n") pythonClass.append("from .. import statics\n") +pythonClass.append("from ..compat import long\n\n") pythonClass.append(""" class Traversal(object): @@ -182,7 +183,9 @@ TRAVERSER ''' class Traverser(object): -def __init__(self, object, bulk=1L): +def __init__(self, object, bulk=None): +if bulk is None: +bulk = long(1) self.object = object self.bulk = bulk def __repr__(self): http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b61f0d82/gremlin-python/src/main/jython/gremlin_python/compat.py -- diff --git a/gremlin-python/src/main/jython/gremlin_python/compat.py b/gremlin-python/src/main/jython/gremlin_python/compat.py new file mode 100644 index 000..8089d85 --- /dev/null +++ b/gremlin-python/src/main/jython/gremlin_python/compat.py @@ -0,0 +1,34 @@ +'''
tinkerpop git commit: Added support for SubgraphStrategy.vertexProperties(). Added some test cases to verify proper functioning. Also, cleaned up Stream-stuff in SubgraphStrategy. Going to do some mor
Repository: tinkerpop Updated Branches: refs/heads/TINKERPOP-1456 [created] 4f723eed8 Added support for SubgraphStrategy.vertexProperties(). Added some test cases to verify proper functioning. Also, cleaned up Stream-stuff in SubgraphStrategy. Going to do some more cleanup there to make things clean and efficient. Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/4f723eed Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/4f723eed Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/4f723eed Branch: refs/heads/TINKERPOP-1456 Commit: 4f723eed82294b95f8409db5cc890f9f41ed84ae Parents: 54ed33d Author: Marko A. RodriguezAuthored: Mon Sep 19 13:52:33 2016 -0600 Committer: Marko A. Rodriguez Committed: Mon Sep 19 13:52:33 2016 -0600 -- .../strategy/decoration/SubgraphStrategy.java | 107 ++- .../decoration/SubgraphStrategyProcessTest.java | 25 - 2 files changed, 105 insertions(+), 27 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4f723eed/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java -- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java index 967a19b..f1a42cd 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java @@ -23,6 +23,8 @@ import org.apache.tinkerpop.gremlin.process.traversal.Traversal; import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__; import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent; +import org.apache.tinkerpop.gremlin.process.traversal.step.filter.LambdaFilterStep; +import org.apache.tinkerpop.gremlin.process.traversal.step.filter.OrStep; import org.apache.tinkerpop.gremlin.process.traversal.step.filter.TraversalFilterStep; import org.apache.tinkerpop.gremlin.process.traversal.step.map.AddEdgeStep; import org.apache.tinkerpop.gremlin.process.traversal.step.map.AddVertexStartStep; @@ -30,14 +32,19 @@ import org.apache.tinkerpop.gremlin.process.traversal.step.map.AddVertexStep; import org.apache.tinkerpop.gremlin.process.traversal.step.map.EdgeOtherVertexStep; import org.apache.tinkerpop.gremlin.process.traversal.step.map.EdgeVertexStep; import org.apache.tinkerpop.gremlin.process.traversal.step.map.GraphStep; +import org.apache.tinkerpop.gremlin.process.traversal.step.map.PropertiesStep; +import org.apache.tinkerpop.gremlin.process.traversal.step.map.PropertyValueStep; import org.apache.tinkerpop.gremlin.process.traversal.step.map.VertexStep; import org.apache.tinkerpop.gremlin.process.traversal.strategy.AbstractTraversalStrategy; +import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversal; import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; 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.PropertyType; import org.apache.tinkerpop.gremlin.structure.Vertex; +import org.apache.tinkerpop.gremlin.structure.VertexProperty; import java.util.ArrayList; import java.util.List; @@ -58,9 +65,10 @@ public final class SubgraphStrategy extends AbstractTraversalStrategy vertexCriterion; private final Traversal.Admin edgeCriterion; +private final Traversal.Admin vertexPropertyCriterion; private final String MARKER = Graph.Hidden.hide(UUID.randomUUID().toString()); -private SubgraphStrategy(final Traversal vertexCriterion, final Traversal edgeCriterion) { +private SubgraphStrategy(final Traversal vertexCriterion, final Traversal edgeCriterion, final Traversal vertexPropertyCriterion) { this.vertexCriterion = null == vertexCriterion ? null : vertexCriterion.asAdmin(); // if there is no vertex predicate there is no need to test either side of the edge @@ -79,10 +87,14 @@ public final class SubgraphStrategy extends AbstractTraversalStrategy(edgeCriterion.asAdmin(), vertexPredicate)); } +this.vertexPropertyCriterion =
svn commit: r1761506 [22/29] - in /tinkerpop/site: docs/3.2.3-SNAPSHOT/ docs/3.2.3-SNAPSHOT/dev/developer/ docs/3.2.3-SNAPSHOT/dev/provider/ docs/3.2.3-SNAPSHOT/recipes/ docs/3.2.3-SNAPSHOT/reference/
Modified: tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/process/traversal/traverser/package-use.html URL: http://svn.apache.org/viewvc/tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/process/traversal/traverser/package-use.html?rev=1761506=1761505=1761506=diff == --- tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/process/traversal/traverser/package-use.html (original) +++ tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/process/traversal/traverser/package-use.html Mon Sep 19 23:12:37 2016 @@ -2,10 +2,10 @@ - + Uses of Package org.apache.tinkerpop.gremlin.process.traversal.traverser (Apache TinkerPop 3.2.3-SNAPSHOT API) - + @@ -84,63 +84,84 @@ -org.apache.tinkerpop.gremlin.process.computer.traversal.step.map +org.apache.tinkerpop.gremlin.process.computer -org.apache.tinkerpop.gremlin.process.remote.traversal +org.apache.tinkerpop.gremlin.process.computer.traversal.step.map -org.apache.tinkerpop.gremlin.process.traversal +org.apache.tinkerpop.gremlin.process.remote.traversal -org.apache.tinkerpop.gremlin.process.traversal.lambda +org.apache.tinkerpop.gremlin.process.traversal -org.apache.tinkerpop.gremlin.process.traversal.step +org.apache.tinkerpop.gremlin.process.traversal.lambda -org.apache.tinkerpop.gremlin.process.traversal.step.branch +org.apache.tinkerpop.gremlin.process.traversal.step -org.apache.tinkerpop.gremlin.process.traversal.step.filter +org.apache.tinkerpop.gremlin.process.traversal.step.branch -org.apache.tinkerpop.gremlin.process.traversal.step.map +org.apache.tinkerpop.gremlin.process.traversal.step.filter -org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect +org.apache.tinkerpop.gremlin.process.traversal.step.map -org.apache.tinkerpop.gremlin.process.traversal.step.util +org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect -org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration +org.apache.tinkerpop.gremlin.process.traversal.step.util -org.apache.tinkerpop.gremlin.process.traversal.traverser +org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration -org.apache.tinkerpop.gremlin.process.traversal.traverser.util +org.apache.tinkerpop.gremlin.process.traversal.traverser +org.apache.tinkerpop.gremlin.process.traversal.traverser.util + + + org.apache.tinkerpop.gremlin.process.traversal.util + + + + + +Classes in org.apache.tinkerpop.gremlin.process.traversal.traverser used by org.apache.tinkerpop.gremlin.process.computer + +Class and Description + + + +TraverserRequirement +A TraverserRequirement is a list of requirements that a Traversal requires of a Traverser. + + + + Modified: tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/process/traversal/util/class-use/Metrics.html URL: http://svn.apache.org/viewvc/tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/process/traversal/util/class-use/Metrics.html?rev=1761506=1761505=1761506=diff == --- tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/process/traversal/util/class-use/Metrics.html (original) +++ tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/process/traversal/util/class-use/Metrics.html Mon Sep 19 23:12:37 2016 @@ -2,10 +2,10 @@ - + Uses of Interface org.apache.tinkerpop.gremlin.process.traversal.util.Metrics (Apache TinkerPop 3.2.3-SNAPSHOT API) - + @@ -122,24 +122,24 @@ Metrics +DefaultTraversalMetrics.getMetrics(intindex) + + +Metrics TraversalMetrics.getMetrics(intstepIndex) Get an individual Metrics object by the index of the profiled Step. - + Metrics -DefaultTraversalMetrics.getMetrics(intindex) +DefaultTraversalMetrics.getMetrics(http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">Stringid) - + Metrics TraversalMetrics.getMetrics(http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">Stringid) Get an individual Metrics object by the id of the profiled Step. - -Metrics -DefaultTraversalMetrics.getMetrics(http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">Stringid) - Metrics Metrics.getNested(http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">StringmetricsId) Modified: tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/process/traversal/util/class-use/TraversalRing.html URL:
svn commit: r1761506 [15/29] - in /tinkerpop/site: docs/3.2.3-SNAPSHOT/ docs/3.2.3-SNAPSHOT/dev/developer/ docs/3.2.3-SNAPSHOT/dev/provider/ docs/3.2.3-SNAPSHOT/recipes/ docs/3.2.3-SNAPSHOT/reference/
Modified: tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/process/traversal/class-use/Traversal.html URL: http://svn.apache.org/viewvc/tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/process/traversal/class-use/Traversal.html?rev=1761506=1761505=1761506=diff == --- tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/process/traversal/class-use/Traversal.html (original) +++ tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/process/traversal/class-use/Traversal.html Mon Sep 19 23:12:37 2016 @@ -2,10 +2,10 @@ - + Uses of Interface org.apache.tinkerpop.gremlin.process.traversal.Traversal (Apache TinkerPop 3.2.3-SNAPSHOT API) - + @@ -368,15 +368,15 @@ GraphComputer.Exceptions.edgeFilterAccessesAdjacentVertices(TraversalVertex,EdgeedgeFilter) -Computer -Computer.edges(TraversalVertex,EdgeedgeFilter) - - GraphComputer GraphComputer.edges(TraversalVertex,EdgeedgeFilter) Add a filter that will limit which edges of the vertices are loaded from the graph source. + +Computer +Computer.edges(TraversalVertex,EdgeedgeFilter) + GraphComputer GraphComputerTest.BadGraphComputer.edges(TraversalVertex,EdgeedgeFilter) @@ -398,15 +398,15 @@ GraphComputer.Exceptions.vertexFilterAccessesIncidentEdges(TraversalVertex,VertexvertexFilter) -Computer -Computer.vertices(TraversalVertex,VertexvertexFilter) - - GraphComputer GraphComputer.vertices(TraversalVertex,VertexvertexFilter) Add a filter that will limit which vertices are loaded from the graph source. + +Computer +Computer.vertices(TraversalVertex,VertexvertexFilter) + GraphComputer GraphComputerTest.BadGraphComputer.vertices(TraversalVertex,VertexvertexFilter) @@ -1508,6 +1508,22 @@ WhereTest.Traversals.get_g_V_asXaX_out_asXbX_whereXin_count_isXeqX3XX_or_whereXoutXcreatedX_and_hasXlabel_personXXX_selectXa_bX() +abstract TraversalVertex,http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true; title="class or interface in java.util">Maphttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String,http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String +WhereTest.get_g_V_asXaX_outEXcreatedX_asXbX_inV_asXcX_inXcreatedX_asXdX_whereXa_ltXbX_orXgtXcXX_andXneqXdXXX_byXageX_byXweightX_byXinXcreatedX_valuesXageX_minX_selectXa_c_dX() + + +TraversalVertex,http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true; title="class or interface in java.util">Maphttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String,http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String +WhereTest.Traversals.get_g_V_asXaX_outEXcreatedX_asXbX_inV_asXcX_inXcreatedX_asXdX_whereXa_ltXbX_orXgtXcXX_andXneqXdXXX_byXageX_byXweightX_byXinXcreatedX_valuesXageX_minX_selectXa_c_dX() + + +abstract TraversalVertex,http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true; title="class or interface in java.util">Maphttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String,http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String +WhereTest.get_g_V_asXaX_outEXcreatedX_asXbX_inV_asXcX_whereXa_gtXbX_orXeqXbXXX_byXageX_byXweightX_byXweightX_selectXa_cX_byXnameX() + + +TraversalVertex,http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true; title="class or interface in java.util">Maphttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String,http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String +WhereTest.Traversals.get_g_V_asXaX_outEXcreatedX_asXbX_inV_asXcX_whereXa_gtXbX_orXeqXbXXX_byXageX_byXweightX_byXweightX_selectXa_cX_byXnameX() + + abstract TraversalVertex,http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true; title="class or interface in java.util">Maphttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String,http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true; title="class or interface in java.lang">Object WhereTest.get_g_V_asXaX_outXcreatedX_asXbX_inXcreatedX_asXcX_bothXknowsX_bothXknowsX_asXdX_whereXc__notXeqXaX_orXeqXd_selectXa_b_c_dX() @@ -1532,6 +1548,14 @@ WhereTest.Traversals.get_g_V_asXaX_outXcreatedX_asXbX_whereXandXasXbX_in__notXasXaX_outXcreatedX_hasXname_rippleXXX_selectXa_bX() +abstract
svn commit: r1761506 [19/29] - in /tinkerpop/site: docs/3.2.3-SNAPSHOT/ docs/3.2.3-SNAPSHOT/dev/developer/ docs/3.2.3-SNAPSHOT/dev/provider/ docs/3.2.3-SNAPSHOT/recipes/ docs/3.2.3-SNAPSHOT/reference/
Modified: tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WhereTest.Traversals.html URL: http://svn.apache.org/viewvc/tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WhereTest.Traversals.html?rev=1761506=1761505=1761506=diff == --- tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WhereTest.Traversals.html (original) +++ tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WhereTest.Traversals.html Mon Sep 19 23:12:37 2016 @@ -2,10 +2,10 @@ - + WhereTest.Traversals (Apache TinkerPop 3.2.3-SNAPSHOT API) - + @@ -19,7 +19,7 @@ catch(err) { } //--> -var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10}; +var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10}; var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -205,62 +205,74 @@ extends get_g_V_asXaX_out_asXbX_whereXin_count_isXeqX3XX_or_whereXoutXcreatedX_and_hasXlabel_personXXX_selectXa_bX() +TraversalVertex,http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true; title="class or interface in java.util">Maphttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String,http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String +get_g_V_asXaX_outEXcreatedX_asXbX_inV_asXcX_inXcreatedX_asXdX_whereXa_ltXbX_orXgtXcXX_andXneqXdXXX_byXageX_byXweightX_byXinXcreatedX_valuesXageX_minX_selectXa_c_dX() + + +TraversalVertex,http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true; title="class or interface in java.util">Maphttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String,http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String +get_g_V_asXaX_outEXcreatedX_asXbX_inV_asXcX_whereXa_gtXbX_orXeqXbXXX_byXageX_byXweightX_byXweightX_selectXa_cX_byXnameX() + + TraversalVertex,http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true; title="class or interface in java.util">Maphttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String,http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true; title="class or interface in java.lang">Object get_g_V_asXaX_outXcreatedX_asXbX_inXcreatedX_asXcX_bothXknowsX_bothXknowsX_asXdX_whereXc__notXeqXaX_orXeqXd_selectXa_b_c_dX() - + TraversalVertex,http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true; title="class or interface in java.util">Maphttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String,http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true; title="class or interface in java.lang">Object get_g_V_asXaX_outXcreatedX_asXbX_whereXandXasXbX_in__notXasXaX_outXcreatedX_hasXname_rippleXXX_selectXa_bX() - + +TraversalVertex,http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true; title="class or interface in java.util">Maphttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String,http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String +get_g_V_asXaX_outXcreatedX_inXcreatedX_asXbX_whereXa_gtXbXX_byXageX_selectXa_bX_byXnameX() + + TraversalVertex,http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true; title="class or interface in java.util">Maphttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String,http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true; title="class or interface in java.lang">Object get_g_V_hasXageX_asXaX_out_in_hasXageX_asXbX_selectXa_bX_whereXa_eqXbXX() - + TraversalVertex,http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true; title="class or interface in java.util">Maphttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String,http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true; title="class or
svn commit: r1761506 [25/29] - in /tinkerpop/site: docs/3.2.3-SNAPSHOT/ docs/3.2.3-SNAPSHOT/dev/developer/ docs/3.2.3-SNAPSHOT/dev/provider/ docs/3.2.3-SNAPSHOT/recipes/ docs/3.2.3-SNAPSHOT/reference/
Modified: tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/structure/class-use/Property.html URL: http://svn.apache.org/viewvc/tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/structure/class-use/Property.html?rev=1761506=1761505=1761506=diff == --- tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/structure/class-use/Property.html (original) +++ tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/structure/class-use/Property.html Mon Sep 19 23:12:37 2016 @@ -2,10 +2,10 @@ - + Uses of Interface org.apache.tinkerpop.gremlin.structure.Property (Apache TinkerPop 3.2.3-SNAPSHOT API) - + @@ -390,12 +390,12 @@ VPropertyV -MultiMetaNeo4jTrait.getProperty(Neo4jVertexPropertyvertexProperty, +Neo4jTrait.getProperty(Neo4jVertexPropertyvertexProperty, http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">Stringkey) VPropertyV -Neo4jTrait.getProperty(Neo4jVertexPropertyvertexProperty, +MultiMetaNeo4jTrait.getProperty(Neo4jVertexPropertyvertexProperty, http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">Stringkey) @@ -406,13 +406,13 @@ VPropertyV -MultiMetaNeo4jTrait.setProperty(Neo4jVertexPropertyvertexProperty, +Neo4jTrait.setProperty(Neo4jVertexPropertyvertexProperty, http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">Stringkey, Vvalue) VPropertyV -Neo4jTrait.setProperty(Neo4jVertexPropertyvertexProperty, +MultiMetaNeo4jTrait.setProperty(Neo4jVertexPropertyvertexProperty, http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">Stringkey, Vvalue) @@ -432,12 +432,12 @@ Vhttp://docs.oracle.com/javase/8/docs/api/java/util/Iterator.html?is-external=true; title="class or interface in java.util">IteratorPropertyV -MultiMetaNeo4jTrait.getProperties(Neo4jVertexPropertyvertexProperty, +Neo4jTrait.getProperties(Neo4jVertexPropertyvertexProperty, http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String...keys) Vhttp://docs.oracle.com/javase/8/docs/api/java/util/Iterator.html?is-external=true; title="class or interface in java.util">IteratorPropertyV -Neo4jTrait.getProperties(Neo4jVertexPropertyvertexProperty, +MultiMetaNeo4jTrait.getProperties(Neo4jVertexPropertyvertexProperty, http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String...keys) @@ -573,13 +573,13 @@ -protected E -PropertyValueStep.map(Traverser.AdminPropertyEtraverser) - - protected Element PropertyElementStep.map(Traverser.AdminPropertyEtraverser) + +protected E +PropertyValueStep.map(Traverser.AdminPropertyEtraverser) + protected http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String PropertyKeyStep.map(Traverser.AdminPropertytraverser) @@ -622,38 +622,31 @@ void -ConsoleMutationListener.edgePropertyChanged(Edgeelement, - PropertyoldValue, - http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true; title="class or interface in java.lang">ObjectsetValue) - - -void MutationListener.edgePropertyChanged(Edgeelement, PropertyoldValue, http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true; title="class or interface in java.lang">ObjectsetValue) Raised after the property of a Edge changed. - + void -ConsoleMutationListener.edgePropertyRemoved(Edgeelement, - PropertyremovedValue) +ConsoleMutationListener.edgePropertyChanged(Edgeelement, + PropertyoldValue, + http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true; title="class or interface in java.lang">ObjectsetValue) - + void MutationListener.edgePropertyRemoved(Edgeelement, Propertyproperty) Raised after an Property property was removed from an Edge. - + void -ConsoleMutationListener.vertexPropertyChanged(Vertexelement, - PropertyoldValue, - http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true; title="class or interface in java.lang">ObjectsetValue, - http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true; title="class or interface in java.lang">Object...vertexPropertyKeyValues)
svn commit: r1761506 [29/29] - in /tinkerpop/site: docs/3.2.3-SNAPSHOT/ docs/3.2.3-SNAPSHOT/dev/developer/ docs/3.2.3-SNAPSHOT/dev/provider/ docs/3.2.3-SNAPSHOT/recipes/ docs/3.2.3-SNAPSHOT/reference/
Modified: tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/overview-tree.html URL: http://svn.apache.org/viewvc/tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/overview-tree.html?rev=1761506=1761505=1761506=diff == --- tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/overview-tree.html (original) +++ tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/overview-tree.html Mon Sep 19 23:12:37 2016 @@ -2,10 +2,10 @@ - + Class Hierarchy (Apache TinkerPop 3.2.3-SNAPSHOT API) - + @@ -897,7 +897,7 @@ org.apache.tinkerpop.gremlin.process.traversal.step.filter.SimplePathStepS org.apache.tinkerpop.gremlin.process.traversal.step.filter.TimeLimitStepS org.apache.tinkerpop.gremlin.process.traversal.step.filter.TraversalFilterStepS (implements org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent) -org.apache.tinkerpop.gremlin.process.traversal.step.filter.WherePredicateStepS (implements org.apache.tinkerpop.gremlin.process.traversal.step.PathProcessor, org.apache.tinkerpop.gremlin.process.traversal.step.Scoping) +org.apache.tinkerpop.gremlin.process.traversal.step.filter.WherePredicateStepS (implements org.apache.tinkerpop.gremlin.process.traversal.step.ByModulating, org.apache.tinkerpop.gremlin.process.traversal.step.PathProcessor, org.apache.tinkerpop.gremlin.process.traversal.step.Scoping, org.apache.t inkerpop.gremlin.process.traversal.step.TraversalParent) org.apache.tinkerpop.gremlin.process.traversal.step.filter.WhereTraversalStepS (implements org.apache.tinkerpop.gremlin.process.traversal.step.PathProcessor, org.apache.tinkerpop.gremlin.process.traversal.step.Scoping, org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent) org.apache.tinkerpop.gremlin.process.traversal.step.filter.WhereTraversalStep.WhereEndStep (implements org.apache.tinkerpop.gremlin.process.traversal.step.Scoping) @@ -1123,17 +1123,17 @@ org.apache.tinkerpop.gremlin.util.function.ChainedComparatorS,C (implements java.util.http://docs.oracle.com/javase/8/docs/api/java/util/Comparator.html?is-external=true; title="class or interface in java.util">ComparatorT, java.io.http://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true; title="class or interface in java.io">Serializable) ChannelInboundHandlerAdapter -org.apache.tinkerpop.gremlin.server.handler.SaslAuthenticationHandler +org.apache.tinkerpop.gremlin.server.handler.HttpBasicAuthenticationHandler ChannelInboundHandlerAdapter -org.apache.tinkerpop.gremlin.server.handler.HttpGremlinEndpointHandler +org.apache.tinkerpop.gremlin.server.handler.SaslAuthenticationHandler ChannelInboundHandlerAdapter -org.apache.tinkerpop.gremlin.server.handler.HttpBasicAuthenticationHandler +org.apache.tinkerpop.gremlin.server.handler.HttpGremlinEndpointHandler ChannelOutboundHandlerAdapter @@ -1695,12 +1695,12 @@ SimpleModule -org.apache.tinkerpop.gremlin.driver.ser.AbstractGraphSONMessageSerializerV1d0.GremlinServerModule +org.apache.tinkerpop.gremlin.driver.ser.AbstractGraphSONMessageSerializerV2d0.GremlinServerModule SimpleModule -org.apache.tinkerpop.gremlin.driver.ser.AbstractGraphSONMessageSerializerV2d0.GremlinServerModule +org.apache.tinkerpop.gremlin.driver.ser.AbstractGraphSONMessageSerializerV1d0.GremlinServerModule org.apache.tinkerpop.gremlin.jsr223.SingleGremlinScriptEngineManager @@ -2413,22 +2413,22 @@ Annotation Type Hierarchy -org.apache.tinkerpop.gremlin.structure.util.FeatureDescriptor (implements java.lang.annotation.http://docs.oracle.com/javase/8/docs/api/java/lang/annotation/Annotation.html?is-external=true; title="class or interface in java.lang.annotation">Annotation) -org.apache.tinkerpop.gremlin.structure.util.GraphFactoryClass (implements java.lang.annotation.http://docs.oracle.com/javase/8/docs/api/java/lang/annotation/Annotation.html?is-external=true; title="class or interface in java.lang.annotation">Annotation) org.apache.tinkerpop.gremlin.structure.Graph.OptIn (implements java.lang.annotation.http://docs.oracle.com/javase/8/docs/api/java/lang/annotation/Annotation.html?is-external=true; title="class or interface in java.lang.annotation">Annotation) org.apache.tinkerpop.gremlin.structure.Graph.OptIns (implements java.lang.annotation.http://docs.oracle.com/javase/8/docs/api/java/lang/annotation/Annotation.html?is-external=true; title="class or interface in java.lang.annotation">Annotation) org.apache.tinkerpop.gremlin.structure.Graph.OptOut (implements java.lang.annotation.http://docs.oracle.com/javase/8/docs/api/java/lang/annotation/Annotation.html?is-external=true; title="class or interface in java.lang.annotation">Annotation) org.apache.tinkerpop.gremlin.structure.Graph.OptOuts (implements java.lang.annotation.http://docs.oracle.com/javase/8/docs/api/java/lang/annotation/Annotation.html?is-external=true; title="class or interface in java.lang.annotation">Annotation)
svn commit: r1761506 [9/29] - in /tinkerpop/site: docs/3.2.3-SNAPSHOT/ docs/3.2.3-SNAPSHOT/dev/developer/ docs/3.2.3-SNAPSHOT/dev/provider/ docs/3.2.3-SNAPSHOT/recipes/ docs/3.2.3-SNAPSHOT/reference/
Modified: tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/driver/ser/package-tree.html URL: http://svn.apache.org/viewvc/tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/driver/ser/package-tree.html?rev=1761506=1761505=1761506=diff == --- tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/driver/ser/package-tree.html (original) +++ tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/driver/ser/package-tree.html Mon Sep 19 23:12:37 2016 @@ -2,10 +2,10 @@ - + org.apache.tinkerpop.gremlin.driver.ser Class Hierarchy (Apache TinkerPop 3.2.3-SNAPSHOT API) - + @@ -116,12 +116,12 @@ org.apache.tinkerpop.gremlin.driver.ser.SerTokens SimpleModule -org.apache.tinkerpop.gremlin.driver.ser.AbstractGraphSONMessageSerializerV1d0.GremlinServerModule +org.apache.tinkerpop.gremlin.driver.ser.AbstractGraphSONMessageSerializerV2d0.GremlinServerModule SimpleModule -org.apache.tinkerpop.gremlin.driver.ser.AbstractGraphSONMessageSerializerV2d0.GremlinServerModule +org.apache.tinkerpop.gremlin.driver.ser.AbstractGraphSONMessageSerializerV1d0.GremlinServerModule java.lang.http://docs.oracle.com/javase/8/docs/api/java/lang/Throwable.html?is-external=true; title="class or interface in java.lang">Throwable (implements java.io.http://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true; title="class or interface in java.io">Serializable) Modified: tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/groovy/plugin/class-use/GremlinPlugin.html URL: http://svn.apache.org/viewvc/tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/groovy/plugin/class-use/GremlinPlugin.html?rev=1761506=1761505=1761506=diff == --- tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/groovy/plugin/class-use/GremlinPlugin.html (original) +++ tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/groovy/plugin/class-use/GremlinPlugin.html Mon Sep 19 23:12:37 2016 @@ -2,10 +2,10 @@ - + Uses of Interface org.apache.tinkerpop.gremlin.groovy.plugin.GremlinPlugin (Apache TinkerPop 3.2.3-SNAPSHOT API) - + @@ -192,7 +192,7 @@ http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true; title="class or interface in java.util">ListGremlinPlugin -DependencyManager.use(http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">Stringgroup, +GremlinGroovyScriptEngine.use(http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">Stringgroup, http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">Stringartifact, http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">Stringversion) Take maven coordinates and load the classes into the classloader used by the ScriptEngine. @@ -200,7 +200,7 @@ http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true; title="class or interface in java.util">ListGremlinPlugin -GremlinGroovyScriptEngine.use(http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">Stringgroup, +DependencyManager.use(http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">Stringgroup, http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">Stringartifact, http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">Stringversion) Take maven coordinates and load the classes into the classloader used by the ScriptEngine. @@ -217,13 +217,13 @@ void -DependencyManager.loadPlugins(http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true; title="class or interface in java.util">ListGremlinPluginplugins) +GremlinGroovyScriptEngine.loadPlugins(http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true; title="class or interface in java.util">ListGremlinPluginplugins) Load a list of GremlinPlugin instances. void -GremlinGroovyScriptEngine.loadPlugins(http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true; title="class or interface in java.util">ListGremlinPluginplugins) +DependencyManager.loadPlugins(http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true; title="class or interface in java.util">ListGremlinPluginplugins) Load a list of GremlinPlugin instances. Modified:
svn commit: r1761506 [4/29] - in /tinkerpop/site: docs/3.2.3-SNAPSHOT/ docs/3.2.3-SNAPSHOT/dev/developer/ docs/3.2.3-SNAPSHOT/dev/provider/ docs/3.2.3-SNAPSHOT/recipes/ docs/3.2.3-SNAPSHOT/reference/
Modified: tinkerpop/site/javadocs/3.2.3-SNAPSHOT/core/org/apache/tinkerpop/gremlin/process/computer/VertexProgram.html URL: http://svn.apache.org/viewvc/tinkerpop/site/javadocs/3.2.3-SNAPSHOT/core/org/apache/tinkerpop/gremlin/process/computer/VertexProgram.html?rev=1761506=1761505=1761506=diff == --- tinkerpop/site/javadocs/3.2.3-SNAPSHOT/core/org/apache/tinkerpop/gremlin/process/computer/VertexProgram.html (original) +++ tinkerpop/site/javadocs/3.2.3-SNAPSHOT/core/org/apache/tinkerpop/gremlin/process/computer/VertexProgram.html Mon Sep 19 23:12:37 2016 @@ -2,10 +2,10 @@ - + VertexProgram (Apache TinkerPop 3.2.3-SNAPSHOT API) - + @@ -19,7 +19,7 @@ catch(err) { } //--> -var methods = {"i0":6,"i1":17,"i2":6,"i3":18,"i4":18,"i5":18,"i6":18,"i7":6,"i8":6,"i9":6,"i10":18,"i11":18,"i12":6,"i13":18,"i14":6,"i15":18,"i16":18}; +var methods = {"i0":6,"i1":17,"i2":6,"i3":18,"i4":18,"i5":18,"i6":18,"i7":6,"i8":6,"i9":6,"i10":18,"i11":18,"i12":18,"i13":6,"i14":18,"i15":6,"i16":18,"i17":18}; var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],16:["t5","Default Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -243,44 +243,50 @@ extends http://docs.oracle.com/ getPreferredResultGraph() +default http://docs.oracle.com/javase/8/docs/api/java/util/Set.html?is-external=true; title="class or interface in java.util">Setorg.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement +getTraverserRequirements() +The traverser requirements that are needed when this VP is used as part of a traversal. + + + default http://docs.oracle.com/javase/8/docs/api/java/util/Set.html?is-external=true; title="class or interface in java.util">SetVertexComputeKey getVertexComputeKeys() The Element properties that will be mutated during the computation. - + default void loadState(Graphgraph, org.apache.commons.configuration.Configurationconfiguration) When it is necessary to load the state of the VertexProgram, this method is called. - + void setup(Memorymemory) The method is called at the beginning of the computation. - + default void storeState(org.apache.commons.configuration.Configurationconfiguration) When it is necessary to store the state of the VertexProgram, this method is called. - + boolean terminate(Memorymemory) The method is called at the end of each iteration to determine if the computation is complete. - + default void workerIterationEnd(Memorymemory) This method is called at the end of each iteration of each "computational chunk." The set of vertices in the graph are typically not processed with full parallelism. - + default void workerIterationStart(Memorymemory) This method is called at the start of each iteration of each "computational chunk." @@ -533,6 +539,21 @@ extends http://docs.oracle.com/ + + + + + +getTraverserRequirements +defaulthttp://docs.oracle.com/javase/8/docs/api/java/util/Set.html?is-external=true; title="class or interface in java.util">Setorg.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirementgetTraverserRequirements() +The traverser requirements that are needed when this VP is used as part of a traversal. + The default is an empty set. + +Returns: +the traverser requirements + + + Modified: tinkerpop/site/javadocs/3.2.3-SNAPSHOT/core/org/apache/tinkerpop/gremlin/process/computer/class-use/GraphComputer.Persist.html URL: http://svn.apache.org/viewvc/tinkerpop/site/javadocs/3.2.3-SNAPSHOT/core/org/apache/tinkerpop/gremlin/process/computer/class-use/GraphComputer.Persist.html?rev=1761506=1761505=1761506=diff == --- tinkerpop/site/javadocs/3.2.3-SNAPSHOT/core/org/apache/tinkerpop/gremlin/process/computer/class-use/GraphComputer.Persist.html (original) +++ tinkerpop/site/javadocs/3.2.3-SNAPSHOT/core/org/apache/tinkerpop/gremlin/process/computer/class-use/GraphComputer.Persist.html Mon Sep 19 23:12:37 2016 @@ -2,10 +2,10 @@ - + Uses of Class org.apache.tinkerpop.gremlin.process.computer.GraphComputer.Persist (Apache TinkerPop 3.2.3-SNAPSHOT API) - + @@ -146,15 +146,15 @@ the order they are declared. -Computer -Computer.persist(GraphComputer.Persistpersist) - - GraphComputer GraphComputer.persist(GraphComputer.Persistpersist) Set the GraphComputer.Persist level of the computation. + +Computer +Computer.persist(GraphComputer.Persistpersist) + static http://docs.oracle.com/javase/8/docs/api/java/lang/IllegalArgumentException.html?is-external=true; title="class or interface in java.lang">IllegalArgumentException GraphComputer.Exceptions.resultGraphPersistCombinationNotSupported(GraphComputer.ResultGraphresultGraph, Modified:
svn commit: r1761506 [17/29] - in /tinkerpop/site: docs/3.2.3-SNAPSHOT/ docs/3.2.3-SNAPSHOT/dev/developer/ docs/3.2.3-SNAPSHOT/dev/provider/ docs/3.2.3-SNAPSHOT/recipes/ docs/3.2.3-SNAPSHOT/reference/
Modified: tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/process/traversal/class-use/TraverserGenerator.html URL: http://svn.apache.org/viewvc/tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/process/traversal/class-use/TraverserGenerator.html?rev=1761506=1761505=1761506=diff == --- tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/process/traversal/class-use/TraverserGenerator.html (original) +++ tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/process/traversal/class-use/TraverserGenerator.html Mon Sep 19 23:12:37 2016 @@ -2,10 +2,10 @@ - + Uses of Interface org.apache.tinkerpop.gremlin.process.traversal.TraverserGenerator (Apache TinkerPop 3.2.3-SNAPSHOT API) - + @@ -267,11 +267,11 @@ TraverserGenerator -EmptyTraversal.getTraverserGenerator() +DefaultTraversal.getTraverserGenerator() TraverserGenerator -DefaultTraversal.getTraverserGenerator() +EmptyTraversal.getTraverserGenerator() Modified: tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/class-use/GraphTraversal.Admin.html URL: http://svn.apache.org/viewvc/tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/class-use/GraphTraversal.Admin.html?rev=1761506=1761505=1761506=diff == --- tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/class-use/GraphTraversal.Admin.html (original) +++ tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/class-use/GraphTraversal.Admin.html Mon Sep 19 23:12:37 2016 @@ -2,10 +2,10 @@ - + Uses of Interface org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal.Admin (Apache TinkerPop 3.2.3-SNAPSHOT API) - + @@ -121,13 +121,13 @@ GraphTraversal.Admin.addStep(Step?,E2step) -GraphTraversal.AdminS,E -DefaultGraphTraversal.asAdmin() - - default GraphTraversal.AdminS,E GraphTraversal.asAdmin() + +GraphTraversal.AdminS,E +DefaultGraphTraversal.asAdmin() + GraphTraversal.AdminS,E GraphTraversal.Admin.clone() Modified: tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/class-use/GraphTraversal.html URL: http://svn.apache.org/viewvc/tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/class-use/GraphTraversal.html?rev=1761506=1761505=1761506=diff == --- tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/class-use/GraphTraversal.html (original) +++ tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/class-use/GraphTraversal.html Mon Sep 19 23:12:37 2016 @@ -2,10 +2,10 @@ - + Uses of Interface org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal (Apache TinkerPop 3.2.3-SNAPSHOT API) - + @@ -294,30 +294,30 @@ -GraphTraversalVertex,Vertex -GraphTraversalSource.addV() - - default GraphTraversalS,Vertex GraphTraversal.addV() + +GraphTraversalVertex,Vertex +GraphTraversalSource.addV() + static AGraphTraversalA,Vertex __.addV() -GraphTraversalVertex,Vertex -GraphTraversalSource.addV(http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true; title="class or interface in java.lang">Object...keyValues) +default GraphTraversalS,Vertex +GraphTraversal.addV(http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true; title="class or interface in java.lang">Object...propertyKeyValues) Deprecated. -As of release 3.1.0, replaced by GraphTraversalSource.addV() +As of release 3.1.0, replaced by addV() -default GraphTraversalS,Vertex -GraphTraversal.addV(http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true; title="class or interface in java.lang">Object...propertyKeyValues) +GraphTraversalVertex,Vertex +GraphTraversalSource.addV(http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true; title="class or interface in java.lang">Object...keyValues) Deprecated. -As of release 3.1.0, replaced by addV() +As of release 3.1.0, replaced by GraphTraversalSource.addV() @@ -328,13 +328,13 @@ -GraphTraversalVertex,Vertex -GraphTraversalSource.addV(http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">Stringlabel) - - default GraphTraversalS,Vertex GraphTraversal.addV(http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">StringvertexLabel) +
svn commit: r1761506 [27/29] - in /tinkerpop/site: docs/3.2.3-SNAPSHOT/ docs/3.2.3-SNAPSHOT/dev/developer/ docs/3.2.3-SNAPSHOT/dev/provider/ docs/3.2.3-SNAPSHOT/recipes/ docs/3.2.3-SNAPSHOT/reference/
Modified: tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/structure/class-use/VertexProperty.Cardinality.html URL: http://svn.apache.org/viewvc/tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/structure/class-use/VertexProperty.Cardinality.html?rev=1761506=1761505=1761506=diff == --- tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/structure/class-use/VertexProperty.Cardinality.html (original) +++ tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/structure/class-use/VertexProperty.Cardinality.html Mon Sep 19 23:12:37 2016 @@ -2,10 +2,10 @@ - + Uses of Class org.apache.tinkerpop.gremlin.structure.VertexProperty.Cardinality (Apache TinkerPop 3.2.3-SNAPSHOT API) - + @@ -212,11 +212,11 @@ VertexProperty.Cardinality -MultiMetaNeo4jTrait.getCardinality(http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">Stringkey) +Neo4jTrait.getCardinality(http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">Stringkey) VertexProperty.Cardinality -Neo4jTrait.getCardinality(http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">Stringkey) +MultiMetaNeo4jTrait.getCardinality(http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">Stringkey) @@ -237,7 +237,7 @@ VVertexPropertyV -MultiMetaNeo4jTrait.setVertexProperty(Neo4jVertexvertex, +Neo4jTrait.setVertexProperty(Neo4jVertexvertex, VertexProperty.Cardinalitycardinality, http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">Stringkey, Vvalue, @@ -245,7 +245,7 @@ VVertexPropertyV -Neo4jTrait.setVertexProperty(Neo4jVertexvertex, +MultiMetaNeo4jTrait.setVertexProperty(Neo4jVertexvertex, VertexProperty.Cardinalitycardinality, http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">Stringkey, Vvalue, Modified: tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/structure/class-use/VertexProperty.html URL: http://svn.apache.org/viewvc/tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/structure/class-use/VertexProperty.html?rev=1761506=1761505=1761506=diff == --- tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/structure/class-use/VertexProperty.html (original) +++ tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/structure/class-use/VertexProperty.html Mon Sep 19 23:12:37 2016 @@ -2,10 +2,10 @@ - + Uses of Interface org.apache.tinkerpop.gremlin.structure.VertexProperty (Apache TinkerPop 3.2.3-SNAPSHOT API) - + @@ -395,12 +395,12 @@ VVertexPropertyV -MultiMetaNeo4jTrait.getVertexProperty(Neo4jVertexvertex, +Neo4jTrait.getVertexProperty(Neo4jVertexvertex, http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">Stringkey) VVertexPropertyV -Neo4jTrait.getVertexProperty(Neo4jVertexvertex, +MultiMetaNeo4jTrait.getVertexProperty(Neo4jVertexvertex, http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">Stringkey) @@ -413,7 +413,7 @@ VVertexPropertyV -MultiMetaNeo4jTrait.setVertexProperty(Neo4jVertexvertex, +Neo4jTrait.setVertexProperty(Neo4jVertexvertex, VertexProperty.Cardinalitycardinality, http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">Stringkey, Vvalue, @@ -421,7 +421,7 @@ VVertexPropertyV -Neo4jTrait.setVertexProperty(Neo4jVertexvertex, +MultiMetaNeo4jTrait.setVertexProperty(Neo4jVertexvertex, VertexProperty.Cardinalitycardinality, http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">Stringkey, Vvalue, @@ -443,12 +443,12 @@ Vhttp://docs.oracle.com/javase/8/docs/api/java/util/Iterator.html?is-external=true; title="class or interface in java.util">IteratorVertexPropertyV -MultiMetaNeo4jTrait.getVertexProperties(Neo4jVertexvertex, +Neo4jTrait.getVertexProperties(Neo4jVertexvertex, http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String...keys)
svn commit: r1761506 [6/29] - in /tinkerpop/site: docs/3.2.3-SNAPSHOT/ docs/3.2.3-SNAPSHOT/dev/developer/ docs/3.2.3-SNAPSHOT/dev/provider/ docs/3.2.3-SNAPSHOT/recipes/ docs/3.2.3-SNAPSHOT/reference/
Modified: tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/index-all.html URL: http://svn.apache.org/viewvc/tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/index-all.html?rev=1761506=1761505=1761506=diff == --- tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/index-all.html (original) +++ tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/index-all.html Mon Sep 19 23:12:37 2016 @@ -2,10 +2,10 @@ - + Index (Apache TinkerPop 3.2.3-SNAPSHOT API) - + @@ -85,7 +85,7 @@ AbstractChannelizer - Class in org.apache.tinkerpop.gremlin.server -A base implementation for the Channelizer which does a basic configuration of the the pipeline, one that +A base implementation for the Channelizer which does a basic configuration of the pipeline, one that is generally common to virtually any Gremlin Server operation (i.e. AbstractChannelizer() - Constructor for class org.apache.tinkerpop.gremlin.server.AbstractChannelizer @@ -316,6 +316,8 @@ Performs this operation on the given arguments. +acceptingRequests() - Method in class org.apache.tinkerpop.gremlin.server.op.session.Session + ACTIVE_TRAVERSERS - Static variable in class org.apache.tinkerpop.gremlin.process.computer.traversal.TraversalVertexProgram add(Object...) - Method in class org.apache.tinkerpop.gremlin.driver.message.RequestMessage.Builder @@ -2761,7 +2763,7 @@ close() - Method in class org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jGraph -This implementation of close will also close the current transaction on the the thread, but it +This implementation of close will also close the current transaction on the thread, but it is up to the caller to deal with dangling transactions in other threads prior to calling this method. close() - Method in interface org.apache.tinkerpop.gremlin.process.computer.ComputerResult @@ -6522,6 +6524,10 @@ g_V_asXaX_out_out_mapXa_name_it_nameX() - Method in class org.apache.tinkerpop.gremlin.process.traversal.step.map.MapTest +g_V_asXaX_outEXcreatedX_asXbX_inV_asXcX_inXcreatedX_asXdX_whereXa_ltXbX_orXgtXcXX_andXneqXdXXX_byXageX_byXweightX_byXinXcreatedX_valuesXageX_minX_selectXa_c_dX() - Method in class org.apache.tinkerpop.gremlin.process.traversal.step.filter.WhereTest + +g_V_asXaX_outEXcreatedX_asXbX_inV_asXcX_whereXa_gtXbX_orXeqXbXXX_byXageX_byXweightX_byXweightX_selectXa_cX_byXnameX() - Method in class org.apache.tinkerpop.gremlin.process.traversal.step.filter.WhereTest + g_V_asXaX_outXcreatedX_asXbX_inXcreatedX_asXcX_bothXknowsX_bothXknowsX_asXdX_whereXc__notXeqXaX_orXeqXd_selectXa_b_c_dX() - Method in class org.apache.tinkerpop.gremlin.process.traversal.step.filter.WhereTest g_V_asXaX_outXcreatedX_asXbX_inXcreatedX_asXcX_dedupXa_bX_path() - Method in class org.apache.tinkerpop.gremlin.process.traversal.step.filter.DedupTest @@ -6530,6 +6536,8 @@ g_V_asXaX_outXcreatedX_asXbX_whereXandXasXbX_in__notXasXaX_outXcreatedX_hasXname_rippleXXX_selectXa_bX() - Method in class org.apache.tinkerpop.gremlin.process.traversal.step.filter.WhereTest +g_V_asXaX_outXcreatedX_inXcreatedX_asXbX_whereXa_gtXbXX_byXageX_selectXa_bX_byXnameX() - Method in class org.apache.tinkerpop.gremlin.process.traversal.step.filter.WhereTest + g_V_asXaX_outXcreatedX_inXcreatedX_whereXneqXaXX_asXbX_addEXcodeveloperX_fromXaX_toXbX_propertyXyear_2009X() - Method in class org.apache.tinkerpop.gremlin.process.traversal.step.map.AddEdgeTest g_V_asXaX_outXcreatedX_inXcreatedX_whereXneqXaXX_asXbX_selectXa_bX_addInEXa_codeveloper_b_year_2009X() - Method in class org.apache.tinkerpop.gremlin.process.traversal.step.map.AddEdgeTest @@ -8008,6 +8016,14 @@ get_g_V_asXaX_out_asXbX_whereXin_count_isXeqX3XX_or_whereXoutXcreatedX_and_hasXlabel_personXXX_selectXa_bX() - Method in class org.apache.tinkerpop.gremlin.process.traversal.step.filter.WhereTest.Traversals +get_g_V_asXaX_outEXcreatedX_asXbX_inV_asXcX_inXcreatedX_asXdX_whereXa_ltXbX_orXgtXcXX_andXneqXdXXX_byXageX_byXweightX_byXinXcreatedX_valuesXageX_minX_selectXa_c_dX() - Method in class org.apache.tinkerpop.gremlin.process.traversal.step.filter.WhereTest + +get_g_V_asXaX_outEXcreatedX_asXbX_inV_asXcX_inXcreatedX_asXdX_whereXa_ltXbX_orXgtXcXX_andXneqXdXXX_byXageX_byXweightX_byXinXcreatedX_valuesXageX_minX_selectXa_c_dX() - Method in class org.apache.tinkerpop.gremlin.process.traversal.step.filter.WhereTest.Traversals + +get_g_V_asXaX_outEXcreatedX_asXbX_inV_asXcX_whereXa_gtXbX_orXeqXbXXX_byXageX_byXweightX_byXweightX_selectXa_cX_byXnameX() - Method in class org.apache.tinkerpop.gremlin.process.traversal.step.filter.WhereTest + +get_g_V_asXaX_outEXcreatedX_asXbX_inV_asXcX_whereXa_gtXbX_orXeqXbXXX_byXageX_byXweightX_byXweightX_selectXa_cX_byXnameX() - Method in class org.apache.tinkerpop.gremlin.process.traversal.step.filter.WhereTest.Traversals +
svn commit: r1761506 [20/29] - in /tinkerpop/site: docs/3.2.3-SNAPSHOT/ docs/3.2.3-SNAPSHOT/dev/developer/ docs/3.2.3-SNAPSHOT/dev/provider/ docs/3.2.3-SNAPSHOT/recipes/ docs/3.2.3-SNAPSHOT/reference/
Modified: tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/process/traversal/step/filter/package-tree.html URL: http://svn.apache.org/viewvc/tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/process/traversal/step/filter/package-tree.html?rev=1761506=1761505=1761506=diff == --- tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/process/traversal/step/filter/package-tree.html (original) +++ tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/process/traversal/step/filter/package-tree.html Mon Sep 19 23:12:37 2016 @@ -2,10 +2,10 @@ - + org.apache.tinkerpop.gremlin.process.traversal.step.filter Class Hierarchy (Apache TinkerPop 3.2.3-SNAPSHOT API) - + @@ -187,7 +187,7 @@ org.apache.tinkerpop.gremlin.process.traversal.step.filter.SimplePathStepS org.apache.tinkerpop.gremlin.process.traversal.step.filter.TimeLimitStepS org.apache.tinkerpop.gremlin.process.traversal.step.filter.TraversalFilterStepS (implements org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent) -org.apache.tinkerpop.gremlin.process.traversal.step.filter.WherePredicateStepS (implements org.apache.tinkerpop.gremlin.process.traversal.step.PathProcessor, org.apache.tinkerpop.gremlin.process.traversal.step.Scoping) +org.apache.tinkerpop.gremlin.process.traversal.step.filter.WherePredicateStepS (implements org.apache.tinkerpop.gremlin.process.traversal.step.ByModulating, org.apache.tinkerpop.gremlin.process.traversal.step.PathProcessor, org.apache.tinkerpop.gremlin.process.traversal.step.Scoping, org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent) org.apache.tinkerpop.gremlin.process.traversal.step.filter.WhereTraversalStepS (implements org.apache.tinkerpop.gremlin.process.traversal.step.PathProcessor, org.apache.tinkerpop.gremlin.process.traversal.step.Scoping, org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent) org.apache.tinkerpop.gremlin.process.traversal.step.filter.WhereTraversalStep.WhereEndStep (implements org.apache.tinkerpop.gremlin.process.traversal.step.Scoping) Modified: tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/process/traversal/step/map/ProgramTest.TestProgram.html URL: http://svn.apache.org/viewvc/tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/process/traversal/step/map/ProgramTest.TestProgram.html?rev=1761506=1761505=1761506=diff == --- tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/process/traversal/step/map/ProgramTest.TestProgram.html (original) +++ tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/process/traversal/step/map/ProgramTest.TestProgram.html Mon Sep 19 23:12:37 2016 @@ -2,10 +2,10 @@ - + ProgramTest.TestProgram (Apache TinkerPop 3.2.3-SNAPSHOT API) - + @@ -278,7 +278,7 @@ implements VertexProgram -createVertexProgram, getFeatures, getMapReducers, getMessageCombiner +createVertexProgram, getFeatures, getMapReducers, getMessageCombiner, getTraverserRequirements Modified: tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/process/traversal/step/package-tree.html URL: http://svn.apache.org/viewvc/tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/process/traversal/step/package-tree.html?rev=1761506=1761505=1761506=diff == --- tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/process/traversal/step/package-tree.html (original) +++ tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/process/traversal/step/package-tree.html Mon Sep 19 23:12:37 2016 @@ -2,10 +2,10 @@ - + org.apache.tinkerpop.gremlin.process.traversal.step Class Hierarchy (Apache TinkerPop 3.2.3-SNAPSHOT API) - + @@ -119,9 +119,9 @@ java.lang.http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true; title="class or interface in java.lang">EnumE (implements java.lang.http://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true; title="class or interface in java.lang">ComparableT, java.io.http://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true; title="class or interface in java.io">Serializable) +org.apache.tinkerpop.gremlin.process.traversal.step.PathProcessor.ElementRequirement org.apache.tinkerpop.gremlin.process.traversal.step.Scoping.Variable org.apache.tinkerpop.gremlin.process.traversal.step.TraversalOptionParent.Pick -org.apache.tinkerpop.gremlin.process.traversal.step.PathProcessor.ElementRequirement Modified:
svn commit: r1761506 [23/29] - in /tinkerpop/site: docs/3.2.3-SNAPSHOT/ docs/3.2.3-SNAPSHOT/dev/developer/ docs/3.2.3-SNAPSHOT/dev/provider/ docs/3.2.3-SNAPSHOT/recipes/ docs/3.2.3-SNAPSHOT/reference/
Modified: tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/structure/class-use/Edge.html URL: http://svn.apache.org/viewvc/tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/structure/class-use/Edge.html?rev=1761506=1761505=1761506=diff == --- tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/structure/class-use/Edge.html (original) +++ tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/structure/class-use/Edge.html Mon Sep 19 23:12:37 2016 @@ -2,10 +2,10 @@ - + Uses of Interface org.apache.tinkerpop.gremlin.structure.Edge (Apache TinkerPop 3.2.3-SNAPSHOT API) - + @@ -612,15 +612,15 @@ GraphComputer.Exceptions.edgeFilterAccessesAdjacentVertices(TraversalVertex,EdgeedgeFilter) -Computer -Computer.edges(TraversalVertex,EdgeedgeFilter) - - GraphComputer GraphComputer.edges(TraversalVertex,EdgeedgeFilter) Add a filter that will limit which edges of the vertices are loaded from the graph source. + +Computer +Computer.edges(TraversalVertex,EdgeedgeFilter) + GraphComputer GraphComputerTest.BadGraphComputer.edges(TraversalVertex,EdgeedgeFilter) @@ -671,17 +671,17 @@ Edge -OneTimeBulkLoader.getOrCreateEdge(Edgeedge, +BulkLoader.getOrCreateEdge(Edgeedge, VertexoutVertex, VertexinVertex, Graphgraph, GraphTraversalSourceg) -Creates a clone of the given edge between the given in- and out-vertices. +Gets or creates a clone of the given edge between the given in- and out-vertices. Edge -BulkLoader.getOrCreateEdge(Edgeedge, +IncrementalBulkLoader.getOrCreateEdge(Edgeedge, VertexoutVertex, VertexinVertex, Graphgraph, @@ -691,12 +691,12 @@ Edge -IncrementalBulkLoader.getOrCreateEdge(Edgeedge, +OneTimeBulkLoader.getOrCreateEdge(Edgeedge, VertexoutVertex, VertexinVertex, Graphgraph, GraphTraversalSourceg) -Gets or creates a clone of the given edge between the given in- and out-vertices. +Creates a clone of the given edge between the given in- and out-vertices. @@ -720,17 +720,17 @@ Edge -OneTimeBulkLoader.getOrCreateEdge(Edgeedge, +BulkLoader.getOrCreateEdge(Edgeedge, VertexoutVertex, VertexinVertex, Graphgraph, GraphTraversalSourceg) -Creates a clone of the given edge between the given in- and out-vertices. +Gets or creates a clone of the given edge between the given in- and out-vertices. Edge -BulkLoader.getOrCreateEdge(Edgeedge, +IncrementalBulkLoader.getOrCreateEdge(Edgeedge, VertexoutVertex, VertexinVertex, Graphgraph, @@ -740,12 +740,12 @@ Edge -IncrementalBulkLoader.getOrCreateEdge(Edgeedge, +OneTimeBulkLoader.getOrCreateEdge(Edgeedge, VertexoutVertex, VertexinVertex, Graphgraph, GraphTraversalSourceg) -Gets or creates a clone of the given edge between the given in- and out-vertices. +Creates a clone of the given edge between the given in- and out-vertices. @@ -1568,21 +1568,15 @@ void -ConsoleMutationListener.edgeAdded(Edgeedge) - - -void MutationListener.edgeAdded(Edgeedge) Raised after a new Edge is added. - + void -ConsoleMutationListener.edgePropertyChanged(Edgeelement, - PropertyoldValue, - http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true; title="class or interface in java.lang">ObjectsetValue) +ConsoleMutationListener.edgeAdded(Edgeedge) - + void MutationListener.edgePropertyChanged(Edgeelement, PropertyoldValue, @@ -1590,28 +1584,34 @@ Raised after the property of a Edge changed. - + void -ConsoleMutationListener.edgePropertyRemoved(Edgeelement, - PropertyremovedValue) +ConsoleMutationListener.edgePropertyChanged(Edgeelement, + PropertyoldValue, + http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true; title="class or interface in java.lang">ObjectsetValue) - + void MutationListener.edgePropertyRemoved(Edgeelement, Propertyproperty) Raised after an Property property was removed from an Edge. - + void -ConsoleMutationListener.edgeRemoved(Edgeedge) +ConsoleMutationListener.edgePropertyRemoved(Edgeelement, + PropertyremovedValue) - + void MutationListener.edgeRemoved(Edgeedge) Raised after an Edge was removed from the graph. + +void +ConsoleMutationListener.edgeRemoved(Edgeedge) + @@ -1956,17 +1956,17 @@ Edge -LegacyGraphSONReader.readEdge(http://docs.oracle.com/javase/8/docs/api/java/io/InputStream.html?is-external=true; title="class or interface in
svn commit: r1761506 [1/29] - in /tinkerpop/site: docs/3.2.3-SNAPSHOT/ docs/3.2.3-SNAPSHOT/dev/developer/ docs/3.2.3-SNAPSHOT/dev/provider/ docs/3.2.3-SNAPSHOT/recipes/ docs/3.2.3-SNAPSHOT/reference/
Author: dkuppitz Date: Mon Sep 19 23:12:37 2016 New Revision: 1761506 URL: http://svn.apache.org/viewvc?rev=1761506=rev Log: Deploy docs for TinkerPop 3.2.3-SNAPSHOT Modified: tinkerpop/site/docs/3.2.3-SNAPSHOT/dev/developer/index.html tinkerpop/site/docs/3.2.3-SNAPSHOT/dev/provider/index.html tinkerpop/site/docs/3.2.3-SNAPSHOT/index.html tinkerpop/site/docs/3.2.3-SNAPSHOT/recipes/index.html tinkerpop/site/docs/3.2.3-SNAPSHOT/reference/index.html tinkerpop/site/docs/3.2.3-SNAPSHOT/tutorials/getting-started/index.html tinkerpop/site/docs/3.2.3-SNAPSHOT/tutorials/the-gremlin-console/index.html tinkerpop/site/docs/3.2.3-SNAPSHOT/upgrade/index.html tinkerpop/site/javadocs/3.2.3-SNAPSHOT/core/deprecated-list.html tinkerpop/site/javadocs/3.2.3-SNAPSHOT/core/index-all.html tinkerpop/site/javadocs/3.2.3-SNAPSHOT/core/org/apache/tinkerpop/gremlin/driver/Cluster.html tinkerpop/site/javadocs/3.2.3-SNAPSHOT/core/org/apache/tinkerpop/gremlin/driver/LoadBalancingStrategy.RoundRobin.html tinkerpop/site/javadocs/3.2.3-SNAPSHOT/core/org/apache/tinkerpop/gremlin/driver/LoadBalancingStrategy.html tinkerpop/site/javadocs/3.2.3-SNAPSHOT/core/org/apache/tinkerpop/gremlin/driver/class-use/Host.html tinkerpop/site/javadocs/3.2.3-SNAPSHOT/core/org/apache/tinkerpop/gremlin/process/computer/MapReduce.html tinkerpop/site/javadocs/3.2.3-SNAPSHOT/core/org/apache/tinkerpop/gremlin/process/computer/VertexProgram.html tinkerpop/site/javadocs/3.2.3-SNAPSHOT/core/org/apache/tinkerpop/gremlin/process/computer/class-use/GraphComputer.Persist.html tinkerpop/site/javadocs/3.2.3-SNAPSHOT/core/org/apache/tinkerpop/gremlin/process/computer/class-use/GraphComputer.ResultGraph.html tinkerpop/site/javadocs/3.2.3-SNAPSHOT/core/org/apache/tinkerpop/gremlin/process/computer/clustering/peerpressure/PeerPressureVertexProgram.html tinkerpop/site/javadocs/3.2.3-SNAPSHOT/core/org/apache/tinkerpop/gremlin/process/computer/package-tree.html tinkerpop/site/javadocs/3.2.3-SNAPSHOT/core/org/apache/tinkerpop/gremlin/process/computer/ranking/pagerank/PageRankVertexProgram.html tinkerpop/site/javadocs/3.2.3-SNAPSHOT/core/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgram.html tinkerpop/site/javadocs/3.2.3-SNAPSHOT/core/org/apache/tinkerpop/gremlin/process/traversal/Order.html tinkerpop/site/javadocs/3.2.3-SNAPSHOT/core/org/apache/tinkerpop/gremlin/process/traversal/class-use/Traversal.html tinkerpop/site/javadocs/3.2.3-SNAPSHOT/core/org/apache/tinkerpop/gremlin/process/traversal/class-use/TraversalSideEffects.html tinkerpop/site/javadocs/3.2.3-SNAPSHOT/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/class-use/GraphTraversal.html tinkerpop/site/javadocs/3.2.3-SNAPSHOT/core/org/apache/tinkerpop/gremlin/process/traversal/package-tree.html tinkerpop/site/javadocs/3.2.3-SNAPSHOT/core/org/apache/tinkerpop/gremlin/structure/class-use/Edge.html tinkerpop/site/javadocs/3.2.3-SNAPSHOT/core/org/apache/tinkerpop/gremlin/structure/class-use/Graph.html tinkerpop/site/javadocs/3.2.3-SNAPSHOT/core/org/apache/tinkerpop/gremlin/structure/class-use/Vertex.html tinkerpop/site/javadocs/3.2.3-SNAPSHOT/core/org/apache/tinkerpop/gremlin/structure/package-tree.html tinkerpop/site/javadocs/3.2.3-SNAPSHOT/core/overview-tree.html tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/deprecated-list.html tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/index-all.html tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/algorithm/generator/class-use/Distribution.html tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/class-use/AbstractGremlinTest.html tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/class-use/FeatureRequirement.html tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/class-use/FeatureRequirementSet.html tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/class-use/GraphProvider.TestListener.html tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/class-use/LoadGraphWith.GraphData.html tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/class-use/LoadGraphWith.html tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/driver/Cluster.html tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/driver/LoadBalancingStrategy.RoundRobin.html tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/driver/LoadBalancingStrategy.html tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/driver/class-use/Host.html tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/driver/class-use/MessageSerializer.html
svn commit: r1761506 [16/29] - in /tinkerpop/site: docs/3.2.3-SNAPSHOT/ docs/3.2.3-SNAPSHOT/dev/developer/ docs/3.2.3-SNAPSHOT/dev/provider/ docs/3.2.3-SNAPSHOT/recipes/ docs/3.2.3-SNAPSHOT/reference/
Modified: tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/process/traversal/class-use/Traverser.Admin.html URL: http://svn.apache.org/viewvc/tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/process/traversal/class-use/Traverser.Admin.html?rev=1761506=1761505=1761506=diff == --- tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/process/traversal/class-use/Traverser.Admin.html (original) +++ tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/process/traversal/class-use/Traverser.Admin.html Mon Sep 19 23:12:37 2016 @@ -2,10 +2,10 @@ - + Uses of Interface org.apache.tinkerpop.gremlin.process.traversal.Traverser.Admin (Apache TinkerPop 3.2.3-SNAPSHOT API) - + @@ -467,19 +467,19 @@ void -LoopTraversal.addStart(Traverser.AdminSstart) +TokenTraversal.addStart(Traverser.AdminSstart) void -TokenTraversal.addStart(Traverser.AdminSstart) +LoopTraversal.addStart(Traverser.AdminSstart) void -IdentityTraversal.addStart(Traverser.AdminSstart) +AbstractLambdaTraversal.addStart(Traverser.AdminSstart) void -AbstractLambdaTraversal.addStart(Traverser.AdminSstart) +IdentityTraversal.addStart(Traverser.AdminSstart) @@ -554,29 +554,29 @@ +protected http://docs.oracle.com/javase/8/docs/api/java/util/Iterator.html?is-external=true; title="class or interface in java.util">IteratorTraverser.AdminE +BranchStep.computerAlgorithm() + + protected http://docs.oracle.com/javase/8/docs/api/java/util/Iterator.html?is-external=true; title="class or interface in java.util">IteratorTraverser.AdminS RepeatStep.computerAlgorithm() - + protected http://docs.oracle.com/javase/8/docs/api/java/util/Iterator.html?is-external=true; title="class or interface in java.util">IteratorTraverser.AdminS RepeatStep.RepeatEndStep.computerAlgorithm() - + protected http://docs.oracle.com/javase/8/docs/api/java/util/Iterator.html?is-external=true; title="class or interface in java.util">IteratorTraverser.AdminE -BranchStep.computerAlgorithm() +BranchStep.standardAlgorithm() - + protected http://docs.oracle.com/javase/8/docs/api/java/util/Iterator.html?is-external=true; title="class or interface in java.util">IteratorTraverser.AdminS RepeatStep.standardAlgorithm() - + protected http://docs.oracle.com/javase/8/docs/api/java/util/Iterator.html?is-external=true; title="class or interface in java.util">IteratorTraverser.AdminS RepeatStep.RepeatEndStep.standardAlgorithm() - -protected http://docs.oracle.com/javase/8/docs/api/java/util/Iterator.html?is-external=true; title="class or interface in java.util">IteratorTraverser.AdminE -BranchStep.standardAlgorithm() - @@ -611,16 +611,8 @@ -protected Traverser.AdminS -FilterStep.processNextStart() - - -protected Traverser.AdminS -DedupGlobalStep.processNextStart() - - -protected Traverser.AdminS -WhereTraversalStep.processNextStart() +protected Traverser.AdminS +AndStep.processNextStart() Traverser.AdminS @@ -635,8 +627,16 @@ WherePredicateStep.processNextStart() -protected Traverser.AdminS -AndStep.processNextStart() +protected Traverser.AdminS +FilterStep.processNextStart() + + +protected Traverser.AdminS +WhereTraversalStep.processNextStart() + + +protected Traverser.AdminS +DedupGlobalStep.processNextStart() @@ -670,51 +670,51 @@ protected boolean -CyclicPathStep.filter(Traverser.AdminStraverser) +TimeLimitStep.filter(Traverser.AdminStraverser) protected boolean -CoinStep.filter(Traverser.AdminStraverser) +TraversalFilterStep.filter(Traverser.AdminStraverser) -protected abstract boolean -FilterStep.filter(Traverser.AdminStraverser) +protected boolean +CoinStep.filter(Traverser.AdminStraverser) protected boolean -IsStep.filter(Traverser.AdminStraverser) +SimplePathStep.filter(Traverser.AdminStraverser) protected boolean -TraversalFilterStep.filter(Traverser.AdminStraverser) +WherePredicateStep.filter(Traverser.AdminStraverser) protected boolean -DedupGlobalStep.filter(Traverser.AdminStraverser) +NotStep.filter(Traverser.AdminStraverser) protected boolean -HasStep.filter(Traverser.AdminStraverser) +CyclicPathStep.filter(Traverser.AdminStraverser) -protected boolean -WhereTraversalStep.filter(Traverser.AdminStraverser) +protected abstract boolean +FilterStep.filter(Traverser.AdminStraverser) protected boolean -SimplePathStep.filter(Traverser.AdminStraverser) +WhereTraversalStep.filter(Traverser.AdminStraverser) protected boolean -TimeLimitStep.filter(Traverser.AdminStraverser) +HasStep.filter(Traverser.AdminStraverser) protected boolean -NotStep.filter(Traverser.AdminStraverser) +DedupGlobalStep.filter(Traverser.AdminStraverser) protected boolean -RangeGlobalStep.filter(Traverser.AdminStraverser) +IsStep.filter(Traverser.AdminStraverser) protected boolean @@ -722,11 +722,11 @@
svn commit: r1761506 [10/29] - in /tinkerpop/site: docs/3.2.3-SNAPSHOT/ docs/3.2.3-SNAPSHOT/dev/developer/ docs/3.2.3-SNAPSHOT/dev/provider/ docs/3.2.3-SNAPSHOT/recipes/ docs/3.2.3-SNAPSHOT/reference/
Modified: tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/neo4j/structure/class-use/Neo4jVertexProperty.html URL: http://svn.apache.org/viewvc/tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/neo4j/structure/class-use/Neo4jVertexProperty.html?rev=1761506=1761505=1761506=diff == --- tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/neo4j/structure/class-use/Neo4jVertexProperty.html (original) +++ tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/neo4j/structure/class-use/Neo4jVertexProperty.html Mon Sep 19 23:12:37 2016 @@ -2,10 +2,10 @@ - + Uses of Class org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jVertexProperty (Apache TinkerPop 3.2.3-SNAPSHOT API) - + @@ -137,12 +137,12 @@ Vhttp://docs.oracle.com/javase/8/docs/api/java/util/Iterator.html?is-external=true; title="class or interface in java.util">IteratorPropertyV -MultiMetaNeo4jTrait.getProperties(Neo4jVertexPropertyvertexProperty, +Neo4jTrait.getProperties(Neo4jVertexPropertyvertexProperty, http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String...keys) Vhttp://docs.oracle.com/javase/8/docs/api/java/util/Iterator.html?is-external=true; title="class or interface in java.util">IteratorPropertyV -Neo4jTrait.getProperties(Neo4jVertexPropertyvertexProperty, +MultiMetaNeo4jTrait.getProperties(Neo4jVertexPropertyvertexProperty, http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String...keys) @@ -152,12 +152,12 @@ VPropertyV -MultiMetaNeo4jTrait.getProperty(Neo4jVertexPropertyvertexProperty, +Neo4jTrait.getProperty(Neo4jVertexPropertyvertexProperty, http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">Stringkey) VPropertyV -Neo4jTrait.getProperty(Neo4jVertexPropertyvertexProperty, +MultiMetaNeo4jTrait.getProperty(Neo4jVertexPropertyvertexProperty, http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">Stringkey) @@ -166,11 +166,11 @@ void -MultiMetaNeo4jTrait.removeVertexProperty(Neo4jVertexPropertyvertexProperty) +Neo4jTrait.removeVertexProperty(Neo4jVertexPropertyvertexProperty) void -Neo4jTrait.removeVertexProperty(Neo4jVertexPropertyvertexProperty) +MultiMetaNeo4jTrait.removeVertexProperty(Neo4jVertexPropertyvertexProperty) VPropertyV @@ -180,13 +180,13 @@ VPropertyV -MultiMetaNeo4jTrait.setProperty(Neo4jVertexPropertyvertexProperty, +Neo4jTrait.setProperty(Neo4jVertexPropertyvertexProperty, http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">Stringkey, Vvalue) VPropertyV -Neo4jTrait.setProperty(Neo4jVertexPropertyvertexProperty, +MultiMetaNeo4jTrait.setProperty(Neo4jVertexPropertyvertexProperty, http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">Stringkey, Vvalue) Modified: tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/package-tree.html URL: http://svn.apache.org/viewvc/tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/package-tree.html?rev=1761506=1761505=1761506=diff == --- tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/package-tree.html (original) +++ tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/package-tree.html Mon Sep 19 23:12:37 2016 @@ -2,10 +2,10 @@ - + org.apache.tinkerpop.gremlin Class Hierarchy (Apache TinkerPop 3.2.3-SNAPSHOT API) - + @@ -108,14 +108,14 @@ Annotation Type Hierarchy -org.apache.tinkerpop.gremlin.ExceptionCoverageSet (implements java.lang.annotation.http://docs.oracle.com/javase/8/docs/api/java/lang/annotation/Annotation.html?is-external=true; title="class or interface in java.lang.annotation">Annotation) +org.apache.tinkerpop.gremlin.LoadGraphWith (implements java.lang.annotation.http://docs.oracle.com/javase/8/docs/api/java/lang/annotation/Annotation.html?is-external=true; title="class or interface in java.lang.annotation">Annotation) +org.apache.tinkerpop.gremlin.GraphProvider.Descriptor (implements java.lang.annotation.http://docs.oracle.com/javase/8/docs/api/java/lang/annotation/Annotation.html?is-external=true; title="class or interface in java.lang.annotation">Annotation) org.apache.tinkerpop.gremlin.FeatureRequirements (implements
svn commit: r1761506 [11/29] - in /tinkerpop/site: docs/3.2.3-SNAPSHOT/ docs/3.2.3-SNAPSHOT/dev/developer/ docs/3.2.3-SNAPSHOT/dev/provider/ docs/3.2.3-SNAPSHOT/recipes/ docs/3.2.3-SNAPSHOT/reference/
Modified: tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.html URL: http://svn.apache.org/viewvc/tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.html?rev=1761506=1761505=1761506=diff == --- tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.html (original) +++ tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.html Mon Sep 19 23:12:37 2016 @@ -2,10 +2,10 @@ - + GraphComputerTest (Apache TinkerPop 3.2.3-SNAPSHOT API) - + @@ -19,7 +19,7 @@ catch(err) { } //--> -var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10,"i27":10,"i28":10,"i29":10}; +var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10,"i27":10,"i28":10,"i29":10,"i30":10,"i31":10}; var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -273,114 +273,122 @@ extends void -shouldHandleUndeclaredMemoryKeysCorrectly() +shouldFailWithImproperTraverserRequirements() void -shouldHaveConsistentMemoryVertexPropertiesAndExceptions() +shouldHandleUndeclaredMemoryKeysCorrectly() void -shouldHaveImmutableComputeResultMemory() +shouldHaveConsistentMemoryVertexPropertiesAndExceptions() void -shouldHaveStandardStringRepresentation() +shouldHaveImmutableComputeResultMemory() void -shouldNotAllowBadGraphComputers() +shouldHaveStandardStringRepresentation() void -shouldNotAllowEmptyMemoryKeys() +shouldNotAllowBadGraphComputers() void -shouldNotAllowNullMemoryKeys() +shouldNotAllowEmptyMemoryKeys() void -shouldNotAllowTheSameComputerToExecutedTwice() +shouldNotAllowNullMemoryKeys() void -shouldNotAllowWithNoVertexProgramNorMapReducers() +shouldNotAllowTheSameComputerToExecutedTwice() void -shouldOnlyAllowIDAccessOfAdjacentVertices() +shouldNotAllowWithNoVertexProgramNorMapReducers() void -shouldOnlyAllowReadingVertexPropertiesInMapReduce() +shouldOnlyAllowIDAccessOfAdjacentVertices() void -shouldProcessResultGraphNewWithPersistEdges() +shouldOnlyAllowReadingVertexPropertiesInMapReduce() void -shouldProcessResultGraphNewWithPersistNothing() +shouldProcessResultGraphNewWithPersistEdges() void -shouldProcessResultGraphNewWithPersistVertexProperties() +shouldProcessResultGraphNewWithPersistNothing() void -shouldProcessResultGraphOriginalWithPersistEdges() +shouldProcessResultGraphNewWithPersistVertexProperties() void -shouldProcessResultGraphOriginalWithPersistNothing() +shouldProcessResultGraphOriginalWithPersistEdges() void -shouldProcessResultGraphOriginalWithPersistVertexProperties() +shouldProcessResultGraphOriginalWithPersistNothing() void -shouldSortMapOutput() +shouldProcessResultGraphOriginalWithPersistVertexProperties() void -shouldSortReduceOutput() +shouldSortMapOutput() void -shouldStartAndEndWorkersForVertexProgramAndMapReduce() +shouldSortReduceOutput() void -shouldSupportBroadcastKeys() +shouldStartAndEndWorkersForVertexProgramAndMapReduce() void -shouldSupportGraphFilter() +shouldSucceedWithProperTraverserRequirements() void -shouldSupportJobChaining() +shouldSupportBroadcastKeys() void -shouldSupportMultipleMapReduceJobs() +shouldSupportGraphFilter() void -shouldSupportPersistResultGraphPairsStatedInFeatures() +shouldSupportJobChaining() void -shouldSupportPreExistingComputeKeys() +shouldSupportMultipleMapReduceJobs() void -shouldSupportTransientKeys() +shouldSupportPersistResultGraphPairsStatedInFeatures() void +shouldSupportPreExistingComputeKeys() + + +void +shouldSupportTransientKeys() + + +void shouldSupportWorkerCount() @@ -835,7 +843,7 @@ extends - + shouldSupportBroadcastKeys publicvoidshouldSupportBroadcastKeys() @@ -843,6 +851,34 @@ extends Throws: http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true; title="class or interface in java.lang">Exception + + + + + + + + +shouldSucceedWithProperTraverserRequirements +publicvoidshouldSucceedWithProperTraverserRequirements() + throws http://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true; title="class or interface in java.lang">Exception + +Throws:
svn commit: r1761506 [21/29] - in /tinkerpop/site: docs/3.2.3-SNAPSHOT/ docs/3.2.3-SNAPSHOT/dev/developer/ docs/3.2.3-SNAPSHOT/dev/provider/ docs/3.2.3-SNAPSHOT/recipes/ docs/3.2.3-SNAPSHOT/reference/
Modified: tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/process/traversal/traverser/class-use/TraverserRequirement.html URL: http://svn.apache.org/viewvc/tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/process/traversal/traverser/class-use/TraverserRequirement.html?rev=1761506=1761505=1761506=diff == --- tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/process/traversal/traverser/class-use/TraverserRequirement.html (original) +++ tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/process/traversal/traverser/class-use/TraverserRequirement.html Mon Sep 19 23:12:37 2016 @@ -2,10 +2,10 @@ - + Uses of Class org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement (Apache TinkerPop 3.2.3-SNAPSHOT API) - + @@ -84,58 +84,62 @@ -org.apache.tinkerpop.gremlin.process.computer.traversal.step.map +org.apache.tinkerpop.gremlin.process.computer -org.apache.tinkerpop.gremlin.process.remote.traversal +org.apache.tinkerpop.gremlin.process.computer.traversal.step.map -org.apache.tinkerpop.gremlin.process.traversal +org.apache.tinkerpop.gremlin.process.remote.traversal -org.apache.tinkerpop.gremlin.process.traversal.lambda +org.apache.tinkerpop.gremlin.process.traversal -org.apache.tinkerpop.gremlin.process.traversal.step +org.apache.tinkerpop.gremlin.process.traversal.lambda -org.apache.tinkerpop.gremlin.process.traversal.step.branch +org.apache.tinkerpop.gremlin.process.traversal.step -org.apache.tinkerpop.gremlin.process.traversal.step.filter +org.apache.tinkerpop.gremlin.process.traversal.step.branch -org.apache.tinkerpop.gremlin.process.traversal.step.map +org.apache.tinkerpop.gremlin.process.traversal.step.filter -org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect +org.apache.tinkerpop.gremlin.process.traversal.step.map -org.apache.tinkerpop.gremlin.process.traversal.step.util +org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect -org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration +org.apache.tinkerpop.gremlin.process.traversal.step.util -org.apache.tinkerpop.gremlin.process.traversal.traverser +org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration -org.apache.tinkerpop.gremlin.process.traversal.traverser.util +org.apache.tinkerpop.gremlin.process.traversal.traverser +org.apache.tinkerpop.gremlin.process.traversal.traverser.util + + + org.apache.tinkerpop.gremlin.process.traversal.util @@ -144,6 +148,26 @@ + + + +Uses of TraverserRequirement in org.apache.tinkerpop.gremlin.process.computer + +Methods in org.apache.tinkerpop.gremlin.process.computer that return types with arguments of type TraverserRequirement + +Modifier and Type +Method and Description + + + +default http://docs.oracle.com/javase/8/docs/api/java/util/Set.html?is-external=true; title="class or interface in java.util">SetTraverserRequirement +VertexProgram.getTraverserRequirements() +The traverser requirements that are needed when this VP is used as part of a traversal. + + + + + @@ -157,19 +181,23 @@ http://docs.oracle.com/javase/8/docs/api/java/util/Set.html?is-external=true; title="class or interface in java.util">SetTraverserRequirement -ComputerResultStep.getRequirements() +ProgramVertexProgramStep.getRequirements() http://docs.oracle.com/javase/8/docs/api/java/util/Set.html?is-external=true; title="class or interface in java.util">SetTraverserRequirement -TraversalVertexProgramStep.getRequirements() +PeerPressureVertexProgramStep.getRequirements() http://docs.oracle.com/javase/8/docs/api/java/util/Set.html?is-external=true; title="class or interface in java.util">SetTraverserRequirement -PeerPressureVertexProgramStep.getRequirements() +PageRankVertexProgramStep.getRequirements() http://docs.oracle.com/javase/8/docs/api/java/util/Set.html?is-external=true; title="class or interface in java.util">SetTraverserRequirement -PageRankVertexProgramStep.getRequirements() +ComputerResultStep.getRequirements() + + +http://docs.oracle.com/javase/8/docs/api/java/util/Set.html?is-external=true; title="class or interface in java.util">SetTraverserRequirement +TraversalVertexProgramStep.getRequirements() @@ -318,7 +346,7 @@ http://docs.oracle.com/javase/8/docs/api/java/util/Set.html?is-external=true; title="class or interface in java.util">SetTraverserRequirement -LocalStep.getRequirements() +BranchStep.getRequirements() http://docs.oracle.com/javase/8/docs/api/java/util/Set.html?is-external=true; title="class or interface in java.util">SetTraverserRequirement @@ -326,7 +354,7 @@ http://docs.oracle.com/javase/8/docs/api/java/util/Set.html?is-external=true; title="class or interface in java.util">SetTraverserRequirement -BranchStep.getRequirements()
svn commit: r1761506 [13/29] - in /tinkerpop/site: docs/3.2.3-SNAPSHOT/ docs/3.2.3-SNAPSHOT/dev/developer/ docs/3.2.3-SNAPSHOT/dev/provider/ docs/3.2.3-SNAPSHOT/recipes/ docs/3.2.3-SNAPSHOT/reference/
Modified: tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/process/traversal/class-use/Step.html URL: http://svn.apache.org/viewvc/tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/process/traversal/class-use/Step.html?rev=1761506=1761505=1761506=diff == --- tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/process/traversal/class-use/Step.html (original) +++ tinkerpop/site/javadocs/3.2.3-SNAPSHOT/full/org/apache/tinkerpop/gremlin/process/traversal/class-use/Step.html Mon Sep 19 23:12:37 2016 @@ -2,10 +2,10 @@ - + Uses of Interface org.apache.tinkerpop.gremlin.process.traversal.Step (Apache TinkerPop 3.2.3-SNAPSHOT API) - + @@ -1045,21 +1045,21 @@ -StepE,? -EmptyStep.getNextStep() - - StepE,? AbstractStep.getNextStep() - -Step?,S -EmptyStep.getPreviousStep() - +StepE,? +EmptyStep.getNextStep() + + Step?,S AbstractStep.getPreviousStep() + +Step?,S +EmptyStep.getPreviousStep() + @@ -1071,19 +1071,19 @@ void -EmptyStep.setNextStep(StepE,?step) +AbstractStep.setNextStep(StepE,?step) void -AbstractStep.setNextStep(StepE,?step) +EmptyStep.setNextStep(StepE,?step) void -EmptyStep.setPreviousStep(Step?,Sstep) +AbstractStep.setPreviousStep(Step?,Sstep) void -AbstractStep.setPreviousStep(Step?,Sstep) +EmptyStep.setPreviousStep(Step?,Sstep) @@ -1112,80 +1112,80 @@ STraverser.AdminS -B_LP_O_P_S_SE_SL_TraverserGenerator.generate(Sstart, +LP_O_OB_S_SE_SL_TraverserGenerator.generate(Sstart, StepS,?startStep, longinitialBulk) STraverser.AdminS -LP_O_OB_S_SE_SL_TraverserGenerator.generate(Sstart, +B_O_S_SE_SL_TraverserGenerator.generate(Sstart, StepS,?startStep, longinitialBulk) STraverser.AdminS -B_O_TraverserGenerator.generate(Sstart, +O_OB_S_SE_SL_TraverserGenerator.generate(Sstart, StepS,?startStep, longinitialBulk) STraverser.AdminS -LP_O_OB_P_S_SE_SL_TraverserGenerator.generate(Sstart, +B_LP_O_P_S_SE_SL_TraverserGenerator.generate(Sstart, StepS,?startStep, longinitialBulk) STraverser.AdminS -O_OB_S_SE_SL_TraverserGenerator.generate(Sstart, +B_O_TraverserGenerator.generate(Sstart, StepS,?startStep, longinitialBulk) STraverser.AdminS -B_O_S_SE_SL_TraverserGenerator.generate(Sstart, +B_LP_O_S_SE_SL_TraverserGenerator.generate(Sstart, StepS,?startStep, longinitialBulk) STraverser.AdminS -B_LP_O_S_SE_SL_TraverserGenerator.generate(Sstart, +LP_O_OB_P_S_SE_SL_TraverserGenerator.generate(Sstart, StepS,?startStep, longinitialBulk) RTraverser.AdminR -B_LP_O_S_SE_SL_Traverser.split(Rr, - StepT,Rstep) +O_Traverser.split(Rr, + StepT,Rstep) RTraverser.AdminR -LP_O_OB_P_S_SE_SL_Traverser.split(Rr, - StepT,Rstep) +B_LP_O_S_SE_SL_Traverser.split(Rr, + StepT,Rstep) RTraverser.AdminR -O_OB_S_SE_SL_Traverser.split(Rr, - StepT,Rstep) - - -RTraverser.AdminR B_O_S_SE_SL_Traverser.split(Rr, StepT,Rstep) - + RTraverser.AdminR B_LP_O_P_S_SE_SL_Traverser.split(Rr, StepT,Rstep) + +RTraverser.AdminR +O_OB_S_SE_SL_Traverser.split(Rr, + StepT,Rstep) + RTraverser.AdminR -LP_O_OB_S_SE_SL_Traverser.split(Rr, - StepT,Rstep) +LP_O_OB_P_S_SE_SL_Traverser.split(Rr, + StepT,Rstep) RTraverser.AdminR -O_Traverser.split(Rr, - StepT,Rstep) +LP_O_OB_S_SE_SL_Traverser.split(Rr, + StepT,Rstep) @@ -1238,13 +1238,13 @@ RTraverser.AdminR -EmptyTraverser.split(Rr, - StepT,Rstep) +AbstractTraverser.split(Rr, + StepT,Rstep) RTraverser.AdminR -AbstractTraverser.split(Rr, - StepT,Rstep) +EmptyTraverser.split(Rr, + StepT,Rstep) @@ -1321,11 +1321,11 @@ http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true; title="class or interface in java.util">ListStep -EmptyTraversal.getSteps() +DefaultTraversal.getSteps() http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true; title="class or interface in java.util">ListStep -DefaultTraversal.getSteps() +EmptyTraversal.getSteps() @@ -1338,12 +1338,12 @@ S2,E2Traversal.AdminS2,E2 -EmptyTraversal.addStep(intindex, +DefaultTraversal.addStep(intindex, Step?,?step) S2,E2Traversal.AdminS2,E2 -DefaultTraversal.addStep(intindex, +EmptyTraversal.addStep(intindex, Step?,?step)
[3/3] tinkerpop git commit: Fixed temporary file path.
Fixed temporary file path. Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/120cef66 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/120cef66 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/120cef66 Branch: refs/heads/TINKERPOP-927-master Commit: 120cef66da6afac1ecbb5781fe58d3ca3e1f0129 Parents: 0100f78 Author: Daniel KuppitzAuthored: Tue Sep 20 01:12:52 2016 +0200 Committer: Daniel Kuppitz Committed: Tue Sep 20 01:12:52 2016 +0200 -- bin/publish-docs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/120cef66/bin/publish-docs.sh -- diff --git a/bin/publish-docs.sh b/bin/publish-docs.sh index 8440ae2..1c374da 100755 --- a/bin/publish-docs.sh +++ b/bin/publish-docs.sh @@ -70,7 +70,7 @@ pushd "javadocs/${VERSION}/"; cat ../../../publish-docs.javadocs | awk '/^A/ {pr pushd "docs/${VERSION}/"; cat ../../../publish-docs.docs | awk '/^D/ {print $2}' | xargs --no-run-if-empty svn delete; popd pushd "javadocs/${VERSION}/"; cat ../../../publish-docs.javadocs | awk '/^D/ {print $2}' | xargs --no-run-if-empty svn delete; popd -CHANGES=$(cat target/publish-docs.*docs | grep -v '.graffle$' | wc -l) +CHANGES=$(cat ../publish-docs.*docs | grep -v '.graffle$' | wc -l) if [ ${CHANGES} -gt 0 ]; then ${SVN_CMD} commit -m "Deploy docs for TinkerPop ${VERSION}"
[1/3] tinkerpop git commit: Merge branch 'TINKERPOP-927' into TINKERPOP-927-master
Repository: tinkerpop Updated Branches: refs/heads/TINKERPOP-927-master [created] 120cef66d Merge branch 'TINKERPOP-927' into TINKERPOP-927-master Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b20921bd Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b20921bd Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b20921bd Branch: refs/heads/TINKERPOP-927-master Commit: b20921bd4d42a08db6a182b26dd22e4808d837c2 Parents: 54ed33d 5f2d251 Author: Daniel KuppitzAuthored: Mon Sep 19 17:23:47 2016 +0200 Committer: Daniel Kuppitz Committed: Mon Sep 19 17:23:47 2016 +0200 -- bin/publish-docs.awk | 31 ++ bin/publish-docs.sh | 48 +-- 2 files changed, 61 insertions(+), 18 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b20921bd/bin/publish-docs.sh -- diff --cc bin/publish-docs.sh index 5fa4178,43c2cd5..83c9f43 --- a/bin/publish-docs.sh +++ b/bin/publish-docs.sh @@@ -42,26 -39,46 +42,38 @@@ mkdir -p target/sv ${SVN_CMD} co --depth immediates https://svn.apache.org/repos/asf/tinkerpop/site target/svn pushd target/svn - ${SVN_CMD} update --depth empty "docs/${VERSION}" - ${SVN_CMD} update --depth empty "javadocs/${VERSION}" - ${SVN_CMD} rm "docs/${VERSION}" - ${SVN_CMD} rm "javadocs/${VERSION}" - ${SVN_CMD} commit . -m "Docs for TinkerPop ${VERSION} are being replaced." - popd - mkdir -p "target/svn/docs/${VERSION}" - mkdir -p "target/svn/javadocs/${VERSION}/core" - mkdir -p "target/svn/javadocs/${VERSION}/full" + ${SVN_CMD} update "docs/${VERSION}" + ${SVN_CMD} update "javadocs/${VERSION}" - cp -R target/docs/htmlsingle/. "target/svn/docs/${VERSION}" - cp -R target/site/apidocs/core/. "target/svn/javadocs/${VERSION}/core" - cp -R target/site/apidocs/full/. "target/svn/javadocs/${VERSION}/full" + mkdir -p "docs/${VERSION}" + mkdir -p "javadocs/${VERSION}/core" + mkdir -p "javadocs/${VERSION}/full" - pushd target/svn - rm "docs/${VERSION}/images/tinkerpop3.graffle" - ${SVN_CMD} update --depth empty "docs/${VERSION}" - ${SVN_CMD} update --depth empty "javadocs/${VERSION}" + diff -rq -I '^Last updated' docs/${VERSION}/ ../docs/htmlsingle/ | awk -f ../../bin/publish-docs.awk | sed 's/^\(.\) \//\1 /g' > ../publish-docs.docs + diff -rq -I 'Generated by javadoc' -I '^ ../publish-docs.javadocs + + # copy new / modified files + for file in $(cat ../publish-docs.docs | awk '/^[AU]/ {print $2}' | grep -v '.graffle$') + do + cp "../docs/htmlsingle/${file}" "docs/${VERSION}/${file}" + done + for file in $(cat ../publish-docs.javadocs | awk '/^[AU]/ {print $2}') + do + cp "../site/apidocs/${file}" "javadocs/${VERSION}/${file}" + done + + pushd "docs/${VERSION}/"; cat ../../../publish-docs.docs | awk '/^A/ {print $2}' | grep -v '.graffle$' | xargs --no-run-if-empty svn add; popd + pushd "javadocs/${VERSION}/"; cat ../../../publish-docs.docs | awk '/^A/ {print $2}' | xargs --no-run-if-empty svn add; popd + + # delete old files + pushd "docs/${VERSION}/"; cat ../../../publish-docs.docs | awk '/^D/ {print $2}' | xargs --no-run-if-empty svn delete; popd -pushd "javadocs/${VERSION}/"; cat ../../../publish-docs.docs | awk '/^D/ {print $2}' | xargs --no-run-if-empty svn delete; popd - -for dir in "docs" "javadocs" -do - CURRENT=$((${SVN_CMD} list "${dir}" ; ls "${dir}") | tr -d '/' | grep -v SNAPSHOT | grep -Fv current | sort -rV | head -n1) ++pushd "javadocs/${VERSION}/"; cat ../../../publish-docs.javadocs | awk '/^D/ {print $2}' | xargs --no-run-if-empty svn delete; popd + - ${SVN_CMD} update --depth empty "${dir}/current" - ${SVN_CMD} rm "${dir}/current" ++CHANGES=$(cat target/publish-docs.*docs | grep -v '.graffle$' | wc -l) + - ${SVN_CMD} update --depth empty "${dir}/${CURRENT}" - ln -s "${CURRENT}" "${dir}/current" - ${SVN_CMD} update --depth empty "${dir}/current" - ${SVN_CMD} add "${dir}/current" -done ++if [ ${CHANGES} -gt 0 ]; then ++ ${SVN_CMD} commit -m "Deploy docs for TinkerPop ${VERSION}" ++fi - ${SVN_CMD} add * --force --${SVN_CMD} commit -m "Deploy docs for TinkerPop ${VERSION}" popd