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 2016/01/26 14:34:07 UTC

[1/2] incubator-tinkerpop git commit: Use QueryBuilder in cassandra example for console tutorial.

Repository: incubator-tinkerpop
Updated Branches:
  refs/heads/master df8d4b151 -> 1f3492a03


Use QueryBuilder in cassandra example for console tutorial.


Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/70221772
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/70221772
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/70221772

Branch: refs/heads/master
Commit: 702217728e4087db902c322a5992bfab29ae68c0
Parents: 9271813
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Jan 26 08:32:41 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Jan 26 08:32:41 2016 -0500

----------------------------------------------------------------------
 docs/src/tutorials/advanced-console/index.asciidoc | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/70221772/docs/src/tutorials/advanced-console/index.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/tutorials/advanced-console/index.asciidoc b/docs/src/tutorials/advanced-console/index.asciidoc
index ab99420..adb9e41 100644
--- a/docs/src/tutorials/advanced-console/index.asciidoc
+++ b/docs/src/tutorials/advanced-console/index.asciidoc
@@ -519,7 +519,9 @@ This is most easily accomplished by copying the required jar files to the `GREML
 gremlin> :install com.datastax.cassandra cassandra-driver-core 2.1.9
 ==>Loaded: [com.datastax.cassandra, cassandra-driver-core, 2.1.9]
 gremlin> import com.datastax.driver.core.*
-==>groovy.grape.Grape, org.apache.commons.configuration.*, ... java.time.Year, com.datastax.driver.core.*
+==>groovy.grape.Grape, org.apache.commons.configuration.*, ..., com.datastax.driver.core.*
+gremlin> import static com.datastax.driver.core.querybuilder.QueryBuilder.*
+==>groovy.grape.Grape, org.apache.commons.configuration.*, ..., static com.datastax.driver.core.querybuilder.QueryBuilder.*
 gremlin> cluster = com.datastax.driver.core.Cluster.builder().addContactPoint("localhost").build()
 ==>com.datastax.driver.core.Cluster@3e1624c7
 gremlin> session = cluster.connect()
@@ -548,9 +550,13 @@ gremlin>                                 properties("location").hasNot("endTime"
 gremlin>       select("person","year","location").by("name").by().by().
 gremlin>       sideEffect{
 gremlin>         def row = it.get()
-gremlin>         session.execute("INSERT INTO locations(name, location, year) VALUES ('${row.person}', '${row.location}', ${row.year});")
+gremlin>         def statement = insertInto("locations").
+gremlin>                         value("name", row.person).
+gremlin>                         value("location", row.location).
+gremlin>                         value("year", row.year)
+gremlin>         session.execute(statement)
 gremlin>       }.iterate()
-gremlin> session.execute("SELECT * FROM locations")
+gremlin> session.execute(select().all().from("locations"))
 ==>Row[daniel, 2004, kaiserslautern]
 ==>Row[daniel, 2005, kaiserslautern]
 ==>Row[daniel, 2006, aachen]
@@ -561,8 +567,6 @@ gremlin> session.execute("SELECT * FROM locations")
 ...
 ==>Row[stephen, 2015, purcellville]
 ==>Row[stephen, 2016, purcellville]
-gremlin> session.execute("SELECT COUNT(*) FROM locations")
-==>Row[52]
 ----
 
 [[def-usage]]


[2/2] incubator-tinkerpop git commit: Merge remote-tracking branch 'origin/master'

Posted by sp...@apache.org.
Merge remote-tracking branch 'origin/master'


Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/1f3492a0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/1f3492a0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/1f3492a0

Branch: refs/heads/master
Commit: 1f3492a034a959d1177965a9cdd5d2aae76e95c4
Parents: 7022177 df8d4b1
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Jan 26 08:33:25 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Jan 26 08:33:25 2016 -0500

----------------------------------------------------------------------
 CHANGELOG.asciidoc                              |   2 +
 .../gremlin/hadoop/structure/HadoopGraph.java   |   5 +
 .../spark/process/computer/CombineIterator.java | 117 +++++++++++++++++++
 .../spark/process/computer/MapIterator.java     |  86 ++++++++++++++
 .../spark/process/computer/ReduceIterator.java  |  85 ++++++++++++++
 .../spark/process/computer/SparkExecutor.java   |  31 ++---
 .../process/computer/SparkGraphComputer.java    |   7 +-
 .../spark/process/computer/SparkMapEmitter.java |  45 -------
 .../process/computer/SparkReduceEmitter.java    |  45 -------
 9 files changed, 309 insertions(+), 114 deletions(-)
----------------------------------------------------------------------