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 2015/05/07 00:02:55 UTC
[1/2] incubator-tinkerpop git commit: Include a timeout for
especially long configurations.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 28828d477 -> 979dd2418
Include a timeout for especially long configurations.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/df1c501a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/df1c501a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/df1c501a
Branch: refs/heads/master
Commit: df1c501a28317ed31b1449d23f93ff8d4ed88684
Parents: 1b28d10
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed May 6 18:00:01 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed May 6 18:00:01 2015 -0400
----------------------------------------------------------------------
.../gremlin/driver/util/ProfilingApplication.java | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/df1c501a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/util/ProfilingApplication.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/util/ProfilingApplication.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/util/ProfilingApplication.java
index a4a5c80..e26591e 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/util/ProfilingApplication.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/util/ProfilingApplication.java
@@ -134,6 +134,7 @@ public class ProfilingApplication {
try {
final String host = options.getOrDefault("host", "localhost").toString();
+ final int timeout = Integer.parseInt(options.getOrDefault("timeout", "1200000").toString());
final int warmups = Integer.parseInt(options.getOrDefault("warmups", "5").toString());
final int executions = Integer.parseInt(options.getOrDefault("executions", "10").toString());
final int clients = Integer.parseInt(options.getOrDefault("clients", "1").toString());
@@ -161,19 +162,22 @@ public class ProfilingApplication {
}
System.out.println("---------------------------WARMUP CYCLE---------------------------");
- for (int ix = 0; ix < warmups; ix ++) {
+ for (int ix = 0; ix < warmups; ix++) {
TimeUnit.SECONDS.sleep(1); // pause between executions
new ProfilingApplication("warmup-" + (ix + 1), cluster, clients, requests).execute();
}
+ final AtomicBoolean exceededTimeout = new AtomicBoolean(false);
+ final long start = System.nanoTime();
System.out.println("----------------------------TEST CYCLE----------------------------");
long totalRequestsPerSecond = 0;
- for (int ix = 0; ix < executions; ix ++) {
+ for (int ix = 0; ix < executions && !exceededTimeout.get(); ix++) {
TimeUnit.SECONDS.sleep(1); // pause between executions
+ exceededTimeout.set((System.nanoTime() - start) > TimeUnit.NANOSECONDS.convert(timeout, TimeUnit.MILLISECONDS));
totalRequestsPerSecond += new ProfilingApplication("test-" + (ix + 1), cluster, clients, requests).execute();
}
- final int averageRequestPerSecond = Math.round(totalRequestsPerSecond / executions);
+ final int averageRequestPerSecond = exceededTimeout.get() ? 0 : Math.round(totalRequestsPerSecond / executions);
System.out.println(String.format("avg req/sec: %s", averageRequestPerSecond));
if (f != null) {
try (final PrintWriter writer = new PrintWriter(new BufferedWriter(new FileWriter(f, true)))) {
[2/2] incubator-tinkerpop git commit: Merge remote-tracking branch
'origin/master'
Posted by sp...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/979dd241
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/979dd241
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/979dd241
Branch: refs/heads/master
Commit: 979dd2418b0ce09f9c1ce1cef8ea1bd7cd470057
Parents: df1c501 28828d4
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed May 6 18:02:47 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed May 6 18:02:47 2015 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 2 +
.../mapreduce/TraverserMapReduce.java | 5 +-
.../process/traversal/TraversalStrategies.java | 2 +-
.../traversal/step/filter/DedupGlobalStep.java | 2 +-
.../traversal/step/filter/SampleGlobalStep.java | 2 +-
.../traversal/step/filter/WhereStep.java | 2 -
.../traversal/step/map/OrderGlobalStep.java | 2 +-
.../step/sideEffect/AggregateStep.java | 2 +-
.../step/sideEffect/SideEffectCapStep.java | 2 +-
.../step/util/CollectingBarrierStep.java | 2 +-
.../traversal/step/util/MarkerIdentityStep.java | 39 -------
.../traversal/step/util/NoOpBarrierStep.java | 2 +-
.../step/util/SupplyingBarrierStep.java | 2 +-
.../ComparatorHolderRemovalStrategy.java | 55 ----------
.../IncidentToAdjacentStrategy.java | 7 ++
.../OrderGlobalRemovalStrategy.java | 65 ++++++++++++
.../optimization/RangeByIsCountStrategy.java | 17 ++--
.../AdjacentToIncidentStrategyTest.java | 2 +-
.../DedupBijectionStrategyTest.java | 2 +-
.../IdentityRemovalStrategyTest.java | 3 +-
.../IncidentToAdjacentStrategyTest.java | 3 +-
.../optimization/MatchWhereStrategyTest.java | 3 +-
.../OrderGlobalRemovalStrategyTest.java | 101 +++++++++++++++++++
.../RangeByIsCountStrategyTest.java | 2 +-
.../ComputerVerificationStrategyTest.java | 84 +++++++++++++++
25 files changed, 291 insertions(+), 119 deletions(-)
----------------------------------------------------------------------