You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2016/10/07 13:39:13 UTC
[01/10] tinkerpop git commit: Tweaked `gremlin.sh` so that it can be
started from anywhere.
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1455-redux 018a4817f -> 027959811
Tweaked `gremlin.sh` so that it can be started from anywhere.
Removed all shell scripts that just forwarded the command to another script and added symbolic links instead.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/9e0244ef
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/9e0244ef
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/9e0244ef
Branch: refs/heads/TINKERPOP-1455-redux
Commit: 9e0244ef4275cf7d782949352a0185e4e5bda253
Parents: 0070d3d
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Wed Sep 28 22:13:56 2016 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Thu Sep 29 11:44:16 2016 +0200
----------------------------------------------------------------------
bin/gremlin.sh | 23 +---------------------
docs/src/dev/developer/release.asciidoc | 4 +++-
gremlin-console/bin/gremlin.sh | 25 +-----------------------
gremlin-console/src/main/bin/gremlin.sh | 29 ++++++++++++++++------------
4 files changed, 22 insertions(+), 59 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9e0244ef/bin/gremlin.sh
----------------------------------------------------------------------
diff --git a/bin/gremlin.sh b/bin/gremlin.sh
deleted file mode 100755
index 512f71f..0000000
--- a/bin/gremlin.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-`dirname $0`/../gremlin-console/bin/gremlin.sh $@
diff --git a/bin/gremlin.sh b/bin/gremlin.sh
new file mode 120000
index 0000000..e99f01d
--- /dev/null
+++ b/bin/gremlin.sh
@@ -0,0 +1 @@
+../gremlin-console/bin/gremlin.sh
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9e0244ef/docs/src/dev/developer/release.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/release.asciidoc b/docs/src/dev/developer/release.asciidoc
index f9baa94..b066dd0 100644
--- a/docs/src/dev/developer/release.asciidoc
+++ b/docs/src/dev/developer/release.asciidoc
@@ -75,11 +75,13 @@ might be high.
.. `mvn verify -DskipPerformanceTests=false`
. `bin/publish-docs.sh <username>` - note that under a release candidate the documentation is published as SNAPSHOT
. `mvn versions:set -DnewVersion=xx.yy.zz -DgenerateBackupPoms=false` to update the project files to reference a non-SNAPSHOT version
+. `pushd gremlin-console/bin; ln -fs ../target/apache-tinkerpop-gremlin-console-xx.yy.zz-standalone/bin/gremlin.sh gremlin.sh; popd`
. `git diff` and review the updated files (expect all `pom.xml` files and this README)
. `git commit -a -m "TinkerPop xx.yy.zz release"` and `git push`
. `git tag -a -m "TinkerPop xx.yy.zz release" xx.yy.zz` and `git push --tags`
. `mvn clean install`
. `mvn versions:set -DnewVersion=xx.yy.zz-SNAPSHOT -DgenerateBackupPoms=false` to go back to SNAPSHOT
+. `pushd gremlin-console/bin; ln -fs ../target/apache-tinkerpop-gremlin-console-xx.yy.zz-SNAPSHOT-standalone/bin/gremlin.sh gremlin.sh; popd`
. `git commit -a -m "Returned to xx.yy.zz-SNAPSHOT"` and `git push`
. Announce the release candidate to `dev` mailing list and await feedback
. Repeat as required or proceed to the next phase
@@ -267,4 +269,4 @@ The Central Maven repo has sync'd as well:
https://repo1.maven.org/maven2/org/apache/tinkerpop/tinkerpop/xx.yy.zz/
[include the release line logo image]
-----
\ No newline at end of file
+----
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9e0244ef/gremlin-console/bin/gremlin.sh
----------------------------------------------------------------------
diff --git a/gremlin-console/bin/gremlin.sh b/gremlin-console/bin/gremlin.sh
deleted file mode 100755
index d0d3240..0000000
--- a/gremlin-console/bin/gremlin.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-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
diff --git a/gremlin-console/bin/gremlin.sh b/gremlin-console/bin/gremlin.sh
new file mode 120000
index 0000000..5825879
--- /dev/null
+++ b/gremlin-console/bin/gremlin.sh
@@ -0,0 +1 @@
+../target/apache-tinkerpop-gremlin-console-3.1.5-SNAPSHOT-standalone/bin/gremlin.sh
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9e0244ef/gremlin-console/src/main/bin/gremlin.sh
----------------------------------------------------------------------
diff --git a/gremlin-console/src/main/bin/gremlin.sh b/gremlin-console/src/main/bin/gremlin.sh
index fe28773..dfcd325 100755
--- a/gremlin-console/src/main/bin/gremlin.sh
+++ b/gremlin-console/src/main/bin/gremlin.sh
@@ -23,7 +23,19 @@ set -e
set -u
DIR="$( cd -P "$( dirname "$0" )" && pwd )"
-SYSTEM_EXT_DIR="${DIR}/../ext"
+
+SOURCE="${BASH_SOURCE[0]}"
+while [ -h "$SOURCE" ]; do
+ DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
+ SOURCE="$(readlink "$SOURCE")"
+ [[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE"
+done
+
+WORKING_DIR="$( cd -P "${DIR}/.." && pwd )"
+SYSTEM_EXT_DIR="${WORKING_DIR}/ext"
+
+pushd ${WORKING_DIR} > /dev/null
+
JAVA_OPTIONS=${JAVA_OPTIONS:-}
if [ ! -z "${JAVA_OPTIONS}" ]; then
@@ -36,21 +48,12 @@ fi
case `uname` in
CYGWIN*)
- CP="`dirname $0`"/../conf
- CP="$CP":$( echo `dirname $0`/../lib/*.jar . | sed 's/ /;/g')
+ CP="$CP";$( echo lib/*.jar . | sed 's/ /;/g')
;;
*)
- CP="`dirname $0`"/../conf
- CP="$CP":$( echo `dirname $0`/../lib/*.jar . | sed 's/ /:/g')
+ CP="$CP":$( echo lib/*.jar . | sed 's/ /:/g')
esac
-SOURCE="${BASH_SOURCE[0]}"
-while [ -h "$SOURCE" ]; do
- DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
- SOURCE="$(readlink "$SOURCE")"
- [[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE"
-done
-
CP=$CP:$( find -L "${SYSTEM_EXT_DIR}" "${USER_EXT_DIR:-${SYSTEM_EXT_DIR}}" -mindepth 1 -maxdepth 1 -type d | \
sort -u | sed 's/$/\/plugin\/*/' | tr '\n' ':' )
@@ -111,3 +114,5 @@ fi
# Start the JVM, execute the application, and return its exit code
exec $JAVA $JAVA_OPTIONS $MAIN_CLASS "$@"
+
+popd > /dev/null
[08/10] tinkerpop git commit: Updated symbolic link to gremlin.sh
Posted by ok...@apache.org.
Updated symbolic link to gremlin.sh
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/dbc905c4
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/dbc905c4
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/dbc905c4
Branch: refs/heads/TINKERPOP-1455-redux
Commit: dbc905c44f7479250589420890f0fa44b8be5588
Parents: abc9d7a
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Fri Oct 7 15:03:41 2016 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Fri Oct 7 15:03:41 2016 +0200
----------------------------------------------------------------------
gremlin-console/bin/gremlin.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/dbc905c4/gremlin-console/bin/gremlin.sh
----------------------------------------------------------------------
diff --git a/gremlin-console/bin/gremlin.sh b/gremlin-console/bin/gremlin.sh
index 5825879..60e8426 120000
--- a/gremlin-console/bin/gremlin.sh
+++ b/gremlin-console/bin/gremlin.sh
@@ -1 +1 @@
-../target/apache-tinkerpop-gremlin-console-3.1.5-SNAPSHOT-standalone/bin/gremlin.sh
\ No newline at end of file
+../target/apache-tinkerpop-gremlin-console-3.2.3-SNAPSHOT-standalone/bin/gremlin.sh
\ No newline at end of file
[03/10] tinkerpop git commit: Added missing steps in PMC VOTE section.
Posted by ok...@apache.org.
Added missing steps in PMC VOTE section.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/bac5b0d0
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/bac5b0d0
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/bac5b0d0
Branch: refs/heads/TINKERPOP-1455-redux
Commit: bac5b0d02613c2fb323e0a1460cfe414f833241c
Parents: f09e5a0
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Thu Sep 29 13:50:12 2016 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Thu Sep 29 13:50:12 2016 +0200
----------------------------------------------------------------------
docs/src/dev/developer/release.asciidoc | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bac5b0d0/docs/src/dev/developer/release.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/release.asciidoc b/docs/src/dev/developer/release.asciidoc
index b066dd0..1bf67a9 100644
--- a/docs/src/dev/developer/release.asciidoc
+++ b/docs/src/dev/developer/release.asciidoc
@@ -109,6 +109,7 @@ current release was under development as this new release will have those change
.. Update the release date.
.. Update the link to `CHANGELOG.asciidoc` - this link may already be correct but will not exist until the repository is tagged.
. `mvn versions:set -DnewVersion=xx.yy.zz -DgenerateBackupPoms=false` to update project files to reference the non-SNAPSHOT version
+. `pushd gremlin-console/bin; ln -fs ../target/apache-tinkerpop-gremlin-console-xx.yy.zz-standalone/bin/gremlin.sh gremlin.sh; popd`
. `git diff` and review the updated files (expect all `pom.xml` files and this README)
. `git commit -a -m "TinkerPop xx.yy.zz release"` and push
. `mvn clean install` - need to build first so that the right version of the console is used with `bin/publish-docs.sh`
@@ -135,6 +136,7 @@ for generating javadoc and without that the binary distributions won't contain t
. Prepare Git administration tasks. Note that this work can be performed at the release manager's discretion. It may be wise to wait until a successful VOTE is eminent before reopening development. Apply the following steps as needed per release branch:
.. Make the appropriate branching changes as required by the release and bump the version to `SNAPSHOT` with
`mvn versions:set -DnewVersion=xx.yy.zz-SNAPSHOT -DgenerateBackupPoms=false`.
+.. `pushd gremlin-console/bin; ln -fs ../target/apache-tinkerpop-gremlin-console-xx.yy.zz-SNAPSHOT-standalone/bin/gremlin.sh gremlin.sh; popd`
.. Update CHANGELOG and upgrade docs to have the appropriate headers for the next version.
.. `mvn clean install -DskipTests` - need to build first so that the right version of the console is used with `bin/publish-docs.sh`
.. `mvn deploy` - deploy the new `SNAPSHOT`
[04/10] tinkerpop git commit: Removed `popd` from the end of
`gremlin.sh`.
Posted by ok...@apache.org.
Removed `popd` from the end of `gremlin.sh`.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/d1f4c576
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d1f4c576
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d1f4c576
Branch: refs/heads/TINKERPOP-1455-redux
Commit: d1f4c5760df870b93d5939ceff26ba14b6fbc525
Parents: bac5b0d
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Thu Sep 29 19:09:03 2016 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Thu Sep 29 19:09:03 2016 +0200
----------------------------------------------------------------------
gremlin-console/src/main/bin/gremlin.sh | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d1f4c576/gremlin-console/src/main/bin/gremlin.sh
----------------------------------------------------------------------
diff --git a/gremlin-console/src/main/bin/gremlin.sh b/gremlin-console/src/main/bin/gremlin.sh
index e47d94e..bb154aa 100755
--- a/gremlin-console/src/main/bin/gremlin.sh
+++ b/gremlin-console/src/main/bin/gremlin.sh
@@ -32,10 +32,8 @@ while [ -h "${SCRIPT_NAME}" ]; do
cd ${DIR}
done
-WORKING_DIR="$( cd -P "${DIR}/.." && pwd )"
-SYSTEM_EXT_DIR="${WORKING_DIR}/ext"
-
-pushd ${WORKING_DIR} > /dev/null
+cd ..
+SYSTEM_EXT_DIR="`pwd`/ext"
JAVA_OPTIONS=${JAVA_OPTIONS:-}
@@ -115,5 +113,3 @@ fi
# Start the JVM, execute the application, and return its exit code
exec $JAVA $JAVA_OPTIONS $MAIN_CLASS "$@"
-
-popd > /dev/null
[06/10] tinkerpop git commit: Merge branch 'tp31'
Posted by ok...@apache.org.
Merge branch 'tp31'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a829e9d6
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a829e9d6
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a829e9d6
Branch: refs/heads/TINKERPOP-1455-redux
Commit: a829e9d627d7e0707912f026fb373abd5ce4271a
Parents: 3caa2a9 e97b56d
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Thu Oct 6 23:59:04 2016 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Thu Oct 6 23:59:04 2016 +0200
----------------------------------------------------------------------
bin/gremlin.sh | 23 +----------------------
docs/src/dev/developer/release.asciidoc | 4 ++++
gremlin-console/bin/gremlin.sh | 25 +------------------------
gremlin-console/src/main/bin/gremlin.sh | 28 +++++++++++++++-------------
4 files changed, 21 insertions(+), 59 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a829e9d6/docs/src/dev/developer/release.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a829e9d6/gremlin-console/src/main/bin/gremlin.sh
----------------------------------------------------------------------
[05/10] tinkerpop git commit: Merge branch 'TINKERPOP-1158' into tp31
Posted by ok...@apache.org.
Merge branch 'TINKERPOP-1158' into tp31
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/e97b56d6
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e97b56d6
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/e97b56d6
Branch: refs/heads/TINKERPOP-1455-redux
Commit: e97b56d610507ac2429060c94b8b4605129b9426
Parents: ffe0b1f d1f4c57
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Thu Oct 6 23:58:06 2016 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Thu Oct 6 23:58:06 2016 +0200
----------------------------------------------------------------------
bin/gremlin.sh | 23 +----------------------
docs/src/dev/developer/release.asciidoc | 6 +++++-
gremlin-console/bin/gremlin.sh | 25 +------------------------
gremlin-console/src/main/bin/gremlin.sh | 28 +++++++++++++++-------------
4 files changed, 22 insertions(+), 60 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e97b56d6/docs/src/dev/developer/release.asciidoc
----------------------------------------------------------------------
[09/10] tinkerpop git commit: updated the docs on BarrierStep as they
discuss LazyBarrierStrategy as a non-default strategy.
Posted by ok...@apache.org.
updated the docs on BarrierStep as they discuss LazyBarrierStrategy as a non-default strategy.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/c6b49f2e
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c6b49f2e
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c6b49f2e
Branch: refs/heads/TINKERPOP-1455-redux
Commit: c6b49f2e9b309862f614eb0174ae377f4b75e264
Parents: dbc905c
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Fri Oct 7 07:17:41 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Fri Oct 7 07:17:41 2016 -0600
----------------------------------------------------------------------
docs/src/reference/the-traversal.asciidoc | 24 +++++++++++++-----------
1 file changed, 13 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c6b49f2e/docs/src/reference/the-traversal.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/the-traversal.asciidoc b/docs/src/reference/the-traversal.asciidoc
index 55963f4..9cbbe6c 100644
--- a/docs/src/reference/the-traversal.asciidoc
+++ b/docs/src/reference/the-traversal.asciidoc
@@ -339,32 +339,34 @@ made more salient on a larger graph. Therefore, the example below leverages the
----
graph = TinkerGraph.open()
graph.io(graphml()).readGraph('data/grateful-dead.xml')
-g = graph.traversal()
-clockWithResult(1){g.V().both().both().both().count().next()} <1>
-clockWithResult(1){g.V().repeat(both()).times(3).count().next()} <2>
-clockWithResult(1){g.V().both().barrier().both().barrier().both().barrier().count().next()} <3>
+g = graph.traversal().withoutStrategies(LazyBarrierStrategy) <1>
+clockWithResult(1){g.V().both().both().both().count().next()} <2>
+clockWithResult(1){g.V().repeat(both()).times(3).count().next()} <3>
+clockWithResult(1){g.V().both().barrier().both().barrier().both().barrier().count().next()} <4>
----
-<1> A non-bulking traversal where each traverser is processed.
-<2> Each traverser entering `repeat()` has its recursion bulked.
-<3> A bulking traversal where implicit traversers are not processed.
+<1> Explicitly remove `LazyBarrierStrategy` which yields a bulking optimization.
+<2> A non-bulking traversal where each traverser is processed.
+<3> Each traverser entering `repeat()` has its recursion bulked.
+<4> A bulking traversal where implicit traversers are not processed.
If `barrier()` is provided an integer argument, then the barrier will only hold `n`-number of unique traversers in its
barrier before draining the aggregated traversers to the next step. This is useful in the aforementioned bulking
-optimization scenario, but reduces the risk of an out-of-memory exception.
+optimization scenario with the added benefit of reducing the risk of an out-of-memory exception.
-The non-default `LazyBarrierStrategy` inserts `barrier()`-steps in a traversal where appropriate in order to gain the
+`LazyBarrierStrategy` inserts `barrier()`-steps into a traversal where appropriate in order to gain the
"bulking optimization."
[gremlin-groovy]
----
graph = TinkerGraph.open()
graph.io(graphml()).readGraph('data/grateful-dead.xml')
-g = graph.traversal().withStrategies(LazyBarrierStrategy.instance())
+g = graph.traversal() <1>
clockWithResult(1){g.V().both().both().both().count().next()}
-g.V().both().both().both().count().iterate().toString() <1>
+g.V().both().both().both().count().iterate().toString() <2>
----
+<1> `LazyBarrierStrategy` is a default strategy and thus, does not need to be explicitly activated.
<1> With `LazyBarrierStrategy` activated, `barrier()` steps are automatically inserted where appropriate.
[[by-step]]
[10/10] tinkerpop git commit: Merge branch 'master' into
TINKERPOP-1455-redux
Posted by ok...@apache.org.
Merge branch 'master' into TINKERPOP-1455-redux
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/02795981
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/02795981
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/02795981
Branch: refs/heads/TINKERPOP-1455-redux
Commit: 027959811bcb186b86f389cd94fd76540877aa69
Parents: 018a481 c6b49f2
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Fri Oct 7 07:38:52 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Fri Oct 7 07:38:52 2016 -0600
----------------------------------------------------------------------
bin/gremlin.sh | 23 +---------------
docs/src/dev/developer/release.asciidoc | 4 +++
docs/src/reference/the-traversal.asciidoc | 24 +++++++++--------
gremlin-console/bin/gremlin.sh | 25 +----------------
gremlin-console/src/main/bin/gremlin.sh | 28 +++++++++++---------
.../server/GremlinResultSetIntegrateTest.java | 12 ---------
6 files changed, 34 insertions(+), 82 deletions(-)
----------------------------------------------------------------------
[07/10] tinkerpop git commit: removed a GremlinServer test that
assumes a particular traverser count. This shouldn't be assumed given that
Gremlin does not guarantee traversers counts nor ordering. Thus,
any tests that assume such things without explicit
Posted by ok...@apache.org.
removed a GremlinServer test that assumes a particular traverser count. This shouldn't be assumed given that Gremlin does not guarantee traversers counts nor ordering. Thus, any tests that assume such things without explicit steps that dictate such matters (e.g. barrier() and order()) should not exist. This is why ProfileTest (looking scornfully at you @rjbriody) is the bane of our existence. It assumes not only traverser counts, but also traversal step structure. Daaaaaaah.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/abc9d7af
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/abc9d7af
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/abc9d7af
Branch: refs/heads/TINKERPOP-1455-redux
Commit: abc9d7af0a1cd7d6809ca4c04792467a8b209d94
Parents: a829e9d
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Fri Oct 7 06:19:42 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Fri Oct 7 06:19:42 2016 -0600
----------------------------------------------------------------------
.../gremlin/server/GremlinResultSetIntegrateTest.java | 12 ------------
1 file changed, 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/abc9d7af/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinResultSetIntegrateTest.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinResultSetIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinResultSetIntegrateTest.java
index d149d7c..3c1efef 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinResultSetIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinResultSetIntegrateTest.java
@@ -93,18 +93,6 @@ public class GremlinResultSetIntegrateTest extends AbstractGremlinServerIntegrat
}
@Test
- public void shouldHandleVertexResultFromTraversal() throws Exception {
- final Graph graph = TinkerGraph.open();
- final GraphTraversalSource g = graph.traversal();
- final Client aliased = client.alias("g");
- final ResultSet resultSet = aliased.submit(g.V().both().both());
- final List<Result> results = resultSet.all().get();
-
- assertThat(results.get(0).getObject(), CoreMatchers.instanceOf(Traverser.class));
- assertEquals(30, results.size());
- }
-
- @Test
public void shouldHandleVertexResultFromTraversalBulked() throws Exception {
final Graph graph = TinkerGraph.open();
final GraphTraversalSource g = graph.traversal();
[02/10] tinkerpop git commit: Fixed unbound variable errors.
Posted by ok...@apache.org.
Fixed unbound variable errors.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/f09e5a0a
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f09e5a0a
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/f09e5a0a
Branch: refs/heads/TINKERPOP-1455-redux
Commit: f09e5a0a18984fc175c8a8670b06862eeae6262a
Parents: 9e0244e
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Thu Sep 29 13:39:22 2016 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Thu Sep 29 13:39:22 2016 +0200
----------------------------------------------------------------------
gremlin-console/src/main/bin/gremlin.sh | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f09e5a0a/gremlin-console/src/main/bin/gremlin.sh
----------------------------------------------------------------------
diff --git a/gremlin-console/src/main/bin/gremlin.sh b/gremlin-console/src/main/bin/gremlin.sh
index dfcd325..e47d94e 100755
--- a/gremlin-console/src/main/bin/gremlin.sh
+++ b/gremlin-console/src/main/bin/gremlin.sh
@@ -22,13 +22,14 @@
set -e
set -u
-DIR="$( cd -P "$( dirname "$0" )" && pwd )"
-
-SOURCE="${BASH_SOURCE[0]}"
-while [ -h "$SOURCE" ]; do
- DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
- SOURCE="$(readlink "$SOURCE")"
- [[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE"
+cd $(dirname $0)
+DIR=`pwd`
+
+SCRIPT_NAME=`basename $0`
+while [ -h "${SCRIPT_NAME}" ]; do
+ SOURCE="$(readlink "${SCRIPT_NAME}")"
+ DIR="$( cd -P "$( dirname "${SOURCE}" )" && pwd )"
+ cd ${DIR}
done
WORKING_DIR="$( cd -P "${DIR}/.." && pwd )"
@@ -48,10 +49,10 @@ fi
case `uname` in
CYGWIN*)
- CP="$CP";$( echo lib/*.jar . | sed 's/ /;/g')
+ CP="${CP:-}";$( echo lib/*.jar . | sed 's/ /;/g')
;;
*)
- CP="$CP":$( echo lib/*.jar . | sed 's/ /:/g')
+ CP="${CP:-}":$( echo lib/*.jar . | sed 's/ /:/g')
esac
CP=$CP:$( find -L "${SYSTEM_EXT_DIR}" "${USER_EXT_DIR:-${SYSTEM_EXT_DIR}}" -mindepth 1 -maxdepth 1 -type d | \