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 2016/10/25 12:08:04 UTC
[1/7] tinkerpop git commit: Update the release email template to
include pypi notice CTR
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1507 0fec46db2 -> 2817c01c1
Update the release email template to include pypi notice CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/e73ec41f
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e73ec41f
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/e73ec41f
Branch: refs/heads/TINKERPOP-1507
Commit: e73ec41fd3bda3223dfbb092c42ddee624fb756e
Parents: 1148e82
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Oct 21 15:40:53 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Oct 21 15:40:53 2016 -0400
----------------------------------------------------------------------
docs/src/dev/developer/release.asciidoc | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e73ec41f/docs/src/dev/developer/release.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/release.asciidoc b/docs/src/dev/developer/release.asciidoc
index 0465419..ec1fdf6 100644
--- a/docs/src/dev/developer/release.asciidoc
+++ b/docs/src/dev/developer/release.asciidoc
@@ -316,5 +316,9 @@ The Central Maven repo has sync'd as well:
https://repo1.maven.org/maven2/org/apache/tinkerpop/tinkerpop/xx.yy.zz/
+Python artifacts have also been deployed to pypi:
+
+https://pypi.python.org/pypi/gremlinpython/xx.yy.zz
+
[include the release line logo image]
----
[5/7] tinkerpop git commit: fixed a severe bug where GraphComputer
strategies were not being loaded until the second usage of the traversal
source -- had to do with when static{} code blocks are initialized. dar.
sucks. Work around is for the user to sim
Posted by ok...@apache.org.
fixed a severe bug where GraphComputer strategies were not being loaded until the second usage of the traversal source -- had to do with when static{} code blocks are initialized. dar. sucks. Work around is for the user to simply do SparkGraphComputer.class in their code prior to using SparkGraphComputer (or whatever XXXGraphComptuer with registered strategies).
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b262c7ec
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b262c7ec
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b262c7ec
Branch: refs/heads/TINKERPOP-1507
Commit: b262c7ec475c2541d3f9af22fc9f9f57efa290a5
Parents: 7bb0c90
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Mon Oct 24 15:46:11 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Mon Oct 24 15:46:11 2016 -0600
----------------------------------------------------------------------
CHANGELOG.asciidoc | 4 ++--
.../traversal/strategy/decoration/VertexProgramStrategy.java | 5 +++++
2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b262c7ec/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 04b642e..4dee4c2 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -23,10 +23,10 @@ TinkerPop 3.2.0 (Nine Inch Gremlins)
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/images/nine-inch-gremlins.png[width=185]
[[release-3-2-4]]
-TinkerPop 3.2.5 (Release Date: NOT OFFICIALLY RELEASED YET)
+TinkerPop 3.2.4 (Release Date: NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
+* Fixed a severe bug where `GraphComputer` strategies are not being loaded until the second use of the traversal source.
[[release-3-2-3]]
TinkerPop 3.2.3 (Release Date: October 17, 2016)
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b262c7ec/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/strategy/decoration/VertexProgramStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/strategy/decoration/VertexProgramStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/strategy/decoration/VertexProgramStrategy.java
index 89e40cb..0eeae3c 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/strategy/decoration/VertexProgramStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/strategy/decoration/VertexProgramStrategy.java
@@ -171,6 +171,11 @@ public final class VertexProgramStrategy extends AbstractTraversalStrategy<Trave
}
} else
graphComputerClass = this.computer.getGraphComputerClass();
+ try {
+ Class.forName(graphComputerClass.getCanonicalName());
+ } catch (final ClassNotFoundException e) {
+ throw new IllegalStateException(e.getMessage(), e);
+ }
final List<TraversalStrategy<?>> graphComputerStrategies = TraversalStrategies.GlobalCache.getStrategies(graphComputerClass).toList();
traversalSource.getStrategies().addStrategies(graphComputerStrategies.toArray(new TraversalStrategy[graphComputerStrategies.size()]));
}
[2/7] tinkerpop git commit: Removed some test settings that were not
longer relevant CTR
Posted by ok...@apache.org.
Removed some test settings that were not longer relevant CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/3e6433bb
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/3e6433bb
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/3e6433bb
Branch: refs/heads/TINKERPOP-1507
Commit: 3e6433bbb62c848975a869f4691a1c92d9e2266f
Parents: e73ec41
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Oct 21 15:54:04 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Oct 21 15:54:04 2016 -0400
----------------------------------------------------------------------
.../server/GremlinServerIntegrateTest.java | 18 ------------------
1 file changed, 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3e6433bb/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
index 9bc6cd9..9ab1f0d 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
@@ -18,8 +18,6 @@
*/
package org.apache.tinkerpop.gremlin.server;
-import java.io.File;
-
import io.netty.handler.ssl.SslContext;
import io.netty.handler.ssl.SslContextBuilder;
import io.netty.handler.ssl.SslProvider;
@@ -56,8 +54,6 @@ import org.apache.tinkerpop.gremlin.process.traversal.step.util.BulkSet;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.T;
import org.apache.tinkerpop.gremlin.server.channel.NioChannelizer;
-import org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor;
-import org.apache.tinkerpop.gremlin.structure.util.Host;
import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex;
import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
import org.apache.tinkerpop.gremlin.util.Log4jRecordingAppender;
@@ -96,7 +92,6 @@ import static org.hamcrest.core.StringEndsWith.endsWith;
import static org.hamcrest.core.StringStartsWith.startsWith;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertFalse;
import static org.junit.Assert.fail;
import static org.junit.Assume.assumeThat;
import static org.junit.Assert.assertEquals;
@@ -168,19 +163,6 @@ public class GremlinServerIntegrateTest extends AbstractGremlinServerIntegration
break;
case "shouldStartWithDefaultSettings":
return new Settings();
- case "shouldHaveTheSessionTimeout":
- settings.processors.clear();
- final Settings.ProcessorSettings processorSettings = new Settings.ProcessorSettings();
- processorSettings.className = SessionOpProcessor.class.getCanonicalName();
- processorSettings.config = new HashMap<>();
- processorSettings.config.put(SessionOpProcessor.CONFIG_SESSION_TIMEOUT, 3000L);
- settings.processors.add(processorSettings);
- break;
- case "shouldExecuteInSessionAndSessionlessWithoutOpeningTransactionWithSingleClient":
- case "shouldExecuteInSessionWithTransactionManagement":
- deleteDirectory(new File("/tmp/neo4j"));
- settings.graphs.put("graph", "conf/neo4j-empty.properties");
- break;
case "shouldUseSimpleSandbox":
settings.scriptEngines.get("gremlin-groovy").config = getScriptEngineConfForSimpleSandbox();
break;
[4/7] tinkerpop git commit: Merge branch 'tp31' into tp32
Posted by ok...@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/7bb0c90a
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/7bb0c90a
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/7bb0c90a
Branch: refs/heads/TINKERPOP-1507
Commit: 7bb0c90a0bfe147ffb0037dfff916e1c6644583b
Parents: 3e6433b 52ae785
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Oct 24 06:25:45 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Oct 24 06:25:45 2016 -0400
----------------------------------------------------------------------
docs/src/reference/the-traversal.asciidoc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7bb0c90a/docs/src/reference/the-traversal.asciidoc
----------------------------------------------------------------------
diff --cc docs/src/reference/the-traversal.asciidoc
index c657d01,0c7ffef..c5c30a3
--- a/docs/src/reference/the-traversal.asciidoc
+++ b/docs/src/reference/the-traversal.asciidoc
@@@ -2647,39 -2403,12 +2647,39 @@@ SubgraphStrateg
[gremlin-groovy]
----
-graph = TinkerFactory.createModern()
-strategy = SubgraphStrategy.build().edgeCriterion(hasId(8,9,10)).create()
-g = GraphTraversalSource.build().with(strategy).create(graph)
-g.V() // shows all vertices as no filter for vertices was specified
-g.E() // shows only the edges defined in the edgeCriterion
+graph = TinkerFactory.createTheCrew()
+g = graph.traversal()
+g.V().as('a').values('location').as('b'). <1>
+ select('a','b').by('name').by()
+g = g.withStrategies(SubgraphStrategy.build().vertexProperties(hasNot('endTime')).create()) <2>
+g.V().as('a').values('location').as('b'). <3>
+ select('a','b').by('name').by()
+g.V().as('a').values('location').as('b').
+ select('a','b').by('name').by().explain()
----
-This strategy is implemented such that the vertices attached to an `Edge` must both satisfy the `vertexCriterion`
+<1> Get all vertices and their vertex property locations.
+<2> Create a `SubgraphStrategy` where vertex properties must not have an `endTime`-property (thus, the current location).
+<3> Get all vertices and their current vertex property locations.
+
+IMPORTANT: This strategy is implemented such that the vertices attached to an `Edge` must both satisfy the vertex criterion
(if present) in order for the `Edge` to be considered a part of the subgraph.
+
+The example below uses all three filters: vertex, edge, and vertex property. People vertices must have lived in more than three places,
+edges must be labeled "develops," and vertex properties must be the persons current location or a non-location property.
+
+[gremlin-groovy]
+----
+graph = TinkerFactory.createTheCrew()
+g = graph.traversal().withStrategies(SubgraphStrategy.build().
+ vertices(or(hasNot('location'),properties('location').count().is(gt(3)))).
+ edges(hasLabel('develops')).
+ vertexProperties(or(hasLabel(neq('location')),hasNot('endTime'))).create())
+g.V().valueMap(true)
+g.E().valueMap(true)
+g.V().outE().inV().
+ path().
+ by('name').
+ by().
+ by('name')
- ----
++----
[7/7] tinkerpop git commit: added Pick to the io graphson.asciidoc
docs. updated CHANGELOG.
Posted by ok...@apache.org.
added Pick to the io graphson.asciidoc docs. updated CHANGELOG.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/2817c01c
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/2817c01c
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/2817c01c
Branch: refs/heads/TINKERPOP-1507
Commit: 2817c01c1ea1a8fdb17c8f3bd8a9149585926b0d
Parents: fc6ce29
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue Oct 25 06:08:00 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Oct 25 06:08:00 2016 -0600
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
docs/src/dev/io/graphson.asciidoc | 1 +
2 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2817c01c/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 4dee4c2..d2cd065 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
TinkerPop 3.2.4 (Release Date: NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Added `Pick.none` and `Pick.any` to the serializers and importers.
* Fixed a severe bug where `GraphComputer` strategies are not being loaded until the second use of the traversal source.
[[release-3-2-3]]
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2817c01c/docs/src/dev/io/graphson.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/io/graphson.asciidoc b/docs/src/dev/io/graphson.asciidoc
index 511a0fc..5858b95 100644
--- a/docs/src/dev/io/graphson.asciidoc
+++ b/docs/src/dev/io/graphson.asciidoc
@@ -149,6 +149,7 @@ file.withWriter { writer ->
writer.write(toJson(Operator.sum, "Operator"))
writer.write(toJson(Order.incr, "Order"))
writer.write(toJson(Pop.all, "Pop"))
+ writer.write(toJson(Pick.any, "Pick"))
writer.write(toJson(org.apache.tinkerpop.gremlin.util.function.Lambda.function("{ it.get() }"), "Lambda"))
tm = g.V().hasLabel('person').out().out().tree().profile().next()
metrics = new org.apache.tinkerpop.gremlin.process.traversal.util.MutableMetrics(tm.getMetrics(0));
[6/7] tinkerpop git commit: Merge branch 'tp32' into TINKERPOP-1507
Posted by ok...@apache.org.
Merge branch 'tp32' into TINKERPOP-1507
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/fc6ce291
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/fc6ce291
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/fc6ce291
Branch: refs/heads/TINKERPOP-1507
Commit: fc6ce2917b5850e3538acd098030371a21e4a441
Parents: 0fec46d b262c7e
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue Oct 25 06:05:25 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Oct 25 06:05:25 2016 -0600
----------------------------------------------------------------------
CHANGELOG.asciidoc | 4 ++--
docs/src/dev/developer/release.asciidoc | 4 ++++
docs/src/reference/the-traversal.asciidoc | 4 ++--
.../decoration/VertexProgramStrategy.java | 5 +++++
.../server/GremlinServerIntegrateTest.java | 18 ------------------
5 files changed, 13 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
[3/7] tinkerpop git commit: Fix minor grammatical error in reference
docs. CTR
Posted by ok...@apache.org.
Fix minor grammatical error in reference docs. CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/52ae7852
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/52ae7852
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/52ae7852
Branch: refs/heads/TINKERPOP-1507
Commit: 52ae78524287e82a6c0853473159549616c72fca
Parents: d68f7cb
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Oct 24 06:25:16 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Oct 24 06:25:16 2016 -0400
----------------------------------------------------------------------
docs/src/reference/the-traversal.asciidoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/52ae7852/docs/src/reference/the-traversal.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/the-traversal.asciidoc b/docs/src/reference/the-traversal.asciidoc
index 3530be3..0c7ffef 100644
--- a/docs/src/reference/the-traversal.asciidoc
+++ b/docs/src/reference/the-traversal.asciidoc
@@ -2100,7 +2100,7 @@ supplier yields a single traverser to continue to the next step. Examples includ
In Gremlin OLAP (see <<traversalvertexprogram,`TraversalVertexProgram`>>), a barrier is introduced at the end of
every <<vertex-steps,adjacent vertex step>>. This means that the traversal does its best to compute as much as
-possible at the current, local vertex. What is can't compute without referencing an adjacent vertex is aggregated
+possible at the current, local vertex. What it can't compute without referencing an adjacent vertex is aggregated
into a barrier collection. When there are no more traversers at the local vertex, the barriered traversers are the
messages that are propagated to remote vertices for further processing.