You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2019/07/09 20:13:36 UTC
[tinkerpop] 01/01: TINKERPOP-2233 Removed Order.decr/incr
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch TINKERPOP-2233
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit ecd89c75e052ec64166624e2dbba72babaf8fbfd
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Sat Jun 15 06:23:32 2019 -0400
TINKERPOP-2233 Removed Order.decr/incr
These were deprecated long ago and shoul no longer be used.
---
CHANGELOG.asciidoc | 1 +
docs/src/upgrade/release-3.5.x.asciidoc | 3 ++
.../tinkerpop/gremlin/process/traversal/Order.java | 44 +---------------------
.../gremlin/process/traversal/OrderTest.java | 17 +--------
.../traversal/step/map/OrderGlobalStepTest.java | 6 ---
.../traversal/step/map/OrderLocalStepTest.java | 6 ---
.../src/Gremlin.Net/Process/Traversal/Order.cs | 6 ---
.../groovy/jsr223/GroovyTranslatorTest.java | 2 +-
.../gremlin-javascript/lib/process/traversal.js | 2 +-
.../test/unit/translator-test.js | 4 +-
.../jython/gremlin_python/process/traversal.py | 4 +-
gremlin-test/features/map/Order.feature | 32 ----------------
gremlin-test/features/map/PageRank.feature | 8 ++--
.../process/traversal/step/map/OrderTest.java | 30 ---------------
.../tinkerpop/gremlin/structure/io/Model.java | 8 +++-
.../structure/io/gryo/_3_5_0/order-v1d0.kryo | 2 +-
.../structure/io/gryo/_3_5_0/order-v3d0.kryo | 2 +-
.../gremlin/sparql/SparqlToGremlinCompiler.java | 2 +-
18 files changed, 25 insertions(+), 154 deletions(-)
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 3acb5f5..4ed46c6 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
This release also includes changes from <<release-3-4-3, 3.4.3>>.
* Modified `null` handling in mutations to be consistent for a new `Vertex` as well as update to an existing one.
+* Removed previously deprecated `decr` and `incr` from `Order`.
* Removed previously deprecated `TraversalSource.withRemote()`.
* Removed previously deprecated `VertexProgram` related infrastructure.
* Removed previously deprecated SSL settings: `keyCertChainFile`, `keyFile`, `keyPassword` and `trustCertChainFile` and related infrastructure.
diff --git a/docs/src/upgrade/release-3.5.x.asciidoc b/docs/src/upgrade/release-3.5.x.asciidoc
index 9583565..62200cf 100644
--- a/docs/src/upgrade/release-3.5.x.asciidoc
+++ b/docs/src/upgrade/release-3.5.x.asciidoc
@@ -80,6 +80,8 @@ The following deprecated classes, methods or fields have been removed in this ve
** `org.apache.tinkerpop.gremlin.process.computer.traversal.step.map.PageRankVertexProgramStep.modulateTimes()`
** `org.apache.tinkerpop.gremlin.process.computer.traversal.step.map.PeerPressureVertexProgramStep.modulateBy(*)`
** `org.apache.tinkerpop.gremlin.process.computer.traversal.step.map.PeerPressureVertexProgramStep.modulateTimes()`
+** `org.apache.tinkerpop.gremlin.process.traversal.Order.decr`
+** `org.apache.tinkerpop.gremlin.process.traversal.Order.incr`
** `org.apache.tinkerpop.gremlin.process.traversal.TraversalSource#withRemote(*)`
** `org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource#withRemote(*)`
* `gremlin-driver`
@@ -95,5 +97,6 @@ The following deprecated classes, methods or fields have been removed in this ve
See: link:https://issues.apache.org/jira/browse/TINKERPOP-2080[TINKERPOP-2080],
link:https://issues.apache.org/jira/browse/TINKERPOP-2231[TINKERPOP-2231],
+link:https://issues.apache.org/jira/browse/TINKERPOP-2233[TINKERPOP-2233],
link:https://issues.apache.org/jira/browse/TINKERPOP-2239[TINKERPOP-2239],
link:http://tinkerpop.apache.org/docs/3.5.0/upgrade/#_ssl_security[3.2.10 Upgrade Documentation for SSL]
\ No newline at end of file
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 618cdfd..34a61a7 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
@@ -32,48 +32,6 @@ import org.apache.tinkerpop.gremlin.util.NumberHelper;
public enum Order implements Comparator<Object> {
/**
- * Order in ascending fashion
- *
- * @since 3.0.0-incubating
- * @deprecated As of release 3.3.4, replaced by {@link #asc}.
- */
- @Deprecated
- incr {
- @Override
- public int compare(final Object first, final Object second) {
- return first instanceof Number && second instanceof Number
- ? NumberHelper.compare((Number) first, (Number) second)
- : Comparator.<Comparable>naturalOrder().compare((Comparable) first, (Comparable) second);
- }
-
- @Override
- public Order reversed() {
- return decr;
- }
- },
-
- /**
- * Order in descending fashion.
- *
- * @since 3.0.0-incubating
- * @deprecated As of release 3.3.4, replaced by {@link #desc}.
- */
- @Deprecated
- decr {
- @Override
- public int compare(final Object first, final Object second) {
- return first instanceof Number && second instanceof Number
- ? NumberHelper.compare((Number) second, (Number) first)
- : Comparator.<Comparable>reverseOrder().compare((Comparable) first, (Comparable) second);
- }
-
- @Override
- public Order reversed() {
- return incr;
- }
- },
-
- /**
* Order in a random fashion.
*
* @since 3.0.0-incubating
@@ -91,7 +49,7 @@ public enum Order implements Comparator<Object> {
},
/**
- * Order in ascending fashion
+ * Order in ascending fashion.
*
* @since 3.3.4
*/
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/OrderTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/OrderTest.java
index a8124c6..2e5f2e1 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/OrderTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/OrderTest.java
@@ -56,22 +56,7 @@ public class OrderTest {
{Order.asc, Arrays.asList(100L, 1L, -1L, 0L), Arrays.asList(-1L, 0L, 1L, 100L)},
{Order.desc, Arrays.asList(100L, 1L, -1L, 0L), Arrays.asList(100L, 1L, 0L, -1L)},
{Order.asc, Arrays.asList(100, 1, -1, 0), Arrays.asList(-1, 0, 1, 100)},
- {Order.desc, Arrays.asList(100, 1, -1, 0), Arrays.asList(100, 1, 0, -1)},
- {Order.incr, Arrays.asList("b", "a", "c", "d"), Arrays.asList("a", "b", "c", "d")},
- {Order.decr, Arrays.asList("b", "a", "c", "d"), Arrays.asList("d", "c", "b", "a")},
- {Order.incr, Arrays.asList(formatter.parse("1-Jan-2018"), formatter.parse("1-Jan-2020"), formatter.parse("1-Jan-2008")),
- Arrays.asList(formatter.parse("1-Jan-2008"), formatter.parse("1-Jan-2018"), formatter.parse("1-Jan-2020"))},
- {Order.decr, Arrays.asList(formatter.parse("1-Jan-2018"), formatter.parse("1-Jan-2020"), formatter.parse("1-Jan-2008")),
- Arrays.asList(formatter.parse("1-Jan-2020"), formatter.parse("1-Jan-2018"), formatter.parse("1-Jan-2008"))},
- {Order.decr, Arrays.asList(100L, 1L, -1L, 0L), Arrays.asList(100L, 1L, 0L, -1L)},
- {Order.incr, Arrays.asList(100.1f, 1.1f, -1.1f, 0.1f), Arrays.asList(-1.1f, 0.1f, 1.1f, 100.1f)},
- {Order.decr, Arrays.asList(100.1f, 1.1f, -1.1f, 0.1f), Arrays.asList(100.1f, 1.1f, 0.1f, -1.1f)},
- {Order.incr, Arrays.asList(100.1d, 1.1d, -1.1d, 0.1d), Arrays.asList(-1.1d, 0.1d, 1.1d, 100.1d)},
- {Order.decr, Arrays.asList(100.1d, 1.1d, -1.1d, 0.1d), Arrays.asList(100.1d, 1.1d, 0.1d, -1.1d)},
- {Order.incr, Arrays.asList(100L, 1L, -1L, 0L), Arrays.asList(-1L, 0L, 1L, 100L)},
- {Order.decr, Arrays.asList(100L, 1L, -1L, 0L), Arrays.asList(100L, 1L, 0L, -1L)},
- {Order.incr, Arrays.asList(100, 1, -1, 0), Arrays.asList(-1, 0, 1, 100)},
- {Order.decr, Arrays.asList(100, 1, -1, 0), Arrays.asList(100, 1, 0, -1)}}));
+ {Order.desc, Arrays.asList(100, 1, -1, 0), Arrays.asList(100, 1, 0, -1)}}));
}
@Parameterized.Parameter(value = 0)
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderGlobalStepTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderGlobalStepTest.java
index 31457fc..8ba2c52 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderGlobalStepTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderGlobalStepTest.java
@@ -40,12 +40,6 @@ public class OrderGlobalStepTest extends StepTest {
protected List<Traversal> getTraversals() {
return Arrays.asList(
__.order(),
- __.order().by(Order.decr),
- __.order().by("age", Order.incr),
- __.order().by("age", Order.decr),
- __.order().by(outE().count(), Order.incr),
- __.order().by("age", Order.incr).by(outE().count(), Order.incr),
- __.order().by(outE().count(), Order.incr).by("age", Order.incr),
__.order().by(Order.desc),
__.order().by("age", Order.asc),
__.order().by("age", Order.desc),
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderLocalStepTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderLocalStepTest.java
index 5999793..ec5e539 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderLocalStepTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderLocalStepTest.java
@@ -42,12 +42,6 @@ public class OrderLocalStepTest extends StepTest {
protected List<Traversal> getTraversals() {
return Arrays.asList(
__.order(Scope.local),
- __.order(Scope.local).by(Order.decr),
- __.order(Scope.local).by("age", Order.incr),
- __.order(Scope.local).by("age", Order.decr),
- __.order(Scope.local).by(outE().count(), Order.incr),
- __.order(Scope.local).by("age", Order.incr).by(outE().count(), Order.incr),
- __.order(Scope.local).by(outE().count(), Order.incr).by("age", Order.incr),
__.order(Scope.local).by(Order.desc),
__.order(Scope.local).by("age", Order.asc),
__.order(Scope.local).by("age", Order.desc),
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Order.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Order.cs
index 9fce332..0ad08a5 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Order.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Order.cs
@@ -38,20 +38,14 @@ namespace Gremlin.Net.Process.Traversal
public static Order Asc => new Order("asc");
- public static Order Decr => new Order("decr");
-
public static Order Desc => new Order("desc");
- public static Order Incr => new Order("incr");
-
public static Order Shuffle => new Order("shuffle");
private static readonly IDictionary<string, Order> Properties = new Dictionary<string, Order>
{
{ "asc", Asc },
- { "decr", Decr },
{ "desc", Desc },
- { "incr", Incr },
{ "shuffle", Shuffle },
};
diff --git a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GroovyTranslatorTest.java b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GroovyTranslatorTest.java
index 84b4a94..2cabb9a 100644
--- a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GroovyTranslatorTest.java
+++ b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GroovyTranslatorTest.java
@@ -210,7 +210,7 @@ public class GroovyTranslatorTest {
@Test
public void shouldHandleOrder() {
- assertTranslation("Order.decr", Order.decr);
+ assertTranslation("Order.shuffle", Order.shuffle);
}
@Test
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/traversal.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/traversal.js
index 975d512..805c32f 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/traversal.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/traversal.js
@@ -456,7 +456,7 @@ module.exports = {
graphSONVersion: toEnum('GraphSONVersion', 'V1_0 V2_0 V3_0'),
gryoVersion: toEnum('GryoVersion', 'V1_0 V3_0'),
operator: toEnum('Operator', 'addAll and assign div max min minus mult or sum sumLong'),
- order: toEnum('Order', 'asc decr desc incr shuffle'),
+ order: toEnum('Order', 'asc desc shuffle'),
pick: toEnum('Pick', 'any none'),
pop: toEnum('Pop', 'all first last mixed'),
scope: toEnum('Scope', 'global local'),
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/translator-test.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/translator-test.js
index f8d4396..d0dbdfe 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/translator-test.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/translator-test.js
@@ -53,9 +53,9 @@ describe('Translator', function () {
it('should produce valid script representation from bytecode glv steps containing enum', function () {
const g = new graph.Graph().traversal();
- const script = new Translator('g').translate(g.V().order().by('age', t.order.decr).getBytecode());
+ const script = new Translator('g').translate(g.V().order().by('age', t.order.shuffle).getBytecode());
assert.ok(script);
- assert.strictEqual(script, 'g.V().order().by(\'age\', decr)');
+ assert.strictEqual(script, 'g.V().order().by(\'age\', shuffle)');
});
it('should produce valid script representation from bytecode glv steps containing a predicate', function () {
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 b29d5f8..64a6473 100644
--- a/gremlin-python/src/main/jython/gremlin_python/process/traversal.py
+++ b/gremlin-python/src/main/jython/gremlin_python/process/traversal.py
@@ -167,10 +167,8 @@ statics.add_static('or_', Operator.or_)
statics.add_static('addAll', Operator.addAll)
statics.add_static('sumLong', Operator.sumLong)
-Order = Enum('Order', ' asc decr desc incr shuffle')
+Order = Enum('Order', ' asc desc shuffle')
-statics.add_static('incr', Order.incr)
-statics.add_static('decr', Order.decr)
statics.add_static('shuffle', Order.shuffle)
statics.add_static('asc', Order.asc)
statics.add_static('desc', Order.desc)
diff --git a/gremlin-test/features/map/Order.feature b/gremlin-test/features/map/Order.feature
index 207675a..7376e5a 100644
--- a/gremlin-test/features/map/Order.feature
+++ b/gremlin-test/features/map/Order.feature
@@ -51,22 +51,6 @@ Feature: Step - order()
| josh |
| lop |
- Scenario: g_V_order_byXname_incrX_name
- Given the modern graph
- And the traversal of
- """
- g.V().order().by("name", Order.incr).values("name")
- """
- When iterated to list
- Then the result should be ordered
- | result |
- | josh |
- | lop |
- | marko |
- | peter |
- | ripple |
- | vadas |
-
Scenario: g_V_order_byXname_ascX_name
Given the modern graph
And the traversal of
@@ -99,22 +83,6 @@ Feature: Step - order()
| ripple |
| vadas |
- Scenario: g_V_outE_order_byXweight_decrX_weight
- Given the modern graph
- And the traversal of
- """
- g.V().outE().order().by("weight", Order.decr).values("weight")
- """
- When iterated to list
- Then the result should be ordered
- | result |
- | d[1.0].d |
- | d[1.0].d |
- | d[0.5].d |
- | d[0.4].d |
- | d[0.4].d |
- | d[0.2].d |
-
Scenario: g_V_outE_order_byXweight_descX_weight
Given the modern graph
And the traversal of
diff --git a/gremlin-test/features/map/PageRank.feature b/gremlin-test/features/map/PageRank.feature
index dbc6981..479a309 100644
--- a/gremlin-test/features/map/PageRank.feature
+++ b/gremlin-test/features/map/PageRank.feature
@@ -48,11 +48,11 @@ Feature: Step - pageRank()
| m[{"name": ["lop"], "projectRank": [3.0]}] |
| m[{"name": ["ripple"], "projectRank": [1.0]}] |
- Scenario: g_V_pageRank_order_byXpageRank_decrX_byXnameX_name
+ Scenario: g_V_pageRank_order_byXpageRank_descX_byXnameX_name
Given the modern graph
And the traversal of
"""
- g.withComputer().V().pageRank().order().by("gremlin.pageRankVertexProgram.pageRank", Order.decr).by("name").values("name")
+ g.withComputer().V().pageRank().order().by("gremlin.pageRankVertexProgram.pageRank", Order.desc).by("name").values("name")
"""
When iterated to list
Then the result should be ordered
@@ -64,11 +64,11 @@ Feature: Step - pageRank()
| marko |
| peter |
- Scenario: g_V_pageRank_order_byXpageRank_decrX_name_limitX2X
+ Scenario: g_V_pageRank_order_byXpageRank_descX_name_limitX2X
Given the modern graph
And the traversal of
"""
- g.withComputer().V().pageRank().order().by("gremlin.pageRankVertexProgram.pageRank", Order.decr).values("name").limit(2)
+ g.withComputer().V().pageRank().order().by("gremlin.pageRankVertexProgram.pageRank", Order.desc).values("name").limit(2)
"""
When iterated to list
Then the result should be ordered
diff --git 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
index ca4172b..544ed67 100644
--- 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
@@ -60,14 +60,10 @@ public abstract class OrderTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, String> get_g_V_name_order_byXa1_b1X_byXb2_a2X();
- public abstract Traversal<Vertex, String> get_g_V_order_byXname_incrX_name();
-
public abstract Traversal<Vertex, String> get_g_V_order_byXname_ascX_name();
public abstract Traversal<Vertex, String> get_g_V_order_byXnameX_name();
- public abstract Traversal<Vertex, Double> get_g_V_outE_order_byXweight_decrX_weight();
-
public abstract Traversal<Vertex, Double> get_g_V_outE_order_byXweight_descX_weight();
public abstract Traversal<Vertex, String> get_g_V_order_byXname_a1_b1X_byXname_b2_a2X_name();
@@ -122,14 +118,6 @@ public abstract class OrderTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
- public void g_V_order_byXname_incrX_name() {
- final Traversal<Vertex, String> traversal = get_g_V_order_byXname_incrX_name();
- printTraversalForm(traversal);
- checkOrderedResults(Arrays.asList("josh", "lop", "marko", "peter", "ripple", "vadas"), traversal);
- }
-
- @Test
- @LoadGraphWith(MODERN)
public void g_V_order_byXname_ascX_name() {
final Traversal<Vertex, String> traversal = get_g_V_order_byXname_ascX_name();
printTraversalForm(traversal);
@@ -146,14 +134,6 @@ public abstract class OrderTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
- public void g_V_outE_order_byXweight_decrX_weight() {
- final Traversal<Vertex, Double> traversal = get_g_V_outE_order_byXweight_decrX_weight();
- printTraversalForm(traversal);
- checkOrderedResults(Arrays.asList(1.0d, 1.0d, 0.5d, 0.4d, 0.4d, 0.2d), traversal);
- }
-
- @Test
- @LoadGraphWith(MODERN)
public void g_V_outE_order_byXweight_descX_weight() {
final Traversal<Vertex, Double> traversal = get_g_V_outE_order_byXweight_descX_weight();
printTraversalForm(traversal);
@@ -455,11 +435,6 @@ public abstract class OrderTest extends AbstractGremlinProcessTest {
}
@Override
- public Traversal<Vertex, String> get_g_V_order_byXname_incrX_name() {
- return g.V().order().by("name", Order.incr).values("name");
- }
-
- @Override
public Traversal<Vertex, String> get_g_V_order_byXname_ascX_name() {
return g.V().order().by("name", Order.asc).values("name");
}
@@ -470,11 +445,6 @@ public abstract class OrderTest extends AbstractGremlinProcessTest {
}
@Override
- public Traversal<Vertex, Double> get_g_V_outE_order_byXweight_decrX_weight() {
- return g.V().outE().order().by("weight", Order.decr).values("weight");
- }
-
- @Override
public Traversal<Vertex, Double> get_g_V_outE_order_byXweight_descX_weight() {
return g.V().outE().order().by("weight", Order.desc).values("weight");
}
diff --git a/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Model.java b/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Model.java
index 4cea315..a76cc62 100644
--- a/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Model.java
+++ b/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Model.java
@@ -114,6 +114,12 @@ public class Model {
.join(Compatibilities.with(GraphSONCompatibility.class).configuredAs(".*no-types|v1d0")
.join(Compatibilities.with(GraphSONCompatibility.class).beforeRelease("3.4.0"))).matchToArray();
+ // the inverse of this definition is basically 3.5.0 or better for both GraphSON and Gryo with no support for
+ // untyped GraphSON anywhere along the way
+ final Compatibility[] before3_5_0 = Compatibilities.with(GryoCompatibility.class).beforeRelease("3.5.0")
+ .join(Compatibilities.with(GraphSONCompatibility.class).configuredAs(".*no-types|v1d0")
+ .join(Compatibilities.with(GraphSONCompatibility.class).beforeRelease("3.5.0"))).matchToArray();
+
// there is no point to testing gryo for list/map/set as they are kryo primitives essentially
final Compatibility[] noGraphSONBeforeV3AndNoGryo = Compatibilities.with(GraphSONCompatibility.class).configuredAs(".*v2d0-partial|v1d0|v2d0-no-types").join(Compatibilities.GRYO_ONLY).matchToArray();
@@ -163,7 +169,7 @@ public class Model {
addGraphProcessEntry(Column.keys, "Column", "", Compatibilities.UNTYPED_GRAPHSON.matchToArray());
addGraphProcessEntry(Direction.OUT, "Direction", "", Compatibilities.UNTYPED_GRAPHSON.matchToArray());
addGraphProcessEntry(Operator.sum, "Operator", "", Compatibilities.UNTYPED_GRAPHSON.matchToArray());
- addGraphProcessEntry(Order.shuffle, "Order", "", Compatibilities.UNTYPED_GRAPHSON.matchToArray());
+ addGraphProcessEntry(Order.shuffle, "Order", "", before3_5_0);
addGraphProcessEntry(TraversalOptionParent.Pick.any, "Pick", "", Compatibilities.UNTYPED_GRAPHSON.matchToArray());
addGraphProcessEntry(Pop.all, "Pop", "", Compatibilities.UNTYPED_GRAPHSON.matchToArray());
addGraphProcessEntry(org.apache.tinkerpop.gremlin.util.function.Lambda.function("{ it.get() }"), "Lambda", "", Compatibilities.UNTYPED_GRAPHSON.matchToArray());
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_5_0/order-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_5_0/order-v1d0.kryo
index c8c7811..40fdece 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_5_0/order-v1d0.kryo
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_5_0/order-v1d0.kryo
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_5_0/order-v3d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_5_0/order-v3d0.kryo
index c8c7811..40fdece 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_5_0/order-v3d0.kryo
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_5_0/order-v3d0.kryo
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinCompiler.java b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinCompiler.java
index 1dbb173..62e9647 100644
--- a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinCompiler.java
+++ b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinCompiler.java
@@ -218,7 +218,7 @@ public class SparqlToGremlinCompiler {
// by default, the sort will be ascending. getDirection() returns -2 if the DESC/ASC isn't
// supplied - weird
- orderingIndex.put(expr.getVarName(), sortCondition.getDirection() == -1 ? Order.decr : Order.incr);
+ orderingIndex.put(expr.getVarName(), sortCondition.getDirection() == -1 ? Order.desc : Order.asc);
}
}