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 2017/01/23 21:24:39 UTC
[43/50] [abbrv] tinkerpop git commit: wow. found a bug in my
OrderGlobalStep work in the lastest PR that only shows up in GraphActors.
wow. found a bug in my OrderGlobalStep work in the lastest PR that only shows up in GraphActors.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/9ebdd0d2
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/9ebdd0d2
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/9ebdd0d2
Branch: refs/heads/TINKERPOP-1564
Commit: 9ebdd0d2824417a7c7b0f8a533c1f51a9974507a
Parents: 76eb3d1
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Thu Jan 19 12:17:30 2017 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Mon Jan 23 14:22:53 2017 -0700
----------------------------------------------------------------------
.../akka/process/actors/io/gryo/GryoSerializer.java | 3 +--
.../akka/process/actors/AkkaActorsProvider.java | 13 ++++++-------
.../gremlin/akka/process/actors/AkkaPlayTest.java | 2 +-
.../actors/traversal/TraversalMasterProgram.java | 3 ++-
4 files changed, 10 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9ebdd0d2/akka-gremlin/src/main/java/org/apache/tinkerpop/gremlin/akka/process/actors/io/gryo/GryoSerializer.java
----------------------------------------------------------------------
diff --git a/akka-gremlin/src/main/java/org/apache/tinkerpop/gremlin/akka/process/actors/io/gryo/GryoSerializer.java b/akka-gremlin/src/main/java/org/apache/tinkerpop/gremlin/akka/process/actors/io/gryo/GryoSerializer.java
index db93128..e060d64 100644
--- a/akka-gremlin/src/main/java/org/apache/tinkerpop/gremlin/akka/process/actors/io/gryo/GryoSerializer.java
+++ b/akka-gremlin/src/main/java/org/apache/tinkerpop/gremlin/akka/process/actors/io/gryo/GryoSerializer.java
@@ -123,8 +123,7 @@ public final class GryoSerializer implements Serializer {
@Override
public Object fromBinary(final byte[] bytes) {
- final Input input = new Input();
- input.setBuffer(bytes);
+ final Input input = new Input(bytes);
return this.gryoPool.readWithKryo(kryo -> kryo.readClassAndObject(input));
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9ebdd0d2/akka-gremlin/src/test/java/org/apache/tinkerpop/gremlin/akka/process/actors/AkkaActorsProvider.java
----------------------------------------------------------------------
diff --git a/akka-gremlin/src/test/java/org/apache/tinkerpop/gremlin/akka/process/actors/AkkaActorsProvider.java b/akka-gremlin/src/test/java/org/apache/tinkerpop/gremlin/akka/process/actors/AkkaActorsProvider.java
index a87fa6d..7fe2a2d 100644
--- a/akka-gremlin/src/test/java/org/apache/tinkerpop/gremlin/akka/process/actors/AkkaActorsProvider.java
+++ b/akka-gremlin/src/test/java/org/apache/tinkerpop/gremlin/akka/process/actors/AkkaActorsProvider.java
@@ -72,16 +72,15 @@ public class AkkaActorsProvider extends AbstractGraphProvider {
"g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack",
"g_V_both_groupCountXaX_out_capXaX_selectXkeysX_unfold_both_groupCountXaX_capXaX",
"g_V_asXaX_name_order_asXbX_selectXa_bX_byXnameX_by_XitX",
- "g_V_hasXsong_name_OHBOYX_outXfollowedByX_outXfollowedByX_order_byXperformancesX_byXsongType_incrX",
- "g_V_hasLabelXsongX_order_byXperfomances_decrX_byXnameX_rangeX110_120X_name",
+ //"g_V_hasXsong_name_OHBOYX_outXfollowedByX_outXfollowedByX_order_byXperformancesX_byXsongType_incrX",
+ //"g_V_hasLabelXsongX_order_byXperfomances_decrX_byXnameX_rangeX110_120X_name",
"g_V_repeatXdedupX_timesX2X_count",
"g_V_repeatXoutX_timesX2X_path_byXitX_byXnameX_byXlangX",
"g_withSackXmap__map_cloneX_V_out_out_sackXmap_a_nameX_sack",
- "g_V_hasLabelXpersonX_order_byXageX_valuesXnameX_skipX1X",
- //"g_V_out_group_byXlabelX_selectXpersonX_unfold_outXcreatedX_name_limitX2X",
- //"g_V_hasLabelXsongX_group_byXnameX_byXproperties_groupCount_byXlabelXX",
- //"g_V_outXfollowedByX_group_byXsongTypeX_byXbothE_group_byXlabelX_byXweight_sumXX",
- OrderTest.Traversals.class.getCanonicalName(),
+ "g_V_out_group_byXlabelX_selectXpersonX_unfold_outXcreatedX_name_limitX2X",
+ "g_V_hasLabelXsongX_group_byXnameX_byXproperties_groupCount_byXlabelXX",
+ "g_V_outXfollowedByX_group_byXsongTypeX_byXbothE_group_byXlabelX_byXweight_sumXX",
+ "g_V_group_byXlabelX_byXbothE_groupXaX_byXlabelX_byXweight_sumX_weight_sumX",
GraphTest.Traversals.class.getCanonicalName(),
ComplexTest.Traversals.class.getCanonicalName(),
SideEffectTest.Traversals.class.getCanonicalName(),
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9ebdd0d2/akka-gremlin/src/test/java/org/apache/tinkerpop/gremlin/akka/process/actors/AkkaPlayTest.java
----------------------------------------------------------------------
diff --git a/akka-gremlin/src/test/java/org/apache/tinkerpop/gremlin/akka/process/actors/AkkaPlayTest.java b/akka-gremlin/src/test/java/org/apache/tinkerpop/gremlin/akka/process/actors/AkkaPlayTest.java
index 7aff0ef..fc1cb84 100644
--- a/akka-gremlin/src/test/java/org/apache/tinkerpop/gremlin/akka/process/actors/AkkaPlayTest.java
+++ b/akka-gremlin/src/test/java/org/apache/tinkerpop/gremlin/akka/process/actors/AkkaPlayTest.java
@@ -52,7 +52,7 @@ public class AkkaPlayTest {
GraphTraversalSource g = graph.traversal().withProcessor(GraphActors.open(AkkaGraphActors.class).workers(2));
// System.out.println(g.V().group().by("name").by(outE().values("weight").fold()).toList());
- System.out.println(g.V().has("lang").group("a").by("lang").by("name").cap("a").toList());
+ System.out.println(g.V().order().by("name").values("name").toList());
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9ebdd0d2/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/actors/traversal/TraversalMasterProgram.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/actors/traversal/TraversalMasterProgram.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/actors/traversal/TraversalMasterProgram.java
index 65bd551..147fb19 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/actors/traversal/TraversalMasterProgram.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/actors/traversal/TraversalMasterProgram.java
@@ -121,7 +121,8 @@ final class TraversalMasterProgram implements ActorProgram.Master<Object> {
this.master.send(this.leaderWorker, Terminate.MAYBE);
} else {
while (this.traversal.hasNext()) {
- this.results.add((Traverser.Admin) this.traversal.nextTraverser());
+ final Traverser.Admin traverser = this.traversal.nextTraverser();
+ this.results.add(-1 == this.orderCounter ? traverser : new OrderedTraverser(traverser,this.orderCounter++));
}
if (this.orderCounter != -1)
this.results.sort((a, b) -> Integer.compare(((OrderedTraverser<?>) a).order(), ((OrderedTraverser<?>) b).order()));