You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2016/10/19 20:54:29 UTC

[7/8] tinkerpop git commit: Made gremlin-benchmark write to /target

Made gremlin-benchmark write to /target

Seemed like this was setup to work at one point but the variable name in the pom and benchmark code were different. CTR


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

Branch: refs/heads/master
Commit: 85367231bb7ed9dbd2a6cb58d6d0e810755af93a
Parents: 288351c
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Oct 18 16:05:55 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Oct 19 14:02:40 2016 -0400

----------------------------------------------------------------------
 .gitignore                                                        | 1 -
 CHANGELOG.asciidoc                                                | 1 +
 docs/src/dev/developer/development-environment.asciidoc           | 3 ++-
 .../apache/tinkerpop/benchmark/util/AbstractBenchmarkBase.java    | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/85367231/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 33fb239..4e8269e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,7 +14,6 @@ _bsp/
 doc/out
 docs/*.asciidoc
 ext/
-benchmarks/
 *$py.class
 __pycache__/
 *.py[cdo]

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/85367231/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 43a50c7..ed73100 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -29,6 +29,7 @@ TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET)
 * Replaced term `REST` with `HTTP` to remove any confusion as to the design of the API.
 * Moved `gremlin-benchmark` under `gremlin-tools` module.
 * Added `gremlin-tools` and its submodule `gremlin-coverage`.
+* Changed `gremlin-benchmark` system property for the report location to `benchmarkReportDir` for consistency.
 
 [[release-3-2-3]]
 TinkerPop 3.2.3 (Release Date: October 17, 2016)

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/85367231/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 0b99647..6707bbc 100644
--- a/docs/src/dev/developer/development-environment.asciidoc
+++ b/docs/src/dev/developer/development-environment.asciidoc
@@ -146,8 +146,9 @@ mvn -Dmaven.javadoc.skip=true --projects tinkergraph-gremlin test
 ** Execute with the `-DuseEpoll` option to try to use Netty native transport (works on Linux, but will fallback to Java NIO on other OS).
 * Performance Tests: `mvn verify -DskipPerformanceTests=false`
 * Benchmarks: `mvn verify -DskipBenchmarks=false`
+** Reports are generated to the console and to `gremlin-tools/gremlin-benchmark/target/reports/benchmark`.
 * Test coverage report: `mvn clean install -Dcoverage` - note that the `install` is necessary because report aggregation is bound to that part of the lifecycle.
-** Reports are generated to `gremlin-tools/gremlin-coverage/target/site`
+** Reports are generated to `gremlin-tools/gremlin-coverage/target/site`.
 
 [[docker-integration]]
 Docker Integration

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/85367231/gremlin-tools/gremlin-benchmark/src/main/java/org/apache/tinkerpop/benchmark/util/AbstractBenchmarkBase.java
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-benchmark/src/main/java/org/apache/tinkerpop/benchmark/util/AbstractBenchmarkBase.java b/gremlin-tools/gremlin-benchmark/src/main/java/org/apache/tinkerpop/benchmark/util/AbstractBenchmarkBase.java
index 2f8bb66..e7ac8a4 100644
--- a/gremlin-tools/gremlin-benchmark/src/main/java/org/apache/tinkerpop/benchmark/util/AbstractBenchmarkBase.java
+++ b/gremlin-tools/gremlin-benchmark/src/main/java/org/apache/tinkerpop/benchmark/util/AbstractBenchmarkBase.java
@@ -104,7 +104,7 @@ public abstract class AbstractBenchmarkBase {
     }
 
     protected String getReportDir() {
-        return System.getProperty("benchmark.dir", DEFAULT_BENCHMARK_DIRECTORY);
+        return System.getProperty("benchmarkReportDir", DEFAULT_BENCHMARK_DIRECTORY);
     }
 
     private int getIntProperty(final String propertyName, final int defaultValue) {