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 2015/11/30 21:59:50 UTC

[1/4] incubator-tinkerpop git commit: use the GraphProvider to convert hardcoded ids

Repository: incubator-tinkerpop
Updated Branches:
  refs/heads/master 6af274b6d -> 4fb384465


use the GraphProvider to convert hardcoded ids


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

Branch: refs/heads/master
Commit: 3a78fdb6300a47936d59c4897b19f5aa3f296e9b
Parents: b0e1f66
Author: pieter <pi...@gmail.com>
Authored: Mon Nov 30 22:00:15 2015 +0200
Committer: pieter <pi...@gmail.com>
Committed: Mon Nov 30 22:00:15 2015 +0200

----------------------------------------------------------------------
 .../groovy/loaders/SugarLoaderPerformanceTest.groovy        | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3a78fdb6/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/loaders/SugarLoaderPerformanceTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/loaders/SugarLoaderPerformanceTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/loaders/SugarLoaderPerformanceTest.groovy
index 50496d6..021ba41 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/loaders/SugarLoaderPerformanceTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/loaders/SugarLoaderPerformanceTest.groovy
@@ -26,6 +26,7 @@ import com.carrotsearch.junitbenchmarks.annotation.BenchmarkMethodChart
 import com.carrotsearch.junitbenchmarks.annotation.LabelType
 import org.apache.tinkerpop.gremlin.AbstractGremlinTest
 import org.apache.tinkerpop.gremlin.LoadGraphWith
+import org.apache.tinkerpop.gremlin.structure.Vertex
 import org.junit.FixMethodOrder
 import org.junit.Rule
 import org.junit.Test
@@ -110,27 +111,27 @@ class SugarLoaderPerformanceTest extends AbstractGremlinTest {
     @LoadGraphWith(LoadGraphWith.GraphData.MODERN)
     @Test
     public void java_g_VX1X_name() throws Exception {
-        g.V(1).values("name").iterate()
+        g.V(graphProvider.convertId(1, Vertex.class)).values("name").iterate()
     }
 
     @BenchmarkOptions(benchmarkRounds = SugarLoaderPerformanceTest.DEFAULT_BENCHMARK_ROUNDS, warmupRounds = SugarLoaderPerformanceTest.DEFAULT_WARMUP_ROUNDS, concurrency = BenchmarkOptions.CONCURRENCY_SEQUENTIAL)
     @LoadGraphWith(LoadGraphWith.GraphData.MODERN)
     @Test
     public void groovy_g_VX1X_name() throws Exception {
-        g.V(1).name.iterate()
+        g.V(graphProvider.convertId(1, Vertex.class)).name.iterate()
     }
 
     @BenchmarkOptions(benchmarkRounds = SugarLoaderPerformanceTest.DEFAULT_BENCHMARK_ROUNDS, warmupRounds = SugarLoaderPerformanceTest.DEFAULT_WARMUP_ROUNDS, concurrency = BenchmarkOptions.CONCURRENCY_SEQUENTIAL)
     @LoadGraphWith(LoadGraphWith.GraphData.MODERN)
     @Test
     public void java_g_VX1X_outE() throws Exception {
-        g.V(1).outE().iterate()
+        g.V(graphProvider.convertId(1, Vertex.class)).outE().iterate()
     }
 
     @BenchmarkOptions(benchmarkRounds = SugarLoaderPerformanceTest.DEFAULT_BENCHMARK_ROUNDS, warmupRounds = SugarLoaderPerformanceTest.DEFAULT_WARMUP_ROUNDS, concurrency = BenchmarkOptions.CONCURRENCY_SEQUENTIAL)
     @LoadGraphWith(LoadGraphWith.GraphData.MODERN)
     @Test
     public void groovy_g_VX1X_outE() throws Exception {
-        g.V(1).outE.iterate()
+        g.V(graphProvider.convertId(1, Vertex.class)).outE.iterate()
     }
 }


[4/4] incubator-tinkerpop git commit: Merge github.com:pietermartin/incubator-tinkerpop

Posted by ok...@apache.org.
Merge github.com:pietermartin/incubator-tinkerpop


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

Branch: refs/heads/master
Commit: 4fb384465047e2817e22ae7ff45c8ef1f2b13cc2
Parents: 6af274b ff70cc8
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Mon Nov 30 13:59:40 2015 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Mon Nov 30 13:59:40 2015 -0700

----------------------------------------------------------------------
 .../gremlin/groovy/loaders/SugarLoaderPerformanceTest.groovy | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------



[2/4] incubator-tinkerpop git commit: replace graphProvider.convertId(1, Vertex.class) with convertToVertexId("Marko")

Posted by ok...@apache.org.
replace graphProvider.convertId(1, Vertex.class) with convertToVertexId("Marko")


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

Branch: refs/heads/master
Commit: 8b4f53c1963dead1d29041250225e0e5f295da24
Parents: 3a78fdb
Author: pieter <pi...@gmail.com>
Authored: Mon Nov 30 22:25:31 2015 +0200
Committer: pieter <pi...@gmail.com>
Committed: Mon Nov 30 22:25:31 2015 +0200

----------------------------------------------------------------------
 .../gremlin/groovy/loaders/SugarLoaderPerformanceTest.groovy | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/8b4f53c1/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/loaders/SugarLoaderPerformanceTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/loaders/SugarLoaderPerformanceTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/loaders/SugarLoaderPerformanceTest.groovy
index 021ba41..e9d992c 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/loaders/SugarLoaderPerformanceTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/loaders/SugarLoaderPerformanceTest.groovy
@@ -111,27 +111,27 @@ class SugarLoaderPerformanceTest extends AbstractGremlinTest {
     @LoadGraphWith(LoadGraphWith.GraphData.MODERN)
     @Test
     public void java_g_VX1X_name() throws Exception {
-        g.V(graphProvider.convertId(1, Vertex.class)).values("name").iterate()
+        g.V(convertToVertexId("marko")).values("name").iterate()
     }
 
     @BenchmarkOptions(benchmarkRounds = SugarLoaderPerformanceTest.DEFAULT_BENCHMARK_ROUNDS, warmupRounds = SugarLoaderPerformanceTest.DEFAULT_WARMUP_ROUNDS, concurrency = BenchmarkOptions.CONCURRENCY_SEQUENTIAL)
     @LoadGraphWith(LoadGraphWith.GraphData.MODERN)
     @Test
     public void groovy_g_VX1X_name() throws Exception {
-        g.V(graphProvider.convertId(1, Vertex.class)).name.iterate()
+        g.V(convertToVertexId("marko")).name.iterate()
     }
 
     @BenchmarkOptions(benchmarkRounds = SugarLoaderPerformanceTest.DEFAULT_BENCHMARK_ROUNDS, warmupRounds = SugarLoaderPerformanceTest.DEFAULT_WARMUP_ROUNDS, concurrency = BenchmarkOptions.CONCURRENCY_SEQUENTIAL)
     @LoadGraphWith(LoadGraphWith.GraphData.MODERN)
     @Test
     public void java_g_VX1X_outE() throws Exception {
-        g.V(graphProvider.convertId(1, Vertex.class)).outE().iterate()
+        g.V(convertToVertexId("marko")).outE().iterate()
     }
 
     @BenchmarkOptions(benchmarkRounds = SugarLoaderPerformanceTest.DEFAULT_BENCHMARK_ROUNDS, warmupRounds = SugarLoaderPerformanceTest.DEFAULT_WARMUP_ROUNDS, concurrency = BenchmarkOptions.CONCURRENCY_SEQUENTIAL)
     @LoadGraphWith(LoadGraphWith.GraphData.MODERN)
     @Test
     public void groovy_g_VX1X_outE() throws Exception {
-        g.V(graphProvider.convertId(1, Vertex.class)).outE.iterate()
+        g.V(convertToVertexId("marko")).outE.iterate()
     }
 }


[3/4] incubator-tinkerpop git commit: remove unused import

Posted by ok...@apache.org.
remove unused import


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

Branch: refs/heads/master
Commit: ff70cc860e74d0f81c7f120173b059563bc0ea43
Parents: 8b4f53c
Author: pieter <pi...@gmail.com>
Authored: Mon Nov 30 22:28:04 2015 +0200
Committer: pieter <pi...@gmail.com>
Committed: Mon Nov 30 22:28:04 2015 +0200

----------------------------------------------------------------------
 .../gremlin/groovy/loaders/SugarLoaderPerformanceTest.groovy        | 1 -
 1 file changed, 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ff70cc86/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/loaders/SugarLoaderPerformanceTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/loaders/SugarLoaderPerformanceTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/loaders/SugarLoaderPerformanceTest.groovy
index e9d992c..c32d1d2 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/loaders/SugarLoaderPerformanceTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/loaders/SugarLoaderPerformanceTest.groovy
@@ -26,7 +26,6 @@ import com.carrotsearch.junitbenchmarks.annotation.BenchmarkMethodChart
 import com.carrotsearch.junitbenchmarks.annotation.LabelType
 import org.apache.tinkerpop.gremlin.AbstractGremlinTest
 import org.apache.tinkerpop.gremlin.LoadGraphWith
-import org.apache.tinkerpop.gremlin.structure.Vertex
 import org.junit.FixMethodOrder
 import org.junit.Rule
 import org.junit.Test