fix nested order have bug #438

Author: shi-yuan

pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.nlpcn</groupId>
 	<artifactId>elasticsearch-sql</artifactId>
-	<version>6.1.1.4</version>
+	<version>6.1.1.5</version>
 	<packaging>jar</packaging>
 	<description>Query elasticsearch using SQL</description>
 	<name>elasticsearch-sql</name>

src/main/java/org/nlpcn/es4sql/domain/Order.java

@@ -6,15 +6,25 @@
  *
  */
 public class Order {
+	private String nestedPath;
 	private String name;
 	private String type;
 
-	public Order(String name, String type) {
+	public Order(String nestedPath, String name, String type) {
+        this.nestedPath = nestedPath;
 		this.name = name;
 		this.type = type;
 	}
 
-	public String getName() {
+    public String getNestedPath() {
+        return nestedPath;
+    }
+
+    public void setNestedPath(String nestedPath) {
+        this.nestedPath = nestedPath;
+    }
+
+    public String getName() {
 		return name;
 	}
 

src/main/java/org/nlpcn/es4sql/domain/Select.java

@@ -72,11 +72,11 @@ public int getRowCount() {
 		return rowCount;
 	}
 
-	public void addOrderBy(String name, String type) {
+	public void addOrderBy(String nestedPath, String name, String type) {
 		if ("_score".equals(name)) {
 			isQuery = true;
 		}
-		this.orderBys.add(new Order(name, type));
+		this.orderBys.add(new Order(nestedPath, name, type));
 	}
 
 

src/main/java/org/nlpcn/es4sql/parse/SqlParser.java

@@ -178,7 +178,8 @@ private void findOrderBy(MySqlSelectQueryBlock query, Select select) throws SqlP
     private void addOrderByToSelect(Select select, List<SQLSelectOrderByItem> items, String alias) throws SqlParseException {
         for (SQLSelectOrderByItem sqlSelectOrderByItem : items) {
             SQLExpr expr = sqlSelectOrderByItem.getExpr();
-            String orderByName = FieldMaker.makeField(expr, null, null).toString();
+            Field f = FieldMaker.makeField(expr, null, null);
+            String orderByName = f.toString();
 
             if (sqlSelectOrderByItem.getType() == null) {
                 sqlSelectOrderByItem.setType(SQLOrderingSpecification.ASC);
@@ -187,7 +188,7 @@ private void addOrderByToSelect(Select select, List<SQLSelectOrderByItem> items,
 
             orderByName = orderByName.replace("`", "");
             if (alias != null) orderByName = orderByName.replaceFirst(alias + "\\.", "");
-            select.addOrderBy(orderByName, type);
+            select.addOrderBy(f.getNestedPath(), orderByName, type);
 
         }
     }

src/main/java/org/nlpcn/es4sql/query/DefaultQueryAction.java

@@ -8,11 +8,11 @@
 import org.elasticsearch.client.Client;
 import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.script.Script;
-import org.elasticsearch.script.ScriptService;
 import org.elasticsearch.script.ScriptType;
 import org.elasticsearch.search.sort.FieldSortBuilder;
+import org.elasticsearch.search.sort.NestedSortBuilder;
+import org.elasticsearch.search.sort.SortBuilders;
 import org.elasticsearch.search.sort.SortOrder;
 import org.nlpcn.es4sql.domain.*;
 import org.nlpcn.es4sql.domain.hints.Hint;
@@ -158,7 +158,11 @@ private void setWhere(Where where) throws SqlParseException {
 	 */
 	private void setSorts(List<Order> orderBys) {
 		for (Order order : orderBys) {
-			request.addSort(order.getName(), SortOrder.valueOf(order.getType()));
+            if (order.getNestedPath() != null) {
+                request.addSort(SortBuilders.fieldSort(order.getName()).order(SortOrder.valueOf(order.getType())).setNestedSort(new NestedSortBuilder(order.getNestedPath())));
+            } else {
+                request.addSort(order.getName(), SortOrder.valueOf(order.getType()));
+            }
 		}
 	}
 

src/test/java/org/nlpcn/es4sql/ExplainTest.java

@@ -71,6 +71,12 @@ public void spatialFilterExplainTest() throws IOException, SqlParseException, No
         assertThat(result.replaceAll("\\s+",""), equalTo(expectedOutput.replaceAll("\\s+","")));
     }
 
+    @Test
+    public void orderByOnNestedFieldTest() throws Exception {
+        String result = explain(String.format("SELECT * FROM %s ORDER BY NESTED('message.info','message')", TEST_INDEX_NESTED_TYPE));
+        assertThat(result.replaceAll("\\s+", ""), equalTo("{\"from\":0,\"size\":200,\"sort\":[{\"message.info\":{\"order\":\"asc\",\"nested\":{\"path\":\"message\"}}}]}"));
+    }
+
     private String explain(String sql) throws SQLFeatureNotSupportedException, SqlParseException, InvocationTargetException, NoSuchMethodException, IllegalAccessException, IOException {
         SearchDao searchDao = MainTestSuite.getSearchDao();
         SqlElasticRequestBuilder requestBuilder = searchDao.explain(sql).explain();