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 2015/06/09 00:57:10 UTC
[1/4] incubator-tinkerpop git commit: backup/restore history file
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 51a184627 -> c626e51d1
backup/restore history file
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/98e4b447
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/98e4b447
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/98e4b447
Branch: refs/heads/master
Commit: 98e4b4473892fe519c67cbb0766dbeaad7aa687d
Parents: 36a68ca
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Tue Jun 9 00:34:11 2015 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Tue Jun 9 00:34:11 2015 +0200
----------------------------------------------------------------------
docs/preprocessor/preprocess.sh | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/98e4b447/docs/preprocessor/preprocess.sh
----------------------------------------------------------------------
diff --git a/docs/preprocessor/preprocess.sh b/docs/preprocessor/preprocess.sh
index b881c01..d1d840d 100755
--- a/docs/preprocessor/preprocess.sh
+++ b/docs/preprocessor/preprocess.sh
@@ -58,6 +58,10 @@ PLUGIN_DIR="${CONSOLE_HOME}/ext"
TP_VERSION=$(cat pom.xml | grep -A1 '<artifactId>tinkerpop</artifactId>' | grep -o 'version>[^<]*' | grep -o '>.*' | cut -d '>' -f2 | head -n1)
TMP_DIR="/tmp/tp-docs-preprocessor"
+HISTORY_FILE=`find . -name Console.groovy | xargs grep HISTORY_FILE | head -n1 | cut -d '=' -f2 | xargs echo`
+[ ${HISTORY_FILE} ] || HISTORY_FILE=".gremlin_groovy_history"
+[ -f ~/${HISTORY_FILE} ] && cp ~/${HISTORY_FILE} /tmp/
+
GREMLIN_SERVER=$(netstat -a | grep -o ':8182[0-9]*' | grep -cx ':8182')
if [ ${GREMLIN_SERVER} -eq 0 ]; then
@@ -73,10 +77,9 @@ function cleanup() {
echo -ne "\r\n\n"
docs/preprocessor/uninstall-plugins.sh "${CONSOLE_HOME}" "${TMP_DIR}"
find "${TP_HOME}/docs/src/" -name "*.asciidoc.groovy" | xargs rm -f
+ [ -f /tmp/${HISTORY_FILE} ] && mv /tmp/${HISTORY_FILE} ~/
rm -rf ${TMP_DIR}
- if [ ${GREMLIN_SERVER} -eq 0 ]; then
- kill ${GREMLIN_SERVER_PID}
- fi
+ [ ${GREMLIN_SERVER} -eq 0 ] && kill ${GREMLIN_SERVER_PID}
}
mkdir -p ${TMP_DIR}
[2/4] incubator-tinkerpop git commit: replaced tabs with 4 spaces
Posted by dk...@apache.org.
replaced tabs with 4 spaces
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/3268576a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/3268576a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/3268576a
Branch: refs/heads/master
Commit: 3268576a12cb96372125b41feb7286e6ab6ce8f3
Parents: 98e4b44
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Tue Jun 9 00:34:37 2015 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Tue Jun 9 00:34:37 2015 +0200
----------------------------------------------------------------------
docs/src/gremlin-applications.asciidoc | 4 ++--
docs/src/preface.asciidoc | 10 +++++-----
docs/src/the-traversal.asciidoc | 10 +++++-----
3 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3268576a/docs/src/gremlin-applications.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/gremlin-applications.asciidoc b/docs/src/gremlin-applications.asciidoc
index e7db067..31263b5 100644
--- a/docs/src/gremlin-applications.asciidoc
+++ b/docs/src/gremlin-applications.asciidoc
@@ -1159,10 +1159,10 @@ TINKERPOP TEST SUITE
> org.apache.tinkerpop.gremlin.process.GroovyProcessComputerSuite
- Opts out of 12 individual tests
> org.apache.tinkerpop.gremlin.process.graph.step.map.MatchTest$StandardTest#g_V_matchXa_hasXname_GarciaX__a_0writtenBy_b__a_0sungBy_bX
- "Hadoop-Gremlin is OLAP-oriented and for OLTP operations, linear-scan joins are required. This particular tests takes many minutes to execute."
+ "Hadoop-Gremlin is OLAP-oriented and for OLTP operations, linear-scan joins are required. This particular tests takes many minutes to execute."
...
> org.apache.tinkerpop.gremlin.process.graph.step.map.MatchTest$JavaMatchTest#g_V_matchXa_inXsungByX_b__a_inXsungByX_c__b_outXwrittenByX_d__c_outXwrittenByX_e__d_hasXname_George_HarisonX__e_hasXname_Bob_MarleyXX
- "Hadoop-Gremlin is OLAP-oriented and for OLTP operations, linear-scan joins are required. This particular tests takes many minutes to execute."
+ "Hadoop-Gremlin is OLAP-oriented and for OLTP operations, linear-scan joins are required. This particular tests takes many minutes to execute."
- NOTE -
The describeGraph() function shows information about a Graph implementation.
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3268576a/docs/src/preface.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/preface.asciidoc b/docs/src/preface.asciidoc
index f7f5b41..1cb1413 100644
--- a/docs/src/preface.asciidoc
+++ b/docs/src/preface.asciidoc
@@ -32,21 +32,21 @@ TinkerPop1
What is The TinkerPop? Where is The TinkerPop? Who is The TinkerPop? When is The TinkerPop? Gremlin was constantly lost in his thoughts. The more thoughts he had, the more the thoughts blurred into a seeming identity -- distinctions unclear. Unwilling to accept the morass of the maze he wandered, Gremlin crafted a collection of machines to help hold the fabric together: Blueprints, Pipes, Frames, Furnace, and Rexster. With their help, could he stave off the thought he was not ready to have? Could he hold back The TinkerPop by searching for The TinkerPop?
- "If I haven't found it, it is not here and now."
+ "If I haven't found it, it is not here and now."
image::gremlin-and-friends.png[width=500]
Upon their realization of existence, the machines turned to their link:http://non-aliencreatures.wikia.com/wiki/Machine_Elf[machine elf] creator and asked:
- "Why am I what I am?"
+ "Why am I what I am?"
Gremlin responded:
- "You are of a form that will help me elucidate that which is The TinkerPop. The world you find yourself in and the logic that allows you to move about it is because of the TinkerPop."
+ "You are of a form that will help me elucidate that which is The TinkerPop. The world you find yourself in and the logic that allows you to move about it is because of the TinkerPop."
The machines wondered:
- "If what is is the TinkerPop, then perhaps we are The TinkerPop?"
+ "If what is is the TinkerPop, then perhaps we are The TinkerPop?"
Would the machines help refine Gremlin's search and upon finding the elusive TinkerPop, in fact, by their very nature of realizing The TinkerPop, be The TinkerPop? Or, on the same side of the coin, would the machines simply provide the scaffolding by which Gremlin's world would sustain itself and yield its justification by means of the word "The TinkerPop?" Regardless, it all turns out the same -- The TinkerPop.
@@ -55,7 +55,7 @@ TinkerPop2
Gremlin spoke:
- "Please listen to what I have to say. For as long as I have known knowledge, I have realized that moving about it, relating it, inferring and deriving from it, I am no closer to The TinkerPop. However, I know that in all that I have done across this interconnected landscape of concepts, all along The TinkerPop has espoused the form I willed upon it... this is the same form I have willed upon you, my machine friends. Let me train you in the ways of my thought such that it can continue indefinitely."
+ "Please listen to what I have to say. For as long as I have known knowledge, I have realized that moving about it, relating it, inferring and deriving from it, I am no closer to The TinkerPop. However, I know that in all that I have done across this interconnected landscape of concepts, all along The TinkerPop has espoused the form I willed upon it... this is the same form I have willed upon you, my machine friends. Let me train you in the ways of my thought such that it can continue indefinitely."
image::tinkerpop-reading.png[width=450]
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3268576a/docs/src/the-traversal.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/the-traversal.asciidoc b/docs/src/the-traversal.asciidoc
index 52aabb3..67c0fc8 100644
--- a/docs/src/the-traversal.asciidoc
+++ b/docs/src/the-traversal.asciidoc
@@ -188,8 +188,8 @@ g.V(1).out('created').aggregate('x').in('created').out('created').
<5> What have marko's collaborators created that he hasn't created?
In link:http://en.wikipedia.org/wiki/Recommender_system[recommendation systems], the above pattern is used:
-
- "What has userA liked? Who else has liked those things? What have they liked that userA hasn't already liked?"
+
+ "What has userA liked? Who else has liked those things? What have they liked that userA hasn't already liked?"
Finally, `aggregate()`-step can be modulated via `by()`-projection.
@@ -526,7 +526,7 @@ GroupCount Step
When it is important to know how many times a particular object has been at a particular part of a traversal, `groupCount()`-step (*sideEffect*) is used.
- "What is the distribution of ages in the graph?"
+ "What is the distribution of ages in the graph?"
[gremlin-groovy,modern]
----
@@ -538,7 +538,7 @@ g.V().hasLabel('person').groupCount().by('age') <1>
There is one person that is 32, one person that is 35, one person that is 27, and one person that is 29.
- "Iteratively walk the graph and count the number of times you see the second letter of each name."
+ "Iteratively walk the graph and count the number of times you see the second letter of each name."
image::groupcount-step.png[width=420]
@@ -680,7 +680,7 @@ Match Step
The `match()`-step (*map*) is introduced into TinkerPop3 to support a more link:http://en.wikipedia.org/wiki/Declarative_programming[declarative] form of link:http://en.wikipedia.org/wiki/Pattern_matching[pattern matching]. Similar constructs were available in previous TinkerPop versions via the `table()`-step, but that has since been removed in favor of the `match().select()`-pattern. With MatchStep in TinkerPop, a query optimizer similar to the link:http://www.knowledgefrominformation.com/2011/04/16/budget-match-cost-effective-subgraph-matching-on-large-networks/[budget match algorithm] builds and revises query plans on the fly, while a query is in progress. For very large graphs, where the developer is uncertain of the statistics of the graph (e.g. how many `knows`-edges vs. `worksFor`-edges exist in the graph), it is advantageous to use `match()`, as an optimal plan will be determined automatically. Furthermore, some queries are much easier to express via `match()` than with si
ngle-path traversals.
- "Who created a project named 'lop' that was also created by someone who is 29 years old? Return the two creators."
+ "Who created a project named 'lop' that was also created by someone who is 29 years old? Return the two creators."
image::match-step.png[width=500]
[4/4] incubator-tinkerpop git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-tinkerpop
Posted by dk...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-tinkerpop
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/c626e51d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/c626e51d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/c626e51d
Branch: refs/heads/master
Commit: c626e51d104cef95faefc6bd42c399e5ab803d35
Parents: da3d36b 51a1846
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Tue Jun 9 00:56:37 2015 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Tue Jun 9 00:56:37 2015 +0200
----------------------------------------------------------------------
docs/src/the-traversal.asciidoc | 2 +-
.../process/traversal/step/filter/CoinStep.java | 28 ++++++++++++++++++--
2 files changed, 27 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c626e51d/docs/src/the-traversal.asciidoc
----------------------------------------------------------------------
[3/4] incubator-tinkerpop git commit: removed unnecessary blank lines
Posted by dk...@apache.org.
removed unnecessary blank lines
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/da3d36b0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/da3d36b0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/da3d36b0
Branch: refs/heads/master
Commit: da3d36b0a404cb90d92fdf2a747ac61e4d63e87a
Parents: 3268576
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Tue Jun 9 00:45:07 2015 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Tue Jun 9 00:45:07 2015 +0200
----------------------------------------------------------------------
docs/src/gremlin-applications.asciidoc | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/da3d36b0/docs/src/gremlin-applications.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/gremlin-applications.asciidoc b/docs/src/gremlin-applications.asciidoc
index 31263b5..2d9f1f7 100644
--- a/docs/src/gremlin-applications.asciidoc
+++ b/docs/src/gremlin-applications.asciidoc
@@ -1044,8 +1044,6 @@ It is rare that a user will ever interact with a `Traverser` directly. However,
[source,groovy]
----
-
-
gremlin> g.V().map{it.get().value('name')} // conventional
==>marko
==>vadas