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/02/21 02:12:13 UTC
[1/2] incubator-tinkerpop git commit: Fix missing kryo registrations
for AtomicLong and DependantMutibleMetrics.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 99fd4872b -> 8f3e628d8
Fix missing kryo registrations for AtomicLong and DependantMutibleMetrics.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/f84791f1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/f84791f1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/f84791f1
Branch: refs/heads/master
Commit: f84791f1cbb5a14b47f104de37e055afcf218187
Parents: fef1f78
Author: rjbriody <bo...@datastax.com>
Authored: Fri Feb 20 19:14:25 2015 -0500
Committer: rjbriody <bo...@datastax.com>
Committed: Fri Feb 20 19:14:25 2015 -0500
----------------------------------------------------------------------
.../util/metric/DependantMutableMetrics.java | 5 +++
.../process/util/metric/MutableMetrics.java | 2 +-
.../gremlin/structure/io/kryo/KryoMapper.java | 6 +++-
.../step/sideEffect/GroovyProfileTest.groovy | 9 ++---
.../traversal/step/sideEffect/ProfileTest.java | 35 ++++++++++----------
5 files changed, 33 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/f84791f1/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/util/metric/DependantMutableMetrics.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/util/metric/DependantMutableMetrics.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/util/metric/DependantMutableMetrics.java
index c483d4a..42eb270 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/util/metric/DependantMutableMetrics.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/util/metric/DependantMutableMetrics.java
@@ -28,6 +28,11 @@ public class DependantMutableMetrics extends MutableMetrics {
private long prevDur = 0L;
private DependantMutableMetrics upStreamMetrics;
+ private DependantMutableMetrics() {
+ // necessary for kryo serialization
+ super();
+ }
+
public DependantMutableMetrics(final String id, final String name, final DependantMutableMetrics upStreamMetrics) {
super(id, name);
this.upStreamMetrics = upStreamMetrics;
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/f84791f1/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/util/metric/MutableMetrics.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/util/metric/MutableMetrics.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/util/metric/MutableMetrics.java
index dc769a8..5d20540 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/util/metric/MutableMetrics.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/util/metric/MutableMetrics.java
@@ -32,7 +32,7 @@ public class MutableMetrics extends ImmutableMetrics implements Cloneable {
private long tempTime = -1l;
- private MutableMetrics() {
+ protected MutableMetrics() {
// necessary for kryo serialization
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/f84791f1/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/kryo/KryoMapper.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/kryo/KryoMapper.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/kryo/KryoMapper.java
index 9a7ddc4..5a35d87 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/kryo/KryoMapper.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/kryo/KryoMapper.java
@@ -35,6 +35,7 @@ import org.apache.tinkerpop.gremlin.process.traverser.B_O_P_PA_S_SE_SL_Traverser
import org.apache.tinkerpop.gremlin.process.traverser.B_O_Traverser;
import org.apache.tinkerpop.gremlin.process.traverser.O_Traverser;
import org.apache.tinkerpop.gremlin.process.util.BulkSet;
+import org.apache.tinkerpop.gremlin.process.util.metric.DependantMutableMetrics;
import org.apache.tinkerpop.gremlin.process.util.metric.MutableMetrics;
import org.apache.tinkerpop.gremlin.process.util.metric.StandardTraversalMetrics;
import org.apache.tinkerpop.gremlin.process.util.TraverserSet;
@@ -58,6 +59,7 @@ import java.math.BigInteger;
import java.net.URI;
import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
import java.util.function.BiPredicate;
import java.util.function.Function;
import java.util.function.Predicate;
@@ -279,7 +281,7 @@ public final class KryoMapper implements Mapper<Kryo> {
add(Triplet.<Class, Function<Kryo, Serializer>, Integer>with(B_O_Traverser.class, null, 75));
add(Triplet.<Class, Function<Kryo, Serializer>, Integer>with(O_Traverser.class, null, 76));
add(Triplet.<Class, Function<Kryo, Serializer>, Integer>with(B_O_P_PA_S_SE_SL_Traverser.class, null, 77));
- add(Triplet.<Class, Function<Kryo, Serializer>, Integer>with(B_O_PA_S_SE_SL_Traverser.class, null, 78)); // ***LAST ID***
+ add(Triplet.<Class, Function<Kryo, Serializer>, Integer>with(B_O_PA_S_SE_SL_Traverser.class, null, 78));
add(Triplet.<Class, Function<Kryo, Serializer>, Integer>with(TraverserSet.class, null, 58));
add(Triplet.<Class, Function<Kryo, Serializer>, Integer>with(Tree.class, null, 61));
@@ -289,6 +291,8 @@ public final class KryoMapper implements Mapper<Kryo> {
add(Triplet.<Class, Function<Kryo, Serializer>, Integer>with(StandardTraversalMetrics.class, null, 70));
add(Triplet.<Class, Function<Kryo, Serializer>, Integer>with(MapMemory.class, null, 73));
add(Triplet.<Class, Function<Kryo, Serializer>, Integer>with(MapReduce.NullObject.class, null, 74));
+ add(Triplet.<Class, Function<Kryo, Serializer>, Integer>with(AtomicLong.class, null, 79));
+ add(Triplet.<Class, Function<Kryo, Serializer>, Integer>with(DependantMutableMetrics.class, null, 80)); // ***LAST ID**
}};
private static final byte major = 1;
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/f84791f1/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyProfileTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyProfileTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyProfileTest.groovy
index 85971b2..ba3bfd1 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyProfileTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyProfileTest.groovy
@@ -47,12 +47,13 @@ public abstract class GroovyProfileTest {
}
@Override
- Traversal<Vertex, StandardTraversalMetrics> get_nested_profile() {
+ Traversal<Vertex, StandardTraversalMetrics> get_g_V_hasXinXcreatedX_count_isX1XX_valuesXnameX_profile() {
g.V().has(__.in("created").count().is(1l)).values("name").profile();
}
@org.junit.Ignore
- void testProfileTimes() {
+ @Override
+ void g_V_sleep_sleep_profile() {
}
@Override
@@ -76,13 +77,13 @@ public abstract class GroovyProfileTest {
}
@Override
- Traversal<Vertex, StandardTraversalMetrics> get_nested_profile() {
+ Traversal<Vertex, StandardTraversalMetrics> get_g_V_hasXinXcreatedX_count_isX1XX_valuesXnameX_profile() {
ComputerTestHelper.compute(" g.V().has(__.in('created').count().is(1l)).values('name').profile()", g);
}
@Override
@org.junit.Ignore
- void testProfileTimes() {
+ void g_V_sleep_sleep_profile() {
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/f84791f1/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/ProfileTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/ProfileTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/ProfileTest.java
index 3fc0239..60828fc 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/ProfileTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/ProfileTest.java
@@ -46,7 +46,7 @@ public abstract class ProfileTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, StandardTraversalMetrics> get_g_V_sleep_sleep_profile();
- public abstract Traversal<Vertex, StandardTraversalMetrics> get_nested_profile();
+ public abstract Traversal<Vertex, StandardTraversalMetrics> get_g_V_hasXinXcreatedX_count_isX1XX_valuesXnameX_profile();
@Test
@LoadGraphWith(MODERN)
@@ -62,24 +62,24 @@ public abstract class ProfileTest extends AbstractGremlinProcessTest {
Metrics metrics = traversalMetrics.getMetrics(0);
assertEquals(6, metrics.getCount(TraversalMetrics.TRAVERSER_COUNT_ID));
assertEquals(6, metrics.getCount(TraversalMetrics.ELEMENT_COUNT_ID));
- assertTrue("Percent duration should be positive.", (Double)metrics.getAnnotation(TraversalMetrics.PERCENT_DURATION_KEY) > 0);
+ assertTrue("Percent duration should be positive.", (Double) metrics.getAnnotation(TraversalMetrics.PERCENT_DURATION_KEY) > 0);
assertTrue("Times should be positive.", metrics.getDuration(TimeUnit.MICROSECONDS) > 0);
metrics = traversalMetrics.getMetrics(1);
assertEquals(6, metrics.getCount(TraversalMetrics.ELEMENT_COUNT_ID));
assertNotEquals(0, metrics.getCount(TraversalMetrics.TRAVERSER_COUNT_ID));
- assertTrue("Percent duration should be positive.", (Double)metrics.getAnnotation(TraversalMetrics.PERCENT_DURATION_KEY) > 0);
+ assertTrue("Percent duration should be positive.", (Double) metrics.getAnnotation(TraversalMetrics.PERCENT_DURATION_KEY) > 0);
assertTrue("Times should be positive.", metrics.getDuration(TimeUnit.MICROSECONDS) > 0);
metrics = traversalMetrics.getMetrics(2);
assertEquals(2, metrics.getCount(TraversalMetrics.ELEMENT_COUNT_ID));
assertNotEquals(0, metrics.getCount(TraversalMetrics.TRAVERSER_COUNT_ID));
- assertTrue("Percent duration should be positive.", (Double)metrics.getAnnotation(TraversalMetrics.PERCENT_DURATION_KEY) > 0);
+ assertTrue("Percent duration should be positive.", (Double) metrics.getAnnotation(TraversalMetrics.PERCENT_DURATION_KEY) > 0);
assertTrue("Times should be positive.", metrics.getDuration(TimeUnit.MICROSECONDS) > 0);
double totalPercentDuration = 0;
for (Metrics m : traversalMetrics.getMetrics()) {
- totalPercentDuration += (Double)m.getAnnotation(TraversalMetrics.PERCENT_DURATION_KEY);
+ totalPercentDuration += (Double) m.getAnnotation(TraversalMetrics.PERCENT_DURATION_KEY);
}
assertEquals(100, totalPercentDuration, 0.000001);
}
@@ -98,24 +98,24 @@ public abstract class ProfileTest extends AbstractGremlinProcessTest {
Metrics metrics = traversalMetrics.getMetrics(0);
assertEquals(808, metrics.getCount(TraversalMetrics.TRAVERSER_COUNT_ID));
assertEquals(808, metrics.getCount(TraversalMetrics.ELEMENT_COUNT_ID));
- assertTrue("Percent duration should be positive.", (Double)metrics.getAnnotation(TraversalMetrics.PERCENT_DURATION_KEY) > 0);
+ assertTrue("Percent duration should be positive.", (Double) metrics.getAnnotation(TraversalMetrics.PERCENT_DURATION_KEY) > 0);
assertTrue("Times should be positive.", metrics.getDuration(TimeUnit.MICROSECONDS) > 0);
metrics = traversalMetrics.getMetrics(1);
assertEquals(8049, metrics.getCount(TraversalMetrics.ELEMENT_COUNT_ID));
assertNotEquals(0, metrics.getCount(TraversalMetrics.TRAVERSER_COUNT_ID));
- assertTrue("Percent duration should be positive.", (Double)metrics.getAnnotation(TraversalMetrics.PERCENT_DURATION_KEY) > 0);
+ assertTrue("Percent duration should be positive.", (Double) metrics.getAnnotation(TraversalMetrics.PERCENT_DURATION_KEY) > 0);
assertTrue("Times should be positive.", metrics.getDuration(TimeUnit.MICROSECONDS) > 0);
metrics = traversalMetrics.getMetrics(2);
assertEquals(327370, metrics.getCount(TraversalMetrics.ELEMENT_COUNT_ID));
assertNotEquals(0, metrics.getCount(TraversalMetrics.TRAVERSER_COUNT_ID));
- assertTrue("Percent duration should be positive.", (Double)metrics.getAnnotation(TraversalMetrics.PERCENT_DURATION_KEY) > 0);
+ assertTrue("Percent duration should be positive.", (Double) metrics.getAnnotation(TraversalMetrics.PERCENT_DURATION_KEY) > 0);
assertTrue("Times should be positive.", metrics.getDuration(TimeUnit.MICROSECONDS) > 0);
double totalPercentDuration = 0;
for (Metrics m : traversalMetrics.getMetrics()) {
- totalPercentDuration += (Double)m.getAnnotation(TraversalMetrics.PERCENT_DURATION_KEY);
+ totalPercentDuration += (Double) m.getAnnotation(TraversalMetrics.PERCENT_DURATION_KEY);
}
assertEquals(100, totalPercentDuration, 0.000001);
}
@@ -123,7 +123,7 @@ public abstract class ProfileTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
@IgnoreEngine(TraversalEngine.Type.COMPUTER)
- public void testProfileTimes() {
+ public void g_V_sleep_sleep_profile() {
final Traversal<Vertex, StandardTraversalMetrics> traversal = get_g_V_sleep_sleep_profile();
printTraversalForm(traversal);
@@ -151,7 +151,7 @@ public abstract class ProfileTest extends AbstractGremlinProcessTest {
double totalPercentDuration = 0;
for (Metrics m : traversalMetrics.getMetrics()) {
- totalPercentDuration += (Double)m.getAnnotation(TraversalMetrics.PERCENT_DURATION_KEY);
+ totalPercentDuration += (Double) m.getAnnotation(TraversalMetrics.PERCENT_DURATION_KEY);
}
assertEquals(100, totalPercentDuration, 0.000001);
}
@@ -171,27 +171,27 @@ public abstract class ProfileTest extends AbstractGremlinProcessTest {
Metrics metrics = traversalMetrics.getMetrics(0);
assertEquals(6, metrics.getCount(TraversalMetrics.TRAVERSER_COUNT_ID));
assertEquals(6, metrics.getCount(TraversalMetrics.ELEMENT_COUNT_ID));
- assertTrue("Percent duration should be positive.", (Double)metrics.getAnnotation(TraversalMetrics.PERCENT_DURATION_KEY) > 0);
+ assertTrue("Percent duration should be positive.", (Double) metrics.getAnnotation(TraversalMetrics.PERCENT_DURATION_KEY) > 0);
assertTrue("Times should be positive.", metrics.getDuration(TimeUnit.MICROSECONDS) > 0);
metrics = traversalMetrics.getMetrics(1);
assertEquals(72, metrics.getCount(TraversalMetrics.ELEMENT_COUNT_ID));
assertNotEquals(0, metrics.getCount(TraversalMetrics.TRAVERSER_COUNT_ID));
assertTrue("Count should be greater than traversers.", metrics.getCount(TraversalMetrics.ELEMENT_COUNT_ID) > metrics.getCount(TraversalMetrics.TRAVERSER_COUNT_ID));
- assertTrue("Percent duration should be positive.", (Double)metrics.getAnnotation(TraversalMetrics.PERCENT_DURATION_KEY) > 0);
+ assertTrue("Percent duration should be positive.", (Double) metrics.getAnnotation(TraversalMetrics.PERCENT_DURATION_KEY) > 0);
assertTrue("Times should be positive.", metrics.getDuration(TimeUnit.MICROSECONDS) > 0);
double totalPercentDuration = 0;
for (Metrics m : traversalMetrics.getMetrics()) {
- totalPercentDuration += (Double)m.getAnnotation(TraversalMetrics.PERCENT_DURATION_KEY);
+ totalPercentDuration += (Double) m.getAnnotation(TraversalMetrics.PERCENT_DURATION_KEY);
}
assertEquals(100, totalPercentDuration, 0.000001);
}
@Test
@LoadGraphWith(MODERN)
- public void test_nested_profile() {
- final Traversal<Vertex, StandardTraversalMetrics> traversal = get_nested_profile();
+ public void g_V_hasXinXcreatedX_count_isX1XX_valuesXnameX_profile() {
+ final Traversal<Vertex, StandardTraversalMetrics> traversal = get_g_V_hasXinXcreatedX_count_isX1XX_valuesXnameX_profile();
printTraversalForm(traversal);
traversal.iterate();
@@ -250,9 +250,8 @@ public abstract class ProfileTest extends AbstractGremlinProcessTest {
}
@Override
- public Traversal<Vertex, StandardTraversalMetrics> get_nested_profile() {
+ public Traversal<Vertex, StandardTraversalMetrics> get_g_V_hasXinXcreatedX_count_isX1XX_valuesXnameX_profile() {
return (Traversal) g.V().has(__.in("created").count().is(1l)).values("name").profile();
}
-
}
}
\ No newline at end of file
[2/2] incubator-tinkerpop git commit: Merge branch 'master' of
https://github.com/rjbriody/incubator-tinkerpop
Posted by ok...@apache.org.
Merge branch 'master' of https://github.com/rjbriody/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/8f3e628d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/8f3e628d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/8f3e628d
Branch: refs/heads/master
Commit: 8f3e628d814df927d3834e278e8bfb41f7c38262
Parents: 99fd487 f84791f
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Fri Feb 20 18:12:06 2015 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Fri Feb 20 18:12:06 2015 -0700
----------------------------------------------------------------------
.../util/metric/DependantMutableMetrics.java | 5 +++
.../process/util/metric/MutableMetrics.java | 2 +-
.../gremlin/structure/io/kryo/KryoMapper.java | 6 +++-
.../step/sideEffect/GroovyProfileTest.groovy | 9 ++---
.../traversal/step/sideEffect/ProfileTest.java | 35 ++++++++++----------
5 files changed, 33 insertions(+), 24 deletions(-)
----------------------------------------------------------------------