script-filter support for file/indexed script

eliranmoyal · eliranmoyal · commit 60d0b3a31da5 · 2015-12-30T17:57:27.000+02:00
diff --git a/src/main/java/org/nlpcn/es4sql/parse/ScriptFilter.java b/src/main/java/org/nlpcn/es4sql/parse/ScriptFilter.java
@@ -3,6 +3,7 @@
 import com.alibaba.druid.sql.ast.SQLExpr;
 import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr;
 import com.alibaba.druid.sql.ast.expr.SQLMethodInvokeExpr;
+import org.elasticsearch.script.ScriptService;
 import org.nlpcn.es4sql.Util;
 import org.nlpcn.es4sql.domain.Field;
 import org.nlpcn.es4sql.domain.KVValue;
@@ -19,14 +20,17 @@
 public class ScriptFilter {
     private String script;
     private Map<String,Object> args;
-
+    private ScriptService.ScriptType scriptType;
     public ScriptFilter() {
+
         args = null;
+        scriptType = ScriptService.ScriptType.INLINE;
     }
 
-    public ScriptFilter(String script, Map<String, Object> args) {
+    public ScriptFilter(String script, Map<String, Object> args, ScriptService.ScriptType scriptType) {
         this.script = script;
         this.args = args;
+        this.scriptType = scriptType;
     }
 
     public boolean tryParseFromMethodExpr(SQLMethodInvokeExpr expr) throws SqlParseException {
@@ -58,12 +62,32 @@ public boolean tryParseFromMethodExpr(SQLMethodInvokeExpr expr) throws SqlParseE
             SQLExpr right = binaryOpExpr.getRight();
             Object value = Util.expr2Object(right);
             String key = Util.extendedToString(binaryOpExpr.getLeft());
-            args.put(key, value);
+            if(key.equals("script_type")){
+                parseAndUpdateScriptType(value.toString());
+            }
+            else {
+                args.put(key, value);
+            }
 
         }
         return true;
     }
 
+    private void parseAndUpdateScriptType(String scriptType) {
+        String scriptTypeUpper = scriptType.toUpperCase();
+        switch(scriptTypeUpper){
+            case "INLINE":
+                this.scriptType = ScriptService.ScriptType.INLINE;
+                break;
+            case "INDEXED":
+                this.scriptType = ScriptService.ScriptType.INDEXED;
+                break;
+            case "FILE":
+                this.scriptType = ScriptService.ScriptType.FILE;
+                break;
+        }
+    }
+
     public boolean containsParameters(){
         return args!=null && args.size() > 0;
     }
@@ -72,6 +96,9 @@ public String getScript() {
         return script;
     }
 
+    public ScriptService.ScriptType getScriptType() {
+        return scriptType;
+    }
 
     public Map<String, Object> getArgs() {
         return args;
diff --git a/src/main/java/org/nlpcn/es4sql/query/maker/Maker.java b/src/main/java/org/nlpcn/es4sql/query/maker/Maker.java
@@ -253,7 +253,7 @@ private ToXContent make(Condition cond, String name, Object value) throws SqlPar
             if(scriptFilter.containsParameters()){
                 params = scriptFilter.getArgs();
             }
-            x = QueryBuilders.scriptQuery(new Script(scriptFilter.getScript(), ScriptService.ScriptType.INLINE, null, params));
+            x = QueryBuilders.scriptQuery(new Script(scriptFilter.getScript(), scriptFilter.getScriptType(), null, params));
         break;
             default:
 			throw new SqlParseException("not define type " + cond.getName());

Original file line number	Diff line number	Diff line change
`@@ -253,7 +253,7 @@ private ToXContent make(Condition cond, String name, Object value) throws SqlPar`
`253`	`253`	`if(scriptFilter.containsParameters()){`
`254`	`254`	`params = scriptFilter.getArgs();`
`255`	`255`	`}`
`256`		`- x = QueryBuilders.scriptQuery(new Script(scriptFilter.getScript(), ScriptService.ScriptType.INLINE, null, params));`
	`256`	`+ x = QueryBuilders.scriptQuery(new Script(scriptFilter.getScript(), scriptFilter.getScriptType(), null, params));`
`257`	`257`	`break;`
`258`	`258`	`default:`
`259`	`259`	`throw new SqlParseException("not define type " + cond.getName());`