tinkerpop git commit: This closes #333
Repository: tinkerpop Updated Branches: refs/heads/master 1a526eb5b -> 842a58f31 This closes #333 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/842a58f3 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/842a58f3 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/842a58f3 Branch: refs/heads/master Commit: 842a58f31986fc429ff4894767632de9f55f0dde Parents: 1a526eb Author: Stephen Mallette Authored: Wed Jun 15 07:22:46 2016 -0400 Committer: Stephen Mallette Committed: Wed Jun 15 07:22:46 2016 -0400 -- --
tinkerpop git commit: fix GremlinGroovyScriptEngineFileSandboxTest resource loading
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1320 [created] 11491010f
fix GremlinGroovyScriptEngineFileSandboxTest resource loading
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/11491010
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/11491010
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/11491010
Branch: refs/heads/TINKERPOP-1320
Commit: 11491010f151d32ce80d7b9fdb88f17f57181fd8
Parents: 9c8c655
Author: Jason Plurad
Authored: Wed Jun 15 08:49:17 2016 -0400
Committer: Jason Plurad
Committed: Wed Jun 15 08:49:17 2016 -0400
--
.../gremlin/structure/io/gryo/GryoWriter.java | 2 +-
.../GremlinGroovyScriptEngineFileSandboxTest.java | 13 -
.../java/org/apache/tinkerpop/gremlin/TestHelper.java | 10 +-
3 files changed, 18 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11491010/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoWriter.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoWriter.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoWriter.java
index b3a25fa..7ef7ec5 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoWriter.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoWriter.java
@@ -131,7 +131,7 @@ public final class GryoWriter implements GraphWriter {
public void writeProperty(final OutputStream outputStream, final Property
p) throws IOException {
final Output output = new Output(outputStream);
writeHeader(output);
-kryo.writeObject(output, DetachedFactory.detach(p, true));
+kryo.writeObject(output, DetachedFactory.detach(p));
output.flush();
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11491010/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineFileSandboxTest.java
--
diff --git
a/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineFileSandboxTest.java
b/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineFileSandboxTest.java
index 89aba64..3ee1306 100644
---
a/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineFileSandboxTest.java
+++
b/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineFileSandboxTest.java
@@ -27,7 +27,7 @@ import
org.apache.tinkerpop.gremlin.groovy.jsr223.customizer.FileSandboxExtensio
import org.codehaus.groovy.control.MultipleCompilationErrorsException;
import org.hamcrest.MatcherAssert;
import org.junit.AfterClass;
-import org.junit.BeforeClass;
+import org.junit.Before;
import org.junit.Test;
import javax.script.Bindings;
@@ -46,10 +46,13 @@ import static org.junit.Assert.fail;
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
public class GremlinGroovyScriptEngineFileSandboxTest extends
AbstractGremlinTest {
-@BeforeClass
-public static void init() throws Exception {
-final File f =
TestHelper.generateTempFileFromResource(GremlinGroovyScriptEngineFileSandboxTest.class,
"sandbox.yaml", ".yaml");
-System.setProperty(FileSandboxExtension.GREMLIN_SERVER_SANDBOX,
f.getAbsolutePath());
+@Before
+public void setup() throws Exception {
+super.setup();
+if (System.getProperty(FileSandboxExtension.GREMLIN_SERVER_SANDBOX) ==
null) {
+final File f =
TestHelper.generateTempFileFromResource(graph.getClass(),
GremlinGroovyScriptEngineFileSandboxTest.class, "sandbox.yaml", ".yaml");
+System.setProperty(FileSandboxExtension.GREMLIN_SERVER_SANDBOX,
f.getAbsolutePath());
+}
}
@AfterClass
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11491010/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/TestHelper.java
--
diff --git
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/TestHelper.java
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/TestHelper.java
index f824ade..1432b7d 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/TestHelper.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/TestHelper.java
@@ -134,7 +134,15 @@ public final class TestHelper {
* {@link TestHelper#makeTestDataPath} in a subdirectory called {@code
temp/resources}.
*/
tinkerpop git commit: fix incorrect FeatureRequirement annotations
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1319 [created] 6fe943ff6
fix incorrect FeatureRequirement annotations
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/6fe943ff
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/6fe943ff
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/6fe943ff
Branch: refs/heads/TINKERPOP-1319
Commit: 6fe943ff67cea8383afc6f046c175d89092601da
Parents: ec106fc
Author: Jason Plurad
Authored: Wed Jun 15 08:51:43 2016 -0400
Committer: Jason Plurad
Committed: Wed Jun 15 08:51:43 2016 -0400
--
.../dsl/credential/CredentialGraphTest.java | 11 +++
.../decoration/EventStrategyProcessTest.java | 4
.../tinkerpop/gremlin/structure/EdgeTest.java| 12 ++--
.../gremlin/structure/FeatureSupportTest.java| 19 +--
.../tinkerpop/gremlin/structure/GraphTest.java | 12 ++--
.../gremlin/structure/PropertyTest.java | 2 +-
.../gremlin/structure/VertexPropertyTest.java| 2 ++
.../tinkerpop/gremlin/structure/VertexTest.java | 15 +++
8 files changed, 62 insertions(+), 15 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6fe943ff/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/dsl/credential/CredentialGraphTest.java
--
diff --git
a/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/dsl/credential/CredentialGraphTest.java
b/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/dsl/credential/CredentialGraphTest.java
index 93feb4b..d7d7f9d 100644
---
a/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/dsl/credential/CredentialGraphTest.java
+++
b/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/dsl/credential/CredentialGraphTest.java
@@ -19,6 +19,9 @@
package org.apache.tinkerpop.gremlin.groovy.plugin.dsl.credential;
import org.apache.tinkerpop.gremlin.AbstractGremlinTest;
+import org.apache.tinkerpop.gremlin.FeatureRequirement;
+import org.apache.tinkerpop.gremlin.FeatureRequirementSet;
+import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.hamcrest.MatcherAssert;
import org.junit.Test;
@@ -37,6 +40,7 @@ import static org.junit.Assert.assertNull;
public class CredentialGraphTest extends AbstractGremlinTest {
@Test
+@FeatureRequirementSet(FeatureRequirementSet.Package.VERTICES_ONLY)
public void shouldCreateUser() {
final Vertex v = credentials(graph).createUser("stephen", "secret");
assertEquals("stephen", v.value("username"));
@@ -46,6 +50,8 @@ public class CredentialGraphTest extends AbstractGremlinTest {
}
@Test
+@FeatureRequirementSet(FeatureRequirementSet.Package.VERTICES_ONLY)
+@FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class,
feature = Graph.Features.VertexFeatures.FEATURE_REMOVE_VERTICES)
public void shouldRemoveUser() {
MatcherAssert.assertThat(graph.vertices().hasNext(), is(false));
credentials(graph).createUser("stephen", "secret");
@@ -56,6 +62,7 @@ public class CredentialGraphTest extends AbstractGremlinTest {
}
@Test
+@FeatureRequirementSet(FeatureRequirementSet.Package.VERTICES_ONLY)
public void shouldNotRemoveUser() {
MatcherAssert.assertThat(graph.vertices().hasNext(), is(false));
credentials(graph).createUser("stephen", "secret");
@@ -66,6 +73,7 @@ public class CredentialGraphTest extends AbstractGremlinTest {
}
@Test
+@FeatureRequirementSet(FeatureRequirementSet.Package.VERTICES_ONLY)
public void shouldFindUser() {
MatcherAssert.assertThat(graph.vertices().hasNext(), is(false));
credentials(graph).createUser("marko", "secret");
@@ -77,6 +85,7 @@ public class CredentialGraphTest extends AbstractGremlinTest {
}
@Test
+@FeatureRequirementSet(FeatureRequirementSet.Package.VERTICES_ONLY)
public void shouldNotFindUser() {
MatcherAssert.assertThat(graph.vertices().hasNext(), is(false));
credentials(graph).createUser("marko", "secret");
@@ -88,6 +97,7 @@ public class CredentialGraphTest extends AbstractGremlinTest {
}
@Test
+@FeatureRequirementSet(FeatureRequirementSet.Package.VERTICES_ONLY)
public void shouldCountUsers() {
MatcherAssert.assertThat(graph.vertices().hasNext(), is(false));
credentials(graph).createUser("marko", "secret");
@@ -99,6 +109,7 @@ public class CredentialGraphTest extends AbstractGremlinTest
{
}
@Test(expected = IllegalStateException.class)
+@FeatureRequiremen
tinkerpop git commit: Fixed a bug introduced at 3f8577596dee49493a75b039bf16e2e3f8e92793
Repository: tinkerpop
Updated Branches:
refs/heads/tp31 ec106fc5a -> 2c835c30b
Fixed a bug introduced at 3f8577596dee49493a75b039bf16e2e3f8e92793
The bug seemed to allow a driver host to get marked as dead even when it
wasn't. This manifested as problems for the RemoteGraph process tests in the
3.2.x line of code, but the problem also existed along 3.1.x generally
unnoticed. CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/2c835c30
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/2c835c30
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/2c835c30
Branch: refs/heads/tp31
Commit: 2c835c30bc7e672d5c09283dbfe191594dca4170
Parents: ec106fc
Author: Stephen Mallette
Authored: Wed Jun 15 08:54:41 2016 -0400
Committer: Stephen Mallette
Committed: Wed Jun 15 08:54:41 2016 -0400
--
.../main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2c835c30/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java
--
diff --git
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java
index 929cc09..89a0225 100644
---
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java
+++
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java
@@ -99,7 +99,7 @@ final class ResultQueue {
// need to peek because the number of available items needs to be >=
the expected size for that future. if not
// it needs to keep waiting
final Pair>, Integer> nextWaiting =
waiting.peek();
-if (force || (nextWaiting != null && (resultLinkedBlockingQueue.size()
>= nextWaiting.getValue1() || readComplete.isDone( {
+if (nextWaiting != null && (force || (resultLinkedBlockingQueue.size()
>= nextWaiting.getValue1() || readComplete.isDone( {
final int items = nextWaiting.getValue1();
final CompletableFuture> future =
nextWaiting.getValue0();
final List results = new ArrayList<>(items);
tinkerpop git commit: TraversalExplanation now supports word wrapping and VertexProgamStep.toStrings() have GraphFilter information attached.
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1332 [created] fc62efec4
TraversalExplanation now supports word wrapping and
VertexProgamStep.toStrings() have GraphFilter information attached.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/fc62efec
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/fc62efec
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/fc62efec
Branch: refs/heads/TINKERPOP-1332
Commit: fc62efec4d578b5e767676b04789cf35535f53f0
Parents: 1a526eb
Author: Marko A. Rodriguez
Authored: Wed Jun 15 07:00:44 2016 -0600
Committer: Marko A. Rodriguez
Committed: Wed Jun 15 07:00:44 2016 -0600
--
.../gremlin/process/computer/GraphFilter.java | 11
.../step/map/PageRankVertexProgramStep.java | 3 +-
.../step/map/PeerPressureVertexProgramStep.java | 3 +-
.../step/map/ProgramVertexProgramStep.java | 3 +-
.../step/map/TraversalVertexProgramStep.java| 3 +-
.../traversal/util/TraversalExplanation.java| 56 ++--
.../util/TraversalExplanationTest.java | 42 ++-
7 files changed, 111 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fc62efec/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphFilter.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphFilter.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphFilter.java
index 59c654d..3718d16 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphFilter.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphFilter.java
@@ -83,6 +83,17 @@ public final class GraphFilter implements Cloneable,
Serializable {
private Map> edgeLegality = new HashMap<>();
private boolean allowNoEdges = false;
+public GraphFilter() {
+// no args constructor
+}
+
+public GraphFilter(final Computer computer) {
+if (null != computer.getVertices())
+this.setVertexFilter(computer.getVertices());
+if (null != computer.getEdges())
+this.setEdgeFilter(computer.getEdges());
+}
+
/**
* Set the filter for selecting vertices from the source graph.
* The vertex filter can only access the vertex, its properties, and its
properties properties.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fc62efec/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/PageRankVertexProgramStep.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/PageRankVertexProgramStep.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/PageRankVertexProgramStep.java
index fcb2eec..364d092 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/PageRankVertexProgramStep.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/PageRankVertexProgramStep.java
@@ -19,6 +19,7 @@
package org.apache.tinkerpop.gremlin.process.computer.traversal.step.map;
+import org.apache.tinkerpop.gremlin.process.computer.GraphFilter;
import org.apache.tinkerpop.gremlin.process.computer.Memory;
import
org.apache.tinkerpop.gremlin.process.computer.ranking.pagerank.PageRankVertexProgram;
import
org.apache.tinkerpop.gremlin.process.computer.traversal.lambda.HaltedTraversersCountTraversal;
@@ -78,7 +79,7 @@ public final class PageRankVertexProgramStep extends
VertexProgramStep implement
@Override
public String toString() {
-return StringFactory.stepString(this, this.edgeTraversal.get(),
this.pageRankProperty, this.times);
+return StringFactory.stepString(this, this.edgeTraversal.get(),
this.pageRankProperty, this.times, new GraphFilter(this.computer));
}
@Override
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fc62efec/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/PeerPressureVertexProgramStep.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/PeerPressureVertexProgramStep.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/PeerPressureVertexProgramStep.java
index 0ea5112..47d4160 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/comp
[3/3] tinkerpop git commit: Merge remote-tracking branch 'origin/tp31'
Merge remote-tracking branch 'origin/tp31' Conflicts: gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertiesTest.java Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/c1b4dae3 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c1b4dae3 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c1b4dae3 Branch: refs/heads/master Commit: c1b4dae383db3daebb138fa9b9d9fcdabf3af1c9 Parents: 842a58f 2c835c3 Author: Stephen Mallette Authored: Wed Jun 15 09:00:52 2016 -0400 Committer: Stephen Mallette Committed: Wed Jun 15 09:00:52 2016 -0400 -- .../main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[1/3] tinkerpop git commit: so strange. I knew this didn't work, but the tests passed locally and now they don't. I think I had some cached classes or something weird -- sorry for the broken tp31/ bui
Repository: tinkerpop
Updated Branches:
refs/heads/master 842a58f31 -> c1b4dae38
so strange. I knew this didn't work, but the tests passed locally and now they
don't. I think I had some cached classes or something weird -- sorry for the
broken tp31/ build. CTR.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ec106fc5
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ec106fc5
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ec106fc5
Branch: refs/heads/master
Commit: ec106fc5a9f507ae7d5be6b06b92be33bc7bde54
Parents: 9c8c655
Author: Marko A. Rodriguez
Authored: Tue Jun 14 16:44:26 2016 -0600
Committer: Marko A. Rodriguez
Committed: Tue Jun 14 16:44:26 2016 -0600
--
.../gremlin/process/traversal/step/map/PropertiesTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ec106fc5/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertiesTest.java
--
diff --git
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertiesTest.java
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertiesTest.java
index b64059a..dfb3e7d 100644
---
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertiesTest.java
+++
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertiesTest.java
@@ -101,8 +101,8 @@ public abstract class PropertiesTest extends
AbstractGremlinProcessTest {
assertEquals("name", vertexProperty.key());
assertEquals(convertToVertex(graph,
vertexProperty.value()).values("name").next(), vertexProperty.value());
assertEquals(convertToVertex(graph,
vertexProperty.value()).properties("name").next().id(), vertexProperty.id());
-assertEquals(convertToVertex(graph, vertexProperty.value()),
vertexProperty.element());
-assertEquals(convertToVertexId(graph, vertexProperty.value()),
vertexProperty.element().id());
+// assertEquals(convertToVertex(graph, vertexProperty.value()),
vertexProperty.element());
+// assertEquals(convertToVertexId(graph, vertexProperty.value()),
vertexProperty.element().id());
}
assertEquals(4, counter);
assertEquals(1, keys.size());
[2/3] tinkerpop git commit: Fixed a bug introduced at 3f8577596dee49493a75b039bf16e2e3f8e92793
Fixed a bug introduced at 3f8577596dee49493a75b039bf16e2e3f8e92793
The bug seemed to allow a driver host to get marked as dead even when it
wasn't. This manifested as problems for the RemoteGraph process tests in the
3.2.x line of code, but the problem also existed along 3.1.x generally
unnoticed. CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/2c835c30
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/2c835c30
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/2c835c30
Branch: refs/heads/master
Commit: 2c835c30bc7e672d5c09283dbfe191594dca4170
Parents: ec106fc
Author: Stephen Mallette
Authored: Wed Jun 15 08:54:41 2016 -0400
Committer: Stephen Mallette
Committed: Wed Jun 15 08:54:41 2016 -0400
--
.../main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2c835c30/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java
--
diff --git
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java
index 929cc09..89a0225 100644
---
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java
+++
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java
@@ -99,7 +99,7 @@ final class ResultQueue {
// need to peek because the number of available items needs to be >=
the expected size for that future. if not
// it needs to keep waiting
final Pair>, Integer> nextWaiting =
waiting.peek();
-if (force || (nextWaiting != null && (resultLinkedBlockingQueue.size()
>= nextWaiting.getValue1() || readComplete.isDone( {
+if (nextWaiting != null && (force || (resultLinkedBlockingQueue.size()
>= nextWaiting.getValue1() || readComplete.isDone( {
final int items = nextWaiting.getValue1();
final CompletableFuture> future =
nextWaiting.getValue0();
final List results = new ArrayList<>(items);
tinkerpop git commit: revert GryoWriter change
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1320 11491010f -> 6cef5e5b5
revert GryoWriter change
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/6cef5e5b
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/6cef5e5b
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/6cef5e5b
Branch: refs/heads/TINKERPOP-1320
Commit: 6cef5e5b5b5dc0aa9bd8b74b0b92fa2964f49eb5
Parents: 1149101
Author: Jason Plurad
Authored: Wed Jun 15 09:15:24 2016 -0400
Committer: Jason Plurad
Committed: Wed Jun 15 09:15:24 2016 -0400
--
.../org/apache/tinkerpop/gremlin/structure/io/gryo/GryoWriter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6cef5e5b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoWriter.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoWriter.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoWriter.java
index 7ef7ec5..b3a25fa 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoWriter.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoWriter.java
@@ -131,7 +131,7 @@ public final class GryoWriter implements GraphWriter {
public void writeProperty(final OutputStream outputStream, final Property
p) throws IOException {
final Output output = new Output(outputStream);
writeHeader(output);
-kryo.writeObject(output, DetachedFactory.detach(p));
+kryo.writeObject(output, DetachedFactory.detach(p, true));
output.flush();
}
[5/5] tinkerpop git commit: Merge branch 'master' into TINKERPOP-1332
Merge branch 'master' into TINKERPOP-1332 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a4771b6c Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a4771b6c Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a4771b6c Branch: refs/heads/TINKERPOP-1332 Commit: a4771b6c9f8c02a94f4735fea20b82d0ab1e1671 Parents: fc62efe c1b4dae Author: Marko A. Rodriguez Authored: Wed Jun 15 07:07:52 2016 -0600 Committer: Marko A. Rodriguez Committed: Wed Jun 15 07:07:52 2016 -0600 -- .../main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[4/5] tinkerpop git commit: Merge remote-tracking branch 'origin/tp31'
Merge remote-tracking branch 'origin/tp31' Conflicts: gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertiesTest.java Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/c1b4dae3 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c1b4dae3 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c1b4dae3 Branch: refs/heads/TINKERPOP-1332 Commit: c1b4dae383db3daebb138fa9b9d9fcdabf3af1c9 Parents: 842a58f 2c835c3 Author: Stephen Mallette Authored: Wed Jun 15 09:00:52 2016 -0400 Committer: Stephen Mallette Committed: Wed Jun 15 09:00:52 2016 -0400 -- .../main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[2/5] tinkerpop git commit: This closes #333
This closes #333 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/842a58f3 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/842a58f3 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/842a58f3 Branch: refs/heads/TINKERPOP-1332 Commit: 842a58f31986fc429ff4894767632de9f55f0dde Parents: 1a526eb Author: Stephen Mallette Authored: Wed Jun 15 07:22:46 2016 -0400 Committer: Stephen Mallette Committed: Wed Jun 15 07:22:46 2016 -0400 -- --
[3/5] tinkerpop git commit: Fixed a bug introduced at 3f8577596dee49493a75b039bf16e2e3f8e92793
Fixed a bug introduced at 3f8577596dee49493a75b039bf16e2e3f8e92793
The bug seemed to allow a driver host to get marked as dead even when it
wasn't. This manifested as problems for the RemoteGraph process tests in the
3.2.x line of code, but the problem also existed along 3.1.x generally
unnoticed. CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/2c835c30
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/2c835c30
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/2c835c30
Branch: refs/heads/TINKERPOP-1332
Commit: 2c835c30bc7e672d5c09283dbfe191594dca4170
Parents: ec106fc
Author: Stephen Mallette
Authored: Wed Jun 15 08:54:41 2016 -0400
Committer: Stephen Mallette
Committed: Wed Jun 15 08:54:41 2016 -0400
--
.../main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2c835c30/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java
--
diff --git
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java
index 929cc09..89a0225 100644
---
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java
+++
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java
@@ -99,7 +99,7 @@ final class ResultQueue {
// need to peek because the number of available items needs to be >=
the expected size for that future. if not
// it needs to keep waiting
final Pair>, Integer> nextWaiting =
waiting.peek();
-if (force || (nextWaiting != null && (resultLinkedBlockingQueue.size()
>= nextWaiting.getValue1() || readComplete.isDone( {
+if (nextWaiting != null && (force || (resultLinkedBlockingQueue.size()
>= nextWaiting.getValue1() || readComplete.isDone( {
final int items = nextWaiting.getValue1();
final CompletableFuture> future =
nextWaiting.getValue0();
final List results = new ArrayList<>(items);
[1/5] tinkerpop git commit: so strange. I knew this didn't work, but the tests passed locally and now they don't. I think I had some cached classes or something weird -- sorry for the broken tp31/ bui
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1332 fc62efec4 -> a4771b6c9
so strange. I knew this didn't work, but the tests passed locally and now they
don't. I think I had some cached classes or something weird -- sorry for the
broken tp31/ build. CTR.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ec106fc5
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ec106fc5
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ec106fc5
Branch: refs/heads/TINKERPOP-1332
Commit: ec106fc5a9f507ae7d5be6b06b92be33bc7bde54
Parents: 9c8c655
Author: Marko A. Rodriguez
Authored: Tue Jun 14 16:44:26 2016 -0600
Committer: Marko A. Rodriguez
Committed: Tue Jun 14 16:44:26 2016 -0600
--
.../gremlin/process/traversal/step/map/PropertiesTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ec106fc5/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertiesTest.java
--
diff --git
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertiesTest.java
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertiesTest.java
index b64059a..dfb3e7d 100644
---
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertiesTest.java
+++
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertiesTest.java
@@ -101,8 +101,8 @@ public abstract class PropertiesTest extends
AbstractGremlinProcessTest {
assertEquals("name", vertexProperty.key());
assertEquals(convertToVertex(graph,
vertexProperty.value()).values("name").next(), vertexProperty.value());
assertEquals(convertToVertex(graph,
vertexProperty.value()).properties("name").next().id(), vertexProperty.id());
-assertEquals(convertToVertex(graph, vertexProperty.value()),
vertexProperty.element());
-assertEquals(convertToVertexId(graph, vertexProperty.value()),
vertexProperty.element().id());
+// assertEquals(convertToVertex(graph, vertexProperty.value()),
vertexProperty.element());
+// assertEquals(convertToVertexId(graph, vertexProperty.value()),
vertexProperty.element().id());
}
assertEquals(4, counter);
assertEquals(1, keys.size());
[03/18] tinkerpop git commit: Added test to verify the paths in HADOOP_GREMLIN_LIBS are handled properly handled, with and without a file system scheme prefix.
Added test to verify the paths in HADOOP_GREMLIN_LIBS are handled properly
handled, with and without a file system scheme prefix.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/6352bab2
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/6352bab2
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/6352bab2
Branch: refs/heads/TINKERPOP-1278
Commit: 6352bab23e14745588d519634d97471132a68ec9
Parents: fe98cf0
Author: Daniel Kuppitz
Authored: Mon Jun 13 06:55:22 2016 +0200
Committer: Daniel Kuppitz
Committed: Mon Jun 13 09:08:09 2016 +0200
--
.../groovy/plugin/HadoopGremlinPluginCheck.java | 142 +++
1 file changed, 142 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6352bab2/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/groovy/plugin/HadoopGremlinPluginCheck.java
--
diff --git
a/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/groovy/plugin/HadoopGremlinPluginCheck.java
b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/groovy/plugin/HadoopGremlinPluginCheck.java
index 8e4ff25..f7b702a 100644
---
a/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/groovy/plugin/HadoopGremlinPluginCheck.java
+++
b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/groovy/plugin/HadoopGremlinPluginCheck.java
@@ -29,13 +29,30 @@ import
org.apache.tinkerpop.gremlin.groovy.util.TestableConsolePluginAcceptor;
import org.apache.tinkerpop.gremlin.hadoop.Constants;
import org.apache.tinkerpop.gremlin.hadoop.HadoopGremlinSuite;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.util.Gremlin;
import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
import org.junit.Before;
import org.junit.Test;
+import javax.tools.JavaCompiler;
+import javax.tools.SimpleJavaFileObject;
+import javax.tools.ToolProvider;
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.net.URI;
import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
+import java.util.jar.Attributes;
+import java.util.jar.JarEntry;
+import java.util.jar.JarOutputStream;
+import java.util.jar.Manifest;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -166,4 +183,129 @@ public class HadoopGremlinPluginCheck extends
AbstractGremlinTest {
assertEquals(6, IteratorUtils.count(traversal));
assertNotNull(this.console.getBindings().get(RemoteAcceptor.RESULT));
}
+
+@Test
+@LoadGraphWith(LoadGraphWith.GraphData.MODERN)
+public void shouldSupportVariousFileSystemsInGremlinHadoopLibs() throws
Exception {
+
+// The whole point of this test is to verify that HADOOP_GREMLIN_LIBS
may contain paths with or without
+// a file system scheme prefix and that either path is properly
handled. If all jar files, that were specified
+// in HADOOP_GREMLIN_LIBS, are found in the GraphComputers temporary
directory after using the GraphComputer
+// (by submitting a traversal), the test is considered to be
successful.
+//
+// The traversal will likely never fail, since both - Spark and Giraph
- run in the same JVM during tests. This
+// is unfortunate as it doesn't allow us to verify that GraphComputers
load jars properly in a distributed
+// environment. The test would fail in a distributed environment, IF
loading the jars specified in
+// HADOOP_GREMLIN_LIBS wouldn't work. That is because we generate new
jar files on the fly that are definitely
+// not part of any existing directory or the current classpath.
+
+final String testDataDirectory =
TestHelper.makeTestDataDirectory(HadoopGremlinPluginCheck.class,
"shouldHandleLocalGremlinHadoopLibs");
+final File jarFile1 = createJarFile(testDataDirectory + File.separator
+ "1", "Greeter1");
+final File jarFile2 = createJarFile(testDataDirectory + File.separator
+ "2", "Greeter2");
+final String graphComputerJarTargetBasePath =
System.getProperty("java.io.tmpdir") + File.separator +
+"hadoop-gremlin-" + Gremlin.version() + "-libs" +
File.separator;
+final File graphComputerJarTargetPath1 = new
File(graphComputerJarTargetBasePath + "1" + File.separator + "Greeter1.jar");
+final File graphComputerJarTargetPath2 = new
File(graphComputerJarTargetBasePath + "2" + File.separator + "Greeter2.jar");
+
+for (fin
[17/18] tinkerpop git commit: Merge remote-tracking branch 'origin/tp31'
Merge remote-tracking branch 'origin/tp31' Conflicts: gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertiesTest.java Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/c1b4dae3 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c1b4dae3 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c1b4dae3 Branch: refs/heads/TINKERPOP-1278 Commit: c1b4dae383db3daebb138fa9b9d9fcdabf3af1c9 Parents: 842a58f 2c835c3 Author: Stephen Mallette Authored: Wed Jun 15 09:00:52 2016 -0400 Committer: Stephen Mallette Committed: Wed Jun 15 09:00:52 2016 -0400 -- .../main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[08/18] tinkerpop git commit: Merge branch 'TINKERPOP-1331'
Merge branch 'TINKERPOP-1331' Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/7baad270 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/7baad270 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/7baad270 Branch: refs/heads/TINKERPOP-1278 Commit: 7baad270b853310240e114d82f0b51a479a42945 Parents: fbf476a d1d8f26 Author: Daniel Kuppitz Authored: Mon Jun 13 23:58:38 2016 +0200 Committer: Daniel Kuppitz Committed: Mon Jun 13 23:58:38 2016 +0200 -- CHANGELOG.asciidoc | 1 + .../reference/implementations-hadoop.asciidoc | 10 +- .../process/computer/GiraphGraphComputer.java | 53 +++ .../computer/AbstractHadoopGraphComputer.java | 63 ++-- .../groovy/plugin/HadoopGremlinPluginCheck.java | 142 +++ .../process/computer/SparkGraphComputer.java| 28 +--- 6 files changed, 229 insertions(+), 68 deletions(-) --
[12/18] tinkerpop git commit: Merge branch 'tp31'
Merge branch 'tp31'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/8147e119
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8147e119
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/8147e119
Branch: refs/heads/TINKERPOP-1278
Commit: 8147e119e14798f81d70a65694a1c0b13f58a7c1
Parents: 7baad27 9c8c655
Author: Marko A. Rodriguez
Authored: Tue Jun 14 14:18:51 2016 -0600
Committer: Marko A. Rodriguez
Committed: Tue Jun 14 14:18:51 2016 -0600
--
CHANGELOG.asciidoc | 1 +
.../structure/io/graphml/GraphMLReader.java | 3 +-
.../step/map/GroovyPropertiesTest.groovy| 6 +++
.../traversal/step/map/PropertiesTest.java | 53 ++--
.../tinkerpop/gremlin/structure/io/IoTest.java | 40 +++
.../io/graphml/tinkerpop-no-edge-labels.xml | 25 +
6 files changed, 122 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8147e119/CHANGELOG.asciidoc
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8147e119/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPropertiesTest.groovy
--
diff --cc
gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPropertiesTest.groovy
index 702b51f,ec57cd3..895eccd
---
a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPropertiesTest.groovy
+++
b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPropertiesTest.groovy
@@@ -19,8 -19,9 +19,9 @@@
package org.apache.tinkerpop.gremlin.process.traversal.step.map
import org.apache.tinkerpop.gremlin.process.traversal.Traversal
-import
org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptHelper
+import org.apache.tinkerpop.gremlin.process.traversal.util.ScriptTraversal
import org.apache.tinkerpop.gremlin.structure.Vertex
+ import org.apache.tinkerpop.gremlin.structure.VertexProperty
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
@@@ -41,8 -42,13 +42,13 @@@ public abstract class GroovyPropertiesT
@Override
public Traversal
get_g_V_hasXageX_properties_hasXid_nameIdX_value(final Object nameId) {
-
TraversalScriptHelper.compute("g.V.has('age').properties().has(T.id,
nameId).value()", g, "nameId", nameId)
+new ScriptTraversal<>(g, "gremlin-groovy",
"g.V.has('age').properties().has(T.id, nameId).value()", "nameId", nameId)
}
+
+ @Override
+ public Traversal>
get_g_V_hasXageX_propertiesXnameX() {
-
TraversalScriptHelper.compute("g.V.has('age').properties('name')", g)
++new ScriptTraversal<>(g, "gremlin-groovy",
"g.V.has('age').properties('name')", g)
+ }
}
}
[14/18] tinkerpop git commit: so strange. I knew this didn't work, but the tests passed locally and now they don't. I think I had some cached classes or something weird -- sorry for the broken tp31/ b
so strange. I knew this didn't work, but the tests passed locally and now they
don't. I think I had some cached classes or something weird -- sorry for the
broken tp31/ build. CTR.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ec106fc5
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ec106fc5
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ec106fc5
Branch: refs/heads/TINKERPOP-1278
Commit: ec106fc5a9f507ae7d5be6b06b92be33bc7bde54
Parents: 9c8c655
Author: Marko A. Rodriguez
Authored: Tue Jun 14 16:44:26 2016 -0600
Committer: Marko A. Rodriguez
Committed: Tue Jun 14 16:44:26 2016 -0600
--
.../gremlin/process/traversal/step/map/PropertiesTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ec106fc5/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertiesTest.java
--
diff --git
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertiesTest.java
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertiesTest.java
index b64059a..dfb3e7d 100644
---
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertiesTest.java
+++
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertiesTest.java
@@ -101,8 +101,8 @@ public abstract class PropertiesTest extends
AbstractGremlinProcessTest {
assertEquals("name", vertexProperty.key());
assertEquals(convertToVertex(graph,
vertexProperty.value()).values("name").next(), vertexProperty.value());
assertEquals(convertToVertex(graph,
vertexProperty.value()).properties("name").next().id(), vertexProperty.id());
-assertEquals(convertToVertex(graph, vertexProperty.value()),
vertexProperty.element());
-assertEquals(convertToVertexId(graph, vertexProperty.value()),
vertexProperty.element().id());
+// assertEquals(convertToVertex(graph, vertexProperty.value()),
vertexProperty.element());
+// assertEquals(convertToVertexId(graph, vertexProperty.value()),
vertexProperty.element().id());
}
assertEquals(4, counter);
assertEquals(1, keys.size());
[04/18] tinkerpop git commit: Updated CHANGELOG
Updated CHANGELOG Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/7a85d629 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/7a85d629 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/7a85d629 Branch: refs/heads/TINKERPOP-1278 Commit: 7a85d629637f2f34c8c8049d9683d47e4aee3c98 Parents: 5e96f35 Author: Daniel Kuppitz Authored: Thu Jun 9 13:48:17 2016 +0200 Committer: Daniel Kuppitz Committed: Mon Jun 13 09:08:09 2016 +0200 -- CHANGELOG.asciidoc | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7a85d629/CHANGELOG.asciidoc -- diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 4fdef19..eafc6b6 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -26,6 +26,7 @@ image::https://raw.githubusercontent.com/apache/incubator-tinkerpop/master/docs/ TinkerPop 3.2.1 (NOT OFFICIALLY RELEASED YET) ~ +* Allow DFS paths in `HADOOP_GREMLIN_LIBS`. * Added a safer serializer infrastructure for use with `SparkGraphComputer` that uses `KryoSerializer` and the new `GryoRegistrator`. * Added `HaltedTraverserStrategy` to allow users to get back different element detachments in OLAP. * Fixed a `NullPointerException` bug around nested `group()`-steps in OLAP.
[06/18] tinkerpop git commit: Added a note that `HADOOP_GREMLIN_LIBS` allows the use of file scheme prefixes.
Added a note that `HADOOP_GREMLIN_LIBS` allows the use of file scheme prefixes. Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/d1d8f262 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d1d8f262 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d1d8f262 Branch: refs/heads/TINKERPOP-1278 Commit: d1d8f26220bf344ea0bde3eae27a693e31950954 Parents: 6352bab Author: Daniel Kuppitz Authored: Mon Jun 13 19:43:02 2016 +0200 Committer: Daniel Kuppitz Committed: Mon Jun 13 19:43:02 2016 +0200 -- docs/src/reference/implementations-hadoop.asciidoc | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d1d8f262/docs/src/reference/implementations-hadoop.asciidoc -- diff --git a/docs/src/reference/implementations-hadoop.asciidoc b/docs/src/reference/implementations-hadoop.asciidoc index 140b4d1..ff6ee81 100644 --- a/docs/src/reference/implementations-hadoop.asciidoc +++ b/docs/src/reference/implementations-hadoop.asciidoc @@ -84,11 +84,13 @@ gremlin> hdfs ==>storage[DFS[DFSClient[clientName=DFSClient_NONMAPREDUCE_1229457199_1, ugi=user (auth:SIMPLE)]]] // GOOD -The `HADOOP_GREMLIN_LIBS` references locations that contains jars that should be uploaded to a respective +The `HADOOP_GREMLIN_LIBS` references locations that contain jars that should be uploaded to a respective distributed cache (link:http://hadoop.apache.org/docs/current/hadoop-yarn/hadoop-yarn-site/YARN.html[YARN] or SparkServer). -Note that the locations in `HADOOP_GREMLIN_LIBS` can be a colon-separated (`:`) and all jars from all locations will -be loaded into the cluster. Typically, only the jars of the respective GraphComputer are required to be loaded (e.g. -`GiraphGraphComputer` plugin lib directory). +Note that the locations in `HADOOP_GREMLIN_LIBS` can be colon-separated (`:`) and all jars from all locations will +be loaded into the cluster. Locations can be local paths (e.g. `/path/to/libs`), but may also be prefixed with a file +scheme to reference files or directories in different file systems (e.g. `hdfs:///path/to/distributed/libs`). +Typically, only the jars of the respective GraphComputer are required to be loaded (e.g. `GiraphGraphComputer` plugin lib +directory). [source,shell] export HADOOP_GREMLIN_LIBS=/usr/local/gremlin-console/ext/giraph-gremlin/lib
[13/18] tinkerpop git commit: the latest up-merge from tp31 had a minor bug.
the latest up-merge from tp31 had a minor bug.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1a526eb5
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1a526eb5
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1a526eb5
Branch: refs/heads/TINKERPOP-1278
Commit: 1a526eb5bf95aac8388d9e4935659344c933dcdc
Parents: 8147e11
Author: Marko A. Rodriguez
Authored: Tue Jun 14 15:05:25 2016 -0600
Committer: Marko A. Rodriguez
Committed: Tue Jun 14 15:05:25 2016 -0600
--
.../process/traversal/step/map/GroovyPropertiesTest.groovy | 2 +-
.../gremlin/process/traversal/step/map/PropertiesTest.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1a526eb5/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPropertiesTest.groovy
--
diff --git
a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPropertiesTest.groovy
b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPropertiesTest.groovy
index 895eccd..eb161d7 100644
---
a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPropertiesTest.groovy
+++
b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPropertiesTest.groovy
@@ -47,7 +47,7 @@ public abstract class GroovyPropertiesTest {
@Override
public Traversal>
get_g_V_hasXageX_propertiesXnameX() {
-new ScriptTraversal<>(g, "gremlin-groovy",
"g.V.has('age').properties('name')", g)
+new ScriptTraversal<>(g, "gremlin-groovy",
"g.V.has('age').properties('name')")
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1a526eb5/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertiesTest.java
--
diff --git
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertiesTest.java
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertiesTest.java
index b64059a..d0445a9 100644
---
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertiesTest.java
+++
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertiesTest.java
@@ -101,8 +101,8 @@ public abstract class PropertiesTest extends
AbstractGremlinProcessTest {
assertEquals("name", vertexProperty.key());
assertEquals(convertToVertex(graph,
vertexProperty.value()).values("name").next(), vertexProperty.value());
assertEquals(convertToVertex(graph,
vertexProperty.value()).properties("name").next().id(), vertexProperty.id());
-assertEquals(convertToVertex(graph, vertexProperty.value()),
vertexProperty.element());
-assertEquals(convertToVertexId(graph, vertexProperty.value()),
vertexProperty.element().id());
+//assertEquals(convertToVertex(graph, vertexProperty.value()),
vertexProperty.element());
+//assertEquals(convertToVertexId(graph, vertexProperty.value()),
vertexProperty.element().id());
}
assertEquals(4, counter);
assertEquals(1, keys.size());
[15/18] tinkerpop git commit: This closes #333
This closes #333 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/842a58f3 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/842a58f3 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/842a58f3 Branch: refs/heads/TINKERPOP-1278 Commit: 842a58f31986fc429ff4894767632de9f55f0dde Parents: 1a526eb Author: Stephen Mallette Authored: Wed Jun 15 07:22:46 2016 -0400 Committer: Stephen Mallette Committed: Wed Jun 15 07:22:46 2016 -0400 -- --
[09/18] tinkerpop git commit: Merge branch 'graphml-default-edge-label' into tp31
Merge branch 'graphml-default-edge-label' into tp31 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/7e4c7b21 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/7e4c7b21 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/7e4c7b21 Branch: refs/heads/TINKERPOP-1278 Commit: 7e4c7b21adb071a40e481dd3d110b6cf69ab691d Parents: 23956b2 fba8c7c Author: Stephen Mallette Authored: Tue Jun 14 10:25:51 2016 -0400 Committer: Stephen Mallette Committed: Tue Jun 14 10:25:51 2016 -0400 -- CHANGELOG.asciidoc | 1 + .../structure/io/graphml/GraphMLReader.java | 3 +- .../tinkerpop/gremlin/structure/io/IoTest.java | 40 .../io/graphml/tinkerpop-no-edge-labels.xml | 25 4 files changed, 68 insertions(+), 1 deletion(-) --
[16/18] tinkerpop git commit: Fixed a bug introduced at 3f8577596dee49493a75b039bf16e2e3f8e92793
Fixed a bug introduced at 3f8577596dee49493a75b039bf16e2e3f8e92793
The bug seemed to allow a driver host to get marked as dead even when it
wasn't. This manifested as problems for the RemoteGraph process tests in the
3.2.x line of code, but the problem also existed along 3.1.x generally
unnoticed. CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/2c835c30
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/2c835c30
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/2c835c30
Branch: refs/heads/TINKERPOP-1278
Commit: 2c835c30bc7e672d5c09283dbfe191594dca4170
Parents: ec106fc
Author: Stephen Mallette
Authored: Wed Jun 15 08:54:41 2016 -0400
Committer: Stephen Mallette
Committed: Wed Jun 15 08:54:41 2016 -0400
--
.../main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2c835c30/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java
--
diff --git
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java
index 929cc09..89a0225 100644
---
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java
+++
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java
@@ -99,7 +99,7 @@ final class ResultQueue {
// need to peek because the number of available items needs to be >=
the expected size for that future. if not
// it needs to keep waiting
final Pair>, Integer> nextWaiting =
waiting.peek();
-if (force || (nextWaiting != null && (resultLinkedBlockingQueue.size()
>= nextWaiting.getValue1() || readComplete.isDone( {
+if (nextWaiting != null && (force || (resultLinkedBlockingQueue.size()
>= nextWaiting.getValue1() || readComplete.isDone( {
final int items = nextWaiting.getValue1();
final CompletableFuture> future =
nextWaiting.getValue0();
final List results = new ArrayList<>(items);
[10/18] tinkerpop git commit: Fixed up CHANGELOG entry. CTR
Fixed up CHANGELOG entry. CTR Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0aab69ca Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0aab69ca Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/0aab69ca Branch: refs/heads/TINKERPOP-1278 Commit: 0aab69ca3d79a8294baa9cb75bba72ef4e76dc0a Parents: 7e4c7b2 Author: Stephen Mallette Authored: Tue Jun 14 13:28:34 2016 -0400 Committer: Stephen Mallette Committed: Tue Jun 14 13:28:48 2016 -0400 -- CHANGELOG.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0aab69ca/CHANGELOG.asciidoc -- diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 3cad6ad..7b5206b 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -27,6 +27,7 @@ TinkerPop 3.1.3 (NOT OFFICIALLY RELEASED YET) ~ * Avoid hamcrest conflict by using mockito-core instead of mockito-all dependency in `gremlin-test`. +* Defaulted to `Edge.DEFAULT` if no edge label was supplied in GraphML. * Fixed bug in `IoGraphTest` causing IllegalArgumentException: URI is not hierarchical error for external graph implementations. * Fixed a bug where timeout functions provided to the `GremlinExecutor` were not executing in the same thread as the script evaluation. * Optimized a few special cases in `RangeByIsCountStrategy`. @@ -1247,7 +1248,6 @@ TinkerPop 3.0.0.M2 (Release Date: September 23, 2014) * Moved `GiraphGraph.getOutputGraph()` to `GiraphHelper`. * Changed `GIRAPH_GREMLIN_HOME` to `GIRAPH_GREMLIN_LIB` to reference directory where jars are to be loaded. * Updated README with release instructions. -* if there is no edge label in the GraphML file, then use Edge.DEFAULT TinkerPop 3.0.0.M1 (Release Date: August 12, 2014) ~
[01/18] tinkerpop git commit: If there is no edge label in the GraphML file, then use Edge.DEFAULT
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1278 9a16f766d -> aeec72c48
If there is no edge label in the GraphML file, then use Edge.DEFAULT
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/fba8c7c8
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/fba8c7c8
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/fba8c7c8
Branch: refs/heads/TINKERPOP-1278
Commit: fba8c7c8591f516e362fd8d650b3a746321dd802
Parents: f30a84a
Author: Serge Vilvovsky
Authored: Tue Jun 7 13:17:55 2016 -0400
Committer: Stephen Mallette
Committed: Wed Jun 8 16:41:41 2016 -0400
--
CHANGELOG.asciidoc | 1 +
.../structure/io/graphml/GraphMLReader.java | 3 +-
.../tinkerpop/gremlin/structure/io/IoTest.java | 40
.../io/graphml/tinkerpop-no-edge-labels.xml | 25
4 files changed, 68 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fba8c7c8/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 10f91a0..3cad6ad 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -1247,6 +1247,7 @@ TinkerPop 3.0.0.M2 (Release Date: September 23, 2014)
* Moved `GiraphGraph.getOutputGraph()` to `GiraphHelper`.
* Changed `GIRAPH_GREMLIN_HOME` to `GIRAPH_GREMLIN_LIB` to reference directory
where jars are to be loaded.
* Updated README with release instructions.
+* if there is no edge label in the GraphML file, then use Edge.DEFAULT
TinkerPop 3.0.0.M1 (Release Date: August 12, 2014)
~
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fba8c7c8/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLReader.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLReader.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLReader.java
index d45d411..e161ba7 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLReader.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLReader.java
@@ -187,7 +187,8 @@ public final class GraphMLReader implements GraphReader {
} else if (elementName.equals(GraphMLTokens.EDGE)) {
final Object[] propsAsArray =
edgeProps.entrySet().stream().flatMap(e -> Stream.of(e.getKey(),
e.getValue())).toArray();
final Object[] propsReady =
edgeFeatures.willAllowId(edgeId) ? ElementHelper.upsert(propsAsArray, T.id,
edgeId) : propsAsArray;
-edgeOutVertex.addEdge(edgeLabel, edgeInVertex,
propsReady);
+
+ edgeOutVertex.addEdge(null == edgeLabel ?
Edge.DEFAULT_LABEL : edgeLabel, edgeInVertex, propsReady);
if (supportsTx && counter.incrementAndGet() %
batchSize == 0)
graphToWriteTo.tx().commit();
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fba8c7c8/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoTest.java
--
diff --git
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoTest.java
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoTest.java
index 2bf0485..2673f4d 100644
---
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoTest.java
+++
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoTest.java
@@ -112,6 +112,17 @@ public class IoTest {
@FeatureRequirement(featureClass = VertexPropertyFeatures.class,
feature = FEATURE_STRING_VALUES)
@FeatureRequirement(featureClass = VertexPropertyFeatures.class,
feature = FEATURE_INTEGER_VALUES)
@FeatureRequirement(featureClass = EdgePropertyFeatures.class, feature
= EdgePropertyFeatures.FEATURE_FLOAT_VALUES)
+public void shouldReadGraphMLWithNoEdgeLabels() throws IOException {
+readGraphMLIntoGraph(graph, "tinkerpop-no-edge-labels.xml");
+assertNoEdgeGraph(graph, false, true);
+}
+
+@Test
+@FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class,
feature = Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES)
+@FeatureRequirement(featureClass =
Graph.Features.VertexFeatures.class, feature =
Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES)
+@FeatureRequirement(featureClass = VertexPropertyFeatures.class,
feature = FEATURE_STRING_V
[07/18] tinkerpop git commit: Improved eigenvector centrality recipe CTR
Improved eigenvector centrality recipe CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/fbf476a1
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/fbf476a1
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/fbf476a1
Branch: refs/heads/TINKERPOP-1278
Commit: fbf476a149d1aba84f0decce05bb6bafa7978519
Parents: 82d9e3b
Author: Stephen Mallette
Authored: Mon Jun 13 14:10:14 2016 -0400
Committer: Stephen Mallette
Committed: Mon Jun 13 14:10:14 2016 -0400
--
docs/src/recipes/centrality.asciidoc | 24 +---
1 file changed, 17 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fbf476a1/docs/src/recipes/centrality.asciidoc
--
diff --git a/docs/src/recipes/centrality.asciidoc
b/docs/src/recipes/centrality.asciidoc
index 90e73df..e8d71e4 100644
--- a/docs/src/recipes/centrality.asciidoc
+++ b/docs/src/recipes/centrality.asciidoc
@@ -138,15 +138,25 @@ Eigenvector Centrality
A calculation of
link:https://en.wikipedia.org/wiki/Centrality#Eigenvector_centrality[eigenvector
centrality] uses the
relative importance of adjacent vertices to help determine their centrality.
In other words, unlike
<> the vertex with the greatest number
of incident edges does not necessarily
-give it the highest rank.
+give it the highest rank. Consider the following example using the Grateful
Dead graph:
-[gremlin-groovy,modern]
+[gremlin-groovy]
-g.V().repeat(groupCount('m').out()).times(30).cap('m')
+graph.io(graphml()).readGraph('data/grateful-dead.xml')
+g.V().repeat(groupCount('m').by('name').out()).times(5).cap('m').
<1>
+ order(local).by(values, decr).limit(local, 10).next()
<2>
+g.V().repeat(groupCount('m').by('name').out().timeLimit(100)).times(5).cap('m').
<3>
+ order(local).by(values, decr).limit(local, 10).next()
-The traversal iterates through each vertex in the graph and for each one
repeatedly group counts each vertex that
+<1> The traversal iterates through each vertex in the graph and for each one
repeatedly group counts each vertex that
passes through using the vertex as the key. The `Map` of this group count is
stored in a variable named "m". The
-`out()` traversal is repeated thirty times or until the paths are exhausted.
Thirty iterations should provide enough
-time to converge on a solution. Calling `cap('m')` at the end simply extracts
the `Map` side-effect stored in "m"
-and returns it from the traversal as the result.
\ No newline at end of file
+`out()` traversal is repeated thirty times or until the paths are exhausted.
Five iterations should provide enough
+time to converge on a solution. Calling `cap('m')` at the end simply extracts
the `Map` side-effect stored in "m".
+<2> The entries in the `Map` are then iterated and sorted with the top ten
most central vertices presented as output.
+<3> The previous examples can be expanded on a little bit by including a
+link:http://tinkerpop.apache.org/docs/current/reference/#timelimit-step[time
limit]. The `timeLimit()` prevents the
+traversal from taking longer than one hundred milliseconds to execute (the
previous example takes considerably longer
+than that). While the answer provided with the `timeLimit()` is not the
absolute ranking, it does provide a relative
+ranking that closely matches the absolute one. The use of `timeLimit()` in
certain algorithms (e.g. recommendations)
+can shorten the time required to get a reasonable and usable result.
\ No newline at end of file
[05/18] tinkerpop git commit: Allow DFS paths in `HADOOP_GREMLIN_LIBS`.
Allow DFS paths in `HADOOP_GREMLIN_LIBS`.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/5e96f353
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5e96f353
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/5e96f353
Branch: refs/heads/TINKERPOP-1278
Commit: 5e96f353b95205b701fc9663aec87183746badf4
Parents: e790e56
Author: Daniel Kuppitz
Authored: Thu Jun 9 13:46:34 2016 +0200
Committer: Daniel Kuppitz
Committed: Mon Jun 13 09:08:09 2016 +0200
--
.../process/computer/GiraphGraphComputer.java | 53
.../computer/AbstractHadoopGraphComputer.java | 46 +
.../process/computer/SparkGraphComputer.java| 28 ++-
3 files changed, 72 insertions(+), 55 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5e96f353/giraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/giraph/process/computer/GiraphGraphComputer.java
--
diff --git
a/giraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/giraph/process/computer/GiraphGraphComputer.java
b/giraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/giraph/process/computer/GiraphGraphComputer.java
index 012b9fc..b06b40a 100644
---
a/giraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/giraph/process/computer/GiraphGraphComputer.java
+++
b/giraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/giraph/process/computer/GiraphGraphComputer.java
@@ -61,13 +61,14 @@ import org.apache.tinkerpop.gremlin.util.Gremlin;
import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
import java.io.File;
+import java.io.IOException;
import java.io.NotSerializableException;
+import java.net.URI;
import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Executor;
import java.util.concurrent.Future;
-import java.util.stream.Stream;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
@@ -133,8 +134,7 @@ public final class GiraphGraphComputer extends
AbstractHadoopGraphComputer imple
final Configuration apacheConfiguration =
ConfUtil.makeApacheConfiguration(this.giraphConfiguration);
return CompletableFuture.supplyAsync(() -> {
try {
-final FileSystem fs = FileSystem.get(this.giraphConfiguration);
-this.loadJars(fs);
+this.loadJars(giraphConfiguration);
ToolRunner.run(this, new String[]{});
} catch (final Exception e) {
//e.printStackTrace();
@@ -247,36 +247,25 @@ public final class GiraphGraphComputer extends
AbstractHadoopGraphComputer imple
return this.giraphConfiguration;
}
-private void loadJars(final FileSystem fs) {
-final String hadoopGremlinLibsRemote = "hadoop-gremlin-" +
Gremlin.version() + "-libs";
-if
(this.giraphConfiguration.getBoolean(Constants.GREMLIN_HADOOP_JARS_IN_DISTRIBUTED_CACHE,
true)) {
-final String hadoopGremlinLibsLocal = null ==
System.getProperty(Constants.HADOOP_GREMLIN_LIBS) ?
System.getenv(Constants.HADOOP_GREMLIN_LIBS) :
System.getProperty(Constants.HADOOP_GREMLIN_LIBS);
-if (null == hadoopGremlinLibsLocal)
-this.logger.warn(Constants.HADOOP_GREMLIN_LIBS + " is not set
-- proceeding regardless");
-else {
-final String[] paths = hadoopGremlinLibsLocal.split(":");
-for (final String path : paths) {
-final File file =
AbstractHadoopGraphComputer.copyDirectoryIfNonExistent(fs, path);
-if (file.exists()) {
-Stream.of(file.listFiles()).filter(f ->
f.getName().endsWith(Constants.DOT_JAR)).forEach(f -> {
-try {
-final Path jarFile = new
Path(fs.getHomeDirectory() + "/" + hadoopGremlinLibsRemote + "/" + f.getName());
-if (!fs.exists(jarFile))
-fs.copyFromLocalFile(new
Path(f.getPath()), jarFile);
-try {
-
DistributedCache.addArchiveToClassPath(jarFile, this.giraphConfiguration, fs);
-} catch (final Exception e) {
-throw new RuntimeException(e.getMessage(),
e);
-}
-} catch (final Exception e) {
-throw new
IllegalStateException(e.getMessage(), e);
-}
-});
-} else {
-this.logger.warn(path + " does not reference a valid
directo
[18/18] tinkerpop git commit: Merge branch 'master' into TINKERPOP-1278
Merge branch 'master' into TINKERPOP-1278 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/aeec72c4 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/aeec72c4 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/aeec72c4 Branch: refs/heads/TINKERPOP-1278 Commit: aeec72c48c82880566a8656efc9df0b94408bfae Parents: 9a16f76 c1b4dae Author: Marko A. Rodriguez Authored: Wed Jun 15 07:38:26 2016 -0600 Committer: Marko A. Rodriguez Committed: Wed Jun 15 07:38:26 2016 -0600 -- CHANGELOG.asciidoc | 2 + docs/src/recipes/centrality.asciidoc| 24 +++- .../reference/implementations-hadoop.asciidoc | 10 +- .../process/computer/GiraphGraphComputer.java | 53 +++ .../structure/io/graphml/GraphMLReader.java | 3 +- .../tinkerpop/gremlin/driver/ResultQueue.java | 2 +- .../step/map/GroovyPropertiesTest.groovy| 6 + .../traversal/step/map/PropertiesTest.java | 53 ++- .../tinkerpop/gremlin/structure/io/IoTest.java | 40 ++ .../io/graphml/tinkerpop-no-edge-labels.xml | 25 .../computer/AbstractHadoopGraphComputer.java | 63 ++-- .../groovy/plugin/HadoopGremlinPluginCheck.java | 142 +++ .../process/computer/SparkGraphComputer.java| 28 +--- 13 files changed, 369 insertions(+), 82 deletions(-) --
[02/18] tinkerpop git commit: Minor tweaks and support for more path separators in `HADOOP_GREMLIN_LIBS` (e.g. `; ` on Windows systems).
Minor tweaks and support for more path separators in `HADOOP_GREMLIN_LIBS`
(e.g. `;` on Windows systems).
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/fe98cf07
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/fe98cf07
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/fe98cf07
Branch: refs/heads/TINKERPOP-1278
Commit: fe98cf07238d90e5880becd3fddfd973c9c7d4bc
Parents: 7a85d62
Author: Daniel Kuppitz
Authored: Thu Jun 9 18:28:30 2016 +0200
Committer: Daniel Kuppitz
Committed: Mon Jun 13 09:08:09 2016 +0200
--
.../computer/AbstractHadoopGraphComputer.java | 25 ++--
1 file changed, 12 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fe98cf07/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/AbstractHadoopGraphComputer.java
--
diff --git
a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/AbstractHadoopGraphComputer.java
b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/AbstractHadoopGraphComputer.java
index f5f332d..6a68046 100644
---
a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/AbstractHadoopGraphComputer.java
+++
b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/AbstractHadoopGraphComputer.java
@@ -49,14 +49,14 @@ import java.util.Optional;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import java.util.stream.Stream;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
public abstract class AbstractHadoopGraphComputer implements GraphComputer {
-private final static Pattern PATH_PATTERN = Pattern.compile("([^:]|://)+");
+private final static Pattern PATH_PATTERN =
+Pattern.compile(File.pathSeparator.equals(":") ? "([^:]|://)+" :
("[^" + File.pathSeparator + "]"));
protected final Logger logger;
protected final HadoopGraph hadoopGraph;
@@ -171,8 +171,7 @@ public abstract class AbstractHadoopGraphComputer
implements GraphComputer {
loadJar(hadoopConfiguration, f, params);
}
}
-}
-else
+} else
this.logger.warn(path + " does not reference a
valid directory -- proceeding regardless");
}
} catch (IOException e) {
@@ -251,22 +250,22 @@ public abstract class AbstractHadoopGraphComputer
implements GraphComputer {
//
-public static File copyDirectoryIfNonExistent(final FileSystem fileSystem,
final String localDirectory) {
+public static File copyDirectoryIfNonExistent(final FileSystem fileSystem,
final String directory) {
try {
final String hadoopGremlinLibsRemote = "hadoop-gremlin-" +
Gremlin.version() + "-libs";
-File file = new File(localDirectory);
-if ((Boolean.valueOf(System.getProperty("is.testing", "false")) ||
!file.exists()) && fileSystem.exists(new Path(localDirectory)) &&
fileSystem.isDirectory(new Path(localDirectory))) {
-final File tempDirectory = new
File(System.getProperty("java.io.tmpdir") +
System.getProperty("file.separator") + hadoopGremlinLibsRemote);
-if (!tempDirectory.exists()) assert tempDirectory.mkdirs();
-final String tempPath = tempDirectory.getAbsolutePath() +
System.getProperty("file.separator") + new File(localDirectory).getName();
-final RemoteIterator files =
fileSystem.listFiles(new Path(localDirectory), false);
+final Path path = new Path(directory);
+if (Boolean.valueOf(System.getProperty("is.testing", "false")) ||
(fileSystem.exists(path) && fileSystem.isDirectory(path))) {
+final File tempDirectory = new
File(System.getProperty("java.io.tmpdir") + File.separator +
hadoopGremlinLibsRemote);
+assert tempDirectory.exists() || tempDirectory.mkdirs();
+final String tempPath = tempDirectory.getAbsolutePath() +
File.separator + path.getName();
+final RemoteIterator files =
fileSystem.listFiles(path, false);
while (files.hasNext()) {
final LocatedFileStatus f = files.next();
-fileSystem.copyToLocalFile(f.getPath(), new Path(tempPath
+ System.getProperty("file.separator") + f.getPath().getName()));
+fileSystem.copyToLocalFile(false, f.getPath(), new
Path(tempPath + System.getProperty("file.separator") + f.
[11/18] tinkerpop git commit: added a new PropertiesTest that really ensures vertex property ids are handled correctly by the underlying engine. CTR.
added a new PropertiesTest that really ensures vertex property ids are handled
correctly by the underlying engine. CTR.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/9c8c655d
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/9c8c655d
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/9c8c655d
Branch: refs/heads/TINKERPOP-1278
Commit: 9c8c655dd7bd324d6f1341321717491e60c2e894
Parents: 0aab69c
Author: Marko A. Rodriguez
Authored: Tue Jun 14 14:17:02 2016 -0600
Committer: Marko A. Rodriguez
Committed: Tue Jun 14 14:17:02 2016 -0600
--
.../step/map/GroovyPropertiesTest.groovy| 8 ++-
.../traversal/step/map/PropertiesTest.java | 53 ++--
2 files changed, 55 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9c8c655d/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPropertiesTest.groovy
--
diff --git
a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPropertiesTest.groovy
b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPropertiesTest.groovy
index 8ed7859..ec57cd3 100644
---
a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPropertiesTest.groovy
+++
b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPropertiesTest.groovy
@@ -18,9 +18,10 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.step.map
-import
org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptHelper
import org.apache.tinkerpop.gremlin.process.traversal.Traversal
+import
org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptHelper
import org.apache.tinkerpop.gremlin.structure.Vertex
+import org.apache.tinkerpop.gremlin.structure.VertexProperty
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
@@ -43,6 +44,11 @@ public abstract class GroovyPropertiesTest {
public Traversal
get_g_V_hasXageX_properties_hasXid_nameIdX_value(final Object nameId) {
TraversalScriptHelper.compute("g.V.has('age').properties().has(T.id,
nameId).value()", g, "nameId", nameId)
}
+
+@Override
+public Traversal>
get_g_V_hasXageX_propertiesXnameX() {
+TraversalScriptHelper.compute("g.V.has('age').properties('name')",
g)
+}
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9c8c655d/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertiesTest.java
--
diff --git
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertiesTest.java
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertiesTest.java
index 8f9c97b..b64059a 100644
---
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertiesTest.java
+++
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertiesTest.java
@@ -21,18 +21,21 @@ package
org.apache.tinkerpop.gremlin.process.traversal.step.map;
import org.apache.tinkerpop.gremlin.LoadGraphWith;
import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
import org.apache.tinkerpop.gremlin.process.GremlinProcessRunner;
-import org.apache.tinkerpop.gremlin.structure.Property;
-import org.apache.tinkerpop.gremlin.structure.T;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine;
+import org.apache.tinkerpop.gremlin.structure.T;
import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
import org.junit.Test;
import org.junit.runner.RunWith;
import java.util.Arrays;
import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
@@ -46,6 +49,8 @@ public abstract class PropertiesTest extends
AbstractGremlinProcessTest {
public abstract Traversal
get_g_V_hasXageX_properties_hasXid_nameIdX_value(final Object nameId);
+public abstract Traversal>
get_g_V_hasXageX_propertiesXnameX();
+
@Test
@LoadGraphWith(MODERN)
public void g_V_hasXageX_propertiesXname_ageX_value() {
@@ -65,7 +70,7 @@ public abstract class PropertiesTest extends
tinkerpop git commit: dar. had ProcessStandardSuite commented out like a ding bat.
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1278 aeec72c48 -> 0cf1523de
dar. had ProcessStandardSuite commented out like a ding bat.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0cf1523d
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0cf1523d
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/0cf1523d
Branch: refs/heads/TINKERPOP-1278
Commit: 0cf1523de048b893555b043c6b01e13aec923097
Parents: aeec72c
Author: Marko A. Rodriguez
Authored: Wed Jun 15 07:43:02 2016 -0600
Committer: Marko A. Rodriguez
Committed: Wed Jun 15 07:43:02 2016 -0600
--
.../apache/tinkerpop/gremlin/process/ProcessStandardSuite.java | 4 ++--
gremlin-variant/src/main/jython/gremlin_python/gremlin_python.py | 2 --
2 files changed, 2 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0cf1523d/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessStandardSuite.java
--
diff --git
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessStandardSuite.java
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessStandardSuite.java
index e21a1ca..3bd485a 100644
---
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessStandardSuite.java
+++
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessStandardSuite.java
@@ -107,7 +107,7 @@ public class ProcessStandardSuite extends
AbstractGremlinSuite {
*/
private static final Class[] allTests = new Class[]{
// branch
-/*BranchTest.Traversals.class,
+BranchTest.Traversals.class,
ChooseTest.Traversals.class,
OptionalTest.Traversals.class,
LocalTest.Traversals.class,
@@ -175,7 +175,7 @@ public class ProcessStandardSuite extends
AbstractGremlinSuite {
// compliance
CoreTraversalTest.class,
-TraversalInterruptionTest.class,*/
+TraversalInterruptionTest.class,
// creations
TranslationStrategyProcessTest.class,
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0cf1523d/gremlin-variant/src/main/jython/gremlin_python/gremlin_python.py
--
diff --git a/gremlin-variant/src/main/jython/gremlin_python/gremlin_python.py
b/gremlin-variant/src/main/jython/gremlin_python/gremlin_python.py
index a122a70..bd993c6 100644
--- a/gremlin-variant/src/main/jython/gremlin_python/gremlin_python.py
+++ b/gremlin-variant/src/main/jython/gremlin_python/gremlin_python.py
@@ -83,8 +83,6 @@ class PythonGraphTraversalSource(object):
return PythonGraphTraversal(self.traversal_source_string + ".V(" +
Helper.stringify(*args) + ")", self.remote_connection)
def addV(self, *args):
return PythonGraphTraversal(self.traversal_source_string + ".addV(" +
Helper.stringify(*args) + ")", self.remote_connection)
- def clone(self, *args):
-return PythonGraphTraversalSource(self.traversal_source_string + ".clone("
+ Helper.stringify(*args) + ")", self.remote_connection)
def inject(self, *args):
return PythonGraphTraversal(self.traversal_source_string + ".inject(" +
Helper.stringify(*args) + ")", self.remote_connection)
def withBulk(self, *args):
[1/2] tinkerpop git commit: Remove reference to the third by() on group() docs CTR
Repository: tinkerpop Updated Branches: refs/heads/master c1b4dae38 -> 97a7ba5b9 Remove reference to the third by() on group() docs CTR Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ebfa7859 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ebfa7859 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ebfa7859 Branch: refs/heads/master Commit: ebfa7859fff273a77cf94fd9e491701b4c7a9e46 Parents: 2c835c3 Author: Stephen Mallette Authored: Wed Jun 15 11:00:19 2016 -0400 Committer: Stephen Mallette Committed: Wed Jun 15 11:00:19 2016 -0400 -- docs/src/reference/the-traversal.asciidoc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ebfa7859/docs/src/reference/the-traversal.asciidoc -- diff --git a/docs/src/reference/the-traversal.asciidoc b/docs/src/reference/the-traversal.asciidoc index 8327dc9..ca4c6be 100644 --- a/docs/src/reference/the-traversal.asciidoc +++ b/docs/src/reference/the-traversal.asciidoc @@ -669,11 +669,10 @@ g.V().group().by(label).by(count()) <3> <2> For each vertex in the group, get their name. <3> For each grouping, what is its size? -The three projection parameters available to `group()` via `by()` are: +The two projection parameters available to `group()` via `by()` are: . Key-projection: What feature of the object to group on (a function that yields the map key)? . Value-projection: What feature of the group to store in the key-list? -. Reduce-projection: What feature of the key-list to ultimately return? [[groupcount-step]] GroupCount Step
tinkerpop git commit: Remove reference to the third by() on group() docs CTR
Repository: tinkerpop Updated Branches: refs/heads/tp31 2c835c30b -> ebfa7859f Remove reference to the third by() on group() docs CTR Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ebfa7859 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ebfa7859 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ebfa7859 Branch: refs/heads/tp31 Commit: ebfa7859fff273a77cf94fd9e491701b4c7a9e46 Parents: 2c835c3 Author: Stephen Mallette Authored: Wed Jun 15 11:00:19 2016 -0400 Committer: Stephen Mallette Committed: Wed Jun 15 11:00:19 2016 -0400 -- docs/src/reference/the-traversal.asciidoc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ebfa7859/docs/src/reference/the-traversal.asciidoc -- diff --git a/docs/src/reference/the-traversal.asciidoc b/docs/src/reference/the-traversal.asciidoc index 8327dc9..ca4c6be 100644 --- a/docs/src/reference/the-traversal.asciidoc +++ b/docs/src/reference/the-traversal.asciidoc @@ -669,11 +669,10 @@ g.V().group().by(label).by(count()) <3> <2> For each vertex in the group, get their name. <3> For each grouping, what is its size? -The three projection parameters available to `group()` via `by()` are: +The two projection parameters available to `group()` via `by()` are: . Key-projection: What feature of the object to group on (a function that yields the map key)? . Value-projection: What feature of the group to store in the key-list? -. Reduce-projection: What feature of the key-list to ultimately return? [[groupcount-step]] GroupCount Step
[2/2] tinkerpop git commit: Merge remote-tracking branch 'origin/tp31'
Merge remote-tracking branch 'origin/tp31' Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/97a7ba5b Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/97a7ba5b Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/97a7ba5b Branch: refs/heads/master Commit: 97a7ba5b9c54dc803bc52a3711947aa4e4635f72 Parents: c1b4dae ebfa785 Author: Stephen Mallette Authored: Wed Jun 15 11:01:37 2016 -0400 Committer: Stephen Mallette Committed: Wed Jun 15 11:01:37 2016 -0400 -- docs/src/reference/the-traversal.asciidoc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/97a7ba5b/docs/src/reference/the-traversal.asciidoc --
tinkerpop git commit: Added the secretary email to the committer invite template
Repository: tinkerpop Updated Branches: refs/heads/tp31 ebfa7859f -> ccd2630ed Added the secretary email to the committer invite template No one ever seems to be able to figure that part out - including the email might save them some time CTR Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ccd2630e Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ccd2630e Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ccd2630e Branch: refs/heads/tp31 Commit: ccd2630edf75e1e7f1e3565a0241e7c708c4d875 Parents: ebfa785 Author: Stephen Mallette Authored: Wed Jun 15 11:17:08 2016 -0400 Committer: Stephen Mallette Committed: Wed Jun 15 11:17:08 2016 -0400 -- docs/src/dev/developer/administration.asciidoc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ccd2630e/docs/src/dev/developer/administration.asciidoc -- diff --git a/docs/src/dev/developer/administration.asciidoc b/docs/src/dev/developer/administration.asciidoc index 246cdfc..db8fa4d 100644 --- a/docs/src/dev/developer/administration.asciidoc +++ b/docs/src/dev/developer/administration.asciidoc @@ -53,9 +53,10 @@ reply to the priv...@tinkerpop.apache.org address only. B. If you are accepting, the next step is to register an iCLA with the Apache Software Foundation: 1. Details of the iCLA and the forms are found through this link: http://www.apache.org/licenses/#clas. -2. The form (text or PDF version) provides instructions for its completion and return to the Secretary of the ASF. +2. The form (text or PDF version) provides instructions for its completion and return to the Secretary of the ASF + at secret...@apache.org. -3. When you transmit the completed iCLA, request to notify the Apache TinkerPop and choose a unique Apache id. +3. When you transmit the completed iCLA, request to notify Apache TinkerPop and choose a unique Apache id. Look to see if your preferred id is already taken at http://people.apache.org/committer-index.html This will allow the Secretary to notify the PMC when your iCLA has been recorded.
[1/2] tinkerpop git commit: Added the secretary email to the committer invite template
Repository: tinkerpop Updated Branches: refs/heads/master 97a7ba5b9 -> c2d2a7d27 Added the secretary email to the committer invite template No one ever seems to be able to figure that part out - including the email might save them some time CTR Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ccd2630e Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ccd2630e Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ccd2630e Branch: refs/heads/master Commit: ccd2630edf75e1e7f1e3565a0241e7c708c4d875 Parents: ebfa785 Author: Stephen Mallette Authored: Wed Jun 15 11:17:08 2016 -0400 Committer: Stephen Mallette Committed: Wed Jun 15 11:17:08 2016 -0400 -- docs/src/dev/developer/administration.asciidoc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ccd2630e/docs/src/dev/developer/administration.asciidoc -- diff --git a/docs/src/dev/developer/administration.asciidoc b/docs/src/dev/developer/administration.asciidoc index 246cdfc..db8fa4d 100644 --- a/docs/src/dev/developer/administration.asciidoc +++ b/docs/src/dev/developer/administration.asciidoc @@ -53,9 +53,10 @@ reply to the priv...@tinkerpop.apache.org address only. B. If you are accepting, the next step is to register an iCLA with the Apache Software Foundation: 1. Details of the iCLA and the forms are found through this link: http://www.apache.org/licenses/#clas. -2. The form (text or PDF version) provides instructions for its completion and return to the Secretary of the ASF. +2. The form (text or PDF version) provides instructions for its completion and return to the Secretary of the ASF + at secret...@apache.org. -3. When you transmit the completed iCLA, request to notify the Apache TinkerPop and choose a unique Apache id. +3. When you transmit the completed iCLA, request to notify Apache TinkerPop and choose a unique Apache id. Look to see if your preferred id is already taken at http://people.apache.org/committer-index.html This will allow the Secretary to notify the PMC when your iCLA has been recorded.
[2/2] tinkerpop git commit: Merge remote-tracking branch 'origin/tp31'
Merge remote-tracking branch 'origin/tp31' Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/c2d2a7d2 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c2d2a7d2 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c2d2a7d2 Branch: refs/heads/master Commit: c2d2a7d27f8058ac58406cc9907fc69089fbdc41 Parents: 97a7ba5 ccd2630 Author: Stephen Mallette Authored: Wed Jun 15 11:18:36 2016 -0400 Committer: Stephen Mallette Committed: Wed Jun 15 11:18:36 2016 -0400 -- docs/src/dev/developer/administration.asciidoc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --
tinkerpop git commit: Moved hadoop-gremlin provider documentation to the provider docs CTR
Repository: tinkerpop
Updated Branches:
refs/heads/tp31 ccd2630ed -> e3c5d8ed1
Moved hadoop-gremlin provider documentation to the provider docs CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/e3c5d8ed
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e3c5d8ed
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/e3c5d8ed
Branch: refs/heads/tp31
Commit: e3c5d8ed1ca9028e35e78b9b1da6e73b8b066659
Parents: ccd2630
Author: Stephen Mallette
Authored: Wed Jun 15 11:25:20 2016 -0400
Committer: Stephen Mallette
Committed: Wed Jun 15 11:25:20 2016 -0400
--
docs/src/dev/provider/index.asciidoc| 42 ++
.../reference/implementations-hadoop.asciidoc | 45 +---
2 files changed, 43 insertions(+), 44 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e3c5d8ed/docs/src/dev/provider/index.asciidoc
--
diff --git a/docs/src/dev/provider/index.asciidoc
b/docs/src/dev/provider/index.asciidoc
index 2d51274..7b876a1 100644
--- a/docs/src/dev/provider/index.asciidoc
+++ b/docs/src/dev/provider/index.asciidoc
@@ -288,6 +288,48 @@ for (final MapReduce mapReduce : mapReducers) {
<2> If there is no reduce stage, the the map-stage results are inserted into
Memory as specified by the application
developer's `MapReduce.addResultToMemory()` implementation.
+Hadoop-Gremlin Usage
+
+
+Hadoop-Gremlin is centered around `InputFormats` and `OutputFormats`. If a
3rd-party graph system provider wishes to
+leverage Hadoop-Gremlin (and its respective `GraphComputer` engines), then
they need to provide, at minimum, a
+Hadoop2 `InputFormat` for their graph system. If
the provider wishes to persist computed
+results back to their graph system (and not just to HDFS via a
`FileOutputFormat`), then a graph system specific
+`OutputFormat` must be developed as well.
+
+Conceptually, `HadoopGraph` is a wrapper around a `Configuration` object.
There is no "data" in the `HadoopGraph` as
+the `InputFormat` specifies where and how to get the graph data at OLAP (and
OLTP) runtime. Thus, `HadoopGraph` is a
+small object with little overhead. Graph system providers should realize
`HadoopGraph` as the gateway to the OLAP
+features offered by Hadoop-Gremlin. For example, a graph system specific
`Graph.compute(Class
+graphComputerClass)`-method may look as follows:
+
+[source,java]
+
+public C compute(final Class graphComputerClass)
throws IllegalArgumentException {
+ try {
+if (AbstractHadoopGraphComputer.class.isAssignableFrom(graphComputerClass))
+ return
graphComputerClass.getConstructor(HadoopGraph.class).newInstance(this);
+else
+ throw
Graph.Exceptions.graphDoesNotSupportProvidedGraphComputer(graphComputerClass);
+ } catch (final Exception e) {
+throw new IllegalArgumentException(e.getMessage(),e);
+ }
+}
+
+
+Note that the configurations for Hadoop are assumed to be in the
`Graph.configuration()` object. If this is not the
+case, then the `Configuration` provided to `HadoopGraph.open()` should be
dynamically created within the
+`compute()`-method. It is in the provided configuration that `HadoopGraph`
gets the various properties which
+determine how to read and write data to and from Hadoop. For instance,
`gremlin.hadoop.graphInputFormat` and
+`gremlin.hadoop.graphOutputFormat`.
+
+IMPORTANT: A graph system provider's `OutputFormat` should implement the
`PersistResultGraphAware` interface which
+determines which persistence options are available to the user. For the
standard file-based `OutputFormats` provided
+by Hadoop-Gremlin (e.g. <>,
<>,
+and <>) `ResultGraph.ORIGINAL` is
not supported as the original graph
+data files are not random access and are, in essence, immutable. Thus, these
file-based `OutputFormats` only support
+`ResultGraph.NEW` which creates a copy of the data specified by the `Persist`
enum.
+
[[io-implementations]]
IO Implementations
^^
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e3c5d8ed/docs/src/reference/implementations-hadoop.asciidoc
--
diff --git a/docs/src/reference/implementations-hadoop.asciidoc
b/docs/src/reference/implementations-hadoop.asciidoc
index 8c591e2..b89c0a1 100644
--- a/docs/src/reference/implementations-hadoop.asciidoc
+++ b/docs/src/reference/implementations-hadoop.asciidoc
@@ -904,47 +904,4 @@ Vertex 4 ("josh") is isolated below:
"age":[{"id":7,"value":32}]}
}
}
-
-
-Hadoop-Gremlin for Graph System Providers
-~
-
-Hadoop-Gremlin is centered around `InputFormats` and `OutputFormats`. If a
3rd-party graph system p
[2/2] tinkerpop git commit: Merge remote-tracking branch 'origin/tp31'
Merge remote-tracking branch 'origin/tp31'
Conflicts:
docs/src/reference/implementations-hadoop.asciidoc
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/6c166325
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/6c166325
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/6c166325
Branch: refs/heads/master
Commit: 6c1663255591748deb1fab7fd5cf9f7ab987ad08
Parents: c2d2a7d e3c5d8e
Author: Stephen Mallette
Authored: Wed Jun 15 11:28:43 2016 -0400
Committer: Stephen Mallette
Committed: Wed Jun 15 11:28:43 2016 -0400
--
docs/src/dev/provider/index.asciidoc| 67 +++
.../reference/implementations-hadoop.asciidoc | 70 +---
2 files changed, 68 insertions(+), 69 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6c166325/docs/src/dev/provider/index.asciidoc
--
diff --cc docs/src/dev/provider/index.asciidoc
index 00dd770,7b876a1..90ab5c0
--- a/docs/src/dev/provider/index.asciidoc
+++ b/docs/src/dev/provider/index.asciidoc
@@@ -290,6 -288,48 +290,73 @@@ for (final MapReduce mapReduce : mapRed
<2> If there is no reduce stage, the the map-stage results are inserted into
Memory as specified by the application
developer's `MapReduce.addResultToMemory()` implementation.
+ Hadoop-Gremlin Usage
+
+
+ Hadoop-Gremlin is centered around `InputFormats` and `OutputFormats`. If a
3rd-party graph system provider wishes to
+ leverage Hadoop-Gremlin (and its respective `GraphComputer` engines), then
they need to provide, at minimum, a
+ Hadoop2 `InputFormat` for their graph system. If
the provider wishes to persist computed
+ results back to their graph system (and not just to HDFS via a
`FileOutputFormat`), then a graph system specific
+ `OutputFormat` must be developed as well.
+
+ Conceptually, `HadoopGraph` is a wrapper around a `Configuration` object.
There is no "data" in the `HadoopGraph` as
+ the `InputFormat` specifies where and how to get the graph data at OLAP (and
OLTP) runtime. Thus, `HadoopGraph` is a
+ small object with little overhead. Graph system providers should realize
`HadoopGraph` as the gateway to the OLAP
+ features offered by Hadoop-Gremlin. For example, a graph system specific
`Graph.compute(Class
+ graphComputerClass)`-method may look as follows:
+
+ [source,java]
+
+ public C compute(final Class graphComputerClass)
throws IllegalArgumentException {
+ try {
+ if
(AbstractHadoopGraphComputer.class.isAssignableFrom(graphComputerClass))
+ return
graphComputerClass.getConstructor(HadoopGraph.class).newInstance(this);
+ else
+ throw
Graph.Exceptions.graphDoesNotSupportProvidedGraphComputer(graphComputerClass);
+ } catch (final Exception e) {
+ throw new IllegalArgumentException(e.getMessage(),e);
+ }
+ }
+
+
+ Note that the configurations for Hadoop are assumed to be in the
`Graph.configuration()` object. If this is not the
+ case, then the `Configuration` provided to `HadoopGraph.open()` should be
dynamically created within the
+ `compute()`-method. It is in the provided configuration that `HadoopGraph`
gets the various properties which
-determine how to read and write data to and from Hadoop. For instance,
`gremlin.hadoop.graphInputFormat` and
-`gremlin.hadoop.graphOutputFormat`.
++determine how to read and write data to and from Hadoop. For instance,
`gremlin.hadoop.graphReader` and
++`gremlin.hadoop.graphWriter`.
++
++GraphFilterAware Interface
++
++<> by OLAP processors to only pull a subgraph of
the full graph from the graph data source. For instance, the
++example below constructs a `GraphFilter` that will only pull the the
"knows"-graph amongst people into the `GraphComputer`
++for processing.
++
++[source,java]
++
++graph.compute().vertices(hasLabel("person")).edges(bothE("knows"))
++
++
++If the provider has a custom `InputRDD`, they can implement
`GraphFilterAware` and that graph filter will be provided to their
++`InputRDD` at load time. For providers that use an `InputFormat`, state but
the graph filter can be accessed from the configuration
++as such:
++
++[source,java]
++
++if (configuration.containsKey(Constants.GREMLIN_HADOOP_GRAPH_FILTER))
++ this.graphFilter = VertexProgramHelper.deserialize(configuration,
Constants.GREMLIN_HADOOP_GRAPH_FILTER);
++
++
++PersistResultGraphAware Interface
+++
+
-IMPORTANT: A graph system provider's `OutputFormat` should implement the
`PersistResultGraphAware` interface which
++A graph system provider's `OutputFormat` should implement the
`PersistResultGraphAware` interface which
+ determines which persistenc
[1/2] tinkerpop git commit: Moved hadoop-gremlin provider documentation to the provider docs CTR
Repository: tinkerpop
Updated Branches:
refs/heads/master c2d2a7d27 -> 6c1663255
Moved hadoop-gremlin provider documentation to the provider docs CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/e3c5d8ed
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e3c5d8ed
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/e3c5d8ed
Branch: refs/heads/master
Commit: e3c5d8ed1ca9028e35e78b9b1da6e73b8b066659
Parents: ccd2630
Author: Stephen Mallette
Authored: Wed Jun 15 11:25:20 2016 -0400
Committer: Stephen Mallette
Committed: Wed Jun 15 11:25:20 2016 -0400
--
docs/src/dev/provider/index.asciidoc| 42 ++
.../reference/implementations-hadoop.asciidoc | 45 +---
2 files changed, 43 insertions(+), 44 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e3c5d8ed/docs/src/dev/provider/index.asciidoc
--
diff --git a/docs/src/dev/provider/index.asciidoc
b/docs/src/dev/provider/index.asciidoc
index 2d51274..7b876a1 100644
--- a/docs/src/dev/provider/index.asciidoc
+++ b/docs/src/dev/provider/index.asciidoc
@@ -288,6 +288,48 @@ for (final MapReduce mapReduce : mapReducers) {
<2> If there is no reduce stage, the the map-stage results are inserted into
Memory as specified by the application
developer's `MapReduce.addResultToMemory()` implementation.
+Hadoop-Gremlin Usage
+
+
+Hadoop-Gremlin is centered around `InputFormats` and `OutputFormats`. If a
3rd-party graph system provider wishes to
+leverage Hadoop-Gremlin (and its respective `GraphComputer` engines), then
they need to provide, at minimum, a
+Hadoop2 `InputFormat` for their graph system. If
the provider wishes to persist computed
+results back to their graph system (and not just to HDFS via a
`FileOutputFormat`), then a graph system specific
+`OutputFormat` must be developed as well.
+
+Conceptually, `HadoopGraph` is a wrapper around a `Configuration` object.
There is no "data" in the `HadoopGraph` as
+the `InputFormat` specifies where and how to get the graph data at OLAP (and
OLTP) runtime. Thus, `HadoopGraph` is a
+small object with little overhead. Graph system providers should realize
`HadoopGraph` as the gateway to the OLAP
+features offered by Hadoop-Gremlin. For example, a graph system specific
`Graph.compute(Class
+graphComputerClass)`-method may look as follows:
+
+[source,java]
+
+public C compute(final Class graphComputerClass)
throws IllegalArgumentException {
+ try {
+if (AbstractHadoopGraphComputer.class.isAssignableFrom(graphComputerClass))
+ return
graphComputerClass.getConstructor(HadoopGraph.class).newInstance(this);
+else
+ throw
Graph.Exceptions.graphDoesNotSupportProvidedGraphComputer(graphComputerClass);
+ } catch (final Exception e) {
+throw new IllegalArgumentException(e.getMessage(),e);
+ }
+}
+
+
+Note that the configurations for Hadoop are assumed to be in the
`Graph.configuration()` object. If this is not the
+case, then the `Configuration` provided to `HadoopGraph.open()` should be
dynamically created within the
+`compute()`-method. It is in the provided configuration that `HadoopGraph`
gets the various properties which
+determine how to read and write data to and from Hadoop. For instance,
`gremlin.hadoop.graphInputFormat` and
+`gremlin.hadoop.graphOutputFormat`.
+
+IMPORTANT: A graph system provider's `OutputFormat` should implement the
`PersistResultGraphAware` interface which
+determines which persistence options are available to the user. For the
standard file-based `OutputFormats` provided
+by Hadoop-Gremlin (e.g. <>,
<>,
+and <>) `ResultGraph.ORIGINAL` is
not supported as the original graph
+data files are not random access and are, in essence, immutable. Thus, these
file-based `OutputFormats` only support
+`ResultGraph.NEW` which creates a copy of the data specified by the `Persist`
enum.
+
[[io-implementations]]
IO Implementations
^^
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e3c5d8ed/docs/src/reference/implementations-hadoop.asciidoc
--
diff --git a/docs/src/reference/implementations-hadoop.asciidoc
b/docs/src/reference/implementations-hadoop.asciidoc
index 8c591e2..b89c0a1 100644
--- a/docs/src/reference/implementations-hadoop.asciidoc
+++ b/docs/src/reference/implementations-hadoop.asciidoc
@@ -904,47 +904,4 @@ Vertex 4 ("josh") is isolated below:
"age":[{"id":7,"value":32}]}
}
}
-
-
-Hadoop-Gremlin for Graph System Providers
-~
-
-Hadoop-Gremlin is centered around `InputFormats` and `OutputFormats`. If a
3rd-party graph syst
tinkerpop git commit: gremlin_python now uses the same Translator-model as Gremlin-Java. That is, you can register a python Translator with a PythonGraphTraversal and it will translate the traversal i
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1278 0cf1523de -> 155abef4a
gremlin_python now uses the same Translator-model as Gremlin-Java. That is, you
can register a python Translator with a PythonGraphTraversal and it will
translate the traversal into any script engine language you want -- right now
we only have GroovyTranslator, but we can easily add ScalaTranslator,
JythonTranslator, etc. This model of language -> translator -> remote
connection is excellent. Its consistent between Java and Python and pretty dead
simple.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/155abef4
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/155abef4
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/155abef4
Branch: refs/heads/TINKERPOP-1278
Commit: 155abef4a22e20207a6bdd9876a026ab2642ad87
Parents: 0cf1523
Author: Marko A. Rodriguez
Authored: Wed Jun 15 10:27:07 2016 -0600
Committer: Marko A. Rodriguez
Committed: Wed Jun 15 10:27:07 2016 -0600
--
.../python/GremlinPythonGenerator.groovy| 82 ++-
.../gremlin/python/PythonTranslator.java| 2 +-
.../src/main/jython/gremlin_python/__init__.py | 1 +
.../jython/gremlin_python/gremlin_python.py | 524 +--
.../jython/gremlin_python/groovy_translator.py | 92
.../main/jython/gremlin_python/translator.py| 40 ++
.../gremlin/python/PythonProvider.java | 1 +
7 files changed, 414 insertions(+), 328 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/155abef4/gremlin-variant/src/main/groovy/org/apache/tinkerpop/gremlin/python/GremlinPythonGenerator.groovy
--
diff --git
a/gremlin-variant/src/main/groovy/org/apache/tinkerpop/gremlin/python/GremlinPythonGenerator.groovy
b/gremlin-variant/src/main/groovy/org/apache/tinkerpop/gremlin/python/GremlinPythonGenerator.groovy
index f35c888..e6f1137 100644
---
a/gremlin-variant/src/main/groovy/org/apache/tinkerpop/gremlin/python/GremlinPythonGenerator.groovy
+++
b/gremlin-variant/src/main/groovy/org/apache/tinkerpop/gremlin/python/GremlinPythonGenerator.groovy
@@ -71,16 +71,12 @@ under the License.
final Map invertedMethodMap = [:].withDefault { it };
methodMap.entrySet().forEach { invertedMethodMap.put(it.value, it.key)
}
-final List NO_QUOTE = [VertexProperty.Cardinality, Column,
Direction, Operator, Order, P, Pop, Scope, SackFunctions.Barrier, T,
- ReadOnlyStrategy, Computer]
-.collect { it.getSimpleName() }.unique().sort { a, b -> a <=>
b };
-final Map enumMap = [Cardinality:
"VertexProperty.Cardinality", Barrier: "SackFunctions.Barrier"]
-.withDefault { it }
-
pythonClass.append("from collections import OrderedDict\n")
pythonClass.append("import inspect\n\n")
pythonClass.append("statics = OrderedDict()\n\n")
pythonClass.append("""
+globalTranslator = None
+
class B(object):
def __init__(self, symbol, value="~empty"):
self.symbol = symbol
@@ -90,31 +86,6 @@ class B(object):
self.value = value
def __repr__(self):
return self.symbol
-
-class Helper(object):
- @staticmethod
- def stringOrObject(arg):
-if (type(arg) is str and
-""")
-NO_QUOTE.forEach { pythonClass.append("
not(arg.startswith(\"${enumMap[it]}.\")) and\n") }
-pythonClass.append(" not(len(arg)==0)):\n")
-pythonClass.append(""" return "\\"" + arg + "\\""
-elif type(arg) is bool:
- return str(arg).lower()
-elif type(arg) is long:
- return str(arg) + "L"
-elif type(arg) is float:
- return str(arg) + "f"
-else:
- return str(arg)
- @staticmethod
- def stringify(*args):
-if len(args) == 0:
- return ""
-elif len(args) == 1:
- return Helper.stringOrObject(args[0])
-else:
- return ", ".join(Helper.stringOrObject(i) for i in args)
""").append("\n\n");
//
@@ -122,16 +93,19 @@ class Helper(object):
//
pythonClass.append(
"""class PythonGraphTraversalSource(object):
- def __init__(self, traversal_source_string, remote_connection=None):
-self.traversal_source_string = traversal_source_string
+ def __init__(self, translator, remote_connection=None):
+global globalTranslator
+self.translator = translator
+globalTranslator = translator
self.remote_connection = remote_connection
def __repr__(self):
if self.remote_connection is None:
- return "graphtraversalsource[no connection, " +
self.traversal_source_string + "]"
+ return "graphtraversalsource[no connection, " +
self.translat
tinkerpop git commit: Re-assigned step labels as appropriate in SubgraphStrategy.
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1139 [created] a41971eca
Re-assigned step labels as appropriate in SubgraphStrategy.
Step labels were not being re-written to replaced steps or to the subgraph
filter steps and so traversals using .as('a') and the like were failing.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a41971ec
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a41971ec
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a41971ec
Branch: refs/heads/TINKERPOP-1139
Commit: a41971eca60bbafbd2e32309385a3499cd61faad
Parents: e3c5d8e
Author: Stephen Mallette
Authored: Wed Jun 15 14:15:53 2016 -0400
Committer: Stephen Mallette
Committed: Wed Jun 15 14:15:53 2016 -0400
--
CHANGELOG.asciidoc | 1 +
.../strategy/decoration/SubgraphStrategy.java | 36 +---
.../decoration/SubgraphStrategyProcessTest.java | 22
3 files changed, 47 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a41971ec/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 7b5206b..a359eca 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -27,6 +27,7 @@ TinkerPop 3.1.3 (NOT OFFICIALLY RELEASED YET)
~
* Avoid hamcrest conflict by using mockito-core instead of mockito-all
dependency in `gremlin-test`.
+* Fixed bug in `SubgraphStrategy` where step labels were not being propogated
properly to new steps injected by the strategy.
* Defaulted to `Edge.DEFAULT` if no edge label was supplied in GraphML.
* Fixed bug in `IoGraphTest` causing IllegalArgumentException: URI is not
hierarchical error for external graph implementations.
* Fixed a bug where timeout functions provided to the `GremlinExecutor` were
not executing in the same thread as the script evaluation.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a41971ec/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
index e2488fb..c9089fa 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
@@ -34,6 +34,7 @@ import
org.apache.tinkerpop.gremlin.process.traversal.strategy.AbstractTraversal
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
import org.apache.tinkerpop.gremlin.structure.Direction;
import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Element;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import java.util.ArrayList;
@@ -86,7 +87,7 @@ public final class SubgraphStrategy extends
AbstractTraversalStrategy
TraversalHelper.insertAfterStep(new TraversalFilterStep<>(traversal,
vertexCriterion.asAdmin().clone()), s, traversal));
+applyCriterion(vertexStepsToInsertFilterAfter, traversal,
vertexCriterion.asAdmin());
}
if (edgeCriterion != null) {
@@ -95,7 +96,7 @@ public final class SubgraphStrategy extends
AbstractTraversalStrategy
TraversalHelper.insertAfterStep(new TraversalFilterStep<>(traversal,
edgeCriterion.asAdmin().clone()), s, traversal));
+applyCriterion(edgeStepsToInsertFilterAfter, traversal,
edgeCriterion.asAdmin());
}
// explode g.V().out() to g.V().outE().inV() only if there is an edge
predicate otherwise
@@ -103,19 +104,19 @@ public final class SubgraphStrategy extends
AbstractTraversalStrategy(traversal, vertexCriterion.asAdmin().clone()), s,
traversal);
else {
-final VertexStep replacementVertexStep = new
VertexStep(traversal, Edge.class, s.getDirection(), s.getEdgeLabels());
-Step intermediateFilterStep = null;
-if (s.getDirection() == Direction.BOTH)
-intermediateFilterStep = new
EdgeOtherVertexStep(traversal);
-else
-intermediateFilterStep = new EdgeVertexStep(traversal,
s.getDirection().opposite());
+final VertexStep someEStep = new VertexStep(traversal,
Edge.class, s.getDirection(), s.getEdgeLabels());
+final Step someVStep = (s.getDirection() == Direction.B
tinkerpop git commit: TranslationStrategy now takes both a __.class and a TraversalSource. Thus, it is completely generic and can be used by any DSL (beyond GraphTraversal).
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1278 155abef4a -> 46fad0383
TranslationStrategy now takes both a __.class and a TraversalSource. Thus, it
is completely generic and can be used by any DSL (beyond GraphTraversal).
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/46fad038
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/46fad038
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/46fad038
Branch: refs/heads/TINKERPOP-1278
Commit: 46fad0383d5bae0df1fa387cd2018208cdb55d4c
Parents: 155abef
Author: Marko A. Rodriguez
Authored: Wed Jun 15 12:26:06 2016 -0600
Committer: Marko A. Rodriguez
Committed: Wed Jun 15 12:26:06 2016 -0600
--
.../process/traversal/TraversalSource.java | 2 +-
.../dsl/graph/GraphTraversalSource.java | 2 +-
.../strategy/creation/TranslationStrategy.java | 49 +++-
.../process/traversal/util/Translator.java | 2 +
4 files changed, 32 insertions(+), 23 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/46fad038/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalSource.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalSource.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalSource.java
index 972dcbe..2f96733 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalSource.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalSource.java
@@ -121,7 +121,7 @@ public interface TraversalSource extends Cloneable {
}
public default TraversalSource withTranslator(final Translator translator)
{
-return this.withStrategies(new TranslationStrategy(translator, null));
+return this.withStrategies(new TranslationStrategy(translator,
this.clone(), null));
}
/**
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/46fad038/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
index 3a36610..ab1e34d 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
@@ -99,7 +99,7 @@ public class GraphTraversalSource implements TraversalSource {
@Override
public GraphTraversalSource withTranslator(final Translator translator) {
-return this.withStrategies(new TranslationStrategy(translator,
__.class));
+return this.withStrategies(new TranslationStrategy(translator,
this.clone(), __.class));
}
@Override
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/46fad038/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/creation/TranslationStrategy.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/creation/TranslationStrategy.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/creation/TranslationStrategy.java
index 573e5aa..a752963 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/creation/TranslationStrategy.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/creation/TranslationStrategy.java
@@ -47,10 +47,13 @@ import java.util.function.Function;
public class TranslationStrategy extends
AbstractTraversalStrategy implements
TraversalStrategy.CreationStrategy {
private final Translator translator;
+private final TraversalSource traversalSource;
private final Class anonymousTraversalClass;
-public TranslationStrategy(final Translator translator, final Class
anonymousTraversalClass) {
+
+public TranslationStrategy(final Translator translator, final
TraversalSource traversalSource, final Class anonymousTraversalClass) {
this.translator = translator;
+this.traversalSource = traversalSource;
this.anonymousTraversalClass = anonymousTraversalClass;
this.createAnonymousTraversalFunction();
}
@@ -62,15 +65,14 @@ public class TranslationStrategy extends
AbstractTrav
tinkerpop git commit: Re-assigned step labels as appropriate in SubgraphStrategy. [Forced Update!]
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1139 a41971eca -> 84f2d63d7 (forced update)
Re-assigned step labels as appropriate in SubgraphStrategy.
Step labels were not being re-written to replaced steps or to the subgraph
filter steps and so traversals using .as('a') and the like were failing.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/84f2d63d
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/84f2d63d
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/84f2d63d
Branch: refs/heads/TINKERPOP-1139
Commit: 84f2d63d7b758c21bb22a6d771d57479fce3d06b
Parents: e3c5d8e
Author: Stephen Mallette
Authored: Wed Jun 15 14:15:53 2016 -0400
Committer: Stephen Mallette
Committed: Wed Jun 15 14:29:43 2016 -0400
--
CHANGELOG.asciidoc | 1 +
.../strategy/decoration/SubgraphStrategy.java | 40 ++--
.../decoration/SubgraphStrategyProcessTest.java | 22 +++
3 files changed, 51 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/84f2d63d/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 7b5206b..a359eca 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -27,6 +27,7 @@ TinkerPop 3.1.3 (NOT OFFICIALLY RELEASED YET)
~
* Avoid hamcrest conflict by using mockito-core instead of mockito-all
dependency in `gremlin-test`.
+* Fixed bug in `SubgraphStrategy` where step labels were not being propogated
properly to new steps injected by the strategy.
* Defaulted to `Edge.DEFAULT` if no edge label was supplied in GraphML.
* Fixed bug in `IoGraphTest` causing IllegalArgumentException: URI is not
hierarchical error for external graph implementations.
* Fixed a bug where timeout functions provided to the `GremlinExecutor` were
not executing in the same thread as the script evaluation.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/84f2d63d/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
index e2488fb..d328168 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
@@ -34,6 +34,7 @@ import
org.apache.tinkerpop.gremlin.process.traversal.strategy.AbstractTraversal
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
import org.apache.tinkerpop.gremlin.structure.Direction;
import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Element;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import java.util.ArrayList;
@@ -86,7 +87,7 @@ public final class SubgraphStrategy extends
AbstractTraversalStrategy
TraversalHelper.insertAfterStep(new TraversalFilterStep<>(traversal,
vertexCriterion.asAdmin().clone()), s, traversal));
+applyCriterion(vertexStepsToInsertFilterAfter, traversal,
vertexCriterion.asAdmin());
}
if (edgeCriterion != null) {
@@ -95,7 +96,7 @@ public final class SubgraphStrategy extends
AbstractTraversalStrategy
TraversalHelper.insertAfterStep(new TraversalFilterStep<>(traversal,
edgeCriterion.asAdmin().clone()), s, traversal));
+applyCriterion(edgeStepsToInsertFilterAfter, traversal,
edgeCriterion.asAdmin());
}
// explode g.V().out() to g.V().outE().inV() only if there is an edge
predicate otherwise
@@ -103,19 +104,19 @@ public final class SubgraphStrategy extends
AbstractTraversalStrategy(traversal, vertexCriterion.asAdmin().clone()), s,
traversal);
else {
-final VertexStep replacementVertexStep = new
VertexStep(traversal, Edge.class, s.getDirection(), s.getEdgeLabels());
-Step intermediateFilterStep = null;
-if (s.getDirection() == Direction.BOTH)
-intermediateFilterStep = new
EdgeOtherVertexStep(traversal);
-else
-intermediateFilterStep = new EdgeVertexStep(traversal,
s.getDirection().opposite());
+final VertexStep someEStep = new VertexStep(traversal,
Edge.class, s.getDirection(), s.getEdgeLabels());
+final Step someVStep = (s.getDirectio
tinkerpop git commit: updated gremlin_python with various of David Brown's comments.
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1278 46fad0383 -> db3ee9636
updated gremlin_python with various of David Brown's comments.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/db3ee963
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/db3ee963
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/db3ee963
Branch: refs/heads/TINKERPOP-1278
Commit: db3ee963654e25ee17102153f97d34cbba73e332
Parents: 46fad03
Author: Marko A. Rodriguez
Authored: Wed Jun 15 13:02:43 2016 -0600
Committer: Marko A. Rodriguez
Committed: Wed Jun 15 13:02:43 2016 -0600
--
.../python/GremlinPythonGenerator.groovy| 16 +++--
.../jython/gremlin_driver/gremlin_driver.py | 5 +-
.../jython/gremlin_python/gremlin_python.py | 66
.../jython/gremlin_python/groovy_translator.py | 13 +++-
.../gremlin_rest_driver/gremlin_rest_driver.py | 10 +--
5 files changed, 68 insertions(+), 42 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/db3ee963/gremlin-variant/src/main/groovy/org/apache/tinkerpop/gremlin/python/GremlinPythonGenerator.groovy
--
diff --git
a/gremlin-variant/src/main/groovy/org/apache/tinkerpop/gremlin/python/GremlinPythonGenerator.groovy
b/gremlin-variant/src/main/groovy/org/apache/tinkerpop/gremlin/python/GremlinPythonGenerator.groovy
index e6f1137..26ea1bb 100644
---
a/gremlin-variant/src/main/groovy/org/apache/tinkerpop/gremlin/python/GremlinPythonGenerator.groovy
+++
b/gremlin-variant/src/main/groovy/org/apache/tinkerpop/gremlin/python/GremlinPythonGenerator.groovy
@@ -119,14 +119,16 @@ class B(object):
if (Traversal.isAssignableFrom(returnType)) {
pythonClass.append(
""" def ${method}(self, *args):
-self.translator.addStep(self, "${method}", *args)
-return PythonGraphTraversal(self.translator, self.remote_connection)
+traversal = PythonGraphTraversal(self.translator, self.remote_connection)
+traversal.translator.addStep(traversal, "${method}", *args)
+return traversal
""")
} else if (TraversalSource.isAssignableFrom(returnType)) {
pythonClass.append(
""" def ${method}(self, *args):
-self.translator.addSource(self, "${method}", *args)
-return PythonGraphTraversalSource(self.translator, self.remote_connection)
+source = PythonGraphTraversalSource(self.translator,
self.remote_connection)
+source.translator.addSource(source, "${method}", *args)
+return source
""")
}
}
@@ -157,13 +159,15 @@ class B(object):
return self.values(key)
def __iter__(self):
return self
+ def __next__(self):
+ return self.next()
def toList(self):
return list(iter(self))
def next(self):
if self.results is None:
-self.results =
self.remote_connection.submit(self.translator.traversal_script, self.bindings)
+self.results =
self.remote_connection.submit(self.translator.script_engine,
self.translator.traversal_script, self.bindings)
if self.last_traverser is None:
- self.last_traverser = self.results.next()
+ self.last_traverser = next(self.results)
object = self.last_traverser.object
self.last_traverser.bulk = self.last_traverser.bulk - 1
if self.last_traverser.bulk <= 0:
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/db3ee963/gremlin-variant/src/main/jython/gremlin_driver/gremlin_driver.py
--
diff --git a/gremlin-variant/src/main/jython/gremlin_driver/gremlin_driver.py
b/gremlin-variant/src/main/jython/gremlin_driver/gremlin_driver.py
index 86fb610..55b6a31 100644
--- a/gremlin-variant/src/main/jython/gremlin_driver/gremlin_driver.py
+++ b/gremlin-variant/src/main/jython/gremlin_driver/gremlin_driver.py
@@ -30,11 +30,10 @@ class Traverser(object):
class RemoteConnection(object):
-def __init__(self, url, script_engine):
+def __init__(self, url):
self.url = url
-self.script_engine = script_engine
@abstractmethod
-def submit(self, script, bindings):
+def submit(self, script_engine, script, bindings):
print "sending " + script + " to GremlinServer..."
return iter([])
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/db3ee963/gremlin-variant/src/main/jython/gremlin_python/gremlin_python.py
--
diff --git a/gremlin-variant/src/main/jython/gremlin_python/gremlin_python.py
b/gremlin-variant/src/main/jython/gremlin_python/gremlin_python.py
index d926575..da54ebd 10064
tinkerpop git commit: crazy, I thought I didn't need addSpawnStep in Python translator -- but I do. Thus, Translator in Java and Python are identical.
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1278 db3ee9636 -> a0533e262
crazy, I thought I didn't need addSpawnStep in Python translator -- but I do.
Thus, Translator in Java and Python are identical.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a0533e26
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a0533e26
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a0533e26
Branch: refs/heads/TINKERPOP-1278
Commit: a0533e26275c652d09a7e639badee499b6d6d644
Parents: db3ee96
Author: Marko A. Rodriguez
Authored: Wed Jun 15 13:09:16 2016 -0600
Committer: Marko A. Rodriguez
Committed: Wed Jun 15 13:09:16 2016 -0600
--
.../gremlin/python/GremlinPythonGenerator.groovy| 2 +-
.../src/main/jython/gremlin_python/gremlin_python.py| 8
.../src/main/jython/gremlin_python/groovy_translator.py | 12
.../src/main/jython/gremlin_python/translator.py| 4
4 files changed, 17 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a0533e26/gremlin-variant/src/main/groovy/org/apache/tinkerpop/gremlin/python/GremlinPythonGenerator.groovy
--
diff --git
a/gremlin-variant/src/main/groovy/org/apache/tinkerpop/gremlin/python/GremlinPythonGenerator.groovy
b/gremlin-variant/src/main/groovy/org/apache/tinkerpop/gremlin/python/GremlinPythonGenerator.groovy
index 26ea1bb..ea18da8 100644
---
a/gremlin-variant/src/main/groovy/org/apache/tinkerpop/gremlin/python/GremlinPythonGenerator.groovy
+++
b/gremlin-variant/src/main/groovy/org/apache/tinkerpop/gremlin/python/GremlinPythonGenerator.groovy
@@ -120,7 +120,7 @@ class B(object):
pythonClass.append(
""" def ${method}(self, *args):
traversal = PythonGraphTraversal(self.translator, self.remote_connection)
-traversal.translator.addStep(traversal, "${method}", *args)
+traversal.translator.addSpawnStep(traversal, "${method}", *args)
return traversal
""")
} else if (TraversalSource.isAssignableFrom(returnType)) {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a0533e26/gremlin-variant/src/main/jython/gremlin_python/gremlin_python.py
--
diff --git a/gremlin-variant/src/main/jython/gremlin_python/gremlin_python.py
b/gremlin-variant/src/main/jython/gremlin_python/gremlin_python.py
index da54ebd..bc716a8 100644
--- a/gremlin-variant/src/main/jython/gremlin_python/gremlin_python.py
+++ b/gremlin-variant/src/main/jython/gremlin_python/gremlin_python.py
@@ -48,19 +48,19 @@ class PythonGraphTraversalSource(object):
return "graphtraversalsource[" + str(self.remote_connection) + ", " +
self.translator.traversal_script + "]"
def E(self, *args):
traversal = PythonGraphTraversal(self.translator, self.remote_connection)
-traversal.translator.addStep(traversal, "E", *args)
+traversal.translator.addSpawnStep(traversal, "E", *args)
return traversal
def V(self, *args):
traversal = PythonGraphTraversal(self.translator, self.remote_connection)
-traversal.translator.addStep(traversal, "V", *args)
+traversal.translator.addSpawnStep(traversal, "V", *args)
return traversal
def addV(self, *args):
traversal = PythonGraphTraversal(self.translator, self.remote_connection)
-traversal.translator.addStep(traversal, "addV", *args)
+traversal.translator.addSpawnStep(traversal, "addV", *args)
return traversal
def inject(self, *args):
traversal = PythonGraphTraversal(self.translator, self.remote_connection)
-traversal.translator.addStep(traversal, "inject", *args)
+traversal.translator.addSpawnStep(traversal, "inject", *args)
return traversal
def withBulk(self, *args):
source = PythonGraphTraversalSource(self.translator,
self.remote_connection)
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a0533e26/gremlin-variant/src/main/jython/gremlin_python/groovy_translator.py
--
diff --git
a/gremlin-variant/src/main/jython/gremlin_python/groovy_translator.py
b/gremlin-variant/src/main/jython/gremlin_python/groovy_translator.py
index 660fa5d..24d7690 100644
--- a/gremlin-variant/src/main/jython/gremlin_python/groovy_translator.py
+++ b/gremlin-variant/src/main/jython/gremlin_python/groovy_translator.py
@@ -36,11 +36,15 @@ class GroovyTranslator(Translator):
Translator.__init__(self, alias, script_engine)
def addStep(self, traversal, step_name, *args):
-newTraversal = GroovyTranslator(self.alias, self.script_engine)
-newTraversal.traversal_script = self.traversal_sc
tinkerpop git commit: Added a NOTE to the centrality recipe to clarify the usage of by() CTR
Repository: tinkerpop Updated Branches: refs/heads/master 6c1663255 -> b67db0c59 Added a NOTE to the centrality recipe to clarify the usage of by() CTR Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b67db0c5 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b67db0c5 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b67db0c5 Branch: refs/heads/master Commit: b67db0c59dab49a1f4d008d21446c9136e8cbf41 Parents: 6c16632 Author: Stephen Mallette Authored: Wed Jun 15 16:40:27 2016 -0400 Committer: Stephen Mallette Committed: Wed Jun 15 16:40:27 2016 -0400 -- docs/src/recipes/centrality.asciidoc | 6 ++ 1 file changed, 6 insertions(+) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b67db0c5/docs/src/recipes/centrality.asciidoc -- diff --git a/docs/src/recipes/centrality.asciidoc b/docs/src/recipes/centrality.asciidoc index e8d71e4..79d 100644 --- a/docs/src/recipes/centrality.asciidoc +++ b/docs/src/recipes/centrality.asciidoc @@ -49,6 +49,12 @@ stream of `Map` objects can allow some greater flexibility. <5> For example, use of a stream enables use of an ordered limit that can be executed in a distributed fashion in OLAP traversals. +NOTE: The link:http://tinkerpop.apache.org/docs/x.y.z/reference/#group-step[group] step takes up to two separate +link:http://tinkerpop.apache.org/docs/x.y.z/reference/#by-step[by] modulators. The first `by()` tells `group()` +what the key in the resulting `Map` will be (i.e. the value to group on). In the above examples, the `by()` is empty +and as a result, the grouping will be on the incoming `Vertex` object itself. The second `by()` is the value to be +stored in the `Map` for each key. + [[betweeness-centrality]] Betweeness Centrality ~
tinkerpop git commit: using isinstance() instead of type() throughout. Removed B bindings. Now a binding is just a 1 element dict whose key is a string. Might conflict, but for now, good enough. Looki
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1278 a0533e262 -> 9ae4ea3c7
using isinstance() instead of type() throughout. Removed B bindings. Now a
binding is just a 1 element dict whose key is a string. Might conflict, but for
now, good enough. Lookin' good Bales.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/9ae4ea3c
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/9ae4ea3c
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/9ae4ea3c
Branch: refs/heads/TINKERPOP-1278
Commit: 9ae4ea3c7a77e3b72627e299a182b569c5f5bd03
Parents: a0533e2
Author: Marko A. Rodriguez
Authored: Wed Jun 15 15:49:25 2016 -0600
Committer: Marko A. Rodriguez
Committed: Wed Jun 15 15:49:25 2016 -0600
--
.../python/GremlinPythonGenerator.groovy| 23 +-
.../jython/gremlin_python/gremlin_python.py | 419 +--
.../jython/gremlin_python/groovy_translator.py | 12 +-
.../gremlin_rest_driver/gremlin_rest_driver.py | 3 +-
4 files changed, 216 insertions(+), 241 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9ae4ea3c/gremlin-variant/src/main/groovy/org/apache/tinkerpop/gremlin/python/GremlinPythonGenerator.groovy
--
diff --git
a/gremlin-variant/src/main/groovy/org/apache/tinkerpop/gremlin/python/GremlinPythonGenerator.groovy
b/gremlin-variant/src/main/groovy/org/apache/tinkerpop/gremlin/python/GremlinPythonGenerator.groovy
index ea18da8..2ea98a1 100644
---
a/gremlin-variant/src/main/groovy/org/apache/tinkerpop/gremlin/python/GremlinPythonGenerator.groovy
+++
b/gremlin-variant/src/main/groovy/org/apache/tinkerpop/gremlin/python/GremlinPythonGenerator.groovy
@@ -76,16 +76,6 @@ under the License.
pythonClass.append("statics = OrderedDict()\n\n")
pythonClass.append("""
globalTranslator = None
-
-class B(object):
- def __init__(self, symbol, value="~empty"):
-self.symbol = symbol
-if value == "~empty":
- self.value = inspect.currentframe().f_back.f_locals[symbol]
-else:
- self.value = value
- def __repr__(self):
-return self.symbol
""").append("\n\n");
//
@@ -99,10 +89,7 @@ class B(object):
globalTranslator = translator
self.remote_connection = remote_connection
def __repr__(self):
-if self.remote_connection is None:
- return "graphtraversalsource[no connection, " +
self.translator.traversal_script + "]"
-else:
- return "graphtraversalsource[" + str(self.remote_connection) + ", " +
self.translator.traversal_script + "]"
+return "graphtraversalsource[" + str(self.remote_connection) + ", " +
self.translator.traversal_script + "]"
""")
GraphTraversalSource.getMethods()
.findAll { !it.name.equals("clone") }
@@ -149,9 +136,9 @@ class B(object):
def __repr__(self):
return self.translator.traversal_script
def __getitem__(self,index):
-if type(index) is int:
+if isinstance(index,int):
return self.range(index,index+1)
-elif type(index) is slice:
+elif isinstance(index,slice):
return self.range(index.start,index.stop)
else:
raise TypeError("Index must be int or slice")
@@ -188,8 +175,8 @@ class B(object):
""" def ${method}(self, *args):
self.translator.addStep(self, "${method}", *args)
for arg in args:
- if type(arg) is B:
-self.bindings[arg.symbol] = arg.value
+ if isinstance(arg, dict) and 1 == len(arg) and
isinstance(arg.keys()[0],str):
+self.bindings.update(arg)
return self
""")
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9ae4ea3c/gremlin-variant/src/main/jython/gremlin_python/gremlin_python.py
--
diff --git a/gremlin-variant/src/main/jython/gremlin_python/gremlin_python.py
b/gremlin-variant/src/main/jython/gremlin_python/gremlin_python.py
index bc716a8..4fe18ec 100644
--- a/gremlin-variant/src/main/jython/gremlin_python/gremlin_python.py
+++ b/gremlin-variant/src/main/jython/gremlin_python/gremlin_python.py
@@ -24,16 +24,6 @@ statics = OrderedDict()
globalTranslator = None
-class B(object):
- def __init__(self, symbol, value="~empty"):
-self.symbol = symbol
-if value == "~empty":
- self.value = inspect.currentframe().f_back.f_locals[symbol]
-else:
- self.value = value
- def __repr__(self):
-return self.symbol
-
class PythonGraphTraversalSource(object):
def __init__(self, translator, remote_connection=None):
@@ -42,10 +32,7 @@ class PythonGraphTraversalSource(object):
globalTranslator = translator
self.remote_connection = remote_connection
def __repr__(self):
-
tinkerpop git commit: removed an unneeded import.
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1278 9ae4ea3c7 -> 6338c9a23
removed an unneeded import.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/6338c9a2
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/6338c9a2
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/6338c9a2
Branch: refs/heads/TINKERPOP-1278
Commit: 6338c9a23dbd367d108e2312a57be52d4b1722d1
Parents: 9ae4ea3
Author: Marko A. Rodriguez
Authored: Wed Jun 15 15:51:27 2016 -0600
Committer: Marko A. Rodriguez
Committed: Wed Jun 15 15:51:27 2016 -0600
--
.../apache/tinkerpop/gremlin/python/GremlinPythonGenerator.groovy | 1 -
1 file changed, 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6338c9a2/gremlin-variant/src/main/groovy/org/apache/tinkerpop/gremlin/python/GremlinPythonGenerator.groovy
--
diff --git
a/gremlin-variant/src/main/groovy/org/apache/tinkerpop/gremlin/python/GremlinPythonGenerator.groovy
b/gremlin-variant/src/main/groovy/org/apache/tinkerpop/gremlin/python/GremlinPythonGenerator.groovy
index 2ea98a1..b5c3efb 100644
---
a/gremlin-variant/src/main/groovy/org/apache/tinkerpop/gremlin/python/GremlinPythonGenerator.groovy
+++
b/gremlin-variant/src/main/groovy/org/apache/tinkerpop/gremlin/python/GremlinPythonGenerator.groovy
@@ -72,7 +72,6 @@ under the License.
methodMap.entrySet().forEach { invertedMethodMap.put(it.value, it.key)
}
pythonClass.append("from collections import OrderedDict\n")
-pythonClass.append("import inspect\n\n")
pythonClass.append("statics = OrderedDict()\n\n")
pythonClass.append("""
globalTranslator = None
tinkerpop git commit: added support for lambda embedding by using the native lambda functionality of the host language. It supplies a String of the translated language lambda. Removed ScriptXXXTravers
Repository: tinkerpop Updated Branches: refs/heads/TINKERPOP-1278 6338c9a23 -> 8d2de3f6a added support for lambda embedding by using the native lambda functionality of the host language. It supplies a String of the translated language lambda. Removed ScriptXXXTraversal model as after discussion on the ticket, it seems that that model is not as good as the CreationStrategy model. Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/8d2de3f6 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8d2de3f6 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/8d2de3f6 Branch: refs/heads/TINKERPOP-1278 Commit: 8d2de3f6aa6dbf11a715ab79bd53823d04e2849c Parents: 6338c9a Author: Marko A. Rodriguez Authored: Wed Jun 15 16:11:14 2016 -0600 Committer: Marko A. Rodriguez Committed: Wed Jun 15 16:11:14 2016 -0600 -- .../dsl/graph/script/ScriptGraphTraversal.java | 957 --- .../script/ScriptGraphTraversalSource.java | 239 - .../process/traversal/util/Translator.java | 9 - .../tinkerpop/gremlin/structure/Graph.java | 3 - .../script/ScriptGraphTraversalSourceTest.java | 60 -- .../graph/script/ScriptGraphTraversalTest.java | 59 -- .../jython/gremlin_python/gremlin_python.py | 2 - .../jython/gremlin_python/groovy_translator.py | 6 + 8 files changed, 6 insertions(+), 1329 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8d2de3f6/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/script/ScriptGraphTraversal.java -- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/script/ScriptGraphTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/script/ScriptGraphTraversal.java deleted file mode 100644 index 16bac30..000 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/script/ScriptGraphTraversal.java +++ /dev/null @@ -1,957 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.script; - -import org.apache.tinkerpop.gremlin.process.computer.VertexProgram; -import org.apache.tinkerpop.gremlin.process.traversal.Order; -import org.apache.tinkerpop.gremlin.process.traversal.P; -import org.apache.tinkerpop.gremlin.process.traversal.Path; -import org.apache.tinkerpop.gremlin.process.traversal.Pop; -import org.apache.tinkerpop.gremlin.process.traversal.Scope; -import org.apache.tinkerpop.gremlin.process.traversal.Traversal; -import org.apache.tinkerpop.gremlin.process.traversal.Traverser; -import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.DefaultGraphTraversal; -import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal; -import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; -import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__; -import org.apache.tinkerpop.gremlin.process.traversal.util.Translator; -import org.apache.tinkerpop.gremlin.process.traversal.step.util.EmptyStep; -import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree; -import org.apache.tinkerpop.gremlin.process.traversal.traverser.util.TraverserSet; -import org.apache.tinkerpop.gremlin.structure.Column; -import org.apache.tinkerpop.gremlin.structure.Direction; -import org.apache.tinkerpop.gremlin.structure.Edge; -import org.apache.tinkerpop.gremlin.structure.Graph; -import org.apache.tinkerpop.gremlin.structure.Property; -import org.apache.tinkerpop.gremlin.structure.T; -import org.apache.tinkerpop.gremlin.structure.Vertex; -import org.apache.tinkerpop.gremlin.structure.VertexProperty; -import org.apache.tinkerpop.gremlin.util.ScriptEngineCache; - -import javax.script.Bindings; -import javax.script.ScriptEngine; -import javax.script.SimpleBindings; -import java.util.Collection; -import java.u
