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/11 12:29:36 UTC
[1/2] incubator-tinkerpop git commit: Adjust profiler config runner.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 4ae2b2a5a -> dbd275083
Adjust profiler config runner.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/7df5baf0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/7df5baf0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/7df5baf0
Branch: refs/heads/master
Commit: 7df5baf0742aa3f55ed9bea6609cddb86c68b2db
Parents: 2a5fa04
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon May 11 06:22:28 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon May 11 06:22:28 2015 -0400
----------------------------------------------------------------------
.../tinkerpop/gremlin/driver/util/ConfigurationEvaluator.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/7df5baf0/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/util/ConfigurationEvaluator.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/util/ConfigurationEvaluator.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/util/ConfigurationEvaluator.java
index 33304b1..084f71a 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/util/ConfigurationEvaluator.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/util/ConfigurationEvaluator.java
@@ -41,7 +41,7 @@ public class ConfigurationEvaluator {
private final List<Integer> parallelismSizeRange = Arrays.asList(1,2,4,8,16);
public Stream<String[]> generate(final String [] args) throws Exception {
- final Set<Set<Integer>> configsTried = new HashSet<>();
+ final Set<String> configsTried = new HashSet<>();
// get ready for the some serious brute-force action here
for (int ir = 0; ir < nioPoolSizeRange.size(); ir++) {
@@ -57,7 +57,7 @@ public class ConfigurationEvaluator {
&& minInProcessPerConnectionRange.get(iu) <= maxInProcessPerConnectionRange.get(iv)
&& minSimultaneousUsagePerConnectionRange.get(iy) <= maxSimultaneousUsagePerConnectionRange.get(iz)
&& maxSimultaneousUsagePerConnectionRange.get(iz) <= maxInProcessPerConnectionRange.get(iv)) {
- final Set s = new HashSet(Arrays.asList(it, iu, iv, iw, ix, iy, iz));
+ final String s = String.join(",", String.valueOf(ir), String.valueOf(is), String.valueOf(it), String.valueOf(iu), String.valueOf(iv), String.valueOf(iw), String.valueOf(ix), String.valueOf(iy), String.valueOf(iz));
if (!configsTried.contains(s)) {
final Object[] argsToProfiler =
Stream.of("nioPoolSize", nioPoolSizeRange.get(ir).toString(),
[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/dbd27508
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/dbd27508
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/dbd27508
Branch: refs/heads/master
Commit: dbd275083ddd1ede20c878501c453ae153fe47d8
Parents: 7df5baf 4ae2b2a
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon May 11 06:29:28 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon May 11 06:29:28 2015 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 4 +-
.../peerpressure/PeerPressureVertexProgram.java | 4 +-
.../ranking/pagerank/PageRankVertexProgram.java | 4 +-
.../traversal/TraversalObjectFunction.java | 47 ----
.../traversal/TraversalScriptFunction.java | 69 ------
.../traversal/TraversalVertexProgram.java | 14 +-
.../computer/util/ScriptEngineCache.java | 47 ----
.../computer/util/ScriptEngineLambda.java | 111 ---------
.../process/traversal/step/util/BulkSet.java | 2 +-
.../traversal/util/TraversalObjectFunction.java | 47 ++++
.../traversal/util/TraversalScriptFunction.java | 66 +++++
.../traversal/util/TraversalScriptHelper.java | 59 +++++
.../apache/tinkerpop/gremlin/util/Gremlin.java | 3 +
.../gremlin/util/ScriptEngineCache.java | 47 ++++
.../tinkerpop/gremlin/util/Serializer.java | 5 +-
.../apache/tinkerpop/gremlin/util/TimeUtil.java | 4 +
.../util/function/ScriptEngineLambda.java | 111 +++++++++
.../process/computer/ComputerTestHelper.groovy | 47 ----
.../GroovyTraversalSideEffectsTest.groovy | 10 +-
.../step/branch/GroovyBranchTest.groovy | 41 +---
.../step/branch/GroovyChooseTest.groovy | 20 +-
.../step/branch/GroovyLocalTest.groovy | 85 +------
.../step/branch/GroovyRepeatTest.groovy | 78 +-----
.../step/branch/GroovyUnionTest.groovy | 59 +----
.../traversal/step/filter/GroovyAndTest.groovy | 30 +--
.../traversal/step/filter/GroovyCoinTest.groovy | 26 +-
.../step/filter/GroovyCyclicPathTest.groovy | 25 +-
.../step/filter/GroovyDedupTest.groovy | 60 +----
.../traversal/step/filter/GroovyDropTest.groovy | 12 +-
.../step/filter/GroovyExceptTest.groovy | 70 +-----
.../step/filter/GroovyFilterTest.groovy | 126 +---------
.../step/filter/GroovyHasNotTest.groovy | 32 +--
.../traversal/step/filter/GroovyHasTest.groovy | 138 ++---------
.../traversal/step/filter/GroovyIsTest.groovy | 49 +---
.../traversal/step/filter/GroovyOrTest.groovy | 31 +--
.../step/filter/GroovyRangeTest.groovy | 111 +--------
.../step/filter/GroovyRetainTest.groovy | 31 +--
.../step/filter/GroovySampleTest.groovy | 69 +-----
.../step/filter/GroovySimplePathTest.groovy | 26 +-
.../step/filter/GroovyWhereTest.groovy | 73 +-----
.../traversal/step/map/GroovyAddEdgeTest.groovy | 12 +-
.../step/map/GroovyAddVertexTest.groovy | 11 +-
.../step/map/GroovyCoalesceTest.groovy | 58 +----
.../traversal/step/map/GroovyCountTest.groovy | 69 +-----
.../traversal/step/map/GroovyFoldTest.groovy | 40 +--
.../traversal/step/map/GroovyMapTest.groovy | 86 +------
.../traversal/step/map/GroovyMatchTest.groovy | 3 +-
.../traversal/step/map/GroovyMaxTest.groovy | 37 +--
.../traversal/step/map/GroovyMeanTest.groovy | 29 +--
.../traversal/step/map/GroovyMinTest.groovy | 37 +--
.../traversal/step/map/GroovyOrderTest.groovy | 127 +---------
.../traversal/step/map/GroovyPathTest.groovy | 69 +-----
.../step/map/GroovyPropertiesTest.groovy | 33 +--
.../traversal/step/map/GroovySelectTest.groovy | 246 +++----------------
.../traversal/step/map/GroovySumTest.groovy | 29 +--
.../traversal/step/map/GroovyUnfoldTest.groovy | 26 +-
.../step/map/GroovyValueMapTest.groovy | 31 +--
.../traversal/step/map/GroovyVertexTest.groovy | 197 +++------------
.../step/sideEffect/GroovyAggregateTest.groovy | 32 +--
.../step/sideEffect/GroovyGroupCountTest.groovy | 70 +-----
.../step/sideEffect/GroovyGroupTest.groovy | 55 +----
.../step/sideEffect/GroovyInjectTest.groovy | 35 +--
.../step/sideEffect/GroovyProfileTest.groovy | 50 +---
.../step/sideEffect/GroovySackTest.groovy | 35 +--
.../sideEffect/GroovySideEffectCapTest.groovy | 29 +--
.../step/sideEffect/GroovySideEffectTest.groovy | 18 +-
.../step/sideEffect/GroovyStoreTest.groovy | 42 +---
.../step/sideEffect/GroovySubgraphTest.groovy | 11 +-
.../step/sideEffect/GroovyTreeTest.groovy | 65 +----
.../process/GroovyProcessComputerSuite.java | 103 ++++----
.../process/GroovyProcessStandardSuite.java | 102 ++++----
.../computer/util/ScriptEngineLambdaTest.java | 162 ------------
.../util/function/ScriptEngineLambdaTest.java | 163 ++++++++++++
.../process/traversal/step/map/AddEdgeTest.java | 10 +-
.../process/traversal/step/map/MatchTest.java | 17 ++
.../step/sideEffect/SideEffectTest.java | 10 +-
.../traversal/step/sideEffect/SubgraphTest.java | 9 +-
.../tinkerpop/gremlin/hadoop/Constants.java | 4 +
.../computer/example/TraversalSupplier2.java | 10 +-
.../computer/example/TraversalSupplier3.java | 13 +-
.../gremlin/hadoop/structure/HadoopGraph.java | 14 +-
81 files changed, 1062 insertions(+), 3030 deletions(-)
----------------------------------------------------------------------