You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2015/02/16 20:22:35 UTC
incubator-tinkerpop git commit: SugarLoad toString overloads and a
toString for GroupMapReduce.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master fdfed8464 -> 9ee42009a
SugarLoad toString overloads and a toString for GroupMapReduce.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/9ee42009
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/9ee42009
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/9ee42009
Branch: refs/heads/master
Commit: 9ee42009a327ba40a2b2ca0f0b0d2fb5c317ed7d
Parents: fdfed84
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Mon Feb 16 12:22:36 2015 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Mon Feb 16 12:22:36 2015 -0700
----------------------------------------------------------------------
.../sideEffect/mapreduce/GroupMapReduce.java | 6 ++++++
.../gremlin/groovy/loaders/SugarLoader.groovy | 22 ++++++++++++++++++++
hadoop-gremlin/conf/hadoop-kryo.properties | 2 +-
3 files changed, 29 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/9ee42009/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/mapreduce/GroupMapReduce.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/mapreduce/GroupMapReduce.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/mapreduce/GroupMapReduce.java
index 433330f..a431d02 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/mapreduce/GroupMapReduce.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/mapreduce/GroupMapReduce.java
@@ -29,6 +29,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.TraversalMatrix;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalUtil;
import org.apache.tinkerpop.gremlin.process.util.BulkSet;
import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
import java.util.Collection;
import java.util.Collections;
@@ -117,4 +118,9 @@ public final class GroupMapReduce implements MapReduce<Object, Collection, Objec
clone.reduceFunction = this.reduceFunction.clone();
return clone;
}
+
+ @Override
+ public String toString() {
+ return StringFactory.mapReduceString(this, this.getMemoryKey());
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/9ee42009/gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/loaders/SugarLoader.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/loaders/SugarLoader.groovy b/gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/loaders/SugarLoader.groovy
index 3a4631a..b2cf571 100644
--- a/gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/loaders/SugarLoader.groovy
+++ b/gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/loaders/SugarLoader.groovy
@@ -24,6 +24,7 @@ import org.apache.tinkerpop.gremlin.process.graph.traversal.GraphTraversal
import org.apache.tinkerpop.gremlin.process.graph.traversal.__
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper
import org.apache.tinkerpop.gremlin.structure.*
+import org.apache.tinkerpop.gremlin.structure.util.StringFactory
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
@@ -88,6 +89,10 @@ class SugarLoader {
public static final get(final Traverser traverser, final String key) {
return traverser.get()."$key";
}
+
+ public String toString() {
+ return this.metaClass.owner.get().toString();
+ }
}
public static class ElementCategory {
@@ -103,6 +108,15 @@ class SugarLoader {
public static final set(final Element element, final String key, final Object value) {
element.property(key, value);
}
+
+ public String toString() {
+ if (this.metaClass.owner instanceof Vertex)
+ return StringFactory.vertexString(this.metaClass.owner);
+ else if (this.metaClass.owner instanceof Edge)
+ return StringFactory.edgeString(this.metaClass.owner);
+ else
+ return StringFactory.propertyString(this.metaClass.owner);
+ }
}
public static class VertexCategory {
@@ -122,6 +136,10 @@ class SugarLoader {
public static final putAt(final Vertex vertex, final String key, final Object value) {
vertex.property(key, value);
}
+
+ public String toString() {
+ return StringFactory.vertexString(this.metaClass.owner);
+ }
}
public static class GraphCategory {
@@ -136,6 +154,10 @@ class SugarLoader {
else
return graph."$key";
}
+
+ public String toString() {
+ return StringFactory.graphString(this.metaClass.owner, "");
+ }
}
public static class GraphTraversalCategory {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/9ee42009/hadoop-gremlin/conf/hadoop-kryo.properties
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/conf/hadoop-kryo.properties b/hadoop-gremlin/conf/hadoop-kryo.properties
index d3f5611..f6e4539 100644
--- a/hadoop-gremlin/conf/hadoop-kryo.properties
+++ b/hadoop-gremlin/conf/hadoop-kryo.properties
@@ -21,7 +21,7 @@ gremlin.hadoop.memoryOutputFormat=org.apache.hadoop.mapreduce.lib.output.Sequenc
gremlin.hadoop.deriveMemory=false
gremlin.hadoop.jarsInDistributedCache=true
-gremlin.hadoop.inputLocation=grateful-dead-vertices.gio
+gremlin.hadoop.inputLocation=tinkergraph-modern-vertices.gio
gremlin.hadoop.outputLocation=output
#gremlin.vertexProgram=org.apache.tinkerpop.gremlin.process.computer.traversal.TraversalVertexProgram
#gremlin.traversalVertexProgram.traversalSupplier.type=CLASS