fix NLPchina#847

shi-yuan · shi-yuan · commit 78c2afc32831 · 2019-01-15T23:12:23.000+08:00
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.5.4.1</version>
+	<version>6.5.4.2</version>
 	<packaging>jar</packaging>
 	<description>Query elasticsearch using SQL</description>
 	<name>elasticsearch-sql</name>
diff --git a/src/main/java/org/nlpcn/es4sql/domain/Paramer.java b/src/main/java/org/nlpcn/es4sql/domain/Paramer.java
@@ -2,6 +2,7 @@
 
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
@@ -10,23 +11,25 @@
 import com.alibaba.druid.sql.ast.expr.SQLMethodInvokeExpr;
 import com.alibaba.druid.sql.ast.expr.SQLNumericLiteralExpr;
 import org.elasticsearch.common.Strings;
+import org.elasticsearch.common.xcontent.LoggingDeprecationHandler;
 import org.elasticsearch.common.xcontent.ToXContent;
 import org.elasticsearch.index.query.*;
 import org.nlpcn.es4sql.Util;
 import org.nlpcn.es4sql.exception.SqlParseException;
 
 public class Paramer {
 	private String analysis;
-	public Float boost;
+    private Float boost;
 	public String value;
     public Integer slop;
 
-    public Map<String, Float> fieldsBoosts = new HashMap<>();
-    public String type;
+    private Map<String, Float> fieldsBoosts = new HashMap<>();
+    private String type;
     private Float tieBreaker;
-    public Operator operator;
+    private Operator operator;
 
     private String defaultField;
+    private String minimumShouldMatch;
 
     private Boolean inOrder;
     public String clauses;
@@ -90,6 +93,9 @@ public static Paramer parseParamer(SQLMethodInvokeExpr method) throws SqlParseEx
                     case "clauses":
                         instance.clauses = Util.expr2Object(sqlExpr.getRight()).toString();
                         break;
+                    case "minimum_should_match":
+                        instance.minimumShouldMatch = Util.expr2Object(sqlExpr.getRight()).toString();
+                        break;
 
                     default:
                         break;
@@ -124,6 +130,15 @@ public static ToXContent fullParamer(MatchQueryBuilder query, Paramer paramer) {
 		if (paramer.boost != null) {
 			query.boost(paramer.boost);
 		}
+
+        if (paramer.operator != null) {
+            query.operator(paramer.operator);
+        }
+
+        if (paramer.minimumShouldMatch != null) {
+            query.minimumShouldMatch(paramer.minimumShouldMatch);
+        }
+
 		return query;
 	}
 
@@ -151,6 +166,24 @@ public static ToXContent fullParamer(QueryStringQueryBuilder query, Paramer para
             query.defaultField(paramer.defaultField);
         }
 
+        if (paramer.tieBreaker != null) {
+            query.tieBreaker(paramer.tieBreaker);
+        }
+
+        if (paramer.operator != null) {
+            query.defaultOperator(paramer.operator);
+        }
+
+        if (paramer.type != null) {
+            query.type(MultiMatchQueryBuilder.Type.parse(paramer.type.toLowerCase(Locale.ROOT), LoggingDeprecationHandler.INSTANCE));
+        }
+
+        if (paramer.minimumShouldMatch != null) {
+            query.minimumShouldMatch(paramer.minimumShouldMatch);
+        }
+
+        query.fields(paramer.fieldsBoosts);
+
         return query;
     }
 
@@ -179,6 +212,12 @@ public static ToXContent fullParamer(MultiMatchQueryBuilder query, Paramer param
             query.operator(paramer.operator);
         }
 
+        if (paramer.minimumShouldMatch != null) {
+            query.minimumShouldMatch(paramer.minimumShouldMatch);
+        }
+
+        query.fields(paramer.fieldsBoosts);
+
         return query;
     }
 
diff --git a/src/main/java/org/nlpcn/es4sql/query/maker/Maker.java b/src/main/java/org/nlpcn/es4sql/query/maker/Maker.java
@@ -113,7 +113,7 @@ private ToXContent make(Condition cond, String name, SQLMethodInvokeExpr value)
         case "multi_match":
         case "multimatch":
             paramer = Paramer.parseParamer(value);
-            MultiMatchQueryBuilder multiMatchQuery = QueryBuilders.multiMatchQuery(paramer.value).fields(paramer.fieldsBoosts);
+            MultiMatchQueryBuilder multiMatchQuery = QueryBuilders.multiMatchQuery(paramer.value);
             bqb = Paramer.fullParamer(multiMatchQuery, paramer);
             break;
 
@@ -137,7 +137,7 @@ private ToXContent make(Condition cond, String name, SQLMethodInvokeExpr value)
             }
 
             //
-            SpanNearQueryBuilder spanNearQuery = QueryBuilders.spanNearQuery(clauses.get(0), paramer.slop);
+            SpanNearQueryBuilder spanNearQuery = QueryBuilders.spanNearQuery(clauses.get(0), Optional.ofNullable(paramer.slop).orElse(SpanNearQueryBuilder.DEFAULT_SLOP));
             for (int i = 1; i < clauses.size(); ++i) {
                 spanNearQuery.addClause(clauses.get(i));
             }
