fix power function parameter error

detongz · detongz · commit bef138acb588 · 2018-06-01T19:52:18.000+08:00
change pow(a) to pow(a,b)
diff --git a/src/main/java/org/nlpcn/es4sql/SQLFunctions.java b/src/main/java/org/nlpcn/es4sql/SQLFunctions.java
@@ -7,6 +7,7 @@
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import org.elasticsearch.common.collect.Tuple;
+import org.elasticsearch.plugin.nlpcn.executors.CSVResult;
 import org.nlpcn.es4sql.domain.KVValue;
 
 import java.util.List;
@@ -62,17 +63,20 @@ public static Tuple<String, String> function(String methodName, List<KVValue> pa
                         name);
                 break;
 
-            case "floor":
+            case "abs":
             case "round":
+            case "floor":
             case "ceil":
             case "cbrt":
             case "rint":
-            case "pow":
             case "exp":
             case "sqrt":
                 functionStr = mathSingleValueTemplate("Math."+methodName,methodName,Util.expr2Object((SQLExpr) paramers.get(0).value).toString(), name);
                 break;
 
+            case "pow":
+                functionStr = mathDoubleValueTemplate("Math."+methodName, methodName, Util.expr2Object((SQLExpr) paramers.get(0).value).toString(), Util.expr2Object((SQLExpr) paramers.get(1).value).toString(), name);
+                break;
 
             case "substring":
                 functionStr = substring(Util.expr2Object((SQLExpr) paramers.get(0).value).toString(),
@@ -302,6 +306,15 @@ public static Tuple<String, String> trim(String strColumn, String valueName) {
 
     }
 
+    private static Tuple<String, String> mathDoubleValueTemplate(String methodName, String fieldName, String val1, String val2, String valueName) {
+        String name = fieldName + "_" + random();
+        if (valueName == null) {
+            return new Tuple(name, "def "+name+" = "+methodName+"(doc['"+val1+"'].value, "+val2+")");
+        } else {
+            return new Tuple(name, val1 + ";def "+name+" = "+methodName+"("+valueName+", "+val2+")");
+        }
+    }
+
     private static Tuple<String, String> mathSingleValueTemplate(String methodName, String strColumn, String valueName) {
         return mathSingleValueTemplate(methodName,methodName, strColumn,valueName);
     }
diff --git a/src/test/java/org/nlpcn/es4sql/SQLFunctionsTest.java b/src/test/java/org/nlpcn/es4sql/SQLFunctionsTest.java
@@ -247,18 +247,26 @@ public void concat_ws_fields() throws Exception {
 
     @Test
     public void functionLogs() throws Exception {
-        MainTestSuite.setUp();
         String query = "SELECT log10(100) as a, log(1) as b, log(2, 4) as c, log2(8) as d from "
-                + TestsConstants.TEST_INDEX + "/account limit 1";
+                + TEST_INDEX_ACCOUNT + "/account limit 1";
         CSVResult csvResult = getCsvResult(false, query);
         List<String> content = csvResult.getLines();
-        System.out.println(content.toString());
         Assert.assertTrue(content.toString().contains("2.0"));
         Assert.assertTrue(content.toString().contains("1.0"));
         Assert.assertTrue(content.toString().contains("0.0"));
         Assert.assertTrue(content.toString().contains("3.0"));
     }
 
+    @Test
+    public void functionPow() throws Exception {
+        String query = "SELECT pow(account_number, 2) as key,"+
+                "abs(age - 60) as new_age from " + TEST_INDEX_ACCOUNT + "/account limit 1";
+        CSVResult csvResult = getCsvResult(false, query);
+        List<String> content = csvResult.getLines();
+        Assert.assertTrue(content.toString().contains("625"));
+        Assert.assertTrue(content.toString().contains("21"));
+    }
+
     // todo: change when split is back on language
 //    @Test
 //    public void split_field() throws Exception {
