fix testcase

Author: shi-yuan

src/main/java/org/elasticsearch/plugin/nlpcn/executors/CSVResultsExtractor.java

@@ -269,9 +269,6 @@ private List<String> createCSVLinesFromDocs(boolean flat, String separator, List
 
     private List<String> createHeadersAndFillDocsMap(boolean flat, SearchHit[] hits, String scrollId, List<Map<String, Object>> docsAsMap) {
         Set<String> csvHeaders = new LinkedHashSet<>();
-        if (this.queryAction instanceof DefaultQueryAction) {
-            csvHeaders.addAll(((DefaultQueryAction) this.queryAction).getFieldNames());
-        }
         for (SearchHit hit : hits) {
             Map<String, Object> doc = hit.getSourceAsMap();
             Map<String, DocumentField> fields = hit.getFields();
@@ -305,7 +302,18 @@ private List<String> createHeadersAndFillDocsMap(boolean flat, SearchHit[] hits,
         if (this.includeScrollId) {
             csvHeaders.add("_scroll_id");
         }
-        return new ArrayList<>(csvHeaders);
+
+        List<String> headers = new ArrayList<>(csvHeaders);
+        if (this.queryAction instanceof DefaultQueryAction) {
+            List<String> fieldNames = ((DefaultQueryAction) this.queryAction).getFieldNames();
+            headers.sort((o1, o2) -> {
+                int i1 = fieldNames.indexOf(o1);
+                int i2 = fieldNames.indexOf(o2);
+                return Integer.compare(i1 < 0 ? Integer.MAX_VALUE : i1, i2 < 0 ? Integer.MAX_VALUE : i2);
+            });
+        }
+
+        return headers;
     }
 
     private String findFieldValue(String header, Map<String, Object> doc, boolean flat, String separator) {

src/main/java/org/nlpcn/es4sql/jdbc/ObjectResultsExtractor.java

@@ -18,7 +18,12 @@
 import org.nlpcn.es4sql.query.DefaultQueryAction;
 import org.nlpcn.es4sql.query.QueryAction;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * Created by allwefantasy on 8/30/16.
@@ -259,10 +264,11 @@ private List<List<Object>> createLinesFromDocs(boolean flat, List<Map<String, Ob
 
     private List<String> createHeadersAndFillDocsMap(boolean flat, SearchHit[] hits, String scrollId, List<Map<String, Object>> docsAsMap) {
         Set<String> headers = new LinkedHashSet<>();
+        List<String> fieldNames = new ArrayList<>();
         if (this.queryAction instanceof DefaultQueryAction) {
-            headers.addAll(((DefaultQueryAction) this.queryAction).getFieldNames());
+            fieldNames.addAll(((DefaultQueryAction) this.queryAction).getFieldNames());
         }
-        boolean hasScrollId = this.includeScrollId || headers.contains("_scroll_id");
+        boolean hasScrollId = this.includeScrollId || fieldNames.contains("_scroll_id");
         for (SearchHit hit : hits) {
             Map<String, Object> doc = hit.getSourceAsMap();
             Map<String, DocumentField> fields = hit.getFields();
@@ -284,7 +290,16 @@ private List<String> createHeadersAndFillDocsMap(boolean flat, SearchHit[] hits,
             mergeHeaders(headers, doc, flat);
             docsAsMap.add(doc);
         }
-        return new ArrayList<>(headers);
+
+        List<String> list = new ArrayList<>(headers);
+        if (!fieldNames.isEmpty()) {
+            list.sort((o1, o2) -> {
+                int i1 = fieldNames.indexOf(o1);
+                int i2 = fieldNames.indexOf(o2);
+                return Integer.compare(i1 < 0 ? Integer.MAX_VALUE : i1, i2 < 0 ? Integer.MAX_VALUE : i2);
+            });
+        }
+        return list;
     }
 
     private Object findFieldValue(String header, Map<String, Object> doc, boolean flat) {

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

@@ -73,10 +73,10 @@ public void simpleSearchResultWithNestedOneFieldNotFlatNoAggs() throws Exception
 
         List<String> lines = csvResult.getLines();
         Assert.assertEquals(7, lines.size());
-        Assert.assertTrue(lines.contains("{firstname=Daenerys},Targaryen"));
-        Assert.assertTrue(lines.contains("{firstname=Eddard},Stark"));
-        Assert.assertTrue(lines.contains("{firstname=Brandon},Stark"));
-        Assert.assertTrue(lines.contains("{firstname=Jaime},Lannister"));
+        Assert.assertTrue(lines.contains("Targaryen,{firstname=Daenerys}"));
+        Assert.assertTrue(lines.contains("Stark,{firstname=Eddard}"));
+        Assert.assertTrue(lines.contains("Stark,{firstname=Brandon}"));
+        Assert.assertTrue(lines.contains("Lannister,{firstname=Jaime}"));
 
     }
 
@@ -92,14 +92,14 @@ public void simpleSearchResultWithNestedTwoFieldsFromSameNestedNotFlatNoAggs() t
 
         List<String> lines = csvResult.getLines();
         Assert.assertEquals(7, lines.size());
-        Assert.assertTrue(lines.contains("{firstname=Daenerys, lastname=Targaryen},Targaryen") ||
-                lines.contains("{lastname=Targaryen, firstname=Daenerys},Targaryen"));
-        Assert.assertTrue(lines.contains("{firstname=Eddard, lastname=Stark},Stark") ||
-                lines.contains("{lastname=Stark, firstname=Eddard},Stark"));
-        Assert.assertTrue(lines.contains("{firstname=Brandon, lastname=Stark},Stark") ||
-                lines.contains("{lastname=Stark, firstname=Brandon},Stark"));
-        Assert.assertTrue(lines.contains("{firstname=Jaime, lastname=Lannister},Lannister") ||
-                lines.contains("{lastname=Lannister, firstname=Jaime},Lannister") );
+        Assert.assertTrue(lines.contains("Targaryen,{firstname=Daenerys, lastname=Targaryen}") ||
+                lines.contains("Targaryen,{lastname=Targaryen, firstname=Daenerys}"));
+        Assert.assertTrue(lines.contains("Stark,{firstname=Eddard, lastname=Stark}") ||
+                lines.contains("Stark,{lastname=Stark, firstname=Eddard}"));
+        Assert.assertTrue(lines.contains("Stark,{firstname=Brandon, lastname=Stark}") ||
+                lines.contains("Stark,{lastname=Stark, firstname=Brandon}"));
+        Assert.assertTrue(lines.contains("Lannister,{firstname=Jaime, lastname=Lannister}") ||
+                lines.contains("Lannister,{lastname=Lannister, firstname=Jaime}") );
 
     }
 

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

@@ -72,7 +72,7 @@ public void functionAlias() throws Exception {
         List<String> headers = csvResult.getHeaders();
         List<String> content = csvResult.getLines();
         Assert.assertTrue(headers.contains("key"));
-        Assert.assertTrue(content.contains("863 Wythe Place,863"));
+        Assert.assertTrue(content.contains("863,863 Wythe Place"));
     }
 
     @Test