You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2015/03/11 19:26:47 UTC
[31/50] [abbrv] incubator-tinkerpop git commit: fixed up SparkVertex
and Hadoop iterators.
fixed up SparkVertex and Hadoop iterators.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/3f5bfac7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/3f5bfac7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/3f5bfac7
Branch: refs/heads/master
Commit: 3f5bfac739e1bce375ade9a61f3631eaf3ce50b1
Parents: 8a2e596
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue Mar 10 07:10:54 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Mar 10 07:10:54 2015 -0600
----------------------------------------------------------------------
.../computer/example/TraversalSupplier1.java | 2 +-
.../computer/example/TraversalSupplier2.java | 2 +-
.../computer/example/TraversalSupplier3.java | 2 +-
.../process/computer/giraph/GiraphMessenger.java | 2 +-
.../process/computer/spark/SparkVertex.java | 18 +++++++-----------
.../computer/spark/SparkVertexPayload.java | 2 +-
.../hadoop/structure/HadoopVertexProperty.java | 11 +++--------
.../hadoop/structure/hdfs/HadoopEdgeIterator.java | 4 ++--
8 files changed, 17 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3f5bfac7/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/example/TraversalSupplier1.java
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/example/TraversalSupplier1.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/example/TraversalSupplier1.java
index 1779809..edca01f 100644
--- a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/example/TraversalSupplier1.java
+++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/example/TraversalSupplier1.java
@@ -29,6 +29,6 @@ import java.util.function.Supplier;
public class TraversalSupplier1 implements Supplier<Traversal> {
@Override
public Traversal get() {
- return HadoopGraph.open().V().out().out().values("name");
+ return HadoopGraph.open().traversal().V().out().out().values("name");
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3f5bfac7/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/example/TraversalSupplier2.java
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/example/TraversalSupplier2.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/example/TraversalSupplier2.java
index 99503e8..d3477f8 100644
--- a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/example/TraversalSupplier2.java
+++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/example/TraversalSupplier2.java
@@ -29,6 +29,6 @@ import java.util.function.Supplier;
public class TraversalSupplier2 implements Supplier<Traversal> {
@Override
public Traversal get() {
- return HadoopGraph.open().V().<String>values("name").map(s -> s.get().length()).groupCount().<Integer>by(i -> i + 100);
+ return HadoopGraph.open().traversal().V().<String>values("name").map(s -> s.get().length()).groupCount().<Integer>by(i -> i + 100);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3f5bfac7/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/example/TraversalSupplier3.java
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/example/TraversalSupplier3.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/example/TraversalSupplier3.java
index 94b1521..efec301 100644
--- a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/example/TraversalSupplier3.java
+++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/example/TraversalSupplier3.java
@@ -30,6 +30,6 @@ import java.util.function.Supplier;
public class TraversalSupplier3 implements Supplier<Traversal> {
@Override
public Traversal get() {
- return HadoopGraph.open().V().<String>values("name").group().<String>by(s -> s.substring(1, 2)).by(v -> v).<Collection>by(Collection::size);
+ return HadoopGraph.open().traversal().V().<String>values("name").group().<String>by(s -> s.substring(1, 2)).by(v -> v).<Collection>by(Collection::size);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3f5bfac7/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/GiraphMessenger.java
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/GiraphMessenger.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/GiraphMessenger.java
index cb00408..56d87b7 100644
--- a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/GiraphMessenger.java
+++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/GiraphMessenger.java
@@ -57,7 +57,7 @@ public class GiraphMessenger<M> implements Messenger<M> {
final Direction direction = GiraphMessenger.getOppositeDirection(incidentTraversal);
incidentTraversal.forEachRemaining(edge ->
this.giraphComputeVertex.sendMessage(
- new LongWritable(Long.valueOf(edge.iterators().vertexIterator(direction).next().id().toString())),
+ new LongWritable(Long.valueOf(edge.vertices(direction).next().id().toString())),
new ObjectWritable<>(localMessageScope.getEdgeFunction().apply(message, edge))));
} else {
final MessageScope.Global globalMessageScope = (MessageScope.Global) messageScope;
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3f5bfac7/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/spark/SparkVertex.java
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/spark/SparkVertex.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/spark/SparkVertex.java
index ffb5e6d..17e1486 100644
--- a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/spark/SparkVertex.java
+++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/spark/SparkVertex.java
@@ -41,7 +41,7 @@ import java.util.Iterator;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
-public final class SparkVertex implements Vertex, Vertex.Iterators, Serializable {
+public final class SparkVertex implements Vertex, Serializable {
private static GryoWriter GRYO_WRITER = GryoWriter.build().create();
private static GryoReader GRYO_READER = GryoReader.build().create();
@@ -87,24 +87,20 @@ public final class SparkVertex implements Vertex, Vertex.Iterators, Serializable
this.vertex.remove();
}
- @Override
- public Iterators iterators() {
- return this;
- }
@Override
- public Iterator<Edge> edgeIterator(final Direction direction, final String... edgeLabels) {
- return this.vertex.iterators().edgeIterator(direction, edgeLabels);
+ public Iterator<Edge> edges(final Direction direction, final String... edgeLabels) {
+ return this.vertex.edges(direction, edgeLabels);
}
@Override
- public Iterator<Vertex> vertexIterator(final Direction direction, final String... edgeLabels) {
- return this.vertex.iterators().vertexIterator(direction, edgeLabels);
+ public Iterator<Vertex> vertices(final Direction direction, final String... edgeLabels) {
+ return this.vertex.vertices(direction, edgeLabels);
}
@Override
- public <V> Iterator<VertexProperty<V>> propertyIterator(final String... propertyKeys) {
- return this.vertex.iterators().propertyIterator(propertyKeys);
+ public <V> Iterator<VertexProperty<V>> properties(final String... propertyKeys) {
+ return this.vertex.properties(propertyKeys);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3f5bfac7/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/spark/SparkVertexPayload.java
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/spark/SparkVertexPayload.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/spark/SparkVertexPayload.java
index 9cfdebe..7d9ac1b 100644
--- a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/spark/SparkVertexPayload.java
+++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/spark/SparkVertexPayload.java
@@ -88,7 +88,7 @@ public final class SparkVertexPayload<M> implements SparkPayload<M>, Messenger<M
final MessageScope.Local<M> localMessageScope = (MessageScope.Local) messageScope;
final Traversal.Admin<Vertex, Edge> incidentTraversal = SparkVertexPayload.setVertexStart(localMessageScope.getIncidentTraversal().get(), this.vertex);
final Direction direction = SparkVertexPayload.getOppositeDirection(incidentTraversal);
- incidentTraversal.forEachRemaining(edge -> this.outgoing.add(new Tuple2<>(edge.iterators().vertexIterator(direction).next().id(), message)));
+ incidentTraversal.forEachRemaining(edge -> this.outgoing.add(new Tuple2<>(edge.vertices(direction).next().id(), message)));
} else {
((MessageScope.Global) messageScope).vertices().forEach(v -> this.outgoing.add(new Tuple2<>(v.id(), message)));
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3f5bfac7/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/HadoopVertexProperty.java
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/HadoopVertexProperty.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/HadoopVertexProperty.java
index cb9a0bb..abb10dd 100644
--- a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/HadoopVertexProperty.java
+++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/HadoopVertexProperty.java
@@ -31,7 +31,7 @@ import java.util.Iterator;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
-public class HadoopVertexProperty<V> implements VertexProperty<V>, VertexProperty.Iterators, WrappedVertexProperty<VertexProperty<V>> {
+public class HadoopVertexProperty<V> implements VertexProperty<V>, WrappedVertexProperty<VertexProperty<V>> {
private final VertexProperty<V> baseVertexProperty;
private final HadoopVertex hadoopVertex;
@@ -102,12 +102,7 @@ public class HadoopVertexProperty<V> implements VertexProperty<V>, VertexPropert
}
@Override
- public VertexProperty.Iterators iterators() {
- return this;
- }
-
- @Override
- public <U> Iterator<Property<U>> propertyIterator(final String... propertyKeys) {
- return IteratorUtils.<Property<U>, Property<U>>map(this.getBaseVertexProperty().iterators().propertyIterator(propertyKeys), property -> new HadoopProperty<>(property, HadoopVertexProperty.this));
+ public <U> Iterator<Property<U>> properties(final String... propertyKeys) {
+ return IteratorUtils.<Property<U>, Property<U>>map(this.getBaseVertexProperty().properties(propertyKeys), property -> new HadoopProperty<>(property, HadoopVertexProperty.this));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3f5bfac7/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/hdfs/HadoopEdgeIterator.java
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/hdfs/HadoopEdgeIterator.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/hdfs/HadoopEdgeIterator.java
index 743a0d4..d5276c6 100644
--- a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/hdfs/HadoopEdgeIterator.java
+++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/hdfs/HadoopEdgeIterator.java
@@ -56,7 +56,7 @@ public class HadoopEdgeIterator extends HadoopElementIterator<Edge> {
if (this.readers.isEmpty())
throw FastNoSuchElementException.instance();
if (this.readers.peek().nextKeyValue()) {
- this.edgeIterator = this.readers.peek().getCurrentValue().get().iterators().edgeIterator(Direction.OUT);
+ this.edgeIterator = this.readers.peek().getCurrentValue().get().edges(Direction.OUT);
} else {
this.readers.remove();
}
@@ -75,7 +75,7 @@ public class HadoopEdgeIterator extends HadoopElementIterator<Edge> {
if (this.readers.isEmpty())
return false;
if (this.readers.peek().nextKeyValue()) {
- this.edgeIterator = this.readers.peek().getCurrentValue().get().iterators().edgeIterator(Direction.OUT);
+ this.edgeIterator = this.readers.peek().getCurrentValue().get().edges(Direction.OUT);
} else {
this.readers.remove();
}