support number field (#68)

ex. select 1 from

Author: penghuo

src/main/java/com/amazon/opendistroforelasticsearch/sql/parser/FieldMaker.java

@@ -85,6 +85,10 @@ public static Field makeField(SQLExpr expr, String alias, String tableAlias) thr
             methodParameters.add(new KVValue(alias));
             methodParameters.add(new KVValue(scriptCode));
             return new MethodField("script", methodParameters, null, alias);
+        } else if (expr instanceof SQLNumericLiteralExpr) {
+            SQLMethodInvokeExpr methodInvokeExpr = new SQLMethodInvokeExpr("assign", null);
+            methodInvokeExpr.addParameter(expr);
+            return makeMethodField(methodInvokeExpr.getMethodName(), methodInvokeExpr.getParameters(), null, alias, tableAlias, true);
         } else {
             throw new SqlParseException("unknown field name : " + expr);
         }

src/main/java/com/amazon/opendistroforelasticsearch/sql/utils/SQLFunctions.java

@@ -60,7 +60,7 @@ public class SQLFunctions {
             "day_of_week", "hour_of_day", "minute_of_day", "minute_of_hour", "second_of_minute"
     );
 
-    private final static Set<String> utilityFunctions = Sets.newHashSet("field");
+    private final static Set<String> utilityFunctions = Sets.newHashSet("field", "assign");
 
     public final static Set<String> builtInFunctions = Stream.of(
             numberOperators,
@@ -229,7 +229,9 @@ public static Tuple<String, String> function(String methodName, List<KVValue> pa
                     functionStr = log(SQLUtils.toSQLExpr("Math.E"), logs.get(0), name);
                 }
                 break;
-
+            case "assign":
+                functionStr = assign((SQLExpr) paramers.get(0).value);
+                break;
             default:
 
         }
@@ -341,6 +343,12 @@ public static Tuple<String, String> add(SQLExpr a, SQLExpr b) {
         return binaryOpertator("add", "+", a, b);
     }
 
+    public static Tuple<String, String> assign(SQLExpr a) {
+        String name = randomize("assign");
+        return new Tuple<>(name,
+                        def(name, extractName(a)));
+    }
+
     private static Tuple<String, String> modulus(SQLExpr a, SQLExpr b) {
         return binaryOpertator("modulus", "%", a, b);
     }

src/test/java/com/amazon/opendistroforelasticsearch/sql/esintgtest/SQLFunctionsIT.java

@@ -16,21 +16,35 @@
 package com.amazon.opendistroforelasticsearch.sql.esintgtest;
 
 
+import org.elasticsearch.action.search.SearchResponse;
+import org.elasticsearch.common.xcontent.LoggingDeprecationHandler;
+import org.elasticsearch.common.xcontent.NamedXContentRegistry;
+import org.elasticsearch.common.xcontent.XContentFactory;
+import org.elasticsearch.common.xcontent.XContentParser;
+import org.elasticsearch.common.xcontent.XContentType;
+import org.elasticsearch.search.SearchHit;
+import org.elasticsearch.search.SearchHits;
 import org.json.JSONObject;
 import org.junit.Assert;
 import org.junit.Ignore;
 import org.junit.Test;
 
+import java.io.IOException;
 import java.util.stream.IntStream;
 
 import static com.amazon.opendistroforelasticsearch.sql.esintgtest.TestsConstants.TEST_INDEX_ACCOUNT;
 import static com.amazon.opendistroforelasticsearch.sql.util.MatcherUtils.hitAny;
 import static com.amazon.opendistroforelasticsearch.sql.util.MatcherUtils.kvDouble;
 import static com.amazon.opendistroforelasticsearch.sql.util.MatcherUtils.kvString;
+import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.both;
+import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.endsWith;
 import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.hasEntry;
+import static org.hamcrest.Matchers.hasValue;
+import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.isEmptyOrNullString;
 import static org.hamcrest.Matchers.not;
 
@@ -191,4 +205,51 @@ public void split_field() throws Exception {
                 TestsConstants.TEST_INDEX + "/account where address is not null " +
                 " limit 10  ";
     }
+
+    @Test
+    public void literal() throws Exception {
+        String query = "SELECT 10 "+
+                "from " + TEST_INDEX_ACCOUNT + "/account limit 1";
+        final SearchHit[] hits = query(query).getHits();
+        assertThat(hits[0].getFields(), hasValue(contains(10)));
+    }
+
+    @Test
+    public void literalWithDoubleValue() throws Exception {
+        String query = "SELECT 10.0 "+
+                "from " + TEST_INDEX_ACCOUNT + "/account limit 1";
+
+        final SearchHit[] hits = query(query).getHits();
+        assertThat(hits[0].getFields(), hasValue(contains(10.0)));
+    }
+
+    @Test
+    public void literalWithAlias() throws Exception {
+        String query = "SELECT 10 as key "+
+                "from " + TEST_INDEX_ACCOUNT + "/account limit 1";
+        final SearchHit[] hits = query(query).getHits();
+
+        assertThat(hits.length, is(1));
+        assertThat(hits[0].getFields(), hasEntry(is("key"), contains(10)));
+    }
+
+    @Test
+    public void literalMultiField() throws Exception {
+        String query = "SELECT 1, 2 "+
+                "from " + TEST_INDEX_ACCOUNT + "/account limit 1";
+        final SearchHit[] hits = query(query).getHits();
+
+        assertThat(hits.length, is(1));
+        assertThat(hits[0].getFields(), allOf(hasValue(contains(1)), hasValue(contains(2))));
+    }
+
+    private SearchHits query(String query) throws IOException {
+        final String rsp = executeQueryWithStringOutput(query);
+
+        final XContentParser parser = XContentFactory.xContent(XContentType.JSON).createParser(
+                NamedXContentRegistry.EMPTY,
+                LoggingDeprecationHandler.INSTANCE,
+                rsp);
+        return SearchResponse.fromXContent(parser).getHits();
+    }
 }

src/test/java/com/amazon/opendistroforelasticsearch/sql/unittest/parser/FieldMakerTest.java

@@ -0,0 +1,55 @@
+/*
+ *   Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License").
+ *   You may not use this file except in compliance with the License.
+ *   A copy of the License is located at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   or in the "license" file accompanying this file. This file is distributed
+ *   on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ *   express or implied. See the License for the specific language governing
+ *   permissions and limitations under the License.
+ */
+
+package com.amazon.opendistroforelasticsearch.sql.unittest.parser;
+
+import com.alibaba.druid.sql.ast.expr.SQLIntegerExpr;
+import com.alibaba.druid.sql.ast.expr.SQLNumberExpr;
+import com.amazon.opendistroforelasticsearch.sql.domain.MethodField;
+import com.amazon.opendistroforelasticsearch.sql.exception.SqlParseException;
+import com.amazon.opendistroforelasticsearch.sql.parser.FieldMaker;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+public class FieldMakerTest {
+
+    private static final String ALIAS = "a";
+
+    private static final String TABLE_ALIAS = "t";
+
+    @Test
+    public void makeFieldAssign() throws SqlParseException {
+        final SQLIntegerExpr sqlExpr = new SQLIntegerExpr(10);
+        final MethodField field = (MethodField) FieldMaker.makeField(sqlExpr, ALIAS, TABLE_ALIAS);
+
+        assertEquals("script", field.getName());
+        assertEquals(ALIAS, field.getParams().get(0).value);
+        assertTrue(((String)field.getParams().get(1).value).matches("def assign_[0-9]+ = 10;return assign_[0-9]+;"));
+        assertEquals(ALIAS, field.getAlias());
+    }
+
+    @Test
+    public void makeFieldAssignDouble() throws SqlParseException {
+        final SQLNumberExpr sqlExpr = new SQLNumberExpr(10.0);
+        final MethodField field = (MethodField) FieldMaker.makeField(sqlExpr, ALIAS, TABLE_ALIAS);
+
+        assertEquals("script", field.getName());
+        assertEquals(ALIAS, field.getParams().get(0).value);
+        assertTrue(((String)field.getParams().get(1).value).matches("def assign_[0-9]+ = 10.0;return assign_[0-9]+;"));
+        assertEquals(ALIAS, field.getAlias());
+    }
+}

src/test/java/com/amazon/opendistroforelasticsearch/sql/unittest/utils/SQLFunctionsTest.java

@@ -0,0 +1,40 @@
+/*
+ *   Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License").
+ *   You may not use this file except in compliance with the License.
+ *   A copy of the License is located at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   or in the "license" file accompanying this file. This file is distributed
+ *   on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ *   express or implied. See the License for the specific language governing
+ *   permissions and limitations under the License.
+ */
+
+package com.amazon.opendistroforelasticsearch.sql.unittest.utils;
+
+import com.alibaba.druid.sql.ast.expr.SQLIntegerExpr;
+import com.amazon.opendistroforelasticsearch.sql.domain.KVValue;
+import com.amazon.opendistroforelasticsearch.sql.utils.SQLFunctions;
+import com.google.common.collect.ImmutableList;
+import org.elasticsearch.common.collect.Tuple;
+import org.junit.Test;
+
+import static org.junit.Assert.assertTrue;
+
+public class SQLFunctionsTest {
+
+    @Test
+    public void testAssign() {
+        final SQLIntegerExpr sqlIntegerExpr = new SQLIntegerExpr(10);
+        final Tuple<String, String> assign = SQLFunctions.function("assign",
+                ImmutableList.of(new KVValue(null, sqlIntegerExpr)),
+                null,
+                true);
+
+        assertTrue(assign.v1().matches("assign_[0-9]+"));
+        assertTrue(assign.v2().matches("def assign_[0-9]+ = 10;return assign_[0-9]+;"));
+    }
+}

src/test/java/com/amazon/opendistroforelasticsearch/sql/util/MatcherUtils.java

@@ -102,4 +102,8 @@ public static Matcher<JSONObject> kvString(String key, Matcher<String> matcher)
     public static Matcher<JSONObject> kvDouble(String key, Matcher<Double> matcher) {
         return featureValueOf("Json Match", matcher, actual -> (Double) actual.query(key));
     }
+
+    public static Matcher<JSONObject> kvInt(String key, Matcher<Integer> matcher) {
+        return featureValueOf("Json Match", matcher, actual -> (Integer) actual.query(key));
+    }
 }