You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2016/06/02 20:05:21 UTC
[01/15] incubator-tinkerpop git commit: Update "current" links as
part of `bin/publish-docs.sh`.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1278 89785f4bb -> fc5e2cbef
Update "current" links as part of `bin/publish-docs.sh`.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/aca8c351
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/aca8c351
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/aca8c351
Branch: refs/heads/TINKERPOP-1278
Commit: aca8c35125d241f61d029bbdf08f7901c1ae5e18
Parents: 96ee0ba
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Wed Jun 1 01:06:33 2016 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Wed Jun 1 01:06:33 2016 +0200
----------------------------------------------------------------------
README.asciidoc | 8 ++++----
bin/publish-docs.sh | 15 +++++++++++++++
2 files changed, 19 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/aca8c351/README.asciidoc
----------------------------------------------------------------------
diff --git a/README.asciidoc b/README.asciidoc
index e028eba..f071aa1 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -25,9 +25,9 @@ Documentation
TinkerPop3 provides graph computing capabilities for both graph databases (OLTP) and graph analytic systems (OLAP).
* link:http://tinkerpop.apache.org/[homepage (downloads)]
-* link:http://tinkerpop.apache.org/docs/3.1.3-SNAPSHOT/reference/[reference documentation]
-* link:http://tinkerpop.apache.org/javadocs/3.1.3-SNAPSHOT/core/[core javadoc]
-* link:http://tinkerpop.apache.org/javadocs/3.1.3-SNAPSHOT/full/[full javadoc]
+* link:http://tinkerpop.apache.org/docs/current/reference/[reference documentation]
+* link:http://tinkerpop.apache.org/javadocs/current/core/[core javadoc]
+* link:http://tinkerpop.apache.org/javadocs/current/full/[full javadoc]
Building and Testing
~~~~~~~~~~~~~~~~~~~~
@@ -42,7 +42,7 @@ The zip distributions can be found in the following directories:
. `gremlin-server/target`
. `gremlin-console/target`
-Please see the link:http://tinkerpop.apache.org/docs/3.1.3-SNAPSHOT/dev/developer/#_contributing[CONTRIBUTING.asciidoc] file for more detailed information and options for building, test running and developing TinkerPop.
+Please see the link:http://tinkerpop.apache.org/docs/current/dev/developer/#_contributing[CONTRIBUTING.asciidoc] file for more detailed information and options for building, test running and developing TinkerPop.
Get Started
~~~~~~~~~~~
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/aca8c351/bin/publish-docs.sh
----------------------------------------------------------------------
diff --git a/bin/publish-docs.sh b/bin/publish-docs.sh
index e8eedf6..212ecde 100755
--- a/bin/publish-docs.sh
+++ b/bin/publish-docs.sh
@@ -56,6 +56,21 @@ cp -R target/site/apidocs/full/. "target/svn/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}"
+
+for dir in "docs" "javadocs"
+do
+ CURRENT=$(${SVN_CMD} list "${dir}" | tr -d '/' | grep -v SNAPSHOT | grep -Fv current | sort -rV | head -n1)
+
+ ${SVN_CMD} update --depth empty "${dir}/current"
+ ${SVN_CMD} rm "${dir}/current"
+
+ ${SVN_CMD} update --depth empty "${dir}/${CURRENT}"
+ ln -s "${CURRENT}" "${dir}/current"
+ ${SVN_CMD} update --depth empty "${dir}/current"
+done
+
${SVN_CMD} add * --force
${SVN_CMD} commit -m "Deploy docs for TinkerPop ${VERSION}"
popd
[15/15] incubator-tinkerpop git commit: Merge branch 'master' into
TINKERPOP-1278
Posted by ok...@apache.org.
Merge branch 'master' into TINKERPOP-1278
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/fc5e2cbe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/fc5e2cbe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/fc5e2cbe
Branch: refs/heads/TINKERPOP-1278
Commit: fc5e2cbef4e8ef9f784c98b366ba432dc24b3fdd
Parents: 89785f4 9c56fa3
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Thu Jun 2 14:04:59 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Thu Jun 2 14:04:59 2016 -0600
----------------------------------------------------------------------
CHANGELOG.asciidoc | 4 +--
README.asciidoc | 8 ++---
bin/publish-docs.sh | 15 ++++++++
docs/src/recipes/index.asciidoc | 2 +-
.../reference/implementations-intro.asciidoc | 2 +-
docs/src/reference/the-traversal.asciidoc | 2 +-
.../tutorials/getting-started/index.asciidoc | 2 +-
.../upgrade/release-3.1.x-incubating.asciidoc | 2 +-
.../upgrade/release-3.2.x-incubating.asciidoc | 6 ++--
.../tinkerpop/gremlin/console/Console.groovy | 2 +-
.../groovy/plugin/DriverRemoteAcceptor.java | 2 +-
.../process/traversal/util/TraversalHelper.java | 2 +-
.../ser/GryoLiteMessageSerializerV1d0.java | 10 +++++-
.../driver/ser/GryoMessageSerializerV1d0.java | 22 ++++++++++--
.../step/branch/GroovyLocalTest.groovy | 8 +++++
.../traversal/step/branch/LocalTest.java | 38 +++++++++++++++++---
16 files changed, 103 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
[05/15] incubator-tinkerpop git commit: Fixed links hardcoded to
specific versions in docs. CTR
Posted by ok...@apache.org.
Fixed links hardcoded to specific versions in docs. CTR
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/3f6b38a8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/3f6b38a8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/3f6b38a8
Branch: refs/heads/TINKERPOP-1278
Commit: 3f6b38a85773fa324e052202678bdd4fcf4ff931
Parents: 3e04f4b
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Jun 1 13:37:51 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Jun 1 13:37:51 2016 -0400
----------------------------------------------------------------------
docs/src/reference/implementations-intro.asciidoc | 2 +-
docs/src/reference/the-traversal.asciidoc | 2 +-
docs/src/tutorials/getting-started/index.asciidoc | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3f6b38a8/docs/src/reference/implementations-intro.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/implementations-intro.asciidoc b/docs/src/reference/implementations-intro.asciidoc
index 2cf4803..f1992e5 100644
--- a/docs/src/reference/implementations-intro.asciidoc
+++ b/docs/src/reference/implementations-intro.asciidoc
@@ -23,5 +23,5 @@ image::gremlin-racecar.png[width=325]
TinkerPop offers several reference implementations of its interfaces that are not only meant for production usage,
but also represent models by which different graph providers can build their systems. More specific documentation
on how to build systems at this level of the API can be found in the
-link:http://tinkerpop.apache.org/docs/3.1.1-incubating/dev/provider/[Provider Documentation]. The following sections
+link:http://tinkerpop.apache.org/docs/x.y.z/dev/provider/[Provider Documentation]. The following sections
describe the various reference implementations and their usage.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3f6b38a8/docs/src/reference/the-traversal.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/the-traversal.asciidoc b/docs/src/reference/the-traversal.asciidoc
index 5f3bbb4..8327dc9 100644
--- a/docs/src/reference/the-traversal.asciidoc
+++ b/docs/src/reference/the-traversal.asciidoc
@@ -46,7 +46,7 @@ image::step-types.png[width=650]
A `GraphTraversal<S,E>` is spawned from a `GraphTraversalSource`. It can also be spawned anonymously (i.e. empty)
via `__`. A graph traversal is composed of an ordered list of steps. All the steps provided by `GraphTraversal`
inherit from the more general forms diagrammed above. A list of all the steps (and their descriptions) are provided
-in the TinkerPop3 link:http://tinkerpop.apache.org/javadocs/3.0.2-incubating/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html[GraphTraversal JavaDoc].
+in the TinkerPop3 link:http://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html[GraphTraversal JavaDoc].
The following subsections will demonstrate the GraphTraversal steps using the <<gremlin-console,Gremlin Console>>.
NOTE: To reduce the verbosity of the expression, it is good to
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3f6b38a8/docs/src/tutorials/getting-started/index.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/tutorials/getting-started/index.asciidoc b/docs/src/tutorials/getting-started/index.asciidoc
index 7b82751..5fcc30e 100644
--- a/docs/src/tutorials/getting-started/index.asciidoc
+++ b/docs/src/tutorials/getting-started/index.asciidoc
@@ -187,7 +187,7 @@ Creating a Graph
As intuitive as it is to you, it is perhaps more intuitive to Gremlin himself, as vertices, edges and properties make
up the very elements of his existence. It is indeed helpful to think of our friend, Gremlin, moving about a graph when
-developing traversals, as picturing his position as the link:http://tinkerpop.apache.org/docs/3.0.2-incubating/#_the_traverser[traverser]
+developing traversals, as picturing his position as the link:http://tinkerpop.apache.org/docs/x.y.z/reference/#_the_traverser[traverser]
helps orient where you need him to go next. Let's use the two vertex, one edge graph we've been discussing above
as an example. First, you need to create this graph:
[04/15] incubator-tinkerpop git commit: Removed "incubating" from the
future 3.1.3 release which will not be under incubator CTR
Posted by ok...@apache.org.
Removed "incubating" from the future 3.1.3 release which will not be under incubator CTR
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/3e04f4bb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/3e04f4bb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/3e04f4bb
Branch: refs/heads/TINKERPOP-1278
Commit: 3e04f4bbd06a9d941b34540921114228561f2100
Parents: 96ee0ba
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Jun 1 13:37:20 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Jun 1 13:37:20 2016 -0400
----------------------------------------------------------------------
.../gremlin/console/groovy/plugin/DriverRemoteAcceptor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3e04f4bb/gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/groovy/plugin/DriverRemoteAcceptor.java
----------------------------------------------------------------------
diff --git a/gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/groovy/plugin/DriverRemoteAcceptor.java b/gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/groovy/plugin/DriverRemoteAcceptor.java
index f34827e..e60b325 100644
--- a/gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/groovy/plugin/DriverRemoteAcceptor.java
+++ b/gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/groovy/plugin/DriverRemoteAcceptor.java
@@ -64,7 +64,7 @@ public class DriverRemoteAcceptor implements RemoteAcceptor {
private static final String TOKEN_SHOW = "show";
/**
- * @deprecated As of 3.1.3-incubating, replaced by "none" option
+ * @deprecated As of 3.1.3, replaced by "none" option
*/
@Deprecated
private static final String TOKEN_MAX = "max";
[09/15] incubator-tinkerpop git commit: Removed "incubating" from
3.2.1 references as it will not be released under incubator CTR
Posted by ok...@apache.org.
Removed "incubating" from 3.2.1 references as it will not be released under incubator CTR
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/2339003b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/2339003b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/2339003b
Branch: refs/heads/TINKERPOP-1278
Commit: 2339003b9a37cd64c24e13c86efd676d39f63897
Parents: cda11fd
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Jun 1 13:46:15 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Jun 1 13:46:15 2016 -0400
----------------------------------------------------------------------
.../groovy/org/apache/tinkerpop/gremlin/console/Console.groovy | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2339003b/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 91cba82..5108948 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
@@ -79,7 +79,7 @@ class Console {
private final boolean interactive
/**
- * @deprecated As of release 3.2.1-incubating.
+ * @deprecated As of release 3.2.1.
*/
@Deprecated
public Console(final String initScriptFile) {
[11/15] incubator-tinkerpop git commit: This closes #71
Posted by ok...@apache.org.
This closes #71
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/ddddc5f2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/ddddc5f2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/ddddc5f2
Branch: refs/heads/TINKERPOP-1278
Commit: ddddc5f216386d9b783b41b2e7a1b68ccddeb323
Parents: 3185ee2
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Jun 2 07:36:32 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Jun 2 07:36:32 2016 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
[08/15] incubator-tinkerpop git commit: Merge remote-tracking branch
'origin/tp31'
Posted by ok...@apache.org.
Merge remote-tracking branch 'origin/tp31'
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/cda11fd2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/cda11fd2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/cda11fd2
Branch: refs/heads/TINKERPOP-1278
Commit: cda11fd2590bbd7c8077e82628cd8856c4343953
Parents: db0334f 171776b
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Jun 1 13:42:03 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Jun 1 13:42:03 2016 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 2 +-
docs/src/upgrade/release-3.1.x-incubating.asciidoc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cda11fd2/CHANGELOG.asciidoc
----------------------------------------------------------------------
[03/15] incubator-tinkerpop git commit: Fixed some bad refactoring of
GryoMessageSerializers
Posted by ok...@apache.org.
Fixed some bad refactoring of GryoMessageSerializers
Added back a constructor that got accidentally removed. CTR
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/aa673db1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/aa673db1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/aa673db1
Branch: refs/heads/TINKERPOP-1278
Commit: aa673db10f1e358e75d57e2dfb1c1c8b78535eb5
Parents: 43d276a
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Jun 1 12:57:24 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Jun 1 12:57:24 2016 -0400
----------------------------------------------------------------------
.../ser/GryoLiteMessageSerializerV1d0.java | 10 ++++++++-
.../driver/ser/GryoMessageSerializerV1d0.java | 22 ++++++++++++++++++--
2 files changed, 29 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/aa673db1/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GryoLiteMessageSerializerV1d0.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GryoLiteMessageSerializerV1d0.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GryoLiteMessageSerializerV1d0.java
index 14f716d..53825be 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GryoLiteMessageSerializerV1d0.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GryoLiteMessageSerializerV1d0.java
@@ -57,6 +57,14 @@ public class GryoLiteMessageSerializerV1d0 extends AbstractGryoMessageSerializer
super(overrideWithLite(GryoMapper.build()).create());
}
+ /**
+ * Creates an instance with a standard {@link GryoMapper} instance. Note that the instance created by the supplied
+ * builder will be overridden by {@link #configure} if it is called.
+ */
+ public GryoLiteMessageSerializerV1d0(final GryoMapper.Builder kryo) {
+ super(overrideWithLite(kryo).create());
+ }
+
@Override
public String[] mimeTypesSupported() {
return new String[]{serializeToString ? MIME_TYPE_STRINGD : MIME_TYPE};
@@ -64,7 +72,7 @@ public class GryoLiteMessageSerializerV1d0 extends AbstractGryoMessageSerializer
@Override
GryoMapper.Builder configureBuilder(final GryoMapper.Builder builder, final Map<String, Object> config,
- final Map<String, Graph> graphs) {
+ final Map<String, Graph> graphs) {
return overrideWithLite(builder);
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/aa673db1/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GryoMessageSerializerV1d0.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GryoMessageSerializerV1d0.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GryoMessageSerializerV1d0.java
index e9b51d1..445b6cc 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GryoMessageSerializerV1d0.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GryoMessageSerializerV1d0.java
@@ -36,13 +36,31 @@ public final class GryoMessageSerializerV1d0 extends AbstractGryoMessageSerializ
private static final String MIME_TYPE_STRINGD = SerTokens.MIME_GRYO_V1D0 + "-stringd";
/**
- * Creates an instance with a standard {@link GryoMapper} instance. Note that this instance
- * will be overridden by {@link #configure} is called.
+ * Creates an instance with a standard {@link GryoMapper} instance.
*/
public GryoMessageSerializerV1d0() {
super(GryoMapper.build().create());
}
+ /**
+ * Creates an instance with a standard {@link GryoMapper} instance. Note that the instance created by the supplied
+ * builder will be overridden by {@link #configure} if it is called.
+ */
+ public GryoMessageSerializerV1d0(final GryoMapper.Builder kryo) {
+ super(kryo.create());
+ }
+
+ /**
+ * Creates an instance with a standard {@link GryoMapper} instance. Note that the instance supplied
+ * will be overridden by {@link #configure} if it is called.
+ *
+ * @deprecated As of release 3.2.1, replaced by {@link GryoMessageSerializerV1d0#GryoMessageSerializerV1d0(GryoMapper.Builder)}.
+ */
+ @Deprecated
+ public GryoMessageSerializerV1d0(final GryoMapper kryo) {
+ super(kryo);
+ }
+
@Override
public String[] mimeTypesSupported() {
return new String[]{serializeToString ? MIME_TYPE_STRINGD : MIME_TYPE};
[07/15] incubator-tinkerpop git commit: Removed references to
"incubating" for 3.1.3 as it won't be released under incubation CTR
Posted by ok...@apache.org.
Removed references to "incubating" for 3.1.3 as it won't be released under incubation CTR
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/171776be
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/171776be
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/171776be
Branch: refs/heads/TINKERPOP-1278
Commit: 171776bef51ca103e99d54db258e63f6d62f6848
Parents: 3f6b38a
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Jun 1 13:40:57 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Jun 1 13:40:57 2016 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 2 +-
docs/src/upgrade/release-3.1.x-incubating.asciidoc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/171776be/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 9cd6998..ebe3efd 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -22,7 +22,7 @@ TinkerPop 3.1.0 (A 187 On The Undercover Gremlinz)
image::https://raw.githubusercontent.com/apache/incubator-tinkerpop/master/docs/static/images/gremlin-gangster.png[width=185]
-[[release-3-1-3-incubating]]
+[[release-3-1-3]]
TinkerPop 3.1.3 (NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/171776be/docs/src/upgrade/release-3.1.x-incubating.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/upgrade/release-3.1.x-incubating.asciidoc b/docs/src/upgrade/release-3.1.x-incubating.asciidoc
index 7f52a37..b1b99f8 100644
--- a/docs/src/upgrade/release-3.1.x-incubating.asciidoc
+++ b/docs/src/upgrade/release-3.1.x-incubating.asciidoc
@@ -27,7 +27,7 @@ TinkerPop 3.1.3
*Release Date: NOT OFFICIALLY RELEASED YET*
-Please see the link:https://github.com/apache/incubator-tinkerpop/blob/3.1.2-incubating/CHANGELOG.asciidoc#tinkerpop-313-release-date-MONTH-DAY-YEAR[changelog] for a complete list of all the modifications that are part of this release.
+Please see the link:https://github.com/apache/incubator-tinkerpop/blob/3.1.3/CHANGELOG.asciidoc#tinkerpop-313-release-date-MONTH-DAY-YEAR[changelog] for a complete list of all the modifications that are part of this release.
Upgrading for Users
~~~~~~~~~~~~~~~~~~~
[14/15] incubator-tinkerpop git commit: MatchStep should be treated
like RepeatStep in TraversalHelper.isLocalStarGraph(). The reason being,
you don't know the order of the patterns and thus,
if the state changes at least once, then assume it can change
Posted by ok...@apache.org.
MatchStep should be treated like RepeatStep in TraversalHelper.isLocalStarGraph(). The reason being, you don't know the order of the patterns and thus, if the state changes at least once, then assume it can change given another ordering. Fixed #TINKERPOP-1323. Added a failing test case from the mailing list to verify correct behavior. CTR.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/9c56fa3a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/9c56fa3a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/9c56fa3a
Branch: refs/heads/TINKERPOP-1278
Commit: 9c56fa3a93ff1979373c681337c335de396ad916
Parents: 9079366
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Thu Jun 2 13:57:47 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Thu Jun 2 13:57:47 2016 -0600
----------------------------------------------------------------------
.../process/traversal/util/TraversalHelper.java | 2 +-
.../step/branch/GroovyLocalTest.groovy | 8 +++++
.../traversal/step/branch/LocalTest.java | 38 +++++++++++++++++---
3 files changed, 43 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/9c56fa3a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalHelper.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalHelper.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalHelper.java
index 9a98e54..67e96b7 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalHelper.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalHelper.java
@@ -129,7 +129,7 @@ public final class TraversalHelper {
state = 'u';
else if (states.contains('e'))
state = 'e';
- if (state != currState && step instanceof RepeatStep)
+ if (state != currState && (step instanceof RepeatStep || step instanceof MatchStep))
return 'x';
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/9c56fa3a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/branch/GroovyLocalTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/branch/GroovyLocalTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/branch/GroovyLocalTest.groovy
index 5e594cb..0e2ef3e 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/branch/GroovyLocalTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/branch/GroovyLocalTest.groovy
@@ -79,5 +79,13 @@ public abstract class GroovyLocalTest {
public Traversal<Vertex, String> get_g_V_localXinEXknowsX_limitX2XX_outV_name() {
new ScriptTraversal<>(g, "gremlin-groovy", "g.V().local(__.inE('knows').limit(2).outV).name");
}
+
+ @Override
+ public Traversal<Vertex, Map<String, String>> get_g_V_localXmatchXproject__created_person__person_name_nameX_selectXname_projectX_by_byXnameX() {
+ new ScriptTraversal<>(g, "gremlin-groovy", """g.V.local(match(
+ __.as('project').in('created').as('person'),
+ __.as('person').values('name').as('name'))).
+ select('name', 'project').by.by('name')""")
+ }
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/9c56fa3a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/LocalTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/LocalTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/LocalTest.java
index f1480fb..c202a9c 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/LocalTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/LocalTest.java
@@ -21,9 +21,10 @@ package org.apache.tinkerpop.gremlin.process.traversal.step.branch;
import org.apache.tinkerpop.gremlin.LoadGraphWith;
import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
import org.apache.tinkerpop.gremlin.process.GremlinProcessRunner;
+import org.apache.tinkerpop.gremlin.process.traversal.Order;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.process.traversal.Order;
import org.apache.tinkerpop.gremlin.structure.T;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.junit.Test;
@@ -34,8 +35,16 @@ import java.util.Map;
import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.CREW;
import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN;
-import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.*;
-import static org.junit.Assert.*;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.as;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.bothE;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.inE;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.out;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.outE;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.properties;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
/**
@@ -64,6 +73,8 @@ public abstract class LocalTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, String> get_g_V_localXinEXknowsX_limitX2XX_outV_name();
+ public abstract Traversal<Vertex, Map<String, String>> get_g_V_localXmatchXproject__created_person__person_name_nameX_selectXname_projectX_by_byXnameX();
+
@Test
@LoadGraphWith(CREW)
public void g_V_localXpropertiesXlocationX_order_byXvalueX_limitX2XX_value() {
@@ -197,6 +208,19 @@ public abstract class LocalTest extends AbstractGremlinProcessTest {
assertEquals(5, counter);
}
+ @Test
+ @LoadGraphWith(MODERN)
+ public void g_V_localXmatchXproject__created_person__person_name_nameX_selectXname_projectX_by_byXnameX() {
+ final Traversal<Vertex, Map<String, String>> traversal = get_g_V_localXmatchXproject__created_person__person_name_nameX_selectXname_projectX_by_byXnameX();
+ printTraversalForm(traversal);
+ checkResults(makeMapList(2,
+ "name", "marko", "project", "lop",
+ "name", "josh", "project", "lop",
+ "name", "peter", "project", "lop",
+ "name", "josh", "project", "ripple"), traversal);
+ assertFalse(traversal.hasNext());
+ }
+
public static class Traversals extends LocalTest {
@Override
@@ -249,6 +273,12 @@ public abstract class LocalTest extends AbstractGremlinProcessTest {
return g.V().local(inE("knows").limit(2)).outV().values("name");
}
-
+ @Override
+ public Traversal<Vertex, Map<String, String>> get_g_V_localXmatchXproject__created_person__person_name_nameX_selectXname_projectX_by_byXnameX() {
+ return g.V().local(__.match(
+ as("project").in("created").as("person"),
+ as("person").values("name").as("name")))
+ .<String>select("name", "project").by().by("name");
+ }
}
}
[06/15] incubator-tinkerpop git commit: Merge remote-tracking branch
'origin/tp31'
Posted by ok...@apache.org.
Merge remote-tracking branch 'origin/tp31'
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/db0334f6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/db0334f6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/db0334f6
Branch: refs/heads/TINKERPOP-1278
Commit: db0334f63f0e8cf47e30136d80da1523cc86f829
Parents: aa673db 3f6b38a
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Jun 1 13:38:21 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Jun 1 13:38:21 2016 -0400
----------------------------------------------------------------------
docs/src/reference/implementations-intro.asciidoc | 2 +-
docs/src/reference/the-traversal.asciidoc | 2 +-
docs/src/tutorials/getting-started/index.asciidoc | 2 +-
.../gremlin/console/groovy/plugin/DriverRemoteAcceptor.java | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/db0334f6/docs/src/reference/the-traversal.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/db0334f6/docs/src/tutorials/getting-started/index.asciidoc
----------------------------------------------------------------------
[12/15] incubator-tinkerpop git commit: Merge branch 'TINKERPOP-1003'
into tp31
Posted by ok...@apache.org.
Merge branch 'TINKERPOP-1003' into tp31
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/029f56b7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/029f56b7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/029f56b7
Branch: refs/heads/TINKERPOP-1278
Commit: 029f56b7213ad43cf4a3f6aef805ea862554418c
Parents: 171776b b220e31
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Thu Jun 2 17:27:21 2016 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Thu Jun 2 17:27:21 2016 +0200
----------------------------------------------------------------------
README.asciidoc | 8 ++++----
bin/publish-docs.sh | 15 +++++++++++++++
2 files changed, 19 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[02/15] incubator-tinkerpop git commit: Forgot to take the current
(possibly unpublished) version's directory into account.
Posted by ok...@apache.org.
Forgot to take the current (possibly unpublished) version's directory into account.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/b220e316
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/b220e316
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/b220e316
Branch: refs/heads/TINKERPOP-1278
Commit: b220e3169381c4e9dc14176583ba32acd0cf364a
Parents: aca8c35
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Wed Jun 1 01:26:44 2016 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Wed Jun 1 01:26:44 2016 +0200
----------------------------------------------------------------------
bin/publish-docs.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/b220e316/bin/publish-docs.sh
----------------------------------------------------------------------
diff --git a/bin/publish-docs.sh b/bin/publish-docs.sh
index 212ecde..99c48b9 100755
--- a/bin/publish-docs.sh
+++ b/bin/publish-docs.sh
@@ -61,7 +61,7 @@ ${SVN_CMD} update --depth empty "javadocs/${VERSION}"
for dir in "docs" "javadocs"
do
- CURRENT=$(${SVN_CMD} list "${dir}" | tr -d '/' | grep -v SNAPSHOT | grep -Fv current | sort -rV | head -n1)
+ CURRENT=$((${SVN_CMD} list "${dir}" ; ls "${dir}") | tr -d '/' | grep -v SNAPSHOT | grep -Fv current | sort -rV | head -n1)
${SVN_CMD} update --depth empty "${dir}/current"
${SVN_CMD} rm "${dir}/current"
[13/15] incubator-tinkerpop git commit: Merge branch 'tp31'
Posted by ok...@apache.org.
Merge branch 'tp31'
Resolved Conflicts:
README.asciidoc
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/90793661
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/90793661
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/90793661
Branch: refs/heads/TINKERPOP-1278
Commit: 907936614b4af24bb9fd383005d10c758303ff6b
Parents: ddddc5f 029f56b
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Thu Jun 2 17:29:04 2016 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Thu Jun 2 17:29:04 2016 +0200
----------------------------------------------------------------------
README.asciidoc | 8 ++++----
bin/publish-docs.sh | 15 +++++++++++++++
2 files changed, 19 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[10/15] incubator-tinkerpop git commit: Fixed up hardcoded links in
docs CTR
Posted by ok...@apache.org.
Fixed up hardcoded links in docs CTR
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/3185ee24
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/3185ee24
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/3185ee24
Branch: refs/heads/TINKERPOP-1278
Commit: 3185ee248a2cd3e8f8cbd6b483377e1e8c545c4e
Parents: 2339003
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Jun 1 13:46:51 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Jun 1 13:46:51 2016 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 2 +-
docs/src/recipes/index.asciidoc | 2 +-
docs/src/upgrade/release-3.2.x-incubating.asciidoc | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3185ee24/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 4faf17d..9590a90 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -22,7 +22,7 @@ TinkerPop 3.2.0 (Nine Inch Gremlins)
image::https://raw.githubusercontent.com/apache/incubator-tinkerpop/master/docs/static/images/nine-inch-gremlins.png[width=185]
-[[release-3.2.1-incubating]]
+[[release-3.2.1]]
TinkerPop 3.2.1 (NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3185ee24/docs/src/recipes/index.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/recipes/index.asciidoc b/docs/src/recipes/index.asciidoc
index 89d4660..6f80ad0 100644
--- a/docs/src/recipes/index.asciidoc
+++ b/docs/src/recipes/index.asciidoc
@@ -58,7 +58,7 @@ How to Contribute a Recipe
Recipes are generated under the same system as all TinkerPop documentation and is stored directly in the source code
repository. TinkerPop documentation is all link:http://asciidoc.org/[asciidoc] based and can be generated locally with
either link:http://tinkerpop.apache.org/docs/x.y.z/dev/developer/#building-testing[shell script/Maven] or
-link:http://tinkerpop.apache.org/docs/3.2.0-incubating/dev/developer/#docker-integration[Docker] build commands. Once
+link:http://tinkerpop.apache.org/docs/x.y.z/dev/developer/#docker-integration[Docker] build commands. Once
changes are complete, submit a pull request for review by TinkerPop committers.
NOTE: Please review existing recipes and attempt to conform to their writing and visual style. It may also be a good
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3185ee24/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 dec022f..9e387de 100644
--- a/docs/src/upgrade/release-3.2.x-incubating.asciidoc
+++ b/docs/src/upgrade/release-3.2.x-incubating.asciidoc
@@ -27,7 +27,7 @@ TinkerPop 3.2.1
*Release Date: NOT OFFICIALLY RELEASED YET*
-Please see the link:https://github.com/apache/incubator-tinkerpop/blob/3.2.1-incubating/CHANGELOG.asciidoc#tinkerpop-321-release-date-MONTH-DAY-YEAR[changelog] for a complete list of all the modifications that are part of this release.
+Please see the link:https://github.com/apache/incubator-tinkerpop/blob/3.2.1/CHANGELOG.asciidoc#tinkerpop-321-release-date-MONTH-DAY-YEAR[changelog] for a complete list of all the modifications that are part of this release.
Upgrading for Users
~~~~~~~~~~~~~~~~~~~
@@ -110,8 +110,8 @@ The console also has a number of new features in addition to `-e` and `-i`:
See: link:https://issues.apache.org/jira/browse/TINKERPOP-1268[TINKERPOP-1268],
link:https://issues.apache.org/jira/browse/TINKERPOP-1155[TINKERPOP-1155], link:https://issues.apache.org/jira/browse/TINKERPOP-1156[TINKERPOP-1156],
link:https://issues.apache.org/jira/browse/TINKERPOP-1157[TINKERPOP-1157],
-link:http://tinkerpop.apache.org/docs/3.2.1-incubating/reference/#interactive-mode[Reference Documentation - Interactive Mode],
-link:http://tinkerpop.apache.org/docs/3.2.1-incubating/reference/#execution-mode[Reference Documentation - Execution Mode]
+link:http://tinkerpop.apache.org/docs/3.2.1/reference/#interactive-mode[Reference Documentation - Interactive Mode],
+link:http://tinkerpop.apache.org/docs/3.2.1/reference/#execution-mode[Reference Documentation - Execution Mode]
Upgrading for Providers
~~~~~~~~~~~~~~~~~~~~~~~