You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by dk...@apache.org on 2018/05/12 01:10:50 UTC
[05/40] tinkerpop git commit: Merge branch 'tp32' into tp33
Merge branch 'tp32' into tp33
Conflicts:
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Pop.java
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/c253e768
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c253e768
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c253e768
Branch: refs/heads/TINKERPOP-1447
Commit: c253e768b489cb78c0d90d85c6a933ff59e7d908
Parents: 4eeb178 a4c5a21
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Apr 26 11:02:04 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Apr 26 11:02:04 2018 -0400
----------------------------------------------------------------------
.../gremlin/process/traversal/Compare.java | 12 ++++
.../gremlin/process/traversal/Contains.java | 4 ++
.../gremlin/process/traversal/Operator.java | 73 ++++++++++++++++++-
.../gremlin/process/traversal/Order.java | 17 ++++-
.../tinkerpop/gremlin/process/traversal/P.java | 76 ++++++++++++++++++++
.../gremlin/process/traversal/Pop.java | 10 ++-
.../gremlin/process/traversal/Scope.java | 19 +++--
.../gremlin/process/traversal/OrderTest.java | 76 ++++++++++++++++++++
8 files changed, 277 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c253e768/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Operator.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c253e768/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 dfd8bf2,3710396..847cc57
--- 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,12 -19,14 +19,15 @@@
package org.apache.tinkerpop.gremlin.process.traversal;
import java.util.Comparator;
-import java.util.Map;
import java.util.Random;
+import org.apache.tinkerpop.gremlin.util.NumberHelper;
+
/**
+ * Provides {@code Comparator} instances for ordering traversers.
+ *
* @author Marko A. Rodriguez (http://markorodriguez.com)
+ * @author Stephen Mallette (http://stephen.genoprime.com)
*/
public enum Order implements Comparator<Object> {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c253e768/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Pop.java
----------------------------------------------------------------------
diff --cc gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Pop.java
index d40fe60,b2fe2b9..45bbf2e
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Pop.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Pop.java
@@@ -39,10 -39,8 +43,12 @@@ public enum Pop
last,
/**
* Get all the items and return them as a list.
+ *
+ * @since 3.0.0-incubating
*/
- all
+ all,
+ /**
+ * Get the items as either a list (for multiple) or an object (for singles).
+ */
+ mixed
}