You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by dk...@apache.org on 2016/05/31 18:37:47 UTC
incubator-tinkerpop git commit: Fixed calculation bug (number of
coworkers).
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1298 d5a16fa16 -> 3dc12260f
Fixed calculation bug (number of coworkers).
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/3dc12260
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/3dc12260
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/3dc12260
Branch: refs/heads/TINKERPOP-1298
Commit: 3dc12260f9f84241514ace819d8961476f460f4a
Parents: d5a16fa
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Tue May 31 20:36:51 2016 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Tue May 31 20:36:51 2016 +0200
----------------------------------------------------------------------
docs/src/reference/implementations-hadoop.asciidoc | 13 +++++++------
.../bulkdumping/BulkExportVertexProgramTest.java | 16 +++++++++-------
2 files changed, 16 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3dc12260/docs/src/reference/implementations-hadoop.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/implementations-hadoop.asciidoc b/docs/src/reference/implementations-hadoop.asciidoc
index 3c756a7..6969ab8 100644
--- a/docs/src/reference/implementations-hadoop.asciidoc
+++ b/docs/src/reference/implementations-hadoop.asciidoc
@@ -398,16 +398,17 @@ g = graph.traversal().withComputer()
g.V().hasLabel('person').match(
__.as('person').values('name').as('name'),
__.as('person').values('age').as('age'),
- __.as('person').outE('created').count().as('projects')
- ).select('person').
- coalesce(out('created'), identity()).
- coalesce(__.in('created'), identity()).
- groupCount('m').by(select('person','name','age','projects')).cap('m').unfold().as('kv').
+ __.as('person').outE('created').count().as('projects'),
+ __.as('person').coalesce(out('created'), identity()).as('project'),
+ __.as('project').coalesce(__.in('created'), identity()).as('coworker'),
+ __.as('coworker').values('name').as('cname'),
+ __.as('coworker').choose(where(eq('person')), constant(0), constant(1)).as('cc')
+ ).dedup('person','coworker').group().by(select('person','name','age','projects')).by(select('cc').sum()).unfold().as('kv').
select(keys).select('person').as('person').
select('kv').select(keys).select('name').as('name').
select('kv').select(keys).select('age').as('age').
select('kv').select(keys).select('projects').as('projects').
- select('kv').select(values).map(union(identity(), constant(-1)).sum()).as('coworkers').
+ select('kv').select(values).as('coworkers').
select('person','name','age','projects','coworkers').
program(BulkDumperVertexProgram.build().create(graph))
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3dc12260/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/bulkdumping/BulkExportVertexProgramTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/bulkdumping/BulkExportVertexProgramTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/bulkdumping/BulkExportVertexProgramTest.java
index 5c3bbfb..19483a2 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/bulkdumping/BulkExportVertexProgramTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/bulkdumping/BulkExportVertexProgramTest.java
@@ -34,6 +34,7 @@ import java.util.Set;
import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN;
import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.OUTPUT;
+import static org.apache.tinkerpop.gremlin.process.traversal.P.eq;
import static org.apache.tinkerpop.gremlin.structure.Column.keys;
import static org.apache.tinkerpop.gremlin.structure.Column.values;
import static org.junit.Assert.assertEquals;
@@ -52,16 +53,17 @@ public class BulkExportVertexProgramTest extends AbstractGremlinProcessTest {
g.V().hasLabel("person").match(
__.as("person").values("name").as("name"),
__.as("person").values("age").as("age"),
- __.as("person").outE("created").count().as("projects")
- ).select("person").
- coalesce(__.out("created"), __.identity()).
- coalesce(__.in("created"), __.identity()).
- groupCount("m").by(__.select("person", "name", "age", "projects")).cap("m").unfold().as("kv").
+ __.as("person").outE("created").count().as("projects"),
+ __.as("person").coalesce(__.out("created"), __.identity()).as("project"),
+ __.as("project").coalesce(__.in("created"), __.identity()).as("coworker"),
+ __.as("coworker").values("name").as("cname"),
+ __.as("coworker").choose(__.where(eq("person")), __.constant(0), __.constant(1)).as("cc")
+ ).dedup("person", "coworker").group().by(__.select("person", "name", "age", "projects")).by(__.select("cc").sum()).unfold().as("kv").
select(keys).select("person").as("person").
select("kv").select(keys).select("name").as("name").
select("kv").select(keys).select("age").as("age").
select("kv").select(keys).select("projects").as("projects").
- select("kv").select(values).map(__.union(__.identity(), __.constant(-1)).sum()).as("coworkers").
+ select("kv").select(values).as("coworkers").
select("person", "name", "age", "projects", "coworkers").
program(BulkDumperVertexProgram.build().create(graph)).iterate();
}
@@ -74,7 +76,7 @@ public class BulkExportVertexProgramTest extends AbstractGremlinProcessTest {
graph.compute().program(BulkExportVertexProgram.build().keys("name", "age", "projects", "coworkers").create(graph)).submit().get();
final Set<String> lines = new HashSet<>();
- lines.add("josh,32,2,3");
+ lines.add("josh,32,2,2");
lines.add("marko,29,1,2");
lines.add("peter,35,1,2");
lines.add("vadas,27,0,0");