ATLAS-993 If condition in DSL order by clause is not defined then dsl query…

release-log.txt

@@ -6,6 +6,7 @@ INCOMPATIBLE CHANGES:
 
 
 ALL CHANGES:
+ATLAS-993 If condition in DSL order by clause is not defined then dsl query fails (guptaneeru via shwethags)
 ATLAS-968 Set group information from UGI for Ldap authentication (nixonrodrigues via shwethags)
 ATLAS-584 Integrate CSRF prevention filter (kevalbhatt18 via shwethags)
 ATLAS-963 UI: Entity details is not display String array attribute values correctly (kevalbhatt18 via shwethags)

repository/src/main/scala/org/apache/atlas/query/GremlinQuery.scala

@@ -331,8 +331,8 @@ class GremlinTranslator(expr: Expression,
              asc  match {
             //builds a closure comparison function based on provided order by clause in DSL. This will be used to sort the results by gremlin order pipe.
             //Ordering is case insensitive.
-              case false=> orderby = s"order{it.b.getProperty('$odr').toLowerCase() <=> it.a.getProperty('$odr').toLowerCase()}"//descending
-              case _ => orderby = s"order{it.a.getProperty('$odr').toLowerCase() <=> it.b.getProperty('$odr').toLowerCase()}"
+             case false=> orderby = s"order{(it.b.getProperty('$odr') !=null ? it.b.getProperty('$odr').toLowerCase(): it.b.getProperty('$odr')) <=> (it.a.getProperty('$odr') != null ? it.a.getProperty('$odr').toLowerCase(): it.a.getProperty('$odr'))}"//descending
+              case _ => orderby = s"order{(it.a.getProperty('$odr') != null ? it.a.getProperty('$odr').toLowerCase(): it.a.getProperty('$odr')) <=> (it.b.getProperty('$odr') !=null ? it.b.getProperty('$odr').toLowerCase(): it.b.getProperty('$odr'))}"
               
             }
           s"""${genQuery(child, inSelect)}.$orderby"""

repository/src/test/java/org/apache/atlas/discovery/GraphBackedDiscoveryServiceTest.java

@@ -515,6 +515,9 @@ public class GraphBackedDiscoveryServiceTest extends BaseRepositoryTest {
                 {"hive_table where (name = \"sales_fact\" and createTime >= \"2014-12-11T02:35:58.440Z\" ) select name as _col_0, createTime as _col_1 orderby '_col_0' limit 10", 1, "_col_0", isAscending},
                 {"hive_table where (name = \"sales_fact\" and createTime >= \"2014-12-11T02:35:58.440Z\" ) select name as _col_0, createTime as _col_1 orderby '_col_0' limit 0 offset 1", 0, "_col_0", isAscending},
 
+                
+                //Test if proeprty is not defined. it should not fail the query
+                {"hive_table orderby 'hive_table.owner_notdefined'", 8, null, isAscending},
         };
     }
     
@@ -553,24 +556,22 @@ public class GraphBackedDiscoveryServiceTest extends BaseRepositoryTest {
         }
         Iterator<String> iter = returnedList.iterator();
         String _current = null, _prev = null;
-        //Following code compares the results in rows and makes sure data is sorted as expected.
-        while(iter.hasNext())
-        {
-            _prev = _current;
-            _current = iter.next().toLowerCase();
-            if (_prev != null && _prev.compareTo(_current) != 0)
-            {
-                if(ascending)
-                {
-                    Assert.assertTrue(_prev.compareTo(_current) < 0);
-                }
-                else
-                {
-                    Assert.assertTrue(_prev.compareTo(_current) > 0);
+        if (orderBy != null) {
+            // Following code compares the results in rows and makes sure data
+            // is sorted as expected
+            while (iter.hasNext()) {
+                _prev = _current;
+                _current = iter.next().toLowerCase();
+                if (_prev != null && _prev.compareTo(_current) != 0) {
+                    if (ascending) {
+                        Assert.assertTrue(_prev.compareTo(_current) < 0);
+                    } else {
+                        Assert.assertTrue(_prev.compareTo(_current) > 0);
+                    }
                 }
             }
         }
-        
+
         System.out.println("query [" + dslQuery + "] returned [" + rows.length() + "] rows");
     }