You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by dk...@apache.org on 2016/01/13 00:40:22 UTC

[1/4] incubator-tinkerpop git commit: Clear Grapes and HDFS in `bin/process-docs.sh`. Also added an option (`--no-clean`) to avoid the cleanup.

Repository: incubator-tinkerpop
Updated Branches:
  refs/heads/master 44ba97572 -> 96f34b12a


Clear Grapes and HDFS in `bin/process-docs.sh`.
Also added an option (`--no-clean`) to avoid the cleanup.


Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/205efdf1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/205efdf1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/205efdf1

Branch: refs/heads/master
Commit: 205efdf1b2505d23fef04440d69b524d6ebcc03d
Parents: 044b5ed
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Mon Jan 4 13:50:24 2016 +0100
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Mon Jan 4 13:50:24 2016 +0100

----------------------------------------------------------------------
 CHANGELOG.asciidoc  |  1 +
 bin/process-docs.sh | 26 +++++++++++++++++++++++++-
 2 files changed, 26 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/205efdf1/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index e131b81..583117c 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,7 @@ image::https://raw.githubusercontent.com/apache/incubator-tinkerpop/master/docs/
 TinkerPop 3.1.1 (NOT OFFICIALLY RELEASED YET)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+* Added `--no-clean` option in `bin/process-docs.sh` to prevent the script from cleaning Grapes and HDFS.
 * Execute the `LifeCycle.beforeEval()` in the same thread that `eval()` is executed in for `GremlinExecutor`.
 * Improved error handling of Gremlin Console initialization scripts to better separate errors in initialization script I/O versus execution of the script itself.
 * Fixed a bug in `Graph.OptOut` when trying to opt-out of certain test cases with the `method` property set to "*".

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/205efdf1/bin/process-docs.sh
----------------------------------------------------------------------
diff --git a/bin/process-docs.sh b/bin/process-docs.sh
index dd1dc2a..8af11d0 100755
--- a/bin/process-docs.sh
+++ b/bin/process-docs.sh
@@ -20,7 +20,31 @@
 
 pushd "$(dirname $0)/.." > /dev/null
 
-if [ "$1" == "--dryRun" ]; then
+while [[ $# -gt 0 ]]
+do
+  key="$1"
+  case $key in
+    -n|--no-clean)
+      NOCLEAN=1
+      ;;
+    -d|--dryRun)
+      DRYRUN=1
+      ;;
+    *)
+      # unknown option
+      ;;
+  esac
+  shift
+done
+
+if [ -z ${NOCLEAN} ]; then
+  rm -rf ~/.groovy/grapes/org.apache.tinkerpop/
+  if hash hadoop 2> /dev/null; then
+    hadoop fs -rm -r "hadoop-gremlin-*-libs" > /dev/null 2>&1
+  fi
+fi
+
+if [ ! -z ${DRYRUN} ]; then
 
   mkdir -p target/postprocess-asciidoc/tmp
   cp -R docs/{static,stylesheets} target/postprocess-asciidoc/


[4/4] incubator-tinkerpop git commit: Merge branch 'TINKERPOP-938'

Posted by dk...@apache.org.
Merge branch 'TINKERPOP-938'

Resolved Conflicts:
	CHANGELOG.asciidoc
	docs/src/dev/developer/contributing.asciidoc


Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/96f34b12
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/96f34b12
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/96f34b12

Branch: refs/heads/master
Commit: 96f34b12a90dc8952affa0f20ddfda5befdfadc2
Parents: 44ba975 f83a594
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Wed Jan 13 00:39:45 2016 +0100
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Wed Jan 13 00:39:45 2016 +0100

----------------------------------------------------------------------
 CHANGELOG.asciidoc                           |  1 +
 bin/process-docs.sh                          | 26 ++++++++++++++++++++++-
 docs/src/dev/developer/contributing.asciidoc |  9 +++++---
 3 files changed, 32 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/96f34b12/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --cc CHANGELOG.asciidoc
index 8be3fe4,a2d9676..1049c97
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -26,16 -26,7 +26,17 @@@ image::https://raw.githubusercontent.co
  TinkerPop 3.1.1 (NOT OFFICIALLY RELEASED YET)
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  
 +* The Spark persistence `StorageLevel` can now be set for both job graphs and `PersistedOutputRDD` data.
 +* Added to the list of "invalid binding keys" allowed by Gremlin Server to cover the private fields of `T` which get exposed in the `ScriptEngine` on static imports.
 +* Fixed a bug around duration calculations of `cap()`-step during profiling.
 +* It is possible to completely avoid using HDFS with Spark if `PersistedInputRDD` and `PersistedOutpuRDD` are leveraged.
 +* `InputRDD` and `OutputRDD` can now process both graphs and memory (i.e. sideEffects).
 +* Removed Groovy specific meta-programming overloads for handling Hadoop `FileSystem` (instead, its all accessible via `FileSystemStorage`).
 +* Added `FileSystemStorage` and `SparkContextStorage` which both implement the new `Storage` API.
 +* Added `Storage` to the gremlin-core io-package which providers can implement to allow conventional access to data sources (e.g. `ls()`, `rm()`, `cp()`, etc.).
 +* Bumped to Spark 1.5.2.
 +* Bumped to Groovy 2.4.5.
+ * Added `--noClean` option in `bin/process-docs.sh` to prevent the script from cleaning Grapes and HDFS.
  * Execute the `LifeCycle.beforeEval()` in the same thread that `eval()` is executed in for `GremlinExecutor`.
  * Improved error handling of Gremlin Console initialization scripts to better separate errors in initialization script I/O versus execution of the script itself.
  * Fixed a bug in `Graph.OptOut` when trying to opt-out of certain test cases with the `method` property set to "*".

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/96f34b12/docs/src/dev/developer/contributing.asciidoc
----------------------------------------------------------------------


[2/4] incubator-tinkerpop git commit: renamed --no-clean option to --noClean (process-docs.sh)

Posted by dk...@apache.org.
renamed --no-clean option to --noClean (process-docs.sh)


Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/60866a22
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/60866a22
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/60866a22

Branch: refs/heads/master
Commit: 60866a2287d436fee461d72e83ea9103fa4e28f0
Parents: 205efdf
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Wed Jan 6 11:27:31 2016 +0100
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Wed Jan 6 11:27:31 2016 +0100

----------------------------------------------------------------------
 CHANGELOG.asciidoc  | 2 +-
 bin/process-docs.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/60866a22/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 583117c..a2d9676 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,7 +26,7 @@ image::https://raw.githubusercontent.com/apache/incubator-tinkerpop/master/docs/
 TinkerPop 3.1.1 (NOT OFFICIALLY RELEASED YET)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-* Added `--no-clean` option in `bin/process-docs.sh` to prevent the script from cleaning Grapes and HDFS.
+* Added `--noClean` option in `bin/process-docs.sh` to prevent the script from cleaning Grapes and HDFS.
 * Execute the `LifeCycle.beforeEval()` in the same thread that `eval()` is executed in for `GremlinExecutor`.
 * Improved error handling of Gremlin Console initialization scripts to better separate errors in initialization script I/O versus execution of the script itself.
 * Fixed a bug in `Graph.OptOut` when trying to opt-out of certain test cases with the `method` property set to "*".

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/60866a22/bin/process-docs.sh
----------------------------------------------------------------------
diff --git a/bin/process-docs.sh b/bin/process-docs.sh
index 8af11d0..c2d8289 100755
--- a/bin/process-docs.sh
+++ b/bin/process-docs.sh
@@ -24,7 +24,7 @@ while [[ $# -gt 0 ]]
 do
   key="$1"
   case $key in
-    -n|--no-clean)
+    -n|--noClean)
       NOCLEAN=1
       ;;
     -d|--dryRun)


[3/4] incubator-tinkerpop git commit: added notes for --noClean in developer docs

Posted by dk...@apache.org.
added notes for --noClean in developer docs


Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/f83a5943
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/f83a5943
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/f83a5943

Branch: refs/heads/master
Commit: f83a59437aedec86e079be90be9c64259a0fb9ef
Parents: 60866a2
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Wed Jan 6 11:40:28 2016 +0100
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Wed Jan 6 11:40:28 2016 +0100

----------------------------------------------------------------------
 docs/src/dev/developer/contributing.asciidoc | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/f83a5943/docs/src/dev/developer/contributing.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/contributing.asciidoc b/docs/src/dev/developer/contributing.asciidoc
index 2cf229d..53b4e12 100644
--- a/docs/src/dev/developer/contributing.asciidoc
+++ b/docs/src/dev/developer/contributing.asciidoc
@@ -44,8 +44,10 @@ Before issuing your pull request, please be sure of the following:
 . If the change requires modification to the documentation, which can be found in `docs/src`, please be sure to try to
 generate the docs.  If the changes are minimal and do not include code examples, it might be sufficient to test
 generate the docs to validate formatting by just doing `bin/process-docs.sh --dryRun`.  If there are code examples,
-please be sure to have Zookeeper and Hadoop running when doing a `bin/process-docs.sh`.  The documentation is
-generated to `/target/docs/htmlsingle`.
+please be sure to have Zookeeper and Hadoop running when doing a `bin/process-docs.sh`.  If no code changes were made,
+one can also use the `--noClean` option. This will prevent the processor from cleaning up the local Grapes directory and
+the Hadoop Gremlin Libs directory in HDFS, resulting in a slightly faster execution time. The documentation is generated
+to `/target/docs/htmlsingle`.
 . If necessary, run the integration tests.  For example, if the changes affect serialization or Gremlin Server/Driver
 operations then running the integration tests assures in addition to unit tests will definitely be necessary. After
 a successful `mvn clean install`, do `mvn verify -DskipIntegrationTests=false -pl gremlin-server`.
@@ -441,4 +443,4 @@ for debugging purposes within tests can be altered by editing the `log4j-test.pr
 resources.  That file gets copied to the `target/test-classes` on build and surefire and failsafe plugins in maven
 are then configured to point at that area of the file system for those configuration files. The properties files
 can be edited to fine tune control of the log output, but generally speaking the current configuration is likely
-best for everyone's general purposes, so if changes are made please revert them prior to commit.
\ No newline at end of file
+best for everyone's general purposes, so if changes are made please revert them prior to commit.