You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by rd...@apache.org on 2017/03/30 14:37:27 UTC
[1/5] tinkerpop git commit: if a settings.xml exists in tinkerpop/
then copy it to .m2
Repository: tinkerpop
Updated Branches:
refs/heads/master 43c207b8a -> 4ae1462a0
if a settings.xml exists in tinkerpop/ then copy it to .m2
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ec066ca6
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ec066ca6
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ec066ca6
Branch: refs/heads/master
Commit: ec066ca60cd5acdfff6b7a853f89bd26b2aff7aa
Parents: 7def039
Author: Robert Dale <ro...@gmail.com>
Authored: Tue Mar 28 13:23:37 2017 -0400
Committer: Robert Dale <ro...@gmail.com>
Committed: Tue Mar 28 13:23:37 2017 -0400
----------------------------------------------------------------------
.gitignore | 3 ++-
docker/scripts/build.sh | 7 +++++++
2 files changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ec066ca6/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index a493d4d..a4c1cdc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,4 +14,5 @@ _bsp/
doc/out
docs/*.asciidoc
ext/
-.glv
\ No newline at end of file
+.glv
+settings.xml
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ec066ca6/docker/scripts/build.sh
----------------------------------------------------------------------
diff --git a/docker/scripts/build.sh b/docker/scripts/build.sh
index 47da2b8..626c1be 100755
--- a/docker/scripts/build.sh
+++ b/docker/scripts/build.sh
@@ -63,6 +63,13 @@ if [ -d "/usr/src/tinkermem" ]; then
cd /usr/src/tinkermem
fi
+# use a custom maven settings.xml
+if [ -r "settings.xml" ]; then
+ echo "Copying settings.xml"
+ mkdir -p ~/.m2
+ cp settings.xml ~/.m2/
+fi
+
mvn clean install process-resources ${TINKERPOP_BUILD_OPTIONS} || exit 1
[ -z "${BUILD_JAVA_DOCS}" ] || mvn process-resources -Djavadoc || exit 1
[5/5] tinkerpop git commit: Merge branch 'tp32'
Posted by rd...@apache.org.
Merge branch 'tp32'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/4ae1462a
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/4ae1462a
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/4ae1462a
Branch: refs/heads/master
Commit: 4ae1462a09842f2c829742dd2a46330d47591054
Parents: 43c207b a4a646d
Author: Robert Dale <ro...@gmail.com>
Authored: Thu Mar 30 10:36:09 2017 -0400
Committer: Robert Dale <ro...@gmail.com>
Committed: Thu Mar 30 10:36:09 2017 -0400
----------------------------------------------------------------------
.gitignore | 1 +
docker/scripts/build.sh | 7 +++++++
docs/src/reference/the-graphcomputer.asciidoc | 1 +
3 files changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4ae1462a/.gitignore
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4ae1462a/docker/scripts/build.sh
----------------------------------------------------------------------
diff --cc docker/scripts/build.sh
index 980b1db,626c1be..ea3bd19
--- a/docker/scripts/build.sh
+++ b/docker/scripts/build.sh
@@@ -57,18 -57,19 +57,25 @@@ TINKERPOP_BUILD_OPTIONS="
[ -z "${BUILD_JAVA_DOCS}" ] && TINKERPOP_BUILD_OPTIONS="${TINKERPOP_BUILD_OPTIONS} -Dmaven.javadoc.skip=true"
# If the tmpfs (in-memory filesystem exists, use it)
-if [ -d "/usr/src/tinkermem" ]; then
- echo Copying source to in-memory tmpfs
- rsync -a . /usr/src/tinkermem
- cd /usr/src/tinkermem
+TINKERMEM_PATH=$(cd .. ; echo `pwd`/tinkermem)
+if [ -d "${TINKERMEM_PATH}" ]; then
+ echo "Moving source to in-memory tmpfs"
+ rsync --remove-source-files -a . ${TINKERMEM_PATH}
+ cd ..
+ rm -rf ${OLDPWD}
+ ln -s ${TINKERMEM_PATH} ${OLDPWD}
+ cd ${TINKERMEM_PATH}
fi
+touch gremlin-python/.glv
+
+ # use a custom maven settings.xml
+ if [ -r "settings.xml" ]; then
+ echo "Copying settings.xml"
+ mkdir -p ~/.m2
+ cp settings.xml ~/.m2/
+ fi
+
mvn clean install process-resources ${TINKERPOP_BUILD_OPTIONS} || exit 1
[ -z "${BUILD_JAVA_DOCS}" ] || mvn process-resources -Djavadoc || exit 1
[2/5] tinkerpop git commit: Fixed 'OTLP', was fixed in tp32 - CTR
Posted by rd...@apache.org.
Fixed 'OTLP', was fixed in tp32 - CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/4e8cb39d
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/4e8cb39d
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/4e8cb39d
Branch: refs/heads/master
Commit: 4e8cb39d4264a59cc07163c4458aa25c586fb0fa
Parents: b831ae8
Author: Robert Dale <ro...@gmail.com>
Authored: Wed Mar 29 11:49:31 2017 -0400
Committer: Robert Dale <ro...@gmail.com>
Committed: Wed Mar 29 11:49:31 2017 -0400
----------------------------------------------------------------------
docs/src/dev/provider/index.asciidoc | 4 ++--
docs/src/reference/the-graphcomputer.asciidoc | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4e8cb39d/docs/src/dev/provider/index.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/provider/index.asciidoc b/docs/src/dev/provider/index.asciidoc
index 3b46762..aa89020 100644
--- a/docs/src/dev/provider/index.asciidoc
+++ b/docs/src/dev/provider/index.asciidoc
@@ -52,7 +52,7 @@ Implementing Gremlin-Core
The classes that a graph system provider should focus on implementing are itemized below. It is a good idea to study
the link:http://tinkerpop.apache.org/docs/x.y.z/reference/#tinkergraph-gremlin[TinkerGraph] (in-memory OLTP and OLAP
in `tinkergraph-gremlin`), link:http://tinkerpop.apache.org/docs/x.y.z/reference/#neo4j-gremlin[Neo4jGraph]
-(OTLP w/ transactions in `neo4j-gremlin`) and/or
+(OLTP w/ transactions in `neo4j-gremlin`) and/or
link:http://tinkerpop.apache.org/docs/x.y.z/reference/#hadoop-gremlin[HadoopGraph] (OLAP in `hadoop-gremlin`)
implementations for ideas and patterns.
@@ -60,7 +60,7 @@ implementations for ideas and patterns.
.. Structure API: `Graph`, `Element`, `Vertex`, `Edge`, `Property` and `Transaction` (if transactions are supported).
.. Process API: `TraversalStrategy` instances for optimizing Gremlin traversals to the provider's graph system (i.e. `TinkerGraphStepStrategy`).
. Online Analytics Processing Graph Systems (*OLAP*)
- .. Everything required of OTLP is required of OLAP (but not vice versa).
+ .. Everything required of OLTP is required of OLAP (but not vice versa).
.. GraphComputer API: `GraphComputer`, `Messenger`, `Memory`.
Please consider the following implementation notes:
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4e8cb39d/docs/src/reference/the-graphcomputer.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/the-graphcomputer.asciidoc b/docs/src/reference/the-graphcomputer.asciidoc
index fb4331a..ef859f9 100644
--- a/docs/src/reference/the-graphcomputer.asciidoc
+++ b/docs/src/reference/the-graphcomputer.asciidoc
@@ -20,7 +20,7 @@ The GraphComputer
image:graphcomputer-puffers.png[width=350,float=right] TinkerPop3 provides two primary means of interacting with a
graph: link:http://en.wikipedia.org/wiki/Online_transaction_processing[online transaction processing] (OLTP) and
-link:http://en.wikipedia.org/wiki/Online_analytical_processing[online analytical processing] (OLAP). OTLP-based
+link:http://en.wikipedia.org/wiki/Online_analytical_processing[online analytical processing] (OLAP). OLTP-based
graph systems allow the user to query the graph in real-time. However, typically, real-time performance is only
possible when a local traversal is enacted. A local traversal is one that starts at a particular vertex (or small set
of vertices) and touches a small set of connected vertices (by any arbitrary path of arbitrary length). In short, OLTP
@@ -394,7 +394,7 @@ TraversalVertexProgram
image:traversal-vertex-program.png[width=250,float=left] The `TraversalVertexProgram` is a "special" VertexProgram in
that it can be executed via a `GraphTraversal` with a `ComputerTraversalEngine`. In Gremlin, it is possible to have
-the same traversal executed using either the standard OTLP-engine or the `GraphComputer` OLAP-engine. The difference
+the same traversal executed using either the standard OLTP-engine or the `GraphComputer` OLAP-engine. The difference
being where the traversal is submitted.
NOTE: This model of graph traversal in a BSP system was first implemented by the
[4/5] tinkerpop git commit: Merge branch 'tp31' into tp32
Posted by rd...@apache.org.
Merge branch 'tp31' into tp32
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a4a646d6
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a4a646d6
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a4a646d6
Branch: refs/heads/master
Commit: a4a646d680261a3e169962bbf016ef323ac8cd2d
Parents: 91802ad beb7f74
Author: Robert Dale <ro...@gmail.com>
Authored: Thu Mar 30 10:34:30 2017 -0400
Committer: Robert Dale <ro...@gmail.com>
Committed: Thu Mar 30 10:34:30 2017 -0400
----------------------------------------------------------------------
.gitignore | 1 +
docker/scripts/build.sh | 7 +++++++
docs/src/reference/the-graphcomputer.asciidoc | 1 +
3 files changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a4a646d6/.gitignore
----------------------------------------------------------------------
diff --cc .gitignore
index 33fb239,a4c1cdc..ca3160b
--- a/.gitignore
+++ b/.gitignore
@@@ -14,9 -14,5 +14,10 @@@ _bsp
doc/out
docs/*.asciidoc
ext/
+benchmarks/
+*$py.class
+__pycache__/
+*.py[cdo]
+__version__.py
.glv
+ settings.xml
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a4a646d6/docs/src/reference/the-graphcomputer.asciidoc
----------------------------------------------------------------------
diff --cc docs/src/reference/the-graphcomputer.asciidoc
index e4dff50,ef859f9..b03c891
--- a/docs/src/reference/the-graphcomputer.asciidoc
+++ b/docs/src/reference/the-graphcomputer.asciidoc
@@@ -313,8 -278,9 +313,9 @@@ public class PageRankVertexProgram impl
@Override
public String toString() {
- return StringFactory.vertexProgramString(this, "alpha=" + this.alpha + ",iterations=" + this.totalIterations);
+ return StringFactory.vertexProgramString(this, "alpha=" + this.alpha + ", iterations=" + this.totalIterations);
}
+ }
----
<1> `PageRankVertexProgram` implements `VertexProgram<Double>` because the messages it sends are Java doubles.
[3/5] tinkerpop git commit: Merge branch 'TINKERPOP-1659' into tp31
Posted by rd...@apache.org.
Merge branch 'TINKERPOP-1659' into tp31
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/beb7f748
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/beb7f748
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/beb7f748
Branch: refs/heads/master
Commit: beb7f7488227501f654a1735c29519268e5a1d34
Parents: 4e8cb39 ec066ca
Author: Robert Dale <ro...@gmail.com>
Authored: Thu Mar 30 10:12:30 2017 -0400
Committer: Robert Dale <ro...@gmail.com>
Committed: Thu Mar 30 10:12:30 2017 -0400
----------------------------------------------------------------------
.gitignore | 3 ++-
docker/scripts/build.sh | 7 +++++++
2 files changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------