Merge branch 'tp32' into tp33 Conflicts: gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/71bc37fd Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/71bc37fd Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/71bc37fd Branch: refs/heads/TINKERPOP-1447 Commit: 71bc37fdfe00bb8c6b75d8bf81834713abf8cd22 Parents: a38d68f 5fea198 Author: Stephen Mallette <sp...@genoprime.com> Authored: Fri Apr 27 08:35:55 2018 -0400 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Fri Apr 27 08:35:55 2018 -0400 ---------------------------------------------------------------------- docs/src/recipes/olap-spark-yarn.asciidoc | 20 ++++++++------------ .../gremlin/process/traversal/Order.java | 9 ++++++++- 2 files changed, 16 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/71bc37fd/docs/src/recipes/olap-spark-yarn.asciidoc ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/71bc37fd/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java ---------------------------------------------------------------------- diff --cc gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java index 847cc57,c9111f0..0b88bba --- 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 @@@ -67,7 -66,82 +67,14 @@@ public enum Order implements Comparator public Order reversed() { return incr; } - }, shuffle { + }, + + /** - * @since 3.0.0-incubating - * @deprecated As of release 3.1.1-incubating, replaced by {@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; - } - }, - - /** - * @since 3.0.0-incubating - * @deprecated As of release 3.1.1-incubating, replaced by {@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; - } - }, - - /** - * @since 3.0.0-incubating - * @deprecated As of release 3.1.1-incubating, replaced by {@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; - } - }, - - /** - * @since 3.0.0-incubating - * @deprecated As of release 3.1.1-incubating, replaced by {@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; - } - }, - - /** + * Order in a random fashion. + * + * @since 3.0.0-incubating + */ + shuffle { @Override public int compare(final Object first, final Object second) { return RANDOM.nextBoolean() ? -1 : 1;