You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by pl...@apache.org on 2016/08/12 12:40:18 UTC
[01/11] tinkerpop git commit: minor word and link cleanup [Forced
Update!]
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1379 db7526f47 -> 6d2939422 (forced update)
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-1379
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
^^^^^^^^^^^^^^^^^^^^^^^^^^^^
[08/11] tinkerpop git commit: Finished renaming distribution from
'apache-' to 'apache-tinkerpop-'
Posted by pl...@apache.org.
Finished renaming distribution from 'apache-' to 'apache-tinkerpop-'
Fixed gremlin.sh and assembly descriptor, updated documentation
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/67329212
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/67329212
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/67329212
Branch: refs/heads/TINKERPOP-1379
Commit: 6732921299af12894d130faece2269a59dbeb180
Parents: 87960e7
Author: Joshua Shinavier <jo...@cisco.com>
Authored: Fri Aug 5 16:17:57 2016 -0700
Committer: Joshua Shinavier <jo...@cisco.com>
Committed: Fri Aug 5 16:17:57 2016 -0700
----------------------------------------------------------------------
docs/src/dev/developer/development-environment.asciidoc | 2 +-
docs/src/dev/developer/for-committers.asciidoc | 4 ++--
docs/src/dev/developer/release.asciidoc | 8 ++++----
docs/src/tutorials/getting-started/index.asciidoc | 12 ++++++------
gremlin-console/bin/gremlin.sh | 4 ++--
gremlin-driver/pom.xml | 2 +-
6 files changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/67329212/docs/src/dev/developer/development-environment.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/development-environment.asciidoc b/docs/src/dev/developer/development-environment.asciidoc
index 3bb6613..2369133 100644
--- a/docs/src/dev/developer/development-environment.asciidoc
+++ b/docs/src/dev/developer/development-environment.asciidoc
@@ -41,7 +41,7 @@ mvn -Dmaven.javadoc.skip=true --projects tinkergraph-gremlin test
** Build AsciiDocs (but don't evaluate code blocks): `bin/process-docs.sh --dryRun`
** Build AsciiDocs (but don't evaluate code blocks in specific files): `bin/process-docs.sh --dryRun docs/src/reference/the-graph.asciidoc,docs/src/tutorial/getting-started,...`
** Build AsciiDocs (but evaluate code blocks only in specific files): `bin/process-docs.sh --fullRun docs/src/reference/the-graph.asciidoc,docs/src/tutorial/getting-started,...`
-** Process a single AsciiDoc file: +pass:[docs/preprocessor/preprocess-file.sh `pwd`/gremlin-console/target/apache-gremlin-console-*-standalone `pwd`/docs/src/xyz.asciidoc]+
+** Process a single AsciiDoc file: +pass:[docs/preprocessor/preprocess-file.sh `pwd`/gremlin-console/target/apache-tinkerpop-gremlin-console-*-standalone `pwd`/docs/src/xyz.asciidoc]+
* Build JavaDocs: `mvn process-resources -Djavadoc`
* Check for Apache License headers: `mvn apache-rat:check`
* Check for newer dependencies: `mvn versions:display-dependency-updates` or `mvn versions:display-plugin-updates`
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/67329212/docs/src/dev/developer/for-committers.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/for-committers.asciidoc b/docs/src/dev/developer/for-committers.asciidoc
index 5f0713d..64e43ce 100644
--- a/docs/src/dev/developer/for-committers.asciidoc
+++ b/docs/src/dev/developer/for-committers.asciidoc
@@ -310,8 +310,8 @@ The binary LICENSE/NOTICE is perhaps most impacted by changes to the various `po
`pom.xml` file of any module, build both Gremlin Console and Gremlin Server and examine the contents of both binary
distributions, either:
-* target/apache-gremlin-console-x.y.z-distribution.zip
-* target/apache-gremlin-server-x.y.z-distribution.zip
+* target/apache-tinkerpop-gremlin-console-x.y.z-distribution.zip
+* target/apache-tinkerpop-gremlin-server-x.y.z-distribution.zip
Apache licensed software does not need to be included in LICENSE, but if the new dependency is an Apache-approved
license (e.g. BSD, MIT) then it should be added in the pattern already defined. A copy of the LICENSE should be
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/67329212/docs/src/dev/developer/release.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/release.asciidoc b/docs/src/dev/developer/release.asciidoc
index 0c21bb6..70390cf 100644
--- a/docs/src/dev/developer/release.asciidoc
+++ b/docs/src/dev/developer/release.asciidoc
@@ -174,8 +174,8 @@ The source distribution is provided by:
apache-tinkerpop-xx.yy.zz-src.zip
Two binary distributions are provided for user convenience:
- apache-gremlin-console-xx.yy.zz-bin.zip
- apache-gremlin-server-xx.yy.zz-bin.zip
+ apache-tinkerpop-gremlin-console-xx.yy.zz-bin.zip
+ apache-tinkerpop-gremlin-server-xx.yy.zz-bin.zip
The GPG key used to sign the release artifacts is available at:
https://dist.apache.org/repos/dist/dev/tinkerpop/KEYS
@@ -236,8 +236,8 @@ there is breaking change, an important game-changing feature or two, etc.]
The release artifacts can be found at this location:
-https://www.apache.org/dyn/closer.lua/tinkerpop/xx.yy.zz/apache-gremlin-console-xx.yy.zz-bin.zip
-https://www.apache.org/dyn/closer.lua/tinkerpop/xx.yy.zz/apache-gremlin-server-xx.yy.zz-bin.zip
+https://www.apache.org/dyn/closer.lua/tinkerpop/xx.yy.zz/apache-tinkerpop-gremlin-console-xx.yy.zz-bin.zip
+https://www.apache.org/dyn/closer.lua/tinkerpop/xx.yy.zz/apache-tinkerpop-gremlin-server-xx.yy.zz-bin.zip
The online docs can be found here:
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/67329212/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 0893188..b6fcbfa 100644
--- a/docs/src/tutorials/getting-started/index.asciidoc
+++ b/docs/src/tutorials/getting-started/index.asciidoc
@@ -51,13 +51,13 @@ NOTE: Are you unsure of what a vertex or edge is? That topic is covered in the <
but please allow the tutorial to get you oriented with the Gremlin Console first, so that you have an understanding of
the tool that will help you with your learning experience.
-link:https://www.apache.org/dyn/closer.lua/tinkerpop/x.y.z/apache-gremlin-console-x.y.z-bin.zip[Download the console],
+link:https://www.apache.org/dyn/closer.lua/tinkerpop/x.y.z/apache-tinkerpop-gremlin-console-x.y.z-bin.zip[Download the console],
unpackage it and start it:
[source,text]
----
-$ unzip apache-gremlin-console-x.y.z-bin.zip
-$ cd apache-gremlin-console-x.y.z-bin.zip
+$ unzip apache-tinkerpop-gremlin-console-x.y.z-bin.zip
+$ cd apache-tinkerpop-gremlin-console-x.y.z-bin.zip
$ bin/gremlin.sh
\,,,/
@@ -532,9 +532,9 @@ containing a Gremlin script to be processed with results returned.
[source,text]
----
-$ curl -L -O https://www.apache.org/dist/tinkerpop/x.y.z/apache-gremlin-server-x.y.z-bin.zip
-$ unzip apache-gremlin-server-x.y.z-bin.zip
-$ cd apache-gremlin-server-x.y.z-bin.zip
+$ curl -L -O https://www.apache.org/dist/tinkerpop/x.y.z/apache-tinkerpop-gremlin-server-x.y.z-bin.zip
+$ unzip apache-tinkerpop-gremlin-server-x.y.z-bin.zip
+$ cd apache-tinkerpop-gremlin-server-x.y.z-bin.zip
$ bin/gremlin-server.sh conf/gremlin-server-modern.yaml
[INFO] GremlinServer -
\,,,/
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/67329212/gremlin-console/bin/gremlin.sh
----------------------------------------------------------------------
diff --git a/gremlin-console/bin/gremlin.sh b/gremlin-console/bin/gremlin.sh
index 5fb65ac..d0d3240 100755
--- a/gremlin-console/bin/gremlin.sh
+++ b/gremlin-console/bin/gremlin.sh
@@ -20,5 +20,5 @@
#
OPTS=$@
-set JAVA_OPTIONS="-Dtinkerpop.ext=/../target/apache-gremlin-*-standalone/ext -Dlog4j.configuration=conf/log4j-console.properties -Dgremlin.log4j.level=$GREMLIN_LOG_LEVEL"
-`dirname $0`/../target/apache-gremlin-*-standalone/bin/gremlin.sh $OPTS
+set JAVA_OPTIONS="-Dtinkerpop.ext=/../target/apache-tinkerpop-gremlin-*-standalone/ext -Dlog4j.configuration=conf/log4j-console.properties -Dgremlin.log4j.level=$GREMLIN_LOG_LEVEL"
+`dirname $0`/../target/apache-tinkerpop-gremlin-*-standalone/bin/gremlin.sh $OPTS
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/67329212/gremlin-driver/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-driver/pom.xml b/gremlin-driver/pom.xml
index 184a73a..22864e0 100644
--- a/gremlin-driver/pom.xml
+++ b/gremlin-driver/pom.xml
@@ -116,7 +116,7 @@ limitations under the License.
<descriptors>
<descriptor>src/assembly/standalone.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>
[10/11] tinkerpop git commit: Merge branch 'pr-376' into tp31
Posted by pl...@apache.org.
Merge branch 'pr-376' into tp31
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/4571061d
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/4571061d
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/4571061d
Branch: refs/heads/TINKERPOP-1379
Commit: 4571061dbb386d4aaaebd55efca2078703b95153
Parents: 58d8bad 6732921
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Aug 8 07:50:16 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Aug 8 07:50:16 2016 -0400
----------------------------------------------------------------------
docs/src/dev/developer/development-environment.asciidoc | 2 +-
docs/src/dev/developer/for-committers.asciidoc | 4 ++--
docs/src/dev/developer/release.asciidoc | 8 ++++----
docs/src/tutorials/getting-started/index.asciidoc | 12 ++++++------
gremlin-console/bin/gremlin.sh | 4 ++--
gremlin-driver/pom.xml | 2 +-
6 files changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
[02/11] tinkerpop git commit: reverted edit
Posted by pl...@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-1379
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
[06/11] tinkerpop git commit: Modified the message when closing a
remote
Posted by pl...@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-1379
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/11] tinkerpop git commit: removed section missed in merge conflict
Posted by pl...@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-1379
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
~~~~~~~~~~~~
[11/11] tinkerpop git commit: remove excess bulk in tail buffer
Posted by pl...@apache.org.
remove excess bulk in tail buffer
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/6d293942
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/6d293942
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/6d293942
Branch: refs/heads/TINKERPOP-1379
Commit: 6d29394225ff49ad12582d8e8e5bfc7b07e9ccfa
Parents: 4571061
Author: Jason Plurad <pl...@us.ibm.com>
Authored: Sat Jul 30 00:04:54 2016 -0400
Committer: Jason Plurad <pl...@us.ibm.com>
Committed: Fri Aug 12 08:29:01 2016 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../traversal/step/filter/TailGlobalStep.java | 5 ++++-
.../traversal/step/filter/GroovyTailTest.groovy | 5 +++++
.../process/traversal/step/filter/TailTest.java | 18 ++++++++++++++++++
4 files changed, 28 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6d293942/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 975f6cf..fefffb0 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -29,6 +29,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-".
* Fixed a problem (previously thought resolved on 3.1.3) causing Gremlin Server to lock up when parallel requests were submitted on the same session if those parallel requests included a script that blocked indefinitely.
+* Fixed bug in `TailGlobalStep` where excess bulk was not accounted for correctly.
[[release-3-1-3]]
TinkerPop 3.1.3 (Release Date: July 18, 2016)
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6d293942/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/TailGlobalStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/TailGlobalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/TailGlobalStep.java
index 19d3d95..33c7c22 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/TailGlobalStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/TailGlobalStep.java
@@ -64,8 +64,11 @@ public final class TailGlobalStep<S> extends AbstractStep<S, S> implements Bypas
final Traverser.Admin<S> oldest = this.tail.pop();
// Trim any excess from the oldest traverser.
final long excess = this.tailBulk - this.limit;
- if (excess > 0)
+ if (excess > 0) {
oldest.setBulk(oldest.bulk() - excess);
+ // Account for the loss of excess in the tail buffer
+ this.tailBulk -= excess;
+ }
// Account for the loss of bulk in the tail buffer as we emit the oldest traverser.
this.tailBulk -= oldest.bulk();
return oldest;
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6d293942/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyTailTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyTailTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyTailTest.groovy
index 50f4d96..7fac07e 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyTailTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyTailTest.groovy
@@ -65,6 +65,11 @@ public abstract class GroovyTailTest {
}
@Override
+ public Traversal<Vertex, Long> get_g_V_repeatXin_outX_timesX3X_tailX7X_count() {
+ TraversalScriptHelper.compute("g.V.repeat(__.in().out()).times(3).tail(7).count()",g)
+ }
+
+ @Override
public Traversal<Vertex, List<String>> get_g_V_asXaX_out_asXaX_out_asXaX_selectXaX_byXunfold_valuesXnameX_foldX_tailXlocal_2X() {
TraversalScriptHelper.compute("g.V.as('a').out.as('a').out.as('a').select('a').by(unfold().values('name').fold).tail(local, 2)",g)
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6d293942/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/TailTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/TailTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/TailTest.java
index 21bdbe6..738964c 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/TailTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/TailTest.java
@@ -28,6 +28,7 @@ import org.junit.runner.RunWith;
import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.both;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.in;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.limit;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.unfold;
import static org.apache.tinkerpop.gremlin.process.traversal.Scope.global;
@@ -35,6 +36,7 @@ import static org.apache.tinkerpop.gremlin.process.traversal.Scope.local;
import static org.junit.Assert.assertEquals;
import java.util.Arrays;
+import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
@@ -58,6 +60,8 @@ public abstract class TailTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, Vertex> get_g_V_repeatXbothX_timesX3X_tailX7X();
+ public abstract Traversal<Vertex, Long> get_g_V_repeatXin_outX_timesX3X_tailX7X_count();
+
public abstract Traversal<Vertex, List<String>> get_g_V_asXaX_out_asXaX_out_asXaX_selectXaX_byXunfold_valuesXnameX_foldX_tailXlocal_2X();
public abstract Traversal<Vertex, String> get_g_V_asXaX_out_asXaX_out_asXaX_selectXaX_byXunfold_valuesXnameX_foldX_tailXlocal_1X();
@@ -120,6 +124,15 @@ public abstract class TailTest extends AbstractGremlinProcessTest {
assertEquals(7, counter);
}
+ /** Scenario: Global scope, using repeat (excess BULK) */
+ @Test
+ @LoadGraphWith(MODERN)
+ public void g_V_repeatXin_outX_timesX3X_tailX7X_count() {
+ final Traversal<Vertex, Long> traversal = get_g_V_repeatXin_outX_timesX3X_tailX7X_count();
+ printTraversalForm(traversal);
+ checkResults(Collections.singletonList(7L), traversal);
+ }
+
/** Scenario: Local scope, List input, N>1 */
@Test
@LoadGraphWith(MODERN)
@@ -221,6 +234,11 @@ public abstract class TailTest extends AbstractGremlinProcessTest {
}
@Override
+ public Traversal<Vertex, Long> get_g_V_repeatXin_outX_timesX3X_tailX7X_count() {
+ return g.V().repeat(in().out()).times(3).tail(7).count();
+ }
+
+ @Override
public Traversal<Vertex, List<String>> get_g_V_asXaX_out_asXaX_out_asXaX_selectXaX_byXunfold_valuesXnameX_foldX_tailXlocal_2X() {
return g.V().as("a").out().as("a").out().as("a").<List<String>>select("a").by(unfold().values("name").fold()).tail(local, 2);
}
[07/11] tinkerpop git commit: Doc generation needed an update now
that artifacts were renamed on TINKERPOP-1376
Posted by pl...@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-1379
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
[04/11] tinkerpop git commit: added missing feature requirement
Posted by pl...@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-1379
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);
[09/11] tinkerpop git commit: TINKERPOP-1350 was never quite fixed in
3.1.3.
Posted by pl...@apache.org.
TINKERPOP-1350 was never quite fixed in 3.1.3.
Changed response encoding to not use the session executor when the session has an error condition it is trying to serialize. This should be fine as there is no need to serialized an error condition as part of a transaction and thus no need to have the session thread to do it. That in turn frees up the worker executor to serialize and cancel long run jobs in the session. Removed recommendations for submitting parallel requests on a session from docs.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/58d8bade
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/58d8bade
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/58d8bade
Branch: refs/heads/TINKERPOP-1379
Commit: 58d8bade7425c7a7865382990eaaed2b7d90659c
Parents: 87960e7
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Aug 2 15:59:19 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Aug 8 06:49:17 2016 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../src/reference/gremlin-applications.asciidoc | 6 +-
.../upgrade/release-3.1.x-incubating.asciidoc | 22 +++++-
.../gremlin/groovy/engine/GremlinExecutor.java | 2 -
.../handler/GremlinResponseFrameEncoder.java | 13 +++-
.../server/GremlinDriverIntegrateTest.java | 81 +++++++++++---------
6 files changed, 75 insertions(+), 50 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/58d8bade/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 306185c..975f6cf 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -28,6 +28,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-".
+* Fixed a problem (previously thought resolved on 3.1.3) causing Gremlin Server to lock up when parallel requests were submitted on the same session if those parallel requests included a script that blocked indefinitely.
[[release-3-1-3]]
TinkerPop 3.1.3 (Release Date: July 18, 2016)
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/58d8bade/docs/src/reference/gremlin-applications.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/gremlin-applications.asciidoc b/docs/src/reference/gremlin-applications.asciidoc
index 9f5121f..cedd98f 100644
--- a/docs/src/reference/gremlin-applications.asciidoc
+++ b/docs/src/reference/gremlin-applications.asciidoc
@@ -1261,7 +1261,7 @@ Tuning
image:gremlin-handdrawn.png[width=120,float=right] Tuning Gremlin Server for a particular environment may require some simple trial-and-error, but the following represent some basic guidelines that might be useful:
* Gremlin Server defaults to a very modest maximum heap size. Consider increasing this value for non-trivial uses. Maximum heap size (`-Xmx`) is defined with the `JAVA_OPTIONS` setting in `gremlin-server.sh`.
-* When configuring the size of `threadPoolWorker` start with the default of `1` and increment by one as needed to a maximum of `2*number of cores`. Note that if using sessions that will accept parallel requests on the same session, then this value should be no less than `2`.
+* When configuring the size of `threadPoolWorker` start with the default of `1` and increment by one as needed to a maximum of `2*number of cores`.
* The "right" size of the `gremlinPool` setting is somewhat dependent on the type of scripts that will be processed
by Gremlin Server. As requests arrive to Gremlin Server they are decoded and queued to be processed by threads in
this pool. When this pool is exhausted of threads, Gremlin Server will continue to accept incoming requests, but
@@ -1407,10 +1407,6 @@ request.
A session is a "heavier" approach to the simple "request/response" approach of sessionless requests, but is sometimes
necessary for a given use case.
-IMPORTANT: If submitting requests in parallel to a single session in Gremlin Server, then the `threadPoolWorker`
-setting can be no less than `2` or else the session may be prone to becoming locked if scripts sent on that session
-tend to block for extended periods of time.
-
[[considering-transactions]]
Considering Transactions
^^^^^^^^^^^^^^^^^^^^^^^^
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/58d8bade/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 11cdb32..b4a1657 100644
--- a/docs/src/upgrade/release-3.1.x-incubating.asciidoc
+++ b/docs/src/upgrade/release-3.1.x-incubating.asciidoc
@@ -22,6 +22,26 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
*A 187 On The Undercover Gremlinz*
+TinkerPop 3.1.4
+---------------
+
+*Release Date: NOT OFFICIALLY RELEASED YET*
+
+Please see the link:https://github.com/apache/tinkerpop/blob/3.1.4/CHANGELOG.asciidoc#tinkerpop-314-release-date-XXXXXXX-XX-2016[changelog] for a complete list of all the modifications that are part of this release.
+
+Upgrading for Users
+~~~~~~~~~~~~~~~~~~~
+
+Gremlin Server Workers
+^^^^^^^^^^^^^^^^^^^^^^
+
+In release 3.1.3, a link:http://tinkerpop.apache.org/docs/3.1.3/upgrade/#_tinkerpop_3_1_3[recommendation] was made to
+ensure that the `threadPoolWorker` setting for Gremlin Server was no less than `2` in cases where Gremlin Server was
+being used with sessions that accept parallel requests. In 3.1.4, that is no longer the case and a size of `1` remains
+acceptable even in that specific case.
+
+See: link:https://issues.apache.org/jira/browse/TINKERPOP-1350[TINKERPOP-1350]
+
TinkerPop 3.1.3
---------------
@@ -74,8 +94,6 @@ those that block for an extended period of time) may cause Gremlin Server to loc
See: link:https://issues.apache.org/jira/browse/TINKERPOP-1350[TINKERPOP-1350]
-
-
Upgrading for Providers
~~~~~~~~~~~~~~~~~~~~~~~
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/58d8bade/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutor.java
----------------------------------------------------------------------
diff --git a/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutor.java b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutor.java
index d70ff3d..da12e1e 100644
--- a/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutor.java
+++ b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutor.java
@@ -232,8 +232,6 @@ public class GremlinExecutor implements AutoCloseable {
return eval(script, language, boundVars, lifeCycle);
}
- private static final AtomicInteger ugh = new AtomicInteger(0);
-
/**
* Evaluate a script and allow for the submission of alteration to the entire evaluation execution lifecycle.
*
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/58d8bade/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/GremlinResponseFrameEncoder.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/GremlinResponseFrameEncoder.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/GremlinResponseFrameEncoder.java
index 50c177b..d0f9d76 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/GremlinResponseFrameEncoder.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/GremlinResponseFrameEncoder.java
@@ -61,8 +61,12 @@ public class GremlinResponseFrameEncoder extends MessageToMessageEncoder<Respons
if (useBinary) {
final Frame serialized;
- // if the request came in on a session then the serialization must occur in that same thread.
- if (null == session)
+ // if the request came in on a session then the serialization must occur in that same thread, except
+ // in the case of an error where we can free the session executor from having to do that job. the
+ // problem here is that if the session executor is used in the case of an error and the executor is
+ // blocked by parallel requests then there is no thread available to serialize the result and send
+ // back the response as the workers get all tied up behind the session executor.
+ if (null == session || !o.getStatus().getCode().isSuccess())
serialized = new Frame(serializer.serializeResponseAsBinary(o, ctx.alloc()));
else
serialized = new Frame(session.getExecutor().submit(() -> serializer.serializeResponseAsBinary(o, ctx.alloc())).get());
@@ -75,8 +79,9 @@ public class GremlinResponseFrameEncoder extends MessageToMessageEncoder<Respons
final Frame serialized;
- // if the request came in on a session then the serialization must occur in that same thread.
- if (null == session)
+ // if the request came in on a session then the serialization must occur that same thread except
+ // in the case of errors for reasons described above.
+ if (null == session || !o.getStatus().getCode().isSuccess())
serialized = new Frame(textSerializer.serializeResponseAsString(o));
else
serialized = new Frame(session.getExecutor().submit(() -> textSerializer.serializeResponseAsString(o)).get());
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/58d8bade/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
index 7f74e03..7314243 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
@@ -125,8 +125,8 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
settings.graphs.put("graph", "conf/neo4j-empty.properties");
break;
case "shouldProcessSessionRequestsInOrderAfterTimeout":
- settings.scriptEvaluationTimeout = 1000;
- settings.threadPoolWorker = 2;
+ settings.scriptEvaluationTimeout = 250;
+ settings.threadPoolWorker = 1;
break;
}
@@ -1210,48 +1210,55 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
final Cluster cluster = Cluster.open();
final Client client = cluster.connect(name.getMethodName());
- final ResultSet first = client.submit(
- "Object mon1 = 'mon1';\n" +
- "synchronized (mon1) {\n" +
- " mon1.wait();\n" +
- "} ");
-
- final ResultSet second = client.submit(
- "Object mon2 = 'mon2';\n" +
- "synchronized (mon2) {\n" +
- " mon2.wait();\n" +
- "}");
-
- final CompletableFuture<List<Result>> futureFirst = first.all();
- final CompletableFuture<List<Result>> futureSecond = second.all();
-
- final AtomicBoolean hit = new AtomicBoolean(false);
- while (!futureFirst.isDone()) {
- // futureSecond can't finish before futureFirst - racy business here?
- assertThat(futureSecond.isDone(), is(false));
- hit.set(true);
+ for(int index = 0; index < 50; index++)
+ {
+ final CompletableFuture<ResultSet> first = client.submitAsync(
+ "Object mon1 = 'mon1';\n" +
+ "synchronized (mon1) {\n" +
+ " mon1.wait();\n" +
+ "} ");
+
+ final CompletableFuture<ResultSet> second = client.submitAsync(
+ "Object mon2 = 'mon2';\n" +
+ "synchronized (mon2) {\n" +
+ " mon2.wait();\n" +
+ "}");
+
+ final CompletableFuture<ResultSet> third = client.submitAsync(
+ "Object mon3 = 'mon3';\n" +
+ "synchronized (mon3) {\n" +
+ " mon3.wait();\n" +
+ "}");
+
+ final CompletableFuture<ResultSet> fourth = client.submitAsync(
+ "Object mon4 = 'mon4';\n" +
+ "synchronized (mon4) {\n" +
+ " mon4.wait();\n" +
+ "}");
+
+ final CompletableFuture<List<Result>> futureFirst = first.get().all();
+ final CompletableFuture<List<Result>> futureSecond = second.get().all();
+ final CompletableFuture<List<Result>> futureThird = third.get().all();
+ final CompletableFuture<List<Result>> futureFourth = fourth.get().all();
+
+ assertFutureTimeout(futureFirst);
+ assertFutureTimeout(futureSecond);
+ assertFutureTimeout(futureThird);
+ assertFutureTimeout(futureFourth);
}
+ }
- // should have entered the loop at least once and thus proven that futureSecond didn't return ahead of
- // futureFirst
- assertThat(hit.get(), is(true));
-
- try {
+ private void assertFutureTimeout(final CompletableFuture<List<Result>> futureFirst) {
+ try
+ {
futureFirst.get();
fail("Should have timed out");
- } catch (Exception ex) {
- final Throwable root = ExceptionUtils.getRootCause(ex);
- assertThat(root, instanceOf(ResponseException.class));
- assertThat(root.getMessage(), startsWith("Script evaluation exceeded the configured 'scriptEvaluationTimeout' threshold of 1000 ms for request"));
}
-
- try {
- futureSecond.get();
- fail("Should have timed out");
- } catch (Exception ex) {
+ catch (Exception ex)
+ {
final Throwable root = ExceptionUtils.getRootCause(ex);
assertThat(root, instanceOf(ResponseException.class));
- assertThat(root.getMessage(), startsWith("Script evaluation exceeded the configured 'scriptEvaluationTimeout' threshold of 1000 ms for request"));
+ assertThat(root.getMessage(), startsWith("Script evaluation exceeded the configured 'scriptEvaluationTimeout' threshold of 250 ms for request"));
}
}
}
[05/11] tinkerpop git commit: Renamed zip distributions to prefix
with "apache-tinkerpop-"
Posted by pl...@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-1379
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>