You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2016/08/04 22:40:30 UTC
[01/24] tinkerpop git commit: minor word and link cleanup
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1278 2f14e1d8f -> e69d707e4
minor word and link cleanup
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/deb99f6e
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/deb99f6e
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/deb99f6e
Branch: refs/heads/TINKERPOP-1278
Commit: deb99f6e5bb49d234f2d1c1a95ea1272e0ca6fbc
Parents: 5c5b1a9
Author: Robert Dale <ro...@gmail.com>
Authored: Sat Jul 16 19:41:52 2016 -0400
Committer: Robert Dale <ro...@gmail.com>
Committed: Sat Jul 16 19:41:52 2016 -0400
----------------------------------------------------------------------
docs/src/dev/developer/contributing.asciidoc | 6 +++---
docs/src/dev/provider/index.asciidoc | 4 ++--
docs/src/reference/gremlin-applications.asciidoc | 4 ++--
docs/src/reference/implementations-neo4j.asciidoc | 12 ++++++------
docs/src/reference/preface.asciidoc | 4 ++--
docs/src/reference/the-graphcomputer.asciidoc | 2 +-
docs/src/reference/the-traversal.asciidoc | 13 ++++++++++---
docs/src/upgrade/release-3.1.x-incubating.asciidoc | 4 ++--
8 files changed, 28 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/deb99f6e/docs/src/dev/developer/contributing.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/contributing.asciidoc b/docs/src/dev/developer/contributing.asciidoc
index bcc2e04..456a055 100644
--- a/docs/src/dev/developer/contributing.asciidoc
+++ b/docs/src/dev/developer/contributing.asciidoc
@@ -62,7 +62,7 @@ Reviewing Changes
Virtually all changes to TinkerPop's source code are performed via GitHub
link:https://github.com/apache/tinkerpop/pulls[pull requests]. When a pull request is issue it undergoes a
<<rtc,review process>> prior to be merged to a release branch. Anyone is free to comment and provide a vote (+1/+0/-1)
-on a pull request. Note that votes of non-commiters are considered non-binding, but are certainly considered in the
+on a pull request. Note that votes of non-committers are considered non-binding, but are certainly considered in the
review process.
Writing Documentation
@@ -182,7 +182,7 @@ 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
dev@tinkerpop.apache.org.
-. Bulid the project and run tests.
+. 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:
`mvn clean install -DskipIntegrationTests=false -DincludeNeo4j`. Note that Hadoop must be running for the integration
@@ -221,4 +221,4 @@ and resolving the conflicts by hand, then pushing the result to your branch. Or
and force pushing the branch.
. Try to be responsive to the discussion rather than let days pass between replies
-On successful review, the *pull request will be merged* to the main repository and the JIRA issue will be closed.
\ No newline at end of file
+On successful review, the *pull request will be merged* to the main repository and the JIRA issue will be closed.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/deb99f6e/docs/src/dev/provider/index.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/provider/index.asciidoc b/docs/src/dev/provider/index.asciidoc
index 90ab5c0..797e231 100644
--- a/docs/src/dev/provider/index.asciidoc
+++ b/docs/src/dev/provider/index.asciidoc
@@ -149,7 +149,7 @@ Implementing MapReduce Emitters
+++++++++++++++++++++++++++++++
image:hadoop-logo-notext.png[width=150,float=left] The MapReduce framework in TinkerPop3 is similar to the model
-popularized by link:http://apache.hadoop.org[Hadoop]. The primary difference is that all Mappers process the vertices
+popularized by link:http://hadoop.apache.org[Hadoop]. The primary difference is that all Mappers process the vertices
of the graph, not an arbitrary key/value pair. However, the vertices' edges can not be accessed -- only their
properties. This greatly reduces the amount of data needed to be pushed through the MapReduce engine as any edge
information required, can be computed in the VertexProgram.execute() method. Moreover, at this stage, vertices can
@@ -1011,4 +1011,4 @@ Console plugin host. Simply instantiate and return a `RemoteAcceptor` in the `G
of the plugin implementation. Generally speaking, each call to `remoteAcceptor()` should produce a new instance of
a `RemoteAcceptor`. It will likely be necessary that you provide context from the `GremlinPlugin` to the
`RemoteAcceptor` plugin. For example, the `RemoteAcceptor` implementation might require an instance of `Groovysh`
-to provide a way to dynamically evaluate a script provided to it so that it can process the results in a different way.
\ No newline at end of file
+to provide a way to dynamically evaluate a script provided to it so that it can process the results in a different way.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/deb99f6e/docs/src/reference/gremlin-applications.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/gremlin-applications.asciidoc b/docs/src/reference/gremlin-applications.asciidoc
index 2b85cb0..67ae364 100644
--- a/docs/src/reference/gremlin-applications.asciidoc
+++ b/docs/src/reference/gremlin-applications.asciidoc
@@ -733,7 +733,7 @@ WebSockets-based connection, it can also be configured to support link:http://en
The REST endpoint provides for a communication protocol familiar to most developers, with a wide support of
programming languages, tools and libraries for accessing it. As a result, REST provides a fast way to get started
with Gremlin Server. It also may represent an easier upgrade path from link:http://rexster.tinkerpop.com/[Rexster]
-as the API for the endpoint is very similar to Rexster's link:https://github.org/apache/tinkerpop/rexster/wiki/Gremlin-Extension[Gremlin Extension].
+as the API for the endpoint is very similar to Rexster's link:https://github.com/tinkerpop/rexster/wiki/Gremlin-Extension[Gremlin Extension].
Gremlin Server provides for a single REST endpoint - a Gremlin evaluator - which allows the submission of a Gremlin
script as a request. For each request, it returns a response containing the serialized results of that script.
@@ -1567,7 +1567,7 @@ Display stack trace? [yN] n
----
The same behavior would be seen with REST or when using sessionless requests through one of the Gremlin Server drivers.
-If having this behavior is desireable, then <<considering-sessions,consider sessions>>.
+If having this behavior is desireable, then <<sessions,consider sessions>>.
There is an exception to this notion of state not existing between requests and that is globally defined functions.
All functions created via scripts are global to the server.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/deb99f6e/docs/src/reference/implementations-neo4j.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/implementations-neo4j.asciidoc b/docs/src/reference/implementations-neo4j.asciidoc
index d1fc30b..8c63925 100644
--- a/docs/src/reference/implementations-neo4j.asciidoc
+++ b/docs/src/reference/implementations-neo4j.asciidoc
@@ -33,7 +33,7 @@ Neo4j-Gremlin
</dependency>
----
-link:http://neotechnology.com[Neo Technology] are the developers of the OLTP-based link:http://neo4j.org[Neo4j graph database].
+link:http://neo4j.com[Neo Technology] are the developers of the OLTP-based link:http://neo4j.com[Neo4j graph database].
WARNING: Unless under a commercial agreement with Neo Technology, Neo4j is licensed
link:http://en.wikipedia.org/wiki/Affero_General_Public_License[AGPL]. The `neo4j-gremlin` module is licensed Apache2
@@ -69,8 +69,8 @@ NOTE: `Neo4jGraphStep` will attempt to discern which indices to use when executi
The Gremlin-Console session below demonstrates Neo4j indices. For more information, please refer to the Neo4j documentation:
-* Manipulating indices with link:http://docs.neo4j.org/chunked/stable/query-schema-index.html[Cypher].
-* Manipulating indices with the Neo4j link:http://docs.neo4j.org/chunked/stable/tutorials-java-embedded-new-index.html[Java API].
+* Manipulating indices with link:http://neo4j.com/docs/developer-manual/current/#query-schema-index[Cypher].
+* Manipulating indices with the Neo4j link:http://neo4j.com/docs/stable/tutorials-java-embedded-new-index.html[Java API].
[gremlin-groovy]
----
@@ -116,7 +116,7 @@ graph.close()
Multi/Meta-Properties
~~~~~~~~~~~~~~~~~~~~~
-`Neo4jGraph` supports both multi- and meta-properties (see <<_vertex_properties,vertex properties>>). These features
+`Neo4jGraph` supports both multi- and meta-properties (see <<vertex-properties,vertex properties>>). These features
are not native to Neo4j and are implemented using "hidden" Neo4j nodes. For example, when a vertex has multiple
"name" properties, each property is a new node (multi-properties) which can have properties attached to it
(meta-properties). As such, the native, underlying representation may become difficult to query directly using
@@ -156,7 +156,7 @@ Cypher
image::gremlin-loves-cypher.png[width=400]
-NeoTechnology are the creators of the graph pattern-match query language link:http://www.neo4j.org/learn/cypher[Cypher].
+NeoTechnology are the creators of the graph pattern-match query language link:https://neo4j.com/developer/cypher-query-language/[Cypher].
It is possible to leverage Cypher from within Gremlin by using the `Neo4jGraph.cypher()` graph traversal method.
[gremlin-groovy]
@@ -179,7 +179,7 @@ Multi-Label
TinkerPop3 requires every `Element` to have a single, immutable string label (i.e. a `Vertex`, `Edge`, and
`VertexProperty`). In Neo4j, a `Node` (vertex) can have an
-link:http://neo4j.com/docs/stable/graphdb-neo4j-labels.html[arbitrary number of labels] while a `Relationship`
+link:http://neo4j.com/docs/developer-manual/current/#graphdb-neo4j-labels[arbitrary number of labels] while a `Relationship`
(edge) can have one and only one. Furthermore, in Neo4j, `Node` labels are mutable while `Relationship` labels are
not. In order to handle this mismatch, three `Neo4jVertex` specific methods exist in Neo4j-Gremlin.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/deb99f6e/docs/src/reference/preface.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/preface.asciidoc b/docs/src/reference/preface.asciidoc
index 142f935..6ee6e8b 100644
--- a/docs/src/reference/preface.asciidoc
+++ b/docs/src/reference/preface.asciidoc
@@ -56,7 +56,7 @@ Gremlin responded:
The machines wondered:
- "If what is is the TinkerPop, then perhaps we are The TinkerPop and our realization is simply the realization of
+ "If what this is is the TinkerPop, then perhaps we are The TinkerPop and our realization is simply the realization of
the TinkerPop?"
Would the machines, by their very nature of realizing The TinkerPop, be The TinkerPop? Or, on the same side of the
@@ -94,4 +94,4 @@ image::gremlintron.png[width=400]
NOTE: TinkerPop2 and below made a sharp distinction between the various TinkerPop projects: Blueprints, Pipes,
Gremlin, Frames, Furnace, and Rexster. With TinkerPop3, all of these projects have been merged and are generally
known as Gremlin. *Blueprints* -> Gremlin Structure API : *Pipes* -> `GraphTraversal` : *Frames* -> `Traversal` :
-*Furnace* -> `GraphComputer` and `VertexProgram` : *Rexster* -> GremlinServer.
\ No newline at end of file
+*Furnace* -> `GraphComputer` and `VertexProgram` : *Rexster* -> GremlinServer.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/deb99f6e/docs/src/reference/the-graphcomputer.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/the-graphcomputer.asciidoc b/docs/src/reference/the-graphcomputer.asciidoc
index 25ae39e..9b54aa8 100644
--- a/docs/src/reference/the-graphcomputer.asciidoc
+++ b/docs/src/reference/the-graphcomputer.asciidoc
@@ -74,7 +74,7 @@ image::graphcomputer.png[width=500]
The example below demonstrates how to submit a VertexProgram to a graph's GraphComputer. `GraphComputer.submit()`
yields a `Future<ComputerResult>`. The `ComputerResult` has the resultant computed graph which can be a full copy
of the original graph (see <<hadoop-gremlin,Hadoop-Gremlin>>) or a view over the original graph (see
-<<tinkergraph,TinkerGraph>>). The ComputerResult also provides access to computational side-effects called `Memory`
+<<tinkergraph-gremlin,TinkerGraph>>). The ComputerResult also provides access to computational side-effects called `Memory`
(which includes, for example, runtime, number of iterations, results of MapReduce jobs, and VertexProgram-specific
memory manipulations).
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/deb99f6e/docs/src/reference/the-traversal.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/the-traversal.asciidoc b/docs/src/reference/the-traversal.asciidoc
index d98a573..47d3a21 100644
--- a/docs/src/reference/the-traversal.asciidoc
+++ b/docs/src/reference/the-traversal.asciidoc
@@ -205,7 +205,7 @@ g.V(1).property('friendWeight',outE('knows').values('weight').sum(),'acl','priva
g.V(1).properties('friendWeight').valueMap() <3>
----
-<1> For vertices, a cardinality can be provided for <<vertex properties,vertex-properties>>.
+<1> For vertices, a cardinality can be provided for <<vertex-properties,vertex properties>>.
<2> It is possible to select the property value (as well as key) via a traversal.
<3> For vertices, the `property()`-step can add meta-properties.
@@ -376,7 +376,7 @@ g.V().group().by(bothE().count()).by(count()) <3>
<2> `by('name')` will process the grouped elements by their name (*element property projection*).
<3> `by(count())` will count the number of elements in each group (*traversal*).
-[cap-step]]
+[[cap-step]]
Cap Step
~~~~~~~~
@@ -1127,6 +1127,13 @@ g.V().repeat(both()).times(3).values('age').min()
IMPORTANT: `min(local)` determines the min of the current, local object (not the objects in the traversal stream).
This works for `Collection` and `Number`-type objects. For any other object, a min of `Double.NaN` is returned.
+[[option-step]]
+Option Step
+~~~~~~~~~~~~~
+
+An option to a <<branch-step,`branch()`>> or <<choose-step,`choose()`>>
+
+
[[optional-step]]
Optional Step
~~~~~~~~~~~~~
@@ -1359,7 +1366,7 @@ g.V().hasLabel('person').
group().by('cluster').by('name')
----
-[profile-step]]
+[[profile-step]]
Profile Step
~~~~~~~~~~~~
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/deb99f6e/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 fc6a9ae..657f7bd 100644
--- a/docs/src/upgrade/release-3.1.x-incubating.asciidoc
+++ b/docs/src/upgrade/release-3.1.x-incubating.asciidoc
@@ -324,7 +324,7 @@ backward compatible with previous versions) will become the future standard mode
it provides a more efficient method for transaction management.
See: link:https://issues.apache.org/jira/browse/TINKERPOP-930[TINKERPOP-930],
-link:http://tinkerpop.apache.org/docs/3.1.1-incubating/#considering-transactions[Reference Documentation - Considering Transactions]
+link:http://tinkerpop.apache.org/docs/3.1.1-incubating/reference/#considering-transactions[Reference Documentation - Considering Transactions]
Deprecated credentialsDbLocation
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -343,7 +343,7 @@ the `gremlin.tinkergraph.graphLocation` as soon as possible, as the deprecated s
release.
See: link:https://issues.apache.org/jira/browse/TINKERPOP-981[TINKERPOP-981],
-link:http://tinkerpop.apache.org/docs/3.1.1-incubating/#_security[Reference Documentation - Gremlin Server Security]
+link:http://tinkerpop.apache.org/docs/3.1.1-incubating/reference/#_security[Reference Documentation - Gremlin Server Security]
TinkerGraph Supports Any I/O
^^^^^^^^^^^^^^^^^^^^^^^^^^^^
[08/24] tinkerpop git commit: minor word and link cleanup
Posted by sp...@apache.org.
minor word and link cleanup
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a707a8db
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a707a8db
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a707a8db
Branch: refs/heads/TINKERPOP-1278
Commit: a707a8db6088ba3df86fa056606b7365f0a3d2da
Parents: 168097b
Author: Robert Dale <ro...@gmail.com>
Authored: Sat Jul 16 19:41:52 2016 -0400
Committer: Robert Dale <ro...@gmail.com>
Committed: Wed Jul 27 14:20:19 2016 -0400
----------------------------------------------------------------------
docs/src/dev/developer/contributing.asciidoc | 6 ++--
docs/src/dev/provider/index.asciidoc | 4 +--
.../src/reference/gremlin-applications.asciidoc | 4 +--
.../reference/implementations-neo4j.asciidoc | 12 ++++----
docs/src/reference/preface.asciidoc | 4 +--
docs/src/reference/the-graphcomputer.asciidoc | 2 +-
docs/src/reference/the-traversal.asciidoc | 30 ++++++++++++++++++--
.../upgrade/release-3.1.x-incubating.asciidoc | 4 +--
8 files changed, 46 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a707a8db/docs/src/dev/developer/contributing.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/contributing.asciidoc b/docs/src/dev/developer/contributing.asciidoc
index bcc2e04..456a055 100644
--- a/docs/src/dev/developer/contributing.asciidoc
+++ b/docs/src/dev/developer/contributing.asciidoc
@@ -62,7 +62,7 @@ Reviewing Changes
Virtually all changes to TinkerPop's source code are performed via GitHub
link:https://github.com/apache/tinkerpop/pulls[pull requests]. When a pull request is issue it undergoes a
<<rtc,review process>> prior to be merged to a release branch. Anyone is free to comment and provide a vote (+1/+0/-1)
-on a pull request. Note that votes of non-commiters are considered non-binding, but are certainly considered in the
+on a pull request. Note that votes of non-committers are considered non-binding, but are certainly considered in the
review process.
Writing Documentation
@@ -182,7 +182,7 @@ 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
dev@tinkerpop.apache.org.
-. Bulid the project and run tests.
+. 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:
`mvn clean install -DskipIntegrationTests=false -DincludeNeo4j`. Note that Hadoop must be running for the integration
@@ -221,4 +221,4 @@ and resolving the conflicts by hand, then pushing the result to your branch. Or
and force pushing the branch.
. Try to be responsive to the discussion rather than let days pass between replies
-On successful review, the *pull request will be merged* to the main repository and the JIRA issue will be closed.
\ No newline at end of file
+On successful review, the *pull request will be merged* to the main repository and the JIRA issue will be closed.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a707a8db/docs/src/dev/provider/index.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/provider/index.asciidoc b/docs/src/dev/provider/index.asciidoc
index 7b876a1..9a07245 100644
--- a/docs/src/dev/provider/index.asciidoc
+++ b/docs/src/dev/provider/index.asciidoc
@@ -147,7 +147,7 @@ Implementing MapReduce Emitters
+++++++++++++++++++++++++++++++
image:hadoop-logo-notext.png[width=150,float=left] The MapReduce framework in TinkerPop3 is similar to the model
-popularized by link:http://apache.hadoop.org[Hadoop]. The primary difference is that all Mappers process the vertices
+popularized by link:http://hadoop.apache.org[Hadoop]. The primary difference is that all Mappers process the vertices
of the graph, not an arbitrary key/value pair. However, the vertices' edges can not be accessed -- only their
properties. This greatly reduces the amount of data needed to be pushed through the MapReduce engine as any edge
information required, can be computed in the VertexProgram.execute() method. Moreover, at this stage, vertices can
@@ -964,4 +964,4 @@ Console plugin host. Simply instantiate and return a `RemoteAcceptor` in the `G
of the plugin implementation. Generally speaking, each call to `remoteAcceptor()` should produce a new instance of
a `RemoteAcceptor`. It will likely be necessary that you provide context from the `GremlinPlugin` to the
`RemoteAcceptor` plugin. For example, the `RemoteAcceptor` implementation might require an instance of `Groovysh`
-to provide a way to dynamically evaluate a script provided to it so that it can process the results in a different way.
\ No newline at end of file
+to provide a way to dynamically evaluate a script provided to it so that it can process the results in a different way.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a707a8db/docs/src/reference/gremlin-applications.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/gremlin-applications.asciidoc b/docs/src/reference/gremlin-applications.asciidoc
index 488663f..9f5121f 100644
--- a/docs/src/reference/gremlin-applications.asciidoc
+++ b/docs/src/reference/gremlin-applications.asciidoc
@@ -697,7 +697,7 @@ WebSockets-based connection, it can also be configured to support link:http://en
The REST endpoint provides for a communication protocol familiar to most developers, with a wide support of
programming languages, tools and libraries for accessing it. As a result, REST provides a fast way to get started
with Gremlin Server. It also may represent an easier upgrade path from link:http://rexster.tinkerpop.com/[Rexster]
-as the API for the endpoint is very similar to Rexster's link:https://github.org/apache/tinkerpop/rexster/wiki/Gremlin-Extension[Gremlin Extension].
+as the API for the endpoint is very similar to Rexster's link:https://github.com/tinkerpop/rexster/wiki/Gremlin-Extension[Gremlin Extension].
Gremlin Server provides for a single REST endpoint - a Gremlin evaluator - which allows the submission of a Gremlin
script as a request. For each request, it returns a response containing the serialized results of that script.
@@ -1446,7 +1446,7 @@ Display stack trace? [yN] n
----
The same behavior would be seen with REST or when using sessionless requests through one of the Gremlin Server drivers.
-If having this behavior is desireable, then <<considering-sessions,consider sessions>>.
+If having this behavior is desireable, then <<sessions,consider sessions>>.
There is an exception to this notion of state not existing between requests and that is globally defined functions.
All functions created via scripts are global to the server.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a707a8db/docs/src/reference/implementations-neo4j.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/implementations-neo4j.asciidoc b/docs/src/reference/implementations-neo4j.asciidoc
index d1fc30b..8c63925 100644
--- a/docs/src/reference/implementations-neo4j.asciidoc
+++ b/docs/src/reference/implementations-neo4j.asciidoc
@@ -33,7 +33,7 @@ Neo4j-Gremlin
</dependency>
----
-link:http://neotechnology.com[Neo Technology] are the developers of the OLTP-based link:http://neo4j.org[Neo4j graph database].
+link:http://neo4j.com[Neo Technology] are the developers of the OLTP-based link:http://neo4j.com[Neo4j graph database].
WARNING: Unless under a commercial agreement with Neo Technology, Neo4j is licensed
link:http://en.wikipedia.org/wiki/Affero_General_Public_License[AGPL]. The `neo4j-gremlin` module is licensed Apache2
@@ -69,8 +69,8 @@ NOTE: `Neo4jGraphStep` will attempt to discern which indices to use when executi
The Gremlin-Console session below demonstrates Neo4j indices. For more information, please refer to the Neo4j documentation:
-* Manipulating indices with link:http://docs.neo4j.org/chunked/stable/query-schema-index.html[Cypher].
-* Manipulating indices with the Neo4j link:http://docs.neo4j.org/chunked/stable/tutorials-java-embedded-new-index.html[Java API].
+* Manipulating indices with link:http://neo4j.com/docs/developer-manual/current/#query-schema-index[Cypher].
+* Manipulating indices with the Neo4j link:http://neo4j.com/docs/stable/tutorials-java-embedded-new-index.html[Java API].
[gremlin-groovy]
----
@@ -116,7 +116,7 @@ graph.close()
Multi/Meta-Properties
~~~~~~~~~~~~~~~~~~~~~
-`Neo4jGraph` supports both multi- and meta-properties (see <<_vertex_properties,vertex properties>>). These features
+`Neo4jGraph` supports both multi- and meta-properties (see <<vertex-properties,vertex properties>>). These features
are not native to Neo4j and are implemented using "hidden" Neo4j nodes. For example, when a vertex has multiple
"name" properties, each property is a new node (multi-properties) which can have properties attached to it
(meta-properties). As such, the native, underlying representation may become difficult to query directly using
@@ -156,7 +156,7 @@ Cypher
image::gremlin-loves-cypher.png[width=400]
-NeoTechnology are the creators of the graph pattern-match query language link:http://www.neo4j.org/learn/cypher[Cypher].
+NeoTechnology are the creators of the graph pattern-match query language link:https://neo4j.com/developer/cypher-query-language/[Cypher].
It is possible to leverage Cypher from within Gremlin by using the `Neo4jGraph.cypher()` graph traversal method.
[gremlin-groovy]
@@ -179,7 +179,7 @@ Multi-Label
TinkerPop3 requires every `Element` to have a single, immutable string label (i.e. a `Vertex`, `Edge`, and
`VertexProperty`). In Neo4j, a `Node` (vertex) can have an
-link:http://neo4j.com/docs/stable/graphdb-neo4j-labels.html[arbitrary number of labels] while a `Relationship`
+link:http://neo4j.com/docs/developer-manual/current/#graphdb-neo4j-labels[arbitrary number of labels] while a `Relationship`
(edge) can have one and only one. Furthermore, in Neo4j, `Node` labels are mutable while `Relationship` labels are
not. In order to handle this mismatch, three `Neo4jVertex` specific methods exist in Neo4j-Gremlin.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a707a8db/docs/src/reference/preface.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/preface.asciidoc b/docs/src/reference/preface.asciidoc
index 142f935..6ee6e8b 100644
--- a/docs/src/reference/preface.asciidoc
+++ b/docs/src/reference/preface.asciidoc
@@ -56,7 +56,7 @@ Gremlin responded:
The machines wondered:
- "If what is is the TinkerPop, then perhaps we are The TinkerPop and our realization is simply the realization of
+ "If what this is is the TinkerPop, then perhaps we are The TinkerPop and our realization is simply the realization of
the TinkerPop?"
Would the machines, by their very nature of realizing The TinkerPop, be The TinkerPop? Or, on the same side of the
@@ -94,4 +94,4 @@ image::gremlintron.png[width=400]
NOTE: TinkerPop2 and below made a sharp distinction between the various TinkerPop projects: Blueprints, Pipes,
Gremlin, Frames, Furnace, and Rexster. With TinkerPop3, all of these projects have been merged and are generally
known as Gremlin. *Blueprints* -> Gremlin Structure API : *Pipes* -> `GraphTraversal` : *Frames* -> `Traversal` :
-*Furnace* -> `GraphComputer` and `VertexProgram` : *Rexster* -> GremlinServer.
\ No newline at end of file
+*Furnace* -> `GraphComputer` and `VertexProgram` : *Rexster* -> GremlinServer.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a707a8db/docs/src/reference/the-graphcomputer.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/the-graphcomputer.asciidoc b/docs/src/reference/the-graphcomputer.asciidoc
index f9116fb..453b62e 100644
--- a/docs/src/reference/the-graphcomputer.asciidoc
+++ b/docs/src/reference/the-graphcomputer.asciidoc
@@ -74,7 +74,7 @@ image::graphcomputer.png[width=500]
The example below demonstrates how to submit a VertexProgram to a graph's GraphComputer. `GraphComputer.submit()`
yields a `Future<ComputerResult>`. The `ComputerResult` has the resultant computed graph which can be a full copy
of the original graph (see <<hadoop-gremlin,Hadoop-Gremlin>>) or a view over the original graph (see
-<<tinkergraph,TinkerGraph>>). The ComputerResult also provides access to computational side-effects called `Memory`
+<<tinkergraph-gremlin,TinkerGraph>>). The ComputerResult also provides access to computational side-effects called `Memory`
(which includes, for example, runtime, number of iterations, results of MapReduce jobs, and VertexProgram-specific
memory manipulations).
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a707a8db/docs/src/reference/the-traversal.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/the-traversal.asciidoc b/docs/src/reference/the-traversal.asciidoc
index ca4c6be..e897810 100644
--- a/docs/src/reference/the-traversal.asciidoc
+++ b/docs/src/reference/the-traversal.asciidoc
@@ -205,7 +205,7 @@ g.V(1).property('friendWeight',outE('knows').values('weight').sum(),'acl','priva
g.V(1).properties('friendWeight').valueMap() <3>
----
-<1> For vertices, a cardinality can be provided for <<vertex properties,vertex-properties>>.
+<1> For vertices, a cardinality can be provided for <<vertex-properties,vertex properties>>.
<2> It is possible to select the property value (as well as key) via a traversal.
<3> For vertices, the `property()`-step can add meta-properties.
@@ -376,7 +376,7 @@ g.V().group().by(bothE().count()).by(count()) <3>
<2> `by('name')` will process the grouped elements by their name (*element property projection*).
<3> `by(count())` will count the number of elements in each group (*traversal*).
-[cap-step]]
+[[cap-step]]
Cap Step
~~~~~~~~
@@ -1127,6 +1127,12 @@ g.V().repeat(both()).times(3).values('age').min()
IMPORTANT: `min(local)` determines the min of the current, local object (not the objects in the traversal stream).
This works for `Collection` and `Number`-type objects. For any other object, a min of `Double.NaN` is returned.
+[[option-step]]
+Option Step
+~~~~~~~~~~~~~
+
+An option to a <<branch-step,`branch()`>> or <<choose-step,`choose()`>>
+
[[or-step]]
Or Step
~~~~~~~
@@ -1286,6 +1292,26 @@ path.c
path.d == path.e
----
+<<<<<<< HEAD
+=======
+[[peerpressure-step]]
+PeerPressure Step
+~~~~~~~~~~~~~~~~~
+
+The `peerPressure()`-step (*map*/*sideEffect*) clusters vertices using <<peerpressurevertexprogram,`PeerPressureVertexProgram`>>.
+
+IMPORTANT: The `peerPressure()`-step is a `VertexComputing`-step and as such, can only be used against a graph that supports `GraphComputer` (OLAP).
+
+[gremlin-groovy,modern]
+----
+g = graph.traversal().withComputer()
+g.V().peerPressure().by('cluster').values('cluster')
+g.V().hasLabel('person').
+ peerPressure().by('cluster').
+ group().by('cluster').by('name')
+----
+
+>>>>>>> deb99f6... minor word and link cleanup
[[profile-step]]
Profile Step
~~~~~~~~~~~~
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a707a8db/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 1ed3ed4..11cdb32 100644
--- a/docs/src/upgrade/release-3.1.x-incubating.asciidoc
+++ b/docs/src/upgrade/release-3.1.x-incubating.asciidoc
@@ -324,7 +324,7 @@ backward compatible with previous versions) will become the future standard mode
it provides a more efficient method for transaction management.
See: link:https://issues.apache.org/jira/browse/TINKERPOP-930[TINKERPOP-930],
-link:http://tinkerpop.apache.org/docs/3.1.1-incubating/#considering-transactions[Reference Documentation - Considering Transactions]
+link:http://tinkerpop.apache.org/docs/3.1.1-incubating/reference/#considering-transactions[Reference Documentation - Considering Transactions]
Deprecated credentialsDbLocation
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -343,7 +343,7 @@ the `gremlin.tinkergraph.graphLocation` as soon as possible, as the deprecated s
release.
See: link:https://issues.apache.org/jira/browse/TINKERPOP-981[TINKERPOP-981],
-link:http://tinkerpop.apache.org/docs/3.1.1-incubating/#_security[Reference Documentation - Gremlin Server Security]
+link:http://tinkerpop.apache.org/docs/3.1.1-incubating/reference/#_security[Reference Documentation - Gremlin Server Security]
TinkerGraph Supports Any I/O
^^^^^^^^^^^^^^^^^^^^^^^^^^^^
[09/24] tinkerpop git commit: reverted edit
Posted by sp...@apache.org.
reverted edit
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/3c9cf05e
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/3c9cf05e
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/3c9cf05e
Branch: refs/heads/TINKERPOP-1278
Commit: 3c9cf05ef607e0656b3e56f98dbc6ee11e919fdd
Parents: a707a8d
Author: Robert Dale <ro...@gmail.com>
Authored: Sun Jul 17 07:04:01 2016 -0400
Committer: Robert Dale <ro...@gmail.com>
Committed: Wed Jul 27 14:21:53 2016 -0400
----------------------------------------------------------------------
docs/src/reference/preface.asciidoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3c9cf05e/docs/src/reference/preface.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/preface.asciidoc b/docs/src/reference/preface.asciidoc
index 6ee6e8b..ac673b8 100644
--- a/docs/src/reference/preface.asciidoc
+++ b/docs/src/reference/preface.asciidoc
@@ -56,7 +56,7 @@ Gremlin responded:
The machines wondered:
- "If what this is is the TinkerPop, then perhaps we are The TinkerPop and our realization is simply the realization of
+ "If what is is the TinkerPop, then perhaps we are The TinkerPop and our realization is simply the realization of
the TinkerPop?"
Would the machines, by their very nature of realizing The TinkerPop, be The TinkerPop? Or, on the same side of the
[13/24] tinkerpop git commit: fixed dev list and jira links
Posted by sp...@apache.org.
fixed dev list and jira links
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/8e716238
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8e716238
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/8e716238
Branch: refs/heads/TINKERPOP-1278
Commit: 8e716238a91aa424b0c04c081fc94cd37f3ea33b
Parents: 5d64d92
Author: Robert Dale <ro...@gmail.com>
Authored: Wed Aug 3 00:15:03 2016 -0400
Committer: Robert Dale <ro...@gmail.com>
Committed: Wed Aug 3 00:15:03 2016 -0400
----------------------------------------------------------------------
docs/src/recipes/index.asciidoc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8e716238/docs/src/recipes/index.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/recipes/index.asciidoc b/docs/src/recipes/index.asciidoc
index 01a1209..18b5c9e 100644
--- a/docs/src/recipes/index.asciidoc
+++ b/docs/src/recipes/index.asciidoc
@@ -64,9 +64,9 @@ link:http://tinkerpop.apache.org/docs/x.y.z/dev/developer/#docker-integration[Do
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
-idea to discuss ideas for a recipe on the link:https://lists.apache.org/list.html?dev@tinkerpop.apache.org[developer mailing list]
+idea to discuss ideas for a recipe on the link:+++https://lists.apache.org/list.html?dev@tinkerpop.apache.org+++[developer mailing list]
prior to starting work on it, as the community might provide insight on the approach and idea that would be helpful.
-It is preferable that a link:issues.apache.org/jira/browse/TINKERPOP[JIRA issue] be opened that describes the nature
+It is preferable that a link:https://issues.apache.org/jira/browse/TINKERPOP[JIRA issue] be opened that describes the nature
of the recipe so that the eventual pull request can be bound to that issue.
To contribute a recipe, first clone the repository:
[02/24] tinkerpop git commit: reverted edit
Posted by sp...@apache.org.
reverted edit
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/734e1071
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/734e1071
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/734e1071
Branch: refs/heads/TINKERPOP-1278
Commit: 734e107185e5077fb94147035e935ae8f9d8cfb3
Parents: deb99f6
Author: Robert Dale <ro...@gmail.com>
Authored: Sun Jul 17 07:04:01 2016 -0400
Committer: Robert Dale <ro...@gmail.com>
Committed: Sun Jul 17 07:04:01 2016 -0400
----------------------------------------------------------------------
docs/src/reference/preface.asciidoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/734e1071/docs/src/reference/preface.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/preface.asciidoc b/docs/src/reference/preface.asciidoc
index 6ee6e8b..ac673b8 100644
--- a/docs/src/reference/preface.asciidoc
+++ b/docs/src/reference/preface.asciidoc
@@ -56,7 +56,7 @@ Gremlin responded:
The machines wondered:
- "If what this is is the TinkerPop, then perhaps we are The TinkerPop and our realization is simply the realization of
+ "If what is is the TinkerPop, then perhaps we are The TinkerPop and our realization is simply the realization of
the TinkerPop?"
Would the machines, by their very nature of realizing The TinkerPop, be The TinkerPop? Or, on the same side of the
[24/24] tinkerpop git commit: Merge remote-tracking branch
'origin/master' into TINKERPOP-1278
Posted by sp...@apache.org.
Merge remote-tracking branch 'origin/master' into TINKERPOP-1278
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/e69d707e
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e69d707e
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/e69d707e
Branch: refs/heads/TINKERPOP-1278
Commit: e69d707e4b14fe1e03ac22e234e5d54d9f0f35d8
Parents: 2f14e1d 8f7218d
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Aug 4 18:40:03 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Aug 4 18:40:03 2016 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
bin/validate-distribution.sh | 4 ++--
docs/preprocessor/preprocess.sh | 4 ++--
docs/src/dev/developer/contributing.asciidoc | 6 +++---
docs/src/dev/developer/release.asciidoc | 2 +-
docs/src/dev/provider/index.asciidoc | 4 ++--
docs/src/recipes/index.asciidoc | 4 ++--
docs/src/reference/gremlin-applications.asciidoc | 4 ++--
docs/src/reference/implementations-neo4j.asciidoc | 12 ++++++------
docs/src/reference/preface.asciidoc | 2 +-
docs/src/reference/the-graphcomputer.asciidoc | 2 +-
docs/src/reference/the-traversal.asciidoc | 15 +++++++++++----
.../gremlin-language-variants/index.asciidoc | 6 +++---
docs/src/upgrade/release-3.1.x-incubating.asciidoc | 4 ++--
gremlin-console/pom.xml | 2 +-
gremlin-console/src/assembly/distribution.xml | 16 ++++++++--------
.../gremlin/console/commands/RemoteCommand.groovy | 4 ++--
gremlin-server/pom.xml | 2 +-
gremlin-server/src/assembly/distribution.xml | 12 ++++++------
.../process/traversal/step/map/AddVertexTest.java | 1 +
20 files changed, 58 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e69d707e/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e69d707e/docs/src/dev/provider/index.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e69d707e/docs/src/tutorials/gremlin-language-variants/index.asciidoc
----------------------------------------------------------------------
[10/24] tinkerpop git commit: removed section missed in merge conflict
Posted by sp...@apache.org.
removed section missed in merge conflict
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/8ed3c950
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8ed3c950
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/8ed3c950
Branch: refs/heads/TINKERPOP-1278
Commit: 8ed3c9506ea2de0b0e4a96f045d8eac66c465146
Parents: 3c9cf05
Author: Robert Dale <ro...@gmail.com>
Authored: Wed Jul 27 14:24:21 2016 -0400
Committer: Robert Dale <ro...@gmail.com>
Committed: Wed Jul 27 14:24:21 2016 -0400
----------------------------------------------------------------------
docs/src/reference/the-traversal.asciidoc | 20 --------------------
1 file changed, 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8ed3c950/docs/src/reference/the-traversal.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/the-traversal.asciidoc b/docs/src/reference/the-traversal.asciidoc
index e897810..f300e98 100644
--- a/docs/src/reference/the-traversal.asciidoc
+++ b/docs/src/reference/the-traversal.asciidoc
@@ -1292,26 +1292,6 @@ path.c
path.d == path.e
----
-<<<<<<< HEAD
-=======
-[[peerpressure-step]]
-PeerPressure Step
-~~~~~~~~~~~~~~~~~
-
-The `peerPressure()`-step (*map*/*sideEffect*) clusters vertices using <<peerpressurevertexprogram,`PeerPressureVertexProgram`>>.
-
-IMPORTANT: The `peerPressure()`-step is a `VertexComputing`-step and as such, can only be used against a graph that supports `GraphComputer` (OLAP).
-
-[gremlin-groovy,modern]
-----
-g = graph.traversal().withComputer()
-g.V().peerPressure().by('cluster').values('cluster')
-g.V().hasLabel('person').
- peerPressure().by('cluster').
- group().by('cluster').by('name')
-----
-
->>>>>>> deb99f6... minor word and link cleanup
[[profile-step]]
Profile Step
~~~~~~~~~~~~
[21/24] tinkerpop git commit: Merge remote-tracking branch
'origin/tp31'
Posted by sp...@apache.org.
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/613a4ba1
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/613a4ba1
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/613a4ba1
Branch: refs/heads/TINKERPOP-1278
Commit: 613a4ba126c77c8bd546b1dcee615fcafa209162
Parents: 81ef195 8888a8c
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Aug 3 13:14:27 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Aug 3 13:14:27 2016 -0400
----------------------------------------------------------------------
.../tinkerpop/gremlin/console/commands/RemoteCommand.groovy | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[23/24] tinkerpop git commit: Merge remote-tracking branch
'origin/tp31'
Posted by sp...@apache.org.
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/8f7218d5
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8f7218d5
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/8f7218d5
Branch: refs/heads/TINKERPOP-1278
Commit: 8f7218d53a31cf41f4a0269d64ac1c27dfc0907a
Parents: 613a4ba 87960e7
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Aug 3 17:05:00 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Aug 3 17:05:00 2016 -0400
----------------------------------------------------------------------
docs/preprocessor/preprocess.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[18/24] tinkerpop git commit: Renamed zip distributions to prefix
with "apache-tinkerpop-"
Posted by sp...@apache.org.
Renamed zip distributions to prefix with "apache-tinkerpop-"
It was formerly "apache-". Tested release docs as best I could given that this wasn't an actual release. Couldn't test validate-distribution.sh but that usually requires some tweaks here and there anyway on release day. TINKERPOP-1376 CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/6bf0d3b5
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/6bf0d3b5
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/6bf0d3b5
Branch: refs/heads/TINKERPOP-1278
Commit: 6bf0d3b5df3f5bdf7dd5bbce9d2bc8daeffda5a2
Parents: 1a4a321
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Aug 3 11:53:48 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Aug 3 11:53:48 2016 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
bin/validate-distribution.sh | 4 ++--
docs/src/dev/developer/release.asciidoc | 2 +-
gremlin-console/pom.xml | 2 +-
gremlin-console/src/assembly/distribution.xml | 16 ++++++++--------
gremlin-server/pom.xml | 2 +-
gremlin-server/src/assembly/distribution.xml | 12 ++++++------
7 files changed, 20 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6bf0d3b5/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 8735a87..306185c 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -27,6 +27,7 @@ TinkerPop 3.1.4 (NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
* Fixed a potential leak of a `ReferenceCounted` resource in Gremlin Server.
+* Renamed distributions to make the prefix "apache-tinkerpop-" as opposed to just "apache-".
[[release-3-1-3]]
TinkerPop 3.1.3 (Release Date: July 18, 2016)
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6bf0d3b5/bin/validate-distribution.sh
----------------------------------------------------------------------
diff --git a/bin/validate-distribution.sh b/bin/validate-distribution.sh
index 30a0345..dcaf8fb 100755
--- a/bin/validate-distribution.sh
+++ b/bin/validate-distribution.sh
@@ -39,8 +39,8 @@ fi
if [ -z ${URL} ]; then
- CONSOLE_URL="https://dist.apache.org/repos/dist/dev/tinkerpop/${VERSION}/apache-gremlin-console-${VERSION}-bin.zip"
- SERVER_URL="https://dist.apache.org/repos/dist/dev/tinkerpop/${VERSION}/apache-gremlin-server-${VERSION}-bin.zip"
+ CONSOLE_URL="https://dist.apache.org/repos/dist/dev/tinkerpop/${VERSION}/apache-tinkerpop-gremlin-console-${VERSION}-bin.zip"
+ SERVER_URL="https://dist.apache.org/repos/dist/dev/tinkerpop/${VERSION}/apache-tinkerpop-gremlin-server-${VERSION}-bin.zip"
SOURCE_URL="https://dist.apache.org/repos/dist/dev/tinkerpop/${VERSION}/apache-tinkerpop-${VERSION}-src.zip"
echo -e "\nValidating binary distributions\n"
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6bf0d3b5/docs/src/dev/developer/release.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/release.asciidoc b/docs/src/dev/developer/release.asciidoc
index b1586f8..0c21bb6 100644
--- a/docs/src/dev/developer/release.asciidoc
+++ b/docs/src/dev/developer/release.asciidoc
@@ -121,7 +121,7 @@ handled document generation and this step now merely needs to upload what was ge
.. `cp ~/.m2/repository/org/apache/tinkerpop/gremlin-server/xx.yy.zz/gremlin-server-xx.yy.zz-distribution.zip* dev/xx.yy.zz`
.. `cp ~/.m2/repository/org/apache/tinkerpop/tinkerpop/xx.yy.zz/tinkerpop-xx.yy.zz-source-release.zip* dev/xx.yy.zz`
.. `cd dev/xx.yy.zz`
-.. pass:[<code>ls * | xargs -n1 -I {} echo "mv apache-{} {}" | sed -e 's/distribution/bin/' -e 's/source-release/src/' -e s'/^\(.*\) \(.*\) \(.*\)$/\1 \3 \2/' | /bin/bash</code>]
+.. pass:[<code>ls * | xargs -n1 -I {} echo "mv apache-tinkerpop-{} {}" | sed -e 's/distribution/bin/' -e 's/source-release/src/' -e s'/^\(.*\) \(.*\) \(.*\)$/\1 \3 \2/' | /bin/bash</code>]
.. `cd ..; svn add xx.yy.zz/; svn ci -m "TinkerPop xx.yy.zz release"`
. Execute `bin/validate-distribution.sh` and any other relevant testing.
. `git tag -a -m "TinkerPop xx.yy.zz release" xx.yy.zz` and `git push --tags`
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6bf0d3b5/gremlin-console/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index 54e66f8..817f352 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -176,7 +176,7 @@ limitations under the License.
<descriptor>src/assembly/standalone.xml</descriptor>
<descriptor>src/assembly/distribution.xml</descriptor>
</descriptors>
- <finalName>apache-${project.artifactId}-${project.version}</finalName>
+ <finalName>apache-tinkerpop-${project.artifactId}-${project.version}</finalName>
<outputDirectory>target</outputDirectory>
<workDirectory>target/assembly/work</workDirectory>
<tarLongFileMode>warn</tarLongFileMode>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6bf0d3b5/gremlin-console/src/assembly/distribution.xml
----------------------------------------------------------------------
diff --git a/gremlin-console/src/assembly/distribution.xml b/gremlin-console/src/assembly/distribution.xml
index 69ecc3b..9f13b41 100644
--- a/gremlin-console/src/assembly/distribution.xml
+++ b/gremlin-console/src/assembly/distribution.xml
@@ -22,7 +22,7 @@ limitations under the License.
<fileSets>
<fileSet>
<fileMode>0775</fileMode>
- <directory>target/apache-${project.artifactId}-${project.version}-standalone/bin</directory>
+ <directory>target/apache-tinkerpop-${project.artifactId}-${project.version}-standalone/bin</directory>
<outputDirectory>bin</outputDirectory>
<includes>
<include>*.sh</include>
@@ -31,7 +31,7 @@ limitations under the License.
</fileSet>
<fileSet>
<fileMode>0775</fileMode>
- <directory>target/apache-${project.artifactId}-${project.version}-standalone/bin/hadoop</directory>
+ <directory>target/apache-tinkerpop-${project.artifactId}-${project.version}-standalone/bin/hadoop</directory>
<outputDirectory>bin/hadoop</outputDirectory>
<includes>
<include>*.sh</include>
@@ -43,27 +43,27 @@ limitations under the License.
<outputDirectory>licenses</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/apache-${project.artifactId}-${project.version}-standalone/conf</directory>
+ <directory>target/apache-tinkerpop-${project.artifactId}-${project.version}-standalone/conf</directory>
<outputDirectory>conf</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/apache-${project.artifactId}-${project.version}-standalone/data</directory>
+ <directory>target/apache-tinkerpop-${project.artifactId}-${project.version}-standalone/data</directory>
<outputDirectory>data</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/apache-${project.artifactId}-${project.version}-standalone/docs</directory>
+ <directory>target/apache-tinkerpop-${project.artifactId}-${project.version}-standalone/docs</directory>
<outputDirectory>docs</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/apache-${project.artifactId}-${project.version}-standalone/javadocs</directory>
+ <directory>target/apache-tinkerpop-${project.artifactId}-${project.version}-standalone/javadocs</directory>
<outputDirectory>javadocs</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/apache-${project.artifactId}-${project.version}-standalone/ext</directory>
+ <directory>target/apache-tinkerpop-${project.artifactId}-${project.version}-standalone/ext</directory>
<outputDirectory>ext</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/apache-${project.artifactId}-${project.version}-standalone/lib</directory>
+ <directory>target/apache-tinkerpop-${project.artifactId}-${project.version}-standalone/lib</directory>
<outputDirectory>lib</outputDirectory>
</fileSet>
</fileSets>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6bf0d3b5/gremlin-server/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index 0f54cca..bed34eb 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -124,7 +124,7 @@ limitations under the License.
<descriptor>src/assembly/standalone.xml</descriptor>
<descriptor>src/assembly/distribution.xml</descriptor>
</descriptors>
- <finalName>apache-${project.artifactId}-${project.version}</finalName>
+ <finalName>apache-tinkerpop-${project.artifactId}-${project.version}</finalName>
<outputDirectory>target</outputDirectory>
<workDirectory>target/assembly/work</workDirectory>
<tarLongFileMode>warn</tarLongFileMode>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6bf0d3b5/gremlin-server/src/assembly/distribution.xml
----------------------------------------------------------------------
diff --git a/gremlin-server/src/assembly/distribution.xml b/gremlin-server/src/assembly/distribution.xml
index d336fe8..e132a81 100644
--- a/gremlin-server/src/assembly/distribution.xml
+++ b/gremlin-server/src/assembly/distribution.xml
@@ -22,7 +22,7 @@ limitations under the License.
<fileSets>
<fileSet>
<fileMode>0775</fileMode>
- <directory>target/apache-${project.artifactId}-${project.version}-standalone/bin</directory>
+ <directory>target/apache-tinkerpop-${project.artifactId}-${project.version}-standalone/bin</directory>
<outputDirectory>bin</outputDirectory>
<includes>
<include>*.sh</include>
@@ -37,26 +37,26 @@ limitations under the License.
<outputDirectory>licenses</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/apache-${project.artifactId}-${project.version}-standalone/data</directory>
+ <directory>target/apache-tinkerpop-${project.artifactId}-${project.version}-standalone/data</directory>
<outputDirectory>data</outputDirectory>
</fileSet>
<fileSet>
<directory>scripts</directory>
</fileSet>
<fileSet>
- <directory>target/apache-${project.artifactId}-${project.version}-standalone/ext</directory>
+ <directory>target/apache-tinkerpop-${project.artifactId}-${project.version}-standalone/ext</directory>
<outputDirectory>ext</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/apache-${project.artifactId}-${project.version}-standalone/docs</directory>
+ <directory>target/apache-tinkerpop-${project.artifactId}-${project.version}-standalone/docs</directory>
<outputDirectory>docs</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/apache-${project.artifactId}-${project.version}-standalone/javadocs</directory>
+ <directory>target/apache-tinkerpop-${project.artifactId}-${project.version}-standalone/javadocs</directory>
<outputDirectory>javadocs</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/apache-${project.artifactId}-${project.version}-standalone/lib</directory>
+ <directory>target/apache-tinkerpop-${project.artifactId}-${project.version}-standalone/lib</directory>
<outputDirectory>lib</outputDirectory>
</fileSet>
</fileSets>
[20/24] tinkerpop git commit: Modified the message when closing a
remote
Posted by sp...@apache.org.
Modified the message when closing a remote
The closing of a remote in yielded a compound message that mentioned the switch to local evaluation first before the close message. That message about the switch didn't seem too useful. Now the switch just happens quietly and user is just informed of the remote closing. TINKERPOP-1377 CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/8888a8c3
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8888a8c3
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/8888a8c3
Branch: refs/heads/TINKERPOP-1278
Commit: 8888a8c3c40e086a324804be088b5ae70eeb0941
Parents: 6bf0d3b
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Aug 3 13:06:03 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Aug 3 13:06:03 2016 -0400
----------------------------------------------------------------------
.../tinkerpop/gremlin/console/commands/RemoteCommand.groovy | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8888a8c3/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/RemoteCommand.groovy
----------------------------------------------------------------------
diff --git a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/RemoteCommand.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/RemoteCommand.groovy
index 79e4099..dccebd3 100644
--- a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/RemoteCommand.groovy
+++ b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/commands/RemoteCommand.groovy
@@ -113,11 +113,11 @@ class RemoteCommand extends ComplexCommandSupport {
// the console is in remote evaluation mode. closing at this point will needs to exit that mode and then
// kill the remote itself
- def line = !mediator.localEvaluation ? swapEvaluationMode() : ""
+ if (!mediator.localEvaluation) swapEvaluationMode()
def removed = mediator.removeCurrent()
removed.close()
- return line.isEmpty() ? "Removed - $removed" : "$line and removed - $removed"
+ return "Removed - $removed"
}
def Object do_console = {
[03/24] tinkerpop git commit: Removed final declaration from
ExpandableStepIterator TINKERPOP-1388
Posted by sp...@apache.org.
Removed final declaration from ExpandableStepIterator TINKERPOP-1388
Seemed like a reasonable change as someone with a custom step might want to inject their own version of this class. CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/4b9212e0
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/4b9212e0
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/4b9212e0
Branch: refs/heads/TINKERPOP-1278
Commit: 4b9212e03e301c874f37400e408eb236b46191b2
Parents: ddefa3f
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Jul 27 06:30:13 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Jul 27 06:30:13 2016 -0400
----------------------------------------------------------------------
.../process/traversal/step/util/ExpandableStepIterator.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4b9212e0/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/ExpandableStepIterator.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/ExpandableStepIterator.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/ExpandableStepIterator.java
index 09e82d0..f5bd239 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/ExpandableStepIterator.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/ExpandableStepIterator.java
@@ -29,7 +29,7 @@ import java.util.Iterator;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
-public final class ExpandableStepIterator<S> implements Iterator<Traverser.Admin<S>>, Serializable {
+public class ExpandableStepIterator<S> implements Iterator<Traverser.Admin<S>>, Serializable {
private final TraverserSet<S> traverserSet = new TraverserSet<>();
private final MultiIterator<Traverser.Admin<S>> traverserIterators = new MultiIterator<>();
[14/24] tinkerpop git commit: Merge branch 'pr-364'
Posted by sp...@apache.org.
Merge branch 'pr-364'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/03da6f6d
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/03da6f6d
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/03da6f6d
Branch: refs/heads/TINKERPOP-1278
Commit: 03da6f6dfd80fc1381779fe5d7eb4b9c06bad7a7
Parents: 5d64d92 a3f5dab
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Aug 3 08:12:56 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Aug 3 08:12:56 2016 -0400
----------------------------------------------------------------------
docs/src/tutorials/gremlin-language-variants/index.asciidoc | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[05/24] tinkerpop git commit: Undo previous CTR'd commit that made
ExpandableStepIterator non-final
Posted by sp...@apache.org.
Undo previous CTR'd commit that made ExpandableStepIterator non-final
@okram -1'd on the dev list: https://lists.apache.org/thread.html/332d1a0061fb32b63a8073084342deff637ebf271cf329bf7e58c227@%3Cdev.tinkerpop.apache.org%3E
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/168097b1
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/168097b1
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/168097b1
Branch: refs/heads/TINKERPOP-1278
Commit: 168097b1672ea59dedae4a0fe1cbd3100862ef25
Parents: 4b9212e
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Jul 27 07:59:49 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Jul 27 07:59:49 2016 -0400
----------------------------------------------------------------------
.../process/traversal/step/util/ExpandableStepIterator.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/168097b1/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/ExpandableStepIterator.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/ExpandableStepIterator.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/ExpandableStepIterator.java
index f5bd239..09e82d0 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/ExpandableStepIterator.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/ExpandableStepIterator.java
@@ -29,7 +29,7 @@ import java.util.Iterator;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
-public class ExpandableStepIterator<S> implements Iterator<Traverser.Admin<S>>, Serializable {
+public final class ExpandableStepIterator<S> implements Iterator<Traverser.Admin<S>>, Serializable {
private final TraverserSet<S> traverserSet = new TraverserSet<>();
private final MultiIterator<Traverser.Admin<S>> traverserIterators = new MultiIterator<>();
[07/24] tinkerpop git commit: tweaks in gremlin language variants doc
Posted by sp...@apache.org.
tweaks in gremlin language variants doc
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a3f5dab1
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a3f5dab1
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a3f5dab1
Branch: refs/heads/TINKERPOP-1278
Commit: a3f5dab17c9bcfbb464f034608b5a89fa57eed55
Parents: 0f5f2d8
Author: Adam Holmberg <Ad...@datastax.com>
Authored: Wed Jul 27 12:57:22 2016 -0500
Committer: Adam Holmberg <Ad...@datastax.com>
Committed: Wed Jul 27 12:57:22 2016 -0500
----------------------------------------------------------------------
docs/src/tutorials/gremlin-language-variants/index.asciidoc | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a3f5dab1/docs/src/tutorials/gremlin-language-variants/index.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/tutorials/gremlin-language-variants/index.asciidoc b/docs/src/tutorials/gremlin-language-variants/index.asciidoc
index 6101fae..1dce00d 100644
--- a/docs/src/tutorials/gremlin-language-variants/index.asciidoc
+++ b/docs/src/tutorials/gremlin-language-variants/index.asciidoc
@@ -63,7 +63,7 @@ public class MyApplication {
----
In query languages like link:https://en.wikipedia.org/wiki/SQL[SQL], the user must construct a string representation of
-their query and submit it to the database for evaluation. This is because SQL can be expressed in Java as they use fundamentally
+their query and submit it to the database for evaluation. This is because SQL cannot be expressed in Java as they use fundamentally
different constructs in their expression. The same example above is presented below using SQL and the
link:https://en.wikipedia.org/wiki/Java_Database_Connectivity[JDBC] interface. The take home point is that Gremlin does
not exist outside the programming language in which it will be used. Gremlin was designed to be able to easily be
@@ -133,7 +133,7 @@ Language Drivers
image:language-drivers.png[width=375,float=right] A Gremlin language driver is a software library that is able to
communicate with a TinkerPop-enabled graph system whether directly via the JVM or indirectly via
-link:http://tinkerpop.apache.org/docs/x.y.z/reference/#gremlin-server[Gremlin Server]. By in large, if a
+link:http://tinkerpop.apache.org/docs/x.y.z/reference/#gremlin-server[Gremlin Server]. By and large, if a
language driver is being developed, it is typically being developed to interact with GremlinServer or a
link:http://tinkerpop.apache.org/docs/x.y.z/reference/#connecting-via-remotegraph[RemoteConnection].
Language drivers are responsible for submitting Gremlin traversals to a TinkerPop-enabled graph system and
@@ -248,7 +248,7 @@ link:https://github.com/mpollmeier/gremlin-scala[Gremlin-Scala] were developed.
available in Java. To leverage these niceties, Gremlin-Scala "wraps" `GraphTraversal` in order to provide Scala-idiomatic extensions.
Another example is Apache TinkerPop's Gremlin-Groovy which does the same via the
link:http://tinkerpop.apache.org/docs/x.y.z/reference/#sugar-plugin[Sugar plugin], but uses
-link:http://groovy-lang.org/metaprogramming.html[meta-programming] instead of object wrapping, where "behing the scenes,"
+link:http://groovy-lang.org/metaprogramming.html[meta-programming] instead of object wrapping, where "behind the scenes,"
Groovy meta-programming is doing object wrapping.
The Jython classes below wrap `GraphTraversalSource` and `GraphTraversal`. In doing so, they add methods
@@ -779,4 +779,4 @@ language. Two ways of doing this for the Python language were presented in this
the reflection-based source code generation technique presented. This method ensures that the language
variant is always in sync with the corresponding Apache TinkerPop Gremlin-Java release version. Moreover, it reduces
the chance of missing methods or creating poorly implemented methods. While Gremlin is simple, there are nearly 200
-steps in `GraphTraversal`. As such, computational means of host language embedding are strongly advised.
\ No newline at end of file
+steps in `GraphTraversal`. As such, computational means of host language embedding are strongly advised.
[12/24] tinkerpop git commit: Merge branch 'pr-362'
Posted by sp...@apache.org.
Merge branch 'pr-362'
Conflicts:
docs/src/reference/the-traversal.asciidoc
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/5d64d927
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5d64d927
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/5d64d927
Branch: refs/heads/TINKERPOP-1278
Commit: 5d64d927c4400806925bae3e318be315f9dceb95
Parents: 8577616 734e107
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Aug 1 13:36:46 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Aug 1 13:36:46 2016 -0400
----------------------------------------------------------------------
docs/src/reference/the-traversal.asciidoc | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5d64d927/docs/src/reference/the-traversal.asciidoc
----------------------------------------------------------------------
[19/24] tinkerpop git commit: Merge remote-tracking branch
'origin/tp31'
Posted by sp...@apache.org.
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/81ef1955
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/81ef1955
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/81ef1955
Branch: refs/heads/TINKERPOP-1278
Commit: 81ef195556bd28cf66fb970e62d412916fefbf64
Parents: 7cd1f6a 6bf0d3b
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Aug 3 11:58:16 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Aug 3 11:58:16 2016 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
bin/validate-distribution.sh | 4 ++--
docs/src/dev/developer/release.asciidoc | 2 +-
gremlin-console/pom.xml | 2 +-
gremlin-console/src/assembly/distribution.xml | 16 ++++++++--------
gremlin-server/pom.xml | 2 +-
gremlin-server/src/assembly/distribution.xml | 12 ++++++------
7 files changed, 20 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/81ef1955/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/81ef1955/gremlin-console/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/81ef1955/gremlin-server/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/81ef1955/gremlin-server/src/assembly/distribution.xml
----------------------------------------------------------------------
diff --cc gremlin-server/src/assembly/distribution.xml
index 5210848,e132a81..43eabd9
--- a/gremlin-server/src/assembly/distribution.xml
+++ b/gremlin-server/src/assembly/distribution.xml
@@@ -41,11 -41,10 +41,11 @@@ limitations under the License
<outputDirectory>data</outputDirectory>
</fileSet>
<fileSet>
- <directory>scripts</directory>
+ <directory>target/apache-${project.artifactId}-${project.version}-standalone/scripts</directory>
+ <outputDirectory>scripts</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/apache-${project.artifactId}-${project.version}-standalone/ext</directory>
+ <directory>target/apache-tinkerpop-${project.artifactId}-${project.version}-standalone/ext</directory>
<outputDirectory>ext</outputDirectory>
</fileSet>
<fileSet>
[17/24] tinkerpop git commit: Merge remote-tracking branch
'origin/tp31'
Posted by sp...@apache.org.
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/7cd1f6a7
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/7cd1f6a7
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/7cd1f6a7
Branch: refs/heads/TINKERPOP-1278
Commit: 7cd1f6a74683e5699674c9d5581efc9da638e318
Parents: d27b43d 1a4a321
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Aug 3 11:10:00 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Aug 3 11:10:00 2016 -0400
----------------------------------------------------------------------
.../tinkerpop/gremlin/process/traversal/step/map/AddVertexTest.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7cd1f6a7/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddVertexTest.java
----------------------------------------------------------------------
[11/24] tinkerpop git commit: Merge remote-tracking branch
'origin/tp31'
Posted by sp...@apache.org.
Merge remote-tracking branch 'origin/tp31'
Conflicts:
docs/src/reference/the-traversal.asciidoc
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/85776169
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/85776169
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/85776169
Branch: refs/heads/TINKERPOP-1278
Commit: 857761693341f51a4c2777c02ebf8f2fc2b83cac
Parents: 0f5f2d8 8ed3c95
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Aug 1 13:35:23 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Aug 1 13:35:23 2016 -0400
----------------------------------------------------------------------
docs/src/dev/developer/contributing.asciidoc | 6 +++---
docs/src/dev/provider/index.asciidoc | 4 ++--
docs/src/reference/gremlin-applications.asciidoc | 4 ++--
docs/src/reference/implementations-neo4j.asciidoc | 12 ++++++------
docs/src/reference/preface.asciidoc | 2 +-
docs/src/reference/the-graphcomputer.asciidoc | 2 +-
docs/src/reference/the-traversal.asciidoc | 12 +++++++++---
docs/src/upgrade/release-3.1.x-incubating.asciidoc | 4 ++--
8 files changed, 26 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/85776169/docs/src/dev/provider/index.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/85776169/docs/src/reference/gremlin-applications.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/85776169/docs/src/reference/the-graphcomputer.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/85776169/docs/src/reference/the-traversal.asciidoc
----------------------------------------------------------------------
diff --cc docs/src/reference/the-traversal.asciidoc
index d98a573,f300e98..6b4696c
--- a/docs/src/reference/the-traversal.asciidoc
+++ b/docs/src/reference/the-traversal.asciidoc
@@@ -1127,31 -1127,12 +1127,37 @@@ g.V().repeat(both()).times(3).values('a
IMPORTANT: `min(local)` determines the min of the current, local object (not the objects in the traversal stream).
This works for `Collection` and `Number`-type objects. For any other object, a min of `Double.NaN` is returned.
+ [[option-step]]
+ Option Step
+ ~~~~~~~~~~~~~
+
+ An option to a <<branch-step,`branch()`>> or <<choose-step,`choose()`>>
+
+[[optional-step]]
+Optional Step
+~~~~~~~~~~~~~
+
+The `optional()`-step (*map*) returns the result of the specified traversal if it yields a result else it returns the calling
+element, i.e. the `identity()`.
+
+[gremlin-groovy,modern]
+----
+g.V(2).optional(out('knows')) <1>
+g.V(2).optional(__.in('knows')) <2>
+----
+
+<1> vadas does not have an `out` "know" edge so vadas is returned.
+<2> vadas does have an `in` "knows" edge so marko is returned.
+
+`optional` is particularly useful for lifting entire graphs when used in conjunction with `path` or `tree`.
+
+[gremlin-groovy,modern]
+----
+g.V().hasLabel('person').optional(out("knows").optional(out("created"))).path() <1>
+----
+
+<1> Returns the paths of everybody followed by who they know followed by what they created.
+
[[or-step]]
Or Step
~~~~~~~
@@@ -2308,7 -2117,7 +2314,7 @@@ Gremlin attempts to provide the user a
leverage a lambda in practice. It is advised that users only leverage a lambda if and only if there is no
corresponding lambda-less step that encompasses the desired functionality. The reason being, lambdas can not be
optimized by Gremlin's compiler strategies as they can not be programmatically inspected (see
- <<traversalstrategy,traversal strategies>>). It is also not currently possible to send a lambda for remote execution to Gremlin-Server or a driver that supports remote execution.
-<<traversalstrategy,traversal strategies>>).
++<<traversalstrategy,traversal strategies>>). It is also not currently possible to send a lambda for remote execution to Gremlin-Server or a driver that supports remote execution.
In many situations where a lambda could be used, either a corresponding step exists or a traversal can be provided in
its place. A `TraversalLambda` behaves like a typical lambda, but it can be optimized and it yields less objects than
[04/24] tinkerpop git commit: Merge remote-tracking branch
'origin/tp31'
Posted by sp...@apache.org.
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/3135c30f
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/3135c30f
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/3135c30f
Branch: refs/heads/TINKERPOP-1278
Commit: 3135c30fbef0f04964f8bef56cbdace925f2ab01
Parents: 2f2b373 4b9212e
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Jul 27 06:38:52 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Jul 27 06:38:52 2016 -0400
----------------------------------------------------------------------
.../process/traversal/step/util/ExpandableStepIterator.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3135c30f/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/ExpandableStepIterator.java
----------------------------------------------------------------------
diff --cc gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/ExpandableStepIterator.java
index 30558e8,f5bd239..dc61ad2
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/ExpandableStepIterator.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/ExpandableStepIterator.java
@@@ -28,12 -29,13 +28,12 @@@ import java.util.Iterator
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
- public final class ExpandableStepIterator<S> implements Iterator<Traverser.Admin<S>>, Serializable {
+ public class ExpandableStepIterator<S> implements Iterator<Traverser.Admin<S>>, Serializable {
private final TraverserSet<S> traverserSet = new TraverserSet<>();
- private final MultiIterator<Traverser.Admin<S>> traverserIterators = new MultiIterator<>();
- private final Step<S,?> hostStep;
+ private final Step<S, ?> hostStep;
- public ExpandableStepIterator(final Step<S,?> hostStep) {
+ public ExpandableStepIterator(final Step<S, ?> hostStep) {
this.hostStep = hostStep;
}
[22/24] tinkerpop git commit: Doc generation needed an update now
that artifacts were renamed on TINKERPOP-1376
Posted by sp...@apache.org.
Doc generation needed an update now that artifacts were renamed on TINKERPOP-1376
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/87960e7c
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/87960e7c
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/87960e7c
Branch: refs/heads/TINKERPOP-1278
Commit: 87960e7cebefdcc99fd084f629c0267945535afe
Parents: 8888a8c
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Aug 3 17:04:01 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Aug 3 17:04:01 2016 -0400
----------------------------------------------------------------------
docs/preprocessor/preprocess.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/87960e7c/docs/preprocessor/preprocess.sh
----------------------------------------------------------------------
diff --git a/docs/preprocessor/preprocess.sh b/docs/preprocessor/preprocess.sh
index d225c48..0e9fa73 100755
--- a/docs/preprocessor/preprocess.sh
+++ b/docs/preprocessor/preprocess.sh
@@ -69,7 +69,7 @@ mkdir -p target/postprocess-asciidoc/tmp
cp -R docs/{static,stylesheets} target/postprocess-asciidoc/
TP_HOME=`pwd`
-CONSOLE_HOME=`directory "${TP_HOME}/gremlin-console/target/apache-gremlin-console-*-standalone"`
+CONSOLE_HOME=`directory "${TP_HOME}/gremlin-console/target/apache-tinkerpop-gremlin-console-*-standalone"`
PLUGIN_DIR="${CONSOLE_HOME}/ext"
TP_VERSION=$(cat pom.xml | grep -A1 '<artifactId>tinkerpop</artifactId>' | grep -o 'version>[^<]*' | grep -o '>.*' | cut -d '>' -f2 | head -n1)
TMP_DIR="/tmp/tp-docs-preprocessor"
@@ -79,7 +79,7 @@ mkdir -p "${TMP_DIR}"
HISTORY_FILE=".gremlin_groovy_history"
[ -f ~/${HISTORY_FILE} ] && cp ~/${HISTORY_FILE} ${TMP_DIR}
-pushd gremlin-server/target/apache-gremlin-server-*-standalone > /dev/null
+pushd gremlin-server/target/apache-tinkerpop-gremlin-server-*-standalone > /dev/null
bin/gremlin-server.sh conf/gremlin-server-modern.yaml > /dev/null 2> /dev/null &
GREMLIN_SERVER_PID=$!
popd > /dev/null
[16/24] tinkerpop git commit: added missing feature requirement
Posted by sp...@apache.org.
added missing feature requirement
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1a4a3214
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1a4a3214
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1a4a3214
Branch: refs/heads/TINKERPOP-1278
Commit: 1a4a321406b373167b38d68c67dc52ddf57fad87
Parents: 8ed3c95
Author: sbarzilay <se...@github.com>
Authored: Wed Aug 3 17:08:45 2016 +0300
Committer: sbarzilay <se...@github.com>
Committed: Wed Aug 3 17:08:45 2016 +0300
----------------------------------------------------------------------
.../tinkerpop/gremlin/process/traversal/step/map/AddVertexTest.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1a4a3214/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddVertexTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddVertexTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddVertexTest.java
index 5a616f8..d166dcc 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddVertexTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddVertexTest.java
@@ -155,6 +155,7 @@ public abstract class AddVertexTest extends AbstractGremlinTest {
@FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES)
@FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_PROPERTY)
@FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_MULTI_PROPERTIES)
+ @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_META_PROPERTIES)
public void g_addVXpersonX_propertyXsingle_name_stephenX_propertyXsingle_name_stephenm_since_2010X() {
final Traversal<Vertex, Vertex> traversal = get_g_addVXpersonX_propertyXsingle_name_stephenX_propertyXsingle_name_stephenm_since_2010X();
printTraversalForm(traversal);
[06/24] tinkerpop git commit: Merge remote-tracking branch
'origin/tp31'
Posted by sp...@apache.org.
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/0f5f2d81
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0f5f2d81
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/0f5f2d81
Branch: refs/heads/TINKERPOP-1278
Commit: 0f5f2d81e27956d7d546bc53e4edcc450c0030c3
Parents: 3135c30 168097b
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Jul 27 08:02:46 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Jul 27 08:02:46 2016 -0400
----------------------------------------------------------------------
.../process/traversal/step/util/ExpandableStepIterator.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0f5f2d81/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/ExpandableStepIterator.java
----------------------------------------------------------------------
diff --cc gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/ExpandableStepIterator.java
index dc61ad2,09e82d0..30558e8
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/ExpandableStepIterator.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/ExpandableStepIterator.java
@@@ -28,12 -29,13 +28,12 @@@ import java.util.Iterator
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
- public class ExpandableStepIterator<S> implements Iterator<Traverser.Admin<S>>, Serializable {
+ public final class ExpandableStepIterator<S> implements Iterator<Traverser.Admin<S>>, Serializable {
private final TraverserSet<S> traverserSet = new TraverserSet<>();
- private final MultiIterator<Traverser.Admin<S>> traverserIterators = new MultiIterator<>();
- private final Step<S,?> hostStep;
+ private final Step<S, ?> hostStep;
- public ExpandableStepIterator(final Step<S,?> hostStep) {
+ public ExpandableStepIterator(final Step<S, ?> hostStep) {
this.hostStep = hostStep;
}
[15/24] tinkerpop git commit: Merge branch 'pr-368'
Posted by sp...@apache.org.
Merge branch 'pr-368'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/d27b43d3
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d27b43d3
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d27b43d3
Branch: refs/heads/TINKERPOP-1278
Commit: d27b43d311227a25d1820a29df8960c3805a4f9c
Parents: 03da6f6 8e71623
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Aug 3 09:58:42 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Aug 3 09:58:42 2016 -0400
----------------------------------------------------------------------
docs/src/recipes/index.asciidoc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------