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 2017/07/12 23:44:07 UTC
[1/3] tinkerpop git commit: TinkerGraphPlay test had a use of the
sack() method.
Repository: tinkerpop
Updated Branches:
refs/heads/master 849563fe3 -> 625196624
TinkerGraphPlay test had a use of the sack() method.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/62519662
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/62519662
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/62519662
Branch: refs/heads/master
Commit: 6251966248ad9b6e2cc8d87c21fda0349cdd8b38
Parents: 736d192
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Mon Jul 10 14:04:23 2017 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Wed Jul 12 17:43:56 2017 -0600
----------------------------------------------------------------------
.../structure/TinkerGraphPlayTest.java | 29 --------------------
1 file changed, 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/62519662/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphPlayTest.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphPlayTest.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphPlayTest.java
index 37187fe..e3c20b5 100644
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphPlayTest.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphPlayTest.java
@@ -144,35 +144,6 @@ public class TinkerGraphPlayTest {
}
- @Test
- @Ignore
- public void testPlay() {
- Graph g = TinkerGraph.open();
- Vertex v1 = g.addVertex(T.id, "1", "animal", "males");
- Vertex v2 = g.addVertex(T.id, "2", "animal", "puppy");
- Vertex v3 = g.addVertex(T.id, "3", "animal", "mama");
- Vertex v4 = g.addVertex(T.id, "4", "animal", "puppy");
- Vertex v5 = g.addVertex(T.id, "5", "animal", "chelsea");
- Vertex v6 = g.addVertex(T.id, "6", "animal", "low");
- Vertex v7 = g.addVertex(T.id, "7", "animal", "mama");
- Vertex v8 = g.addVertex(T.id, "8", "animal", "puppy");
- Vertex v9 = g.addVertex(T.id, "9", "animal", "chula");
-
- v1.addEdge("link", v2, "weight", 2f);
- v2.addEdge("link", v3, "weight", 3f);
- v2.addEdge("link", v4, "weight", 4f);
- v2.addEdge("link", v5, "weight", 5f);
- v3.addEdge("link", v6, "weight", 1f);
- v4.addEdge("link", v6, "weight", 2f);
- v5.addEdge("link", v6, "weight", 3f);
- v6.addEdge("link", v7, "weight", 2f);
- v6.addEdge("link", v8, "weight", 3f);
- v7.addEdge("link", v9, "weight", 1f);
- v8.addEdge("link", v9, "weight", 7f);
-
- g.traversal().withSack(Float.MIN_VALUE).V(v1).repeat(outE().sack(Operator.max, "weight").inV()).times(5).sack().forEachRemaining(x -> logger.info(x.toString()));
- }
-
/* @Test
public void testTraversalDSL() throws Exception {
Graph g = TinkerFactory.createClassic();
[2/3] tinkerpop git commit: I swear I did this already... weird.
pushing removed tests for deprecated sack() method.
Posted by ok...@apache.org.
I swear I did this already... weird. pushing removed tests for deprecated sack() method.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/736d1921
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/736d1921
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/736d1921
Branch: refs/heads/master
Commit: 736d192195ca55020cc805ff9038d853c5ef77e9
Parents: 18eacfd
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Mon Jul 10 13:59:03 2017 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Wed Jul 12 17:43:56 2017 -0600
----------------------------------------------------------------------
.../traversal/step/sideEffect/SackTest.java | 35 --------------------
1 file changed, 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/736d1921/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SackTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SackTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SackTest.java
index 07cc143..3d63910 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SackTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SackTest.java
@@ -56,12 +56,6 @@ public abstract class SackTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, Double> get_g_withSackX0X_V_repeatXoutE_sackXsumX_byXweightX_inVX_timesX2X_sack();
- @Deprecated
- public abstract Traversal<Vertex, Double> get_g_withSackX0X_V_outE_sackXsum_weightX_inV_sack_sum();
-
- @Deprecated
- public abstract Traversal<Vertex, Double> get_g_withSackX0X_V_repeatXoutE_sackXsum_weightX_inVX_timesX2X_sack();
-
public abstract Traversal<Vertex, Map> get_g_withSackXmap__map_cloneX_V_out_out_sackXmap_a_nameX_sack();
public abstract Traversal<Vertex, Double> get_g_withSackX1_sumX_VX1X_localXoutXknowsX_barrierXnormSackXX_inXknowsX_barrier_sack(final Object v1Id);
@@ -90,16 +84,6 @@ public abstract class SackTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
- @Deprecated
- public void g_withSackX0X_V_outE_sackXsum_weightX_inV_sack_sum() {
- final Traversal<Vertex, Double> traversal = get_g_withSackX0X_V_outE_sackXsum_weightX_inV_sack_sum();
- printTraversalForm(traversal);
- assertEquals(3.5d, traversal.next(), 0.00001d);
- assertFalse(traversal.hasNext());
- }
-
- @Test
- @LoadGraphWith(MODERN)
public void g_withSackX0X_V_repeatXoutE_sackXsumX_byXweightX_inVX_timesX2X_sack() {
final Traversal<Vertex, Double> traversal = get_g_withSackX0X_V_repeatXoutE_sackXsumX_byXweightX_inVX_timesX2X_sack();
printTraversalForm(traversal);
@@ -108,15 +92,6 @@ public abstract class SackTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
- @Deprecated
- public void g_withSackX0X_V_repeatXoutE_sackXsum_weightX_inVX_timesX2X_sack() {
- final Traversal<Vertex, Double> traversal = get_g_withSackX0X_V_repeatXoutE_sackXsum_weightX_inVX_timesX2X_sack();
- printTraversalForm(traversal);
- checkResults(Arrays.asList(2.0d, 1.4d), traversal);
- }
-
- @Test
- @LoadGraphWith(MODERN)
public void g_withSackXmap__map_cloneX_V_out_out_sackXmap_a_nameX_sack() {
final Traversal<Vertex, Map> traversal = get_g_withSackXmap__map_cloneX_V_out_out_sackXmap_a_nameX_sack();
printTraversalForm(traversal);
@@ -186,16 +161,6 @@ public abstract class SackTest extends AbstractGremlinProcessTest {
}
@Override
- public Traversal<Vertex, Double> get_g_withSackX0X_V_outE_sackXsum_weightX_inV_sack_sum() {
- return g.withSack(0.0d).V().outE().sack(sum, "weight").inV().sack().sum();
- }
-
- @Override
- public Traversal<Vertex, Double> get_g_withSackX0X_V_repeatXoutE_sackXsum_weightX_inVX_timesX2X_sack() {
- return g.withSack(0.0d).V().repeat(outE().sack(sum, "weight").inV()).times(2).sack();
- }
-
- @Override
public Traversal<Vertex, Map> get_g_withSackXmap__map_cloneX_V_out_out_sackXmap_a_nameX_sack() {
return g.<HashMap>withSack(HashMap::new, m -> (HashMap) m.clone()).V().out().out().<Map, Vertex>sack((map, vertex) -> {
map.put("a", vertex.value("name"));
[3/3] tinkerpop git commit: removed deprecated sack() function.
Posted by ok...@apache.org.
removed deprecated sack() function.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/18eacfdc
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/18eacfdc
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/18eacfdc
Branch: refs/heads/master
Commit: 18eacfdc015621c7127fb7ad495b36c84d70d47e
Parents: 849563f
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Mon Jul 10 13:52:09 2017 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Wed Jul 12 17:43:56 2017 -0600
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
docs/src/upgrade/release-3.3.x.asciidoc | 7 ++++++-
.../gremlin/process/traversal/dsl/graph/GraphTraversal.java | 9 ---------
.../tinkerpop/gremlin/process/traversal/dsl/graph/__.java | 8 --------
4 files changed, 7 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/18eacfdc/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 31ea10e..ca690ab 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -29,6 +29,7 @@ TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET)
* Removed previously deprecated `DetachedEdge(Object,String,Map,Pair,Pair)` constructor.
* Removed previously deprecated `Bindings` constructor. It is now a private constructor.
* Removed previously deprecated `TraversalSource.withBindings()`.
+* Removed previously deprecated `GraphTraversal.sack(BiFunction,String)`.
* Established the Gryo 3.0 format.
* `GryoVersion` now includes a default `ClassResolver` to supply to the `GryoMapper`.
* `GryoClassResolver` renamed to `GryoClassResolverV1d0` which has an abstract class that for providers to extend in `AbstractGryoClassResolver`.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/18eacfdc/docs/src/upgrade/release-3.3.x.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/upgrade/release-3.3.x.asciidoc b/docs/src/upgrade/release-3.3.x.asciidoc
index f1b3693..74b9c55 100644
--- a/docs/src/upgrade/release-3.3.x.asciidoc
+++ b/docs/src/upgrade/release-3.3.x.asciidoc
@@ -216,6 +216,7 @@ The following deprecated classes, methods or fields have been removed in this ve
** `org.apache.tinkerpop.gremlin.process.traversal.util.OrP(P...)`
** `org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptFunction`
** `org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptHelper`
+<<<<<<< 849563fe3773d504d6ba2f61ee640547277760de
** `org.apache.tinkerpop.gremlin.process.traversal.Order.keyIncr`
** `org.apache.tinkerpop.gremlin.process.traversal.Order.valueIncr`
** `org.apache.tinkerpop.gremlin.process.traversal.Order.keyDecr`
@@ -229,6 +230,9 @@ The following deprecated classes, methods or fields have been removed in this ve
** `org.apache.tinkerpop.gremlin.process.traversal.Bindings()`
** `org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource#withBindings(Bindings)`
** `org.apache.tinkerpop.gremlin.structure.Transaction.submit(Function)`
+=======
+** `org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal#sack(BiFunction,String)`
+>>>>>>> removed deprecated sack() function.
** `org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#supportsAddProperty()`
** `org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#FEATURE_ADD_PROPERTY`
** `org.apache.tinkerpop.gremlin.structure.Graph.OptIn#SUITE_GROOVY_PROCESS_STANDARD`
@@ -326,7 +330,8 @@ link:https://issues.apache.org/jira/browse/TINKERPOP-1700[TINKERPOP-1700],
link:https://issues.apache.org/jira/browse/TINKERPOP-1142[TINKERPOP-1142],
link:https://issues.apache.org/jira/browse/TINKERPOP-1291[TINKERPOP-1291],
link:https://issues.apache.org/jira/browse/TINKERPOP-832[TINKERPOP-832],
-link:https://issues.apache.org/jira/browse/TINKERPOP-1721[TINKERPOP-1721]
+link:https://issues.apache.org/jira/browse/TINKERPOP-1721[TINKERPOP-1721],
+link:https://issues.apache.org/jira/browse/TINKERPOP-834[TINKERPOP-834]
Gremlin-server.sh and Init Scripts
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/18eacfdc/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
index 182bd5f..b038bee 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
@@ -1950,15 +1950,6 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
}
/**
- * @since 3.0.0-incubating
- * @deprecated As of release 3.1.0, replaced by {@link #sack(BiFunction)} with {@link #by(String)}.
- */
- @Deprecated
- public default <V, U> GraphTraversal<S, E> sack(final BiFunction<V, U, V> sackOperator, final String elementPropertyKey) {
- return this.sack(sackOperator).by(elementPropertyKey);
- }
-
- /**
* Lazily aggregates objects in the stream into a side-effect collection.
*
* @param sideEffectKey the name of the side-effect key that will hold the aggregate
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/18eacfdc/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java
index 73acf13..142fd19 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java
@@ -920,14 +920,6 @@ public class __ {
}
/**
- * @deprecated As of release 3.1.0, replaced by {@link #sack(BiFunction)}.
- */
- @Deprecated
- public static <A, V, U> GraphTraversal<A, A> sack(final BiFunction<V, U, V> sackOperator, final String elementPropertyKey) {
- return __.<A>start().sack(sackOperator, elementPropertyKey);
- }
-
- /**
* @see GraphTraversal#store(String)
*/
public static <A> GraphTraversal<A, A> store(final String sideEffectKey) {