This is an automated email from the ASF dual-hosted git repository. pinal pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/atlas.git
The following commit(s) were added to refs/heads/master by this push: new eb38d8f ATLAS-4529 : DSL Search : OrderBy does not work for ScriptEngineBasedExecutor eb38d8f is described below commit eb38d8f34715728e1859c0d7d5e11403c92885c5 Author: Pinal Shah <pinal.s...@freestoneinfotech.com> AuthorDate: Wed Jan 12 14:20:54 2022 +0530 ATLAS-4529 : DSL Search : OrderBy does not work for ScriptEngineBasedExecutor Signed-off-by: Pinal Shah <pinal.s...@freestoneinfotech.com> --- repository/src/main/java/org/apache/atlas/query/GremlinClause.java | 2 +- .../main/java/org/apache/atlas/util/AtlasGremlin3QueryProvider.java | 4 ++-- .../test/java/org/apache/atlas/query/GremlinQueryComposerTest.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/repository/src/main/java/org/apache/atlas/query/GremlinClause.java b/repository/src/main/java/org/apache/atlas/query/GremlinClause.java index 7014b4a..674ad3c 100644 --- a/repository/src/main/java/org/apache/atlas/query/GremlinClause.java +++ b/repository/src/main/java/org/apache/atlas/query/GremlinClause.java @@ -39,7 +39,7 @@ public enum GremlinClause { NESTED_HAS_OPERATOR("has('%s', %s(%s))"), LIMIT("limit(%s)"), ORDER_BY("order().by('%s')"), - ORDER_BY_DESC("order().by('%s', decr)"), + ORDER_BY_DESC("order().by('%s', desc)"), OUT("out('%s')"), RANGE("range(%s, %s + %s)"), SELECT("select('%s')"), diff --git a/repository/src/main/java/org/apache/atlas/util/AtlasGremlin3QueryProvider.java b/repository/src/main/java/org/apache/atlas/util/AtlasGremlin3QueryProvider.java index 547a43d..5b10c35 100644 --- a/repository/src/main/java/org/apache/atlas/util/AtlasGremlin3QueryProvider.java +++ b/repository/src/main/java/org/apache/atlas/util/AtlasGremlin3QueryProvider.java @@ -58,9 +58,9 @@ public class AtlasGremlin3QueryProvider extends AtlasGremlin2QueryProvider { case RELATIONSHIP_SEARCH: return "g.V().has('__guid', guid).bothE(relation).has('__state', within(states)).otherV().has('__state', within(states))"; case RELATIONSHIP_SEARCH_ASCENDING_SORT: - return ".order().by(sortAttributeName, incr)"; + return ".order().by(sortAttributeName, asc)"; case RELATIONSHIP_SEARCH_DESCENDING_SORT: - return ".order().by(sortAttributeName, decr)"; + return ".order().by(sortAttributeName, desc)"; case GREMLIN_SEARCH_RETURNS_VERTEX_ID: return "g.V().range(0,1).toList()"; case GREMLIN_SEARCH_RETURNS_EDGE_ID: diff --git a/repository/src/test/java/org/apache/atlas/query/GremlinQueryComposerTest.java b/repository/src/test/java/org/apache/atlas/query/GremlinQueryComposerTest.java index 52cb68c..4002a32 100644 --- a/repository/src/test/java/org/apache/atlas/query/GremlinQueryComposerTest.java +++ b/repository/src/test/java/org/apache/atlas/query/GremlinQueryComposerTest.java @@ -178,7 +178,7 @@ public class GremlinQueryComposerTest { @Test public void fromDBOrderByNameDesc() { - verify("from DB orderby name DESC", "g.V().has('__typeName', 'DB').order().by('DB.name', decr).dedup().limit(25).toList()"); + verify("from DB orderby name DESC", "g.V().has('__typeName', 'DB').order().by('DB.name', desc).dedup().limit(25).toList()"); } @Test