es 6.3.2 support

shi-yuan · shi-yuan · commit d63c1300c5cf · 2018-08-10T18:33:09.000+08:00
diff --git a/.travis.yml b/.travis.yml
@@ -17,7 +17,7 @@ before_install:
   # update to java 8
   - sudo update-java-alternatives -s java-8-oracle
   - export JAVA_HOME=/usr/lib/jvm/java-8-oracle
-  - wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.3.1.deb && sudo dpkg -i --force-confnew elasticsearch-6.3.1.deb
+  - wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.3.2.deb && sudo dpkg -i --force-confnew elasticsearch-6.3.2.deb
   - sudo cp ./src/test/resources/elasticsearch.yml /etc/elasticsearch/elasticsearch.yml
   - sudo cat /etc/elasticsearch/elasticsearch.yml
   - sudo java -version
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.nlpcn</groupId>
 	<artifactId>elasticsearch-sql</artifactId>
-	<version>6.3.1.1</version>
+	<version>6.3.2.0</version>
 	<packaging>jar</packaging>
 	<description>Query elasticsearch using SQL</description>
 	<name>elasticsearch-sql</name>
@@ -45,7 +45,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<runSuite>**/MainTestSuite.class</runSuite>
 		<elasticsearch.plugin.name>sql</elasticsearch.plugin.name>
-		<elasticsearch.version>6.3.1</elasticsearch.version>
+		<elasticsearch.version>6.3.2</elasticsearch.version>
 		<elasticsearch.plugin.classname>org.elasticsearch.plugin.nlpcn.SqlPlug</elasticsearch.plugin.classname>
 	</properties>
 
diff --git a/src/main/java/org/nlpcn/es4sql/domain/Paramer.java b/src/main/java/org/nlpcn/es4sql/domain/Paramer.java
@@ -28,6 +28,8 @@ public class Paramer {
     public Float tieBreaker;
     public Operator operator;
 
+    public String default_field;
+
 	public static Paramer parseParamer(SQLMethodInvokeExpr method) throws SqlParseException {
 		Paramer instance = new Paramer();
 		List<SQLExpr> parameters = method.getParameters();
@@ -76,6 +78,11 @@ public static Paramer parseParamer(SQLMethodInvokeExpr method) throws SqlParseEx
                     case "operator":
                         instance.operator = Operator.fromString(Util.expr2Object(sqlExpr.getRight()).toString());
                         break;
+
+                    case "default_field":
+                        instance.default_field = Util.expr2Object(sqlExpr.getRight()).toString();
+                        break;
+
                     default:
                         break;
                 }
@@ -132,6 +139,10 @@ public static ToXContent fullParamer(QueryStringQueryBuilder query, Paramer para
             query.phraseSlop(paramer.slop);
         }
 
+        if (paramer.default_field != null) {
+            query.defaultField(paramer.default_field);
+        }
+
         return query;
     }
 
diff --git a/src/main/java/org/nlpcn/es4sql/query/maker/AggMaker.java b/src/main/java/org/nlpcn/es4sql/query/maker/AggMaker.java
@@ -6,17 +6,21 @@
 import java.util.*;
 import java.util.stream.Collectors;
 
+import com.fasterxml.jackson.core.JsonFactory;
+import org.elasticsearch.common.ParsingException;
 import org.elasticsearch.common.xcontent.LoggingDeprecationHandler;
 import org.elasticsearch.common.xcontent.NamedXContentRegistry;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.common.xcontent.json.JsonXContent;
+import org.elasticsearch.common.xcontent.json.JsonXContentParser;
 import org.elasticsearch.join.aggregations.JoinAggregationBuilders;
 import org.elasticsearch.script.Script;
 import org.elasticsearch.script.ScriptType;
 import org.elasticsearch.search.aggregations.AbstractAggregationBuilder;
 import org.elasticsearch.search.aggregations.AggregationBuilder;
 import org.elasticsearch.search.aggregations.AggregationBuilders;
 import org.elasticsearch.search.aggregations.BucketOrder;
+import org.elasticsearch.search.aggregations.InternalOrder;
 import org.elasticsearch.search.aggregations.bucket.geogrid.GeoGridAggregationBuilder;
 
 import org.elasticsearch.search.aggregations.bucket.histogram.*;
@@ -289,7 +293,24 @@ private AggregationBuilder termsAgg(MethodField field) throws SqlParseException
                         } else if ("desc".equalsIgnoreCase(value)) {
                             terms.order(BucketOrder.key(false));
                         } else {
-                            throw new SqlParseException("order can only support asc/desc " + kv.toString());
+                            List<BucketOrder> orderElements = new ArrayList<>();
+                            try (JsonXContentParser parser = new JsonXContentParser(NamedXContentRegistry.EMPTY, LoggingDeprecationHandler.INSTANCE, new JsonFactory().createParser(value))) {
+                                XContentParser.Token currentToken = parser.nextToken();
+                                if (currentToken == XContentParser.Token.START_OBJECT) {
+                                    orderElements.add(InternalOrder.Parser.parseOrderParam(parser));
+                                } else if (currentToken == XContentParser.Token.START_ARRAY) {
+                                    for (currentToken = parser.nextToken(); currentToken != XContentParser.Token.END_ARRAY; currentToken = parser.nextToken()) {
+                                        if (currentToken == XContentParser.Token.START_OBJECT) {
+                                            orderElements.add(InternalOrder.Parser.parseOrderParam(parser));
+                                        } else {
+                                            throw new ParsingException(parser.getTokenLocation(), "Invalid token in order array");
+                                        }
+                                    }
+                                }
+                            } catch (IOException e) {
+                                throw new SqlParseException("couldn't parse order: " + e.getMessage());
+                            }
+                            terms.order(orderElements);
                         }
                         break;
                     case "alias":
