More tests, minor adjustements

Author: astefan

x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/expression/function/scalar/datetime/BaseDateTimeFunction.java

@@ -17,7 +17,7 @@
 
 import java.util.TimeZone;
 
-public abstract class BaseDateTimeFunction extends UnaryScalarFunction {
+abstract class BaseDateTimeFunction extends UnaryScalarFunction {
 
     private final TimeZone timeZone;
     private final String name;
@@ -53,7 +53,6 @@ public TimeZone timeZone() {
         return timeZone;
     }
 
-    // add tz along the rest of the params
     @Override
     public String name() {
         return name;

x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/expression/function/scalar/datetime/NamedDateTimeFunction.java

@@ -24,7 +24,10 @@
 import static org.elasticsearch.xpack.sql.expression.function.scalar.script.ParamsBuilder.paramsBuilder;
 import static org.elasticsearch.xpack.sql.expression.function.scalar.script.ScriptTemplate.formatTemplate;
 
-public abstract class NamedDateTimeFunction extends BaseDateTimeFunction {
+/*
+ * Base class for the two "naming" date/time functions: month_name and day_name
+ */
+abstract class NamedDateTimeFunction extends BaseDateTimeFunction {
 
     NamedDateTimeFunction(Location location, Expression field, TimeZone timeZone) {
         super(location, field, timeZone);
@@ -55,6 +58,7 @@ protected ScriptTemplate asScriptFrom(FieldAttribute field) {
     }
 
     private String formatMethodName(String template) {
+        // the Painless method name will be the enum's lower camelcase name
         return template.replace("{method_name}", StringUtils.underscoreToLowerCamelCase(nameExtractor().toString()));
     }
 

x-pack/plugin/sql/src/main/resources/org/elasticsearch/xpack/sql/plugin/sql_whitelist.txt

@@ -9,9 +9,9 @@
 class org.elasticsearch.xpack.sql.expression.function.scalar.whitelist.InternalSqlScriptUtils {
 
   Integer dateTimeChrono(long, String, String)
-  String dayName(long,String)
-  String monthName(long,String)
-  Integer quarter(long,String)
+  String dayName(long, String)
+  String monthName(long, String)
+  Integer quarter(long, String)
   Integer ascii(String)
   Integer bitLength(String)
   String character(Number)

x-pack/plugin/sql/src/test/java/org/elasticsearch/xpack/sql/expression/function/scalar/datetime/QuarterProcessorTests.java

@@ -16,7 +16,7 @@ public class QuarterProcessorTests extends ESTestCase {
 
     private static final TimeZone UTC = TimeZone.getTimeZone("UTC");
 
-    public void testQuarter() {
+    public void testQuarterWithUTCTimezone() {
         QuarterProcessor proc = new QuarterProcessor(UTC);
 
         assertEquals(1, proc.process(new DateTime(0L, DateTimeZone.UTC)));
@@ -28,4 +28,19 @@ public void testQuarter() {
         assertEquals(3, proc.process("-64164233612338"));
         assertEquals(2, proc.process("64164233612338"));
     }
+    
+    public void testValidDayNamesWithNonUTCTimeZone() {
+        QuarterProcessor proc = new QuarterProcessor(TimeZone.getTimeZone("GMT-10:00"));
+        assertEquals(4, proc.process(new DateTime(0L, DateTimeZone.UTC)));
+        assertEquals(4, proc.process(new DateTime(-5400, 1, 1, 5, 0, DateTimeZone.UTC)));
+        assertEquals(1, proc.process(new DateTime(30, 4, 1, 9, 59, DateTimeZone.UTC)));
+        
+        proc = new QuarterProcessor(TimeZone.getTimeZone("GMT+10:00"));
+        assertEquals(4, proc.process(new DateTime(10902, 9, 30, 14, 1, DateTimeZone.UTC)));
+        assertEquals(3, proc.process(new DateTime(10902, 9, 30, 13, 59, DateTimeZone.UTC)));
+        
+        assertEquals(1, proc.process("0"));
+        assertEquals(3, proc.process("-64164233612338"));
+        assertEquals(2, proc.process("64164233612338"));
+    }
 }

x-pack/qa/sql/src/main/resources/datetime.sql-spec

@@ -12,10 +12,13 @@
 
 dateTimeDay
 SELECT DAY(birth_date) d, last_name l FROM "test_emp" WHERE emp_no < 10010 ORDER BY emp_no;
+
 dateTimeDayOfMonth
 SELECT DAY_OF_MONTH(birth_date) d, last_name l FROM "test_emp" WHERE emp_no < 10010 ORDER BY emp_no;
+
 dateTimeMonth
 SELECT MONTH(birth_date) d, last_name l FROM "test_emp" WHERE emp_no < 10010 ORDER BY emp_no;
+
 dateTimeYear
 SELECT YEAR(birth_date) d, last_name l FROM "test_emp" WHERE emp_no < 10010 ORDER BY emp_no;
 
@@ -31,10 +34,13 @@ SELECT QUARTER(hire_date) q, hire_date FROM test_emp ORDER BY hire_date LIMIT 15
 //
 // Filter
 //
+
 dateTimeFilterDayOfMonth
 SELECT DAY_OF_MONTH(birth_date) AS d, last_name l FROM "test_emp" WHERE DAY_OF_MONTH(birth_date) <= 10 ORDER BY emp_no LIMIT 5;
+
 dateTimeFilterMonth
 SELECT MONTH(birth_date) AS d, last_name l FROM "test_emp" WHERE MONTH(birth_date) <= 5 ORDER BY emp_no LIMIT 5;
+
 dateTimeFilterYear
 SELECT YEAR(birth_date) AS d, last_name l FROM "test_emp" WHERE YEAR(birth_date) <= 1960 ORDER BY emp_no LIMIT 5;
 
@@ -60,20 +66,30 @@ SELECT QUARTER(hire_date) quarter, hire_date FROM test_emp WHERE QUARTER(hire_da
 dateTimeAggByYear
 SELECT YEAR(birth_date) AS d, CAST(SUM(emp_no) AS INT) s FROM "test_emp" GROUP BY YEAR(birth_date) ORDER BY YEAR(birth_date) LIMIT 13;
 
-dateTimeAggByMonth
+dateTimeAggByMonthWithOrderBy
 SELECT MONTH(birth_date) AS d, COUNT(*) AS c, CAST(SUM(emp_no) AS INT) s FROM "test_emp" GROUP BY MONTH(birth_date) ORDER BY MONTH(birth_date) DESC;
 
-dateTimeAggByDayOfMonth
+dateTimeAggByDayOfMonthWithOrderBy
 SELECT DAY_OF_MONTH(birth_date) AS d, COUNT(*) AS c, CAST(SUM(emp_no) AS INT) s FROM "test_emp" GROUP BY DAY_OF_MONTH(birth_date) ORDER BY DAY_OF_MONTH(birth_date) DESC;
 
 monthNameWithGroupBy
-select MONTHNAME("hire_date") AS month, COUNT(*) AS count FROM "test_emp" GROUP BY MONTHNAME("hire_date"), MONTH("hire_date") ORDER BY MONTH("hire_date");
+SELECT MONTHNAME("hire_date") AS month, COUNT(*) AS count FROM "test_emp" GROUP BY MONTHNAME("hire_date"), MONTH("hire_date") ORDER BY MONTH("hire_date");
+
+dayNameWithHaving
+SELECT DAYNAME("hire_date") FROM "test_emp" GROUP BY DAYNAME("hire_date") HAVING MAX("emp_no") > ASCII(DAYNAME("hire_date"));
 
-monthNameWithGroupByAndOrderBy
-select MONTHNAME("hire_date") AS month, COUNT(*) AS count FROM "test_emp" GROUP BY MONTHNAME("hire_date"), MONTH("hire_date") ORDER BY MONTHNAME("hire_date") DESC;
+monthNameWithDoubleGroupByAndOrderBy
+SELECT MONTHNAME("hire_date") AS month, COUNT(*) AS count FROM "test_emp" GROUP BY MONTHNAME("hire_date"), MONTH("hire_date") ORDER BY MONTHNAME("hire_date") DESC;
 
-dayNameWithGroupByAndOrderBy
+// AwaitsFix https://github.com/elastic/elasticsearch/issues/33519
+// monthNameWithGroupByOrderByAndHaving
+// SELECT CAST(MAX("salary") AS DOUBLE) max_salary, MONTHNAME("hire_date") month_name FROM "test_emp" GROUP BY MONTHNAME("hire_date") HAVING MAX("salary") > 50000 ORDER BY MONTHNAME(hire_date);
+
+dayNameWithDoubleGroupByAndOrderBy
 SELECT COUNT(*) c, DAYNAME(hire_date) day_name, DAY(hire_date) day FROM test_emp WHERE MONTHNAME(hire_date) = 'August' GROUP BY DAYNAME(hire_date), DAY(hire_date) ORDER BY DAYNAME(hire_date), DAY(hire_date);
 
+dayNameWithGroupByOrderByAndHaving
+SELECT CAST(MAX(salary) AS DOUBLE) max_salary, DAYNAME(hire_date) day_name FROM test_emp GROUP BY DAYNAME(hire_date) HAVING MAX(salary) > 50000 ORDER BY DAYNAME("hire_date");
+
 quarterWithGroupByAndOrderBy
 SELECT QUARTER(hire_date) quarter, COUNT(*) hires FROM test_emp GROUP BY QUARTER(hire_date) ORDER BY QUARTER(hire_date);