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/19 17:40:51 UTC
[45/50] [abbrv] tinkerpop git commit: opened up more test cases to
AkkaGraphActors. A few that fail don't make sense too me...but very close to
the entire test suite passing.
opened up more test cases to AkkaGraphActors. A few that fail don't make sense too me...but very close to the entire test suite passing.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a74aa5b5
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a74aa5b5
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a74aa5b5
Branch: refs/heads/TINKERPOP-1564
Commit: a74aa5b57acb56ee2f29f24ecdb2f9e6ce4ea0ab
Parents: 95d0857
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Wed Jan 18 07:31:04 2017 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Thu Jan 19 10:30:38 2017 -0700
----------------------------------------------------------------------
.../gremlin/akka/process/actors/AkkaGraphActors.java | 10 ++++------
.../gremlin/akka/process/actors/AkkaActorsProvider.java | 7 ++++---
.../gremlin/akka/process/actors/AkkaPlayTest.java | 2 +-
.../actors/traversal/WorkerTraversalSideEffects.java | 2 +-
4 files changed, 10 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a74aa5b5/akka-gremlin/src/main/java/org/apache/tinkerpop/gremlin/akka/process/actors/AkkaGraphActors.java
----------------------------------------------------------------------
diff --git a/akka-gremlin/src/main/java/org/apache/tinkerpop/gremlin/akka/process/actors/AkkaGraphActors.java b/akka-gremlin/src/main/java/org/apache/tinkerpop/gremlin/akka/process/actors/AkkaGraphActors.java
index 61c4439..d536b82 100644
--- a/akka-gremlin/src/main/java/org/apache/tinkerpop/gremlin/akka/process/actors/AkkaGraphActors.java
+++ b/akka-gremlin/src/main/java/org/apache/tinkerpop/gremlin/akka/process/actors/AkkaGraphActors.java
@@ -23,7 +23,6 @@ import akka.actor.ActorSystem;
import akka.actor.Deploy;
import akka.actor.Props;
import akka.remote.RemoteScope;
-import com.typesafe.config.Config;
import org.apache.commons.configuration.BaseConfiguration;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationUtils;
@@ -85,16 +84,15 @@ public final class AkkaGraphActors<R> implements GraphActors<R> {
throw new IllegalStateException("Can not execute twice");
this.executed = true;
///////
- final String systemName = "tinkerpop-" + UUID.randomUUID();
final Configuration finalConfiguration = new SerializableConfiguration(graph.configuration());
ConfigurationUtils.copy(this.configuration, finalConfiguration);
+ final String systemName = "tinkerpop-" + UUID.randomUUID();
finalConfiguration.setProperty(Constants.GREMLIN_AKKA_SYSTEM_NAME, systemName);
- final Config config = AkkaConfigFactory.generateAkkaConfig(this.actorProgram, finalConfiguration);
- final ActorSystem system = ActorSystem.create(systemName, config);
+ final ActorSystem system = ActorSystem.create(systemName, AkkaConfigFactory.generateAkkaConfig(this.actorProgram, finalConfiguration));
final ActorsResult<R> result = new DefaultActorsResult<>();
///////
- final akka.actor.Address masterAddress = AkkaConfigFactory.getMasterActorDeployment(finalConfiguration);
- system.actorOf(Props.create(MasterActor.class, finalConfiguration, result).withDeploy(new Deploy(new RemoteScope(masterAddress))), "master");
+ system.actorOf(Props.create(MasterActor.class, finalConfiguration, result).
+ withDeploy(new Deploy(new RemoteScope(AkkaConfigFactory.getMasterActorDeployment(finalConfiguration)))), "master");
return CompletableFuture.supplyAsync(() -> {
while (!system.isTerminated()) {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a74aa5b5/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 64341c5..59c5c7d 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
@@ -76,12 +76,13 @@ public class AkkaActorsProvider extends AbstractGraphProvider {
"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_repeatXbothXfollowedByXX_timesX2X_group_byXsongTypeX_byXcountX",
+ "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",
GraphTest.Traversals.class.getCanonicalName(),
- GroupTest.Traversals.class.getCanonicalName(),
ComplexTest.Traversals.class.getCanonicalName(),
- SubgraphTest.Traversals.class.getCanonicalName(),
SideEffectTest.Traversals.class.getCanonicalName(),
- SubgraphStrategyProcessTest.class.getCanonicalName(),
ProfileTest.Traversals.class.getCanonicalName(),
PartitionStrategyProcessTest.class.getCanonicalName(),
EventStrategyProcessTest.class.getCanonicalName(),
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a74aa5b5/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 ae308e8..7aff0ef 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").out().cap("a").toList());
+ System.out.println(g.V().has("lang").group("a").by("lang").by("name").cap("a").toList());
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a74aa5b5/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/actors/traversal/WorkerTraversalSideEffects.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/actors/traversal/WorkerTraversalSideEffects.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/actors/traversal/WorkerTraversalSideEffects.java
index b660eda..7337316 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/actors/traversal/WorkerTraversalSideEffects.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/actors/traversal/WorkerTraversalSideEffects.java
@@ -73,7 +73,7 @@ public final class WorkerTraversalSideEffects implements TraversalSideEffects {
@Override
public void add(final String key, final Object value) {
- this.sideEffects.add(key, value);
+ //this.sideEffects.add(key, value);
this.worker.send(this.worker.master(), new SideEffectAddMessage(key, value));
}