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/11/23 01:47:40 UTC
[02/50] [abbrv] tinkerpop git commit: per @spmallette instructions,
selectV3d0 should be called selectV3d2. Changed and rebuilt.
per @spmallette instructions, selectV3d0 should be called selectV3d2. Changed and rebuilt.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/189d4f4a
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/189d4f4a
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/189d4f4a
Branch: refs/heads/TINKERPOP-1520
Commit: 189d4f4a175474225fc0cc37423eb50dd23816b9
Parents: cd591d6
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue Nov 15 06:58:45 2016 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Nov 15 06:58:58 2016 -0700
----------------------------------------------------------------------
docs/src/upgrade/release-3.3.x.asciidoc | 4 +++-
.../process/traversal/dsl/graph/GraphTraversal.java | 10 +++++-----
.../gremlin/process/traversal/dsl/graph/__.java | 12 ++++++------
.../jython/gremlin_python/process/graph_traversal.py | 14 +++++++-------
4 files changed, 21 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/189d4f4a/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 74062ff..b05ccff 100644
--- a/docs/src/upgrade/release-3.3.x.asciidoc
+++ b/docs/src/upgrade/release-3.3.x.asciidoc
@@ -42,11 +42,13 @@ it is rare for repeated labels to be used in practice. However, formal backwards
Assuming that `x` is not a `Pop` argument:
-1. Change all `select(x,y,z)` calls to `selectV3d0(x,y,z)` calls.
+1. Change all `select(x,y,z)` calls to `selectV3d2(x,y,z)` calls.
2. Change all `select(x,y,z)`-step calls to `select(Pop.mixed,x,y,z)`.
If an explicit `Pop` argument is provided, then no changes are required.
+See: https://issues.apache.org/jira/browse/TINKERPOP-1541[TINKERPOP-1541]
+
OptionalStep and Side-Effects
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/189d4f4a/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 2fcfb2e..b43d595 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
@@ -640,8 +640,8 @@ 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> selectV3d0(final String selectKey) {
- this.asAdmin().getBytecode().addStep(Symbols.selectV3d0, selectKey);
+ 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));
}
@@ -649,12 +649,12 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
* @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>> selectV3d0(final String selectKey1, final String selectKey2, String... otherSelectKeys) {
+ 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.selectV3d0, selectKey1, selectKey2, otherSelectKeys);
+ this.asAdmin().getBytecode().addStep(Symbols.selectV3d2, selectKey1, selectKey2, otherSelectKeys);
return this.asAdmin().addStep(new SelectStep<>(this.asAdmin(), Pop.mixed, selectKeys));
}
@@ -1577,7 +1577,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
public static final String propertyMap = "propertyMap";
public static final String valueMap = "valueMap";
public static final String select = "select";
- public static final String selectV3d0 = "selectV3d0";
+ public static final String selectV3d2 = "selectV3d2";
public static final String key = "key";
public static final String value = "value";
public static final String path = "path";
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/189d4f4a/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 731d6cc..2e0831a 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
@@ -353,11 +353,11 @@ public class __ {
}
/**
- * @see GraphTraversal#selectV3d0(String)
+ * @see GraphTraversal#selectV3d2(String)
*/
@Deprecated
- public static <A, B> GraphTraversal<A, B> selectV3d0(final String selectKey) {
- return __.<A>start().selectV3d0(selectKey);
+ public static <A, B> GraphTraversal<A, B> selectV3d2(final String selectKey) {
+ return __.<A>start().selectV3d2(selectKey);
}
/**
@@ -375,11 +375,11 @@ public class __ {
}
/**
- * @see GraphTraversal#selectV3d0(String, String, String...)
+ * @see GraphTraversal#selectV3d2(String, String, String...)
*/
@Deprecated
- public static <A, B> GraphTraversal<A, Map<String, B>> selectV3d0(final String selectKey1, final String selectKey2, final String... otherSelectKeys) {
- return __.<A>start().selectV3d0(selectKey1, selectKey2, otherSelectKeys);
+ 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);
}
/**
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/189d4f4a/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 354cabe..7e5fdbc 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
@@ -333,8 +333,8 @@ class GraphTraversal(Traversal):
def select(self, *args):
self.bytecode.add_step("select", *args)
return self
- def selectV3d0(self, *args):
- self.bytecode.add_step("selectV3d0", *args)
+ def selectV3d2(self, *args):
+ self.bytecode.add_step("selectV3d2", *args)
return self
def sideEffect(self, *args):
self.bytecode.add_step("sideEffect", *args)
@@ -616,8 +616,8 @@ class __(object):
def select(*args):
return GraphTraversal(None, None, Bytecode()).select(*args)
@staticmethod
- def selectV3d0(*args):
- return GraphTraversal(None, None, Bytecode()).selectV3d0(*args)
+ def selectV3d2(*args):
+ return GraphTraversal(None, None, Bytecode()).selectV3d2(*args)
@staticmethod
def sideEffect(*args):
return GraphTraversal(None, None, Bytecode()).sideEffect(*args)
@@ -1040,10 +1040,10 @@ def select(*args):
statics.add_static('select', select)
-def selectV3d0(*args):
- return __.selectV3d0(*args)
+def selectV3d2(*args):
+ return __.selectV3d2(*args)
-statics.add_static('selectV3d0', selectV3d0)
+statics.add_static('selectV3d2', selectV3d2)
def sideEffect(*args):
return __.sideEffect(*args)