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 21:07:01 UTC
[40/50] [abbrv] tinkerpop git commit: starting to fill out
GraphActorsTest (like GraphComputerTest). Tweaks to AkkaConfigFactory for
default 'local' settings.
starting to fill out GraphActorsTest (like GraphComputerTest). Tweaks to AkkaConfigFactory for default 'local' settings.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/48d860f3
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/48d860f3
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/48d860f3
Branch: refs/heads/TINKERPOP-1564
Commit: 48d860f3f2fefc550606b3defa742f39445d042f
Parents: 7b837d5
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Wed Jan 18 05:38:07 2017 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Thu Jan 19 13:01:41 2017 -0700
----------------------------------------------------------------------
.../akka/process/actors/AkkaConfigFactory.java | 6 ++---
.../akka/process/actors/AkkaPlayTest.java | 4 ++--
.../gremlin/process/actors/GraphActorsTest.java | 25 +++++++++++++++++++-
3 files changed, 29 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/48d860f3/akka-gremlin/src/main/java/org/apache/tinkerpop/gremlin/akka/process/actors/AkkaConfigFactory.java
----------------------------------------------------------------------
diff --git a/akka-gremlin/src/main/java/org/apache/tinkerpop/gremlin/akka/process/actors/AkkaConfigFactory.java b/akka-gremlin/src/main/java/org/apache/tinkerpop/gremlin/akka/process/actors/AkkaConfigFactory.java
index d1bab75..f764fca 100644
--- a/akka-gremlin/src/main/java/org/apache/tinkerpop/gremlin/akka/process/actors/AkkaConfigFactory.java
+++ b/akka-gremlin/src/main/java/org/apache/tinkerpop/gremlin/akka/process/actors/AkkaConfigFactory.java
@@ -77,14 +77,14 @@ final class AkkaConfigFactory {
}
static Address getMasterActorDeployment(final Configuration configuration) {
- final String hostName = configuration.getString(Constants.AKKA_REMOTE_NETTY_TCP_HOSTNAME);
- final String port = configuration.getProperty(Constants.AKKA_REMOTE_NETTY_TCP_PORT).toString();
+ final String hostName = configuration.getString(Constants.AKKA_REMOTE_NETTY_TCP_HOSTNAME, "127.0.0.1");
+ final String port = configuration.getInteger(Constants.AKKA_REMOTE_NETTY_TCP_PORT, 0).toString();
return AddressFromURIString.parse("akka.tcp://" + configuration.getString(Constants.GREMLIN_AKKA_SYSTEM_NAME) + "@" + hostName + ":" + port);
}
static Address getWorkerActorDeployment(final Configuration configuration, final Partition partition) {
final String hostName = partition.location().isSiteLocalAddress() ? "127.0.0.1" : partition.location().getHostAddress().toString();
- final String port = configuration.getProperty(Constants.AKKA_REMOTE_NETTY_TCP_PORT).toString();
+ final String port = configuration.getInteger(Constants.AKKA_REMOTE_NETTY_TCP_PORT, 0).toString();
return AddressFromURIString.parse("akka.tcp://" + configuration.getString(Constants.GREMLIN_AKKA_SYSTEM_NAME) + "@" + hostName + ":" + port);
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/48d860f3/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 e1c80bd..ae308e8 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
@@ -49,10 +49,10 @@ public class AkkaPlayTest {
configuration.setProperty(TinkerGraph.GREMLIN_TINKERGRAPH_GRAPH_FORMAT,"gryo");
final Graph graph = TinkerGraph.open(configuration);
//graph.io(GryoIo.build()).readGraph("../data/tinkerpop-modern.kryo");
- GraphTraversalSource g = graph.traversal().withProcessor(GraphActors.open(AkkaGraphActors.class).workers(3));
+ 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().groupCount().by(T.label).toList());
+ System.out.println(g.V().has("lang").group("a").by("lang").by("name").out().cap("a").toList());
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/48d860f3/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/actors/GraphActorsTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/actors/GraphActorsTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/actors/GraphActorsTest.java
index cc9d995..be003d6 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/actors/GraphActorsTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/actors/GraphActorsTest.java
@@ -19,13 +19,18 @@
package org.apache.tinkerpop.gremlin.process.actors;
+import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration.ConfigurationConverter;
import org.apache.tinkerpop.gremlin.LoadGraphWith;
import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
import org.junit.Test;
+import java.util.UUID;
+
import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
@@ -41,7 +46,25 @@ public class GraphActorsTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
- public void shouldHaveProperWorkerCounte() {
+ public void shouldNotAlterGraphConfiguration() {
+ final String uuid = UUID.randomUUID().toString();
+ final Configuration graphConfiguration = graph.configuration();
+ assertEquals(ConfigurationConverter.getMap(graphConfiguration), ConfigurationConverter.getMap(graph.configuration()));
+ assertFalse(graphConfiguration.containsKey("graphActorsTest.uuid-" + uuid));
+ final GraphActors actors = graphProvider.getGraphActors(graph);
+ actors.configure("graphActorsTest.uuid-" + uuid, "bloop");
+ actors.workers(1);
+ final Configuration actorsConfiguration = actors.configuration();
+ assertEquals("bloop", actorsConfiguration.getString("graphActorsTest.uuid-" + uuid));
+ assertEquals(1, actorsConfiguration.getInt(GraphActors.GRAPH_ACTORS_WORKERS));
+ ///
+ assertEquals(ConfigurationConverter.getMap(graphConfiguration), ConfigurationConverter.getMap(graph.configuration()));
+ assertFalse(graphConfiguration.containsKey("graphActorsTest.uuid-" + uuid));
+ }
+
+ @Test
+ @LoadGraphWith(MODERN)
+ public void shouldHaveProperWorkerCount() {
final GraphActors actors = graphProvider.getGraphActors(graph);
for (int i = 1; i < 10; i++) {
assertEquals(6L, g.withProcessor(actors.workers(i)).V().count().next().longValue());