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/24 14:02:26 UTC
[1/2] tinkerpop git commit: pushed updated graph_traversal.py from
template construction.
Repository: tinkerpop
Updated Branches:
refs/heads/master 7a262826e -> 374f83373
pushed updated graph_traversal.py from template construction.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/374f8337
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/374f8337
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/374f8337
Branch: refs/heads/master
Commit: 374f833732ffc413be5a5c63aa5b739237d54434
Parents: baa5ff4
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Fri Jul 14 11:22:49 2017 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Mon Jul 24 08:02:20 2017 -0600
----------------------------------------------------------------------
.../jython/gremlin_python/process/graph_traversal.py | 12 ------------
1 file changed, 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/374f8337/gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py
----------------------------------------------------------------------
diff --git a/gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py b/gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py
index fe8d2de..ea4afc6 100644
--- a/gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py
+++ b/gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py
@@ -416,10 +416,6 @@ class GraphTraversal(Traversal):
self.bytecode.add_step("select", *args)
return self
- def selectV3d2(self, *args):
- self.bytecode.add_step("selectV3d2", *args)
- return self
-
def sideEffect(self, *args):
self.bytecode.add_step("sideEffect", *args)
return self
@@ -780,10 +776,6 @@ class __(object):
return cls.graph_traversal(None, None, Bytecode()).select(*args)
@classmethod
- def selectV3d2(cls, *args):
- return cls.graph_traversal(None, None, Bytecode()).selectV3d2(*args)
-
- @classmethod
def sideEffect(cls, *args):
return cls.graph_traversal(None, None, Bytecode()).sideEffect(*args)
@@ -1133,10 +1125,6 @@ def select(*args):
return __.select(*args)
statics.add_static('select', select)
-def selectV3d2(*args):
- return __.selectV3d2(*args)
-statics.add_static('selectV3d2', selectV3d2)
-
def sideEffect(*args):
return __.sideEffect(*args)
statics.add_static('sideEffect', sideEffect)
[2/2] tinkerpop git commit: removed deprecated selectV3d0() select
step. Updated CHANGELOG and release notes accordingly.
Posted by ok...@apache.org.
removed deprecated selectV3d0() select step. Updated CHANGELOG and release notes accordingly.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/baa5ff49
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/baa5ff49
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/baa5ff49
Branch: refs/heads/master
Commit: baa5ff49a34c29c56183d40b59a8bd4fbf37b385
Parents: 7a26282
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Fri Jul 14 11:11:36 2017 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Mon Jul 24 08:02:20 2017 -0600
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
docs/src/upgrade/release-3.3.x.asciidoc | 4 +++-
.../traversal/dsl/graph/GraphTraversal.java | 23 --------------------
.../gremlin/process/traversal/dsl/graph/__.java | 16 --------------
4 files changed, 4 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/baa5ff49/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 9ea7826..66ebb8e 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -28,6 +28,7 @@ TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET)
* Bumped to support Spark 2.2.0.
* Detected if type checking was required in `GremlinGroovyScriptEngine` and disabled related infrastructure if not.
+* Removed previously deprecated `GraphTraversal.selectV3d0()` step.
* 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()`.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/baa5ff49/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 2f2f400..41c41c0 100644
--- a/docs/src/upgrade/release-3.3.x.asciidoc
+++ b/docs/src/upgrade/release-3.3.x.asciidoc
@@ -292,6 +292,7 @@ The following deprecated classes, methods or fields have been removed in this ve
** `org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal#addE(Direction, String, String, Object...)`
** `org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal#addOutE(String, String, Object...)`
** `org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal#addInV(String, String, Object...)`
+** `org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal#selectV3d2()`
** `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)`
@@ -417,7 +418,8 @@ link:https://issues.apache.org/jira/browse/TINKERPOP-1721[TINKERPOP-1721],
link:https://issues.apache.org/jira/browse/TINKERPOP-1719[TINKERPOP-1719],
link:https://issues.apache.org/jira/browse/TINKERPOP-1720[TINKERPOP-1720],
link:https://issues.apache.org/jira/browse/TINKERPOP-880[TINKERPOP-880],
-link:https://issues.apache.org/jira/browse/TINKERPOP-1170[TINKERPOP-1170]
+link:https://issues.apache.org/jira/browse/TINKERPOP-1170[TINKERPOP-1170],
+link:https://issues.apache.org/jira/browse/TINKERPOP-1729[TINKERPOP-1729]
Gremlin-server.sh and Init Scripts
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/baa5ff49/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 be46413..dcee467 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
@@ -732,29 +732,6 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
}
/**
- * @deprecated As of release 3.3.0, replaced by {@link GraphTraversal#select(Pop, String)} with {@link Pop#mixed}.
- */
- @Deprecated
- public default <E2> GraphTraversal<S, E2> selectV3d2(final String selectKey) {
- this.asAdmin().getBytecode().addStep(Symbols.selectV3d2, selectKey);
- return this.asAdmin().addStep(new SelectOneStep<>(this.asAdmin(), Pop.mixed, selectKey));
- }
-
- /**
- * @deprecated As of release 3.3.0, replaced by {@link GraphTraversal#select(Pop, String, String, String...)} with {@link Pop#mixed}.
- */
- @Deprecated
- public default <E2> GraphTraversal<S, Map<String, E2>> selectV3d2(final String selectKey1, final String selectKey2, String... otherSelectKeys) {
- final String[] selectKeys = new String[otherSelectKeys.length + 2];
- selectKeys[0] = selectKey1;
- selectKeys[1] = selectKey2;
- System.arraycopy(otherSelectKeys, 0, selectKeys, 2, otherSelectKeys.length);
- this.asAdmin().getBytecode().addStep(Symbols.selectV3d2, selectKey1, selectKey2, otherSelectKeys);
- return this.asAdmin().addStep(new SelectStep<>(this.asAdmin(), Pop.mixed, selectKeys));
- }
-
-
- /**
* A version of {@code select} that allows for the extraction of a {@link Column} from objects in the traversal.
*
* @param column the column to extract
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/baa5ff49/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 82c7651..a1b40e3 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
@@ -338,14 +338,6 @@ public class __ {
}
/**
- * @see GraphTraversal#selectV3d2(String)
- */
- @Deprecated
- public static <A, B> GraphTraversal<A, B> selectV3d2(final String selectKey) {
- return __.<A>start().selectV3d2(selectKey);
- }
-
- /**
* @see GraphTraversal#select(Pop, String, String, String...)
*/
public static <A, B> GraphTraversal<A, Map<String, B>> select(final Pop pop, final String selectKey1, final String selectKey2, final String... otherSelectKeys) {
@@ -360,14 +352,6 @@ public class __ {
}
/**
- * @see GraphTraversal#selectV3d2(String, String, String...)
- */
- @Deprecated
- public static <A, B> GraphTraversal<A, Map<String, B>> selectV3d2(final String selectKey1, final String selectKey2, final String... otherSelectKeys) {
- return __.<A>start().selectV3d2(selectKey1, selectKey2, otherSelectKeys);
- }
-
- /**
* @see GraphTraversal#unfold()
*/
public static <A> GraphTraversal<A, A> unfold() {