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 13:56:40 UTC
[1/3] tinkerpop git commit: removed deprecated Order enums keyDecr,
valueDecr, keyIncr,
and valueIncr. These were replaced long ago by Column.keys and Column.values
using respective Order.incr and Order.decr ordering enums.
Repository: tinkerpop
Updated Branches:
refs/heads/master 144441a04 -> 4203bd867
removed deprecated Order enums keyDecr, valueDecr, keyIncr, and valueIncr. These were replaced long ago by Column.keys and Column.values using respective Order.incr and Order.decr ordering enums.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ae100b30
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ae100b30
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ae100b30
Branch: refs/heads/master
Commit: ae100b3083e9a9d5b323b47ea11d31c1f1e5b92a
Parents: c3cfaea
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Mon Jul 10 08:54:52 2017 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Mon Jul 10 08:54:52 2017 -0600
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
docs/src/upgrade/release-3.3.x.asciidoc | 4 ++
.../gremlin/process/traversal/Order.java | 61 --------------------
3 files changed, 5 insertions(+), 61 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ae100b30/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index bfdd43d..2486b94 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Removed previously deprecatd `Order` enums of `keyIncr`, `keyDecr`, `valueIncr`, and `valueDecr.`
* Removed previously deprecated `TraversalSource.Builder` class.
* Removed previously deprecated `ConnectiveP`, `AndP`, `OrP` constructors.
* Removed previously deprecated `TraversalScriptFunction` class.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ae100b30/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 d729da8..3f12891 100644
--- a/docs/src/upgrade/release-3.3.x.asciidoc
+++ b/docs/src/upgrade/release-3.3.x.asciidoc
@@ -211,6 +211,10 @@ 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`
+** `org.apache.tinkerpop.gremlin.process.traversal.Order.keyIncr`
+** `org.apache.tinkerpop.gremlin.process.traversal.Order.valueIncr`
+** `org.apache.tinkerpop.gremlin.process.traversal.Order.keyDecr`
+** `org.apache.tinkerpop.gremlin.process.traversal.Order.valueIncr`
** `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`
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ae100b30/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java
index 4e3801a..ce69715 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java
@@ -19,7 +19,6 @@
package org.apache.tinkerpop.gremlin.process.traversal;
import java.util.Comparator;
-import java.util.Map;
import java.util.Random;
/**
@@ -47,66 +46,6 @@ public enum Order implements Comparator<Object> {
public Order reversed() {
return incr;
}
- },
- /**
- * @deprecated Use {@link org.apache.tinkerpop.gremlin.structure.Column#keys};
- */
- @Deprecated
- keyIncr {
- @Override
- public int compare(final Object first, final Object second) {
- return Comparator.<Comparable>naturalOrder().compare(((Map.Entry<Comparable, ?>) first).getKey(), ((Map.Entry<Comparable, ?>) second).getKey());
- }
-
- @Override
- public Order reversed() {
- return keyDecr;
- }
- },
- /**
- * @deprecated Use {@link org.apache.tinkerpop.gremlin.structure.Column#values};
- */
- @Deprecated
- valueIncr {
- @Override
- public int compare(final Object first, final Object second) {
- return Comparator.<Comparable>naturalOrder().compare(((Map.Entry<?, Comparable>) first).getValue(), ((Map.Entry<?, Comparable>) second).getValue());
- }
-
- @Override
- public Order reversed() {
- return valueDecr;
- }
- },
- /**
- * @deprecated Use {@link org.apache.tinkerpop.gremlin.structure.Column#keys};
- */
- @Deprecated
- keyDecr {
- @Override
- public int compare(final Object first, final Object second) {
- return Comparator.<Comparable>reverseOrder().compare(((Map.Entry<Comparable, ?>) first).getKey(), ((Map.Entry<Comparable, ?>) second).getKey());
- }
-
- @Override
- public Order reversed() {
- return keyIncr;
- }
- },
- /**
- * @deprecated Use {@link org.apache.tinkerpop.gremlin.structure.Column#values};
- */
- @Deprecated
- valueDecr {
- @Override
- public int compare(final Object first, final Object second) {
- return Comparator.<Comparable>reverseOrder().compare(((Map.Entry<?, Comparable>) first).getValue(), ((Map.Entry<?, Comparable>) second).getValue());
- }
-
- @Override
- public Order reversed() {
- return valueIncr;
- }
}, shuffle {
@Override
public int compare(final Object first, final Object second) {
[3/3] tinkerpop git commit: added link: to release notes and fixed
conflicts in CHANGELOG.
Posted by ok...@apache.org.
added link: to release notes and fixed conflicts in CHANGELOG.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/4203bd86
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/4203bd86
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/4203bd86
Branch: refs/heads/master
Commit: 4203bd867718913d4c0d823fd11de5d4a106d345
Parents: 144441a 8cf3173
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Wed Jul 12 07:56:27 2017 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Wed Jul 12 07:56:27 2017 -0600
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
docs/src/upgrade/release-3.3.x.asciidoc | 7 ++-
.../gremlin/process/traversal/Order.java | 61 --------------------
.../jython/gremlin_python/process/traversal.py | 6 +-
4 files changed, 8 insertions(+), 67 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4203bd86/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --cc CHANGELOG.asciidoc
index 8c08d5d,2486b94..7fe3636
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -26,9 -26,7 +26,10 @@@ image::https://raw.githubusercontent.co
TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* 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`.
+ * Removed previously deprecatd `Order` enums of `keyIncr`, `keyDecr`, `valueIncr`, and `valueDecr.`
* Removed previously deprecated `TraversalSource.Builder` class.
* Removed previously deprecated `ConnectiveP`, `AndP`, `OrP` constructors.
* Removed previously deprecated `TraversalScriptFunction` class.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4203bd86/docs/src/upgrade/release-3.3.x.asciidoc
----------------------------------------------------------------------
diff --cc docs/src/upgrade/release-3.3.x.asciidoc
index e02bc6e,3f12891..3b73242
--- a/docs/src/upgrade/release-3.3.x.asciidoc
+++ b/docs/src/upgrade/release-3.3.x.asciidoc
@@@ -309,7 -308,7 +313,8 @@@ link:https://issues.apache.org/jira/bro
link:https://issues.apache.org/jira/browse/TINKERPOP-1622[TINKERPOP-1622],
link:https://issues.apache.org/jira/browse/TINKERPOP-1651[TINKERPOP-1651],
link:https://issues.apache.org/jira/browse/TINKERPOP-1694[TINKERPOP-1694],
--link:https://issues.apache.org/jira/browse/TINKERPOP-1700[TINKERPOP-1700]
++link:https://issues.apache.org/jira/browse/TINKERPOP-1700[TINKERPOP-1700],
++link:https://issues.apache.org/jira/browse/TINKERPOP-1142[TINKERPOP-1142]
Gremlin-server.sh and Init Scripts
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
[2/3] tinkerpop git commit: removed valueIncr, valueDecr, keyIncr,
and keyDecr from Gremlin-Python enums.
Posted by ok...@apache.org.
removed valueIncr, valueDecr, keyIncr, and keyDecr from Gremlin-Python enums.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/8cf3173b
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8cf3173b
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/8cf3173b
Branch: refs/heads/master
Commit: 8cf3173b8a519af62e8a4621daf89f0a8412d7ed
Parents: ae100b3
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Mon Jul 10 08:57:01 2017 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Mon Jul 10 08:57:01 2017 -0600
----------------------------------------------------------------------
.../src/main/jython/gremlin_python/process/traversal.py | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8cf3173b/gremlin-python/src/main/jython/gremlin_python/process/traversal.py
----------------------------------------------------------------------
diff --git a/gremlin-python/src/main/jython/gremlin_python/process/traversal.py b/gremlin-python/src/main/jython/gremlin_python/process/traversal.py
index 1afaa6c..6e88d02 100644
--- a/gremlin-python/src/main/jython/gremlin_python/process/traversal.py
+++ b/gremlin-python/src/main/jython/gremlin_python/process/traversal.py
@@ -148,14 +148,10 @@ statics.add_static('or_', Operator.or_)
statics.add_static('addAll', Operator.addAll)
statics.add_static('sumLong', Operator.sumLong)
-Order = Enum('Order', ' decr incr keyDecr keyIncr shuffle valueDecr valueIncr')
+Order = Enum('Order', ' decr incr shuffle')
statics.add_static('incr', Order.incr)
statics.add_static('decr', Order.decr)
-statics.add_static('keyIncr', Order.keyIncr)
-statics.add_static('valueIncr', Order.valueIncr)
-statics.add_static('keyDecr', Order.keyDecr)
-statics.add_static('valueDecr', Order.valueDecr)
statics.add_static('shuffle', Order.shuffle)
Pick = Enum('Pick', ' any none')