Merge branch 'tp33'

Conflicts:
        gremlin-test/features/map/Order.feature
        
gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderTest.java


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/9eec6557
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/9eec6557
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/9eec6557

Branch: refs/heads/master
Commit: 9eec6557818938ad1c6e19b1c84d1bd18d69f941
Parents: 32c5306 20a722a
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu May 17 16:28:14 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu May 17 16:28:14 2018 -0400

----------------------------------------------------------------------
 CHANGELOG.asciidoc                              |   1 +
 docs/site/home/gremlin.html                     |   4 +-
 docs/site/home/index.html                       |   2 +-
 docs/site/home/js/prism.js                      |   2 +-
 docs/src/dev/io/graphson.asciidoc               |   8 +-
 docs/src/dev/io/gryo.asciidoc                   |   4 +-
 docs/src/recipes/centrality.asciidoc            |   6 +-
 docs/src/recipes/collections.asciidoc           |   2 +-
 docs/src/recipes/recommendation.asciidoc        |  16 +-
 docs/src/recipes/style-guide.asciidoc           |   4 +-
 docs/src/reference/gremlin-variants.asciidoc    |  10 +-
 docs/src/reference/the-graph.asciidoc           |   2 +-
 docs/src/reference/the-traversal.asciidoc       |  61 ++++----
 .../gremlin-language-variants/index.asciidoc    |   2 +-
 docs/src/upgrade/release-3.3.x.asciidoc         |  10 ++
 .../gremlin/process/traversal/Order.java        |  40 +++++
 .../traversal/step/map/OrderGlobalStep.java     |   4 +-
 .../traversal/step/map/OrderLocalStep.java      |   4 +-
 .../util/function/ChainedComparator.java        |   2 +-
 .../gremlin/util/function/MultiComparator.java  |   2 +-
 .../gremlin/process/traversal/BytecodeTest.java |   6 +-
 .../gremlin/process/traversal/OrderTest.java    |  15 ++
 .../traversal/step/map/OrderGlobalStepTest.java |   8 +-
 .../traversal/step/map/OrderLocalStepTest.java  |   8 +-
 .../PathRetractionStrategyTest.java             |   2 +-
 .../LambdaRestrictionStrategyTest.java          |   4 +-
 .../util/function/MultiComparatorTest.java      |   6 +-
 .../Process/Traversal/NamingConversions.cs      |   2 +
 .../src/Gremlin.Net/Process/Traversal/Order.cs  |   6 +
 .../DriverRemoteConnection/EnumTests.cs         |   2 +-
 .../gremlin-javascript/lib/process/traversal.js |   2 +-
 .../test/unit/traversal-test.js                 |   4 +-
 .../jython/gremlin_python/process/traversal.py  |   4 +-
 gremlin-test/features/branch/Local.feature      |   2 +-
 gremlin-test/features/filter/Dedup.feature      |   4 +-
 gremlin-test/features/map/AddEdge.feature       |   4 +-
 gremlin-test/features/map/Match.feature         |   4 +-
 gremlin-test/features/map/Order.feature         |  72 ++++++---
 gremlin-test/features/map/Project.feature       |   4 +-
 gremlin-test/features/map/Select.feature        |   4 +-
 .../process/traversal/step/ComplexTest.java     |   4 +-
 .../traversal/step/branch/LocalTest.java        |   2 +-
 .../traversal/step/filter/DedupTest.java        |  10 +-
 .../process/traversal/step/map/AddEdgeTest.java |  12 +-
 .../process/traversal/step/map/MatchTest.java   |  12 +-
 .../process/traversal/step/map/MathTest.java    |  12 +-
 .../process/traversal/step/map/OrderTest.java   | 150 +++++++++++--------
 .../traversal/step/map/PageRankTest.java        |  20 +--
 .../process/traversal/step/map/ProgramTest.java |  10 +-
 .../process/traversal/step/map/ProjectTest.java |  10 +-
 .../process/traversal/step/map/SelectTest.java  |  10 +-
 .../decoration/SubgraphStrategyProcessTest.java |   2 +-
 .../gremlin/process/FeatureCoverageTest.java    |   4 +-
 .../tinkerpop/gremlin/structure/io/Model.java   |   2 +-
 .../io/AbstractTypedCompatibilityTest.java      |   2 -
 .../io/graphson/_3_2_3/order-v2d0-no-types.json |   2 +-
 .../io/graphson/_3_2_3/order-v2d0-partial.json  |   2 +-
 .../io/graphson/_3_2_4/order-v2d0-no-types.json |   2 +-
 .../io/graphson/_3_2_4/order-v2d0-partial.json  |   2 +-
 .../io/graphson/_3_2_5/order-v2d0-no-types.json |   2 +-
 .../io/graphson/_3_2_5/order-v2d0-partial.json  |   2 +-
 .../io/graphson/_3_2_6/order-v2d0-no-types.json |   2 +-
 .../io/graphson/_3_2_6/order-v2d0-partial.json  |   2 +-
 .../io/graphson/_3_2_7/order-v2d0-no-types.json |   2 +-
 .../io/graphson/_3_2_7/order-v2d0-partial.json  |   2 +-
 .../io/graphson/_3_2_8/order-v2d0-no-types.json |   2 +-
 .../io/graphson/_3_2_8/order-v2d0-partial.json  |   2 +-
 .../io/graphson/_3_2_9/order-v2d0-no-types.json |   2 +-
 .../io/graphson/_3_2_9/order-v2d0-partial.json  |   2 +-
 .../io/graphson/_3_3_0/order-v2d0-no-types.json |   2 +-
 .../io/graphson/_3_3_0/order-v2d0-partial.json  |   2 +-
 .../io/graphson/_3_3_0/order-v3d0.json          |   2 +-
 .../io/graphson/_3_3_1/order-v2d0-no-types.json |   2 +-
 .../io/graphson/_3_3_1/order-v2d0-partial.json  |   2 +-
 .../io/graphson/_3_3_1/order-v3d0.json          |   2 +-
 .../io/graphson/_3_3_2/order-v2d0-partial.json  |   2 +-
 .../io/graphson/_3_3_2/order-v3d0.json          |   2 +-
 .../io/graphson/_3_3_3/order-v2d0-partial.json  |   2 +-
 .../io/graphson/_3_3_3/order-v3d0.json          |   2 +-
 .../structure/io/gryo/_3_2_3/order-v1d0.kryo    |   2 +-
 .../structure/io/gryo/_3_2_4/order-v1d0.kryo    |   2 +-
 .../structure/io/gryo/_3_2_5/order-v1d0.kryo    |   2 +-
 .../structure/io/gryo/_3_2_6/order-v1d0.kryo    |   2 +-
 .../structure/io/gryo/_3_2_7/order-v1d0.kryo    |   2 +-
 .../structure/io/gryo/_3_2_8/order-v1d0.kryo    |   2 +-
 .../structure/io/gryo/_3_2_9/order-v1d0.kryo    |   2 +-
 .../structure/io/gryo/_3_3_0/order-v1d0.kryo    |   2 +-
 .../structure/io/gryo/_3_3_0/order-v3d0.kryo    |   2 +-
 .../structure/io/gryo/_3_3_1/order-v1d0.kryo    |   2 +-
 .../structure/io/gryo/_3_3_1/order-v3d0.kryo    |   2 +-
 .../structure/io/gryo/_3_3_2/order-v1d0.kryo    |   2 +-
 .../structure/io/gryo/_3_3_2/order-v3d0.kryo    |   2 +-
 .../structure/io/gryo/_3_3_3/order-v1d0.kryo    |   2 +-
 .../structure/io/gryo/_3_3_3/order-v3d0.kryo    |   2 +-
 94 files changed, 421 insertions(+), 268 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9eec6557/CHANGELOG.asciidoc
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9eec6557/docs/site/home/gremlin.html
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9eec6557/docs/site/home/index.html
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9eec6557/docs/src/reference/the-traversal.asciidoc
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9eec6557/gremlin-test/features/map/Order.feature
----------------------------------------------------------------------
diff --cc gremlin-test/features/map/Order.feature
index 1b1bf2d,f361878..a13102f
--- a/gremlin-test/features/map/Order.feature
+++ b/gremlin-test/features/map/Order.feature
@@@ -192,13 -224,13 +224,13 @@@ Feature: Step - order(
      When iterated to list
      Then the result should be ordered
        | result |
 -      | 
m[{"vadas":"d[0].i","peter":"d[0.2].d","josh":"d[1.4].d","marko":"d[1.9].d"}] |
 +      | m[{"peter":"d[0.2].d","josh":"d[1.4].d","marko":"d[1.9].d"}] |
  
-   Scenario: g_V_mapXbothE_weight_foldX_order_byXsumXlocalX_decrX
 -  Scenario: g_V_localXbothE_weight_foldX_order_byXsumXlocalX_descX
++  Scenario: g_V_mapXbothE_weight_foldX_order_byXsumXlocalX_descX
      Given the modern graph
      And the traversal of
        """
-       
g.V().map(__.bothE().values("weight").fold()).order().by(__.sum(Scope.local), 
Order.decr)
 -      
g.V().local(__.bothE().values("weight").fold()).order().by(__.sum(Scope.local), 
Order.desc)
++      
g.V().map(__.bothE().values("weight").fold()).order().by(__.sum(Scope.local), 
Order.desc)
        """
      When iterated to list
      Then the result should be ordered
@@@ -233,8 -265,9 +265,8 @@@
        | m[{"marko":"d[1.9].d"}]  |
        | m[{"josh":"d[1.4].d"}]  |
        | m[{"peter":"d[0.2].d"}]  |
 -      | m[{"vadas":"d[0].i"}]  |
  
-   Scenario: 
g_V_asXvX_mapXbothE_weight_foldX_sumXlocalX_asXsX_selectXv_sX_order_byXselectXsX_decrX
+   Scenario: 
g_V_asXvX_mapXbothE_weight_foldX_sumXlocalX_asXsX_selectXv_sX_order_byXselectXsX_descX
      Given the modern graph
      And the traversal of
        """

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9eec6557/gremlin-test/features/map/Select.feature
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9eec6557/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderTest.java
----------------------------------------------------------------------
diff --cc 
gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderTest.java
index d5cd6fd,3cb50aa..2bb1bc7
--- 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderTest.java
+++ 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderTest.java
@@@ -70,15 -74,15 +74,15 @@@ public abstract class OrderTest extend
  
      public abstract Traversal<Vertex, Map<String, Vertex>> 
get_g_V_asXaX_outXcreatedX_asXbX_order_byXshuffleX_selectXa_bX();
  
-     public abstract Traversal<Vertex, Map<Integer, Integer>> 
get_g_VX1X_hasXlabel_personX_mapXmapXint_ageXX_orderXlocalX_byXvalues_decrX_byXkeys_incrX(final
 Object v1Id);
+     public abstract Traversal<Vertex, Map<Integer, Integer>> 
get_g_VX1X_hasXlabel_personX_mapXmapXint_ageXX_orderXlocalX_byXvalues_descX_byXkeys_ascX(final
 Object v1Id);
  
-     public abstract Traversal<Vertex, Vertex> 
get_g_V_order_byXoutE_count__decrX();
+     public abstract Traversal<Vertex, Vertex> 
get_g_V_order_byXoutE_count_descX();
  
-     public abstract Traversal<Vertex, Map<String, List<Vertex>>> 
get_g_V_group_byXlabelX_byXname_order_byXdecrX_foldX();
+     public abstract Traversal<Vertex, Map<String, List<Vertex>>> 
get_g_V_group_byXlabelX_byXname_order_byXdescX_foldX();
  
-     public abstract Traversal<Vertex, List<Double>> 
get_g_V_mapXbothE_weight_foldX_order_byXsumXlocalX_decrX();
 -    public abstract Traversal<Vertex, List<Double>> 
get_g_V_localXbothE_weight_foldX_order_byXsumXlocalX_descX();
++    public abstract Traversal<Vertex, List<Double>> 
get_g_V_mapXbothE_weight_foldX_order_byXsumXlocalX_descX();
  
-     public abstract Traversal<Vertex, Map<String, Object>> 
get_g_V_asXvX_mapXbothE_weight_foldX_sumXlocalX_asXsX_selectXv_sX_order_byXselectXsX_decrX();
+     public abstract Traversal<Vertex, Map<String, Object>> 
get_g_V_asXvX_mapXbothE_weight_foldX_sumXlocalX_asXsX_selectXv_sX_order_byXselectXsX_descX();
  
      public abstract Traversal<Vertex, Vertex> 
get_g_V_hasLabelXpersonX_order_byXageX();
  
@@@ -244,8 -264,8 +264,8 @@@
  
      @Test
      @LoadGraphWith(MODERN)
-     public void g_V_mapXbothE_weight_foldX_order_byXsumXlocalX_decrX() {
-         final Traversal<Vertex, List<Double>> traversal = 
get_g_V_mapXbothE_weight_foldX_order_byXsumXlocalX_decrX();
 -    public void g_V_localXbothE_weight_foldX_order_byXsumXlocalX_descX() {
 -        final Traversal<Vertex, List<Double>> traversal = 
get_g_V_localXbothE_weight_foldX_order_byXsumXlocalX_descX();
++    public void g_V_mapXbothE_weight_foldX_order_byXsumXlocalX_descX() {
++        final Traversal<Vertex, List<Double>> traversal = 
get_g_V_mapXbothE_weight_foldX_order_byXsumXlocalX_descX();
          final List<List<Double>> list = traversal.toList();
          assertEquals(list.get(0).size(), 3);
          assertEquals(list.get(1).size(), 3);
@@@ -479,8 -515,8 +509,8 @@@
          }
  
          @Override
-         public Traversal<Vertex, List<Double>> 
get_g_V_mapXbothE_weight_foldX_order_byXsumXlocalX_decrX() {
-             return 
g.V().map(__.bothE().<Double>values("weight").fold()).order().by(__.sum(Scope.local),
 Order.decr);
 -        public Traversal<Vertex, List<Double>> 
get_g_V_localXbothE_weight_foldX_order_byXsumXlocalX_descX() {
 -            return 
g.V().local(__.bothE().<Double>values("weight").fold()).order().by(__.sum(Scope.local),
 Order.desc);
++        public Traversal<Vertex, List<Double>> 
get_g_V_mapXbothE_weight_foldX_order_byXsumXlocalX_descX() {
++            return 
g.V().map(__.bothE().<Double>values("weight").fold()).order().by(__.sum(Scope.local),
 Order.desc);
          }
  
          @Override

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9eec6557/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectTest.java
----------------------------------------------------------------------

Reply via email to