Merge pull request #880 from katzyn/datetime

Assorted date-time related changes

h2/src/main/org/h2/expression/AggregateDataMedian.java

@@ -224,7 +224,8 @@ class AggregateDataMedian extends AggregateData {
         case Value.DOUBLE:
             return ValueDouble.get((v0.getFloat() + v1.getDouble()) / 2);
         case Value.TIME: {
-            return ValueTime.fromMillis((v0.getTime().getTime() + v1.getTime().getTime()) / 2);
+            ValueTime t0 = (ValueTime) v0.convertTo(Value.TIME), t1 = (ValueTime) v1.convertTo(Value.TIME);
+            return ValueTime.fromNanos((t0.getNanos() + t1.getNanos()) / 2);
         }
         case Value.DATE: {
             ValueDate d0 = (ValueDate) v0.convertTo(Value.DATE), d1 = (ValueDate) v1.convertTo(Value.DATE);

h2/src/main/org/h2/expression/Function.java

@@ -15,7 +15,7 @@ import java.nio.charset.StandardCharsets;
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.text.SimpleDateFormat;
+import java.text.DateFormatSymbols;
 import java.util.ArrayList;
 import java.util.GregorianCalendar;
 import java.util.HashMap;
@@ -153,6 +153,11 @@ public class Function extends Expression implements FunctionCall {
     private static final HashMap<String, Integer> DATE_PART = new HashMap<>();
     private static final char[] SOUNDEX_INDEX = new char[128];
 
+    /**
+     * English names of months and week days.
+     */
+    private static volatile String[][] MONTHS_AND_WEEKS;
+
     protected Expression[] args;
 
     private final FunctionInfo info;
@@ -844,9 +849,8 @@ public class Function extends Expression implements FunctionCall {
                     database.getMode().treatEmptyStringsAsNull);
             break;
         case DAY_NAME: {
-            SimpleDateFormat dayName = new SimpleDateFormat(
-                    "EEEE", Locale.ENGLISH);
-            result = ValueString.get(dayName.format(v0.getDate()),
+            int dayOfWeek = DateTimeUtils.getSundayDayOfWeek(DateTimeUtils.dateAndTimeFromValue(v0)[0]);
+            result = ValueString.get(getMonthsAndWeeks(1)[dayOfWeek],
                     database.getMode().treatEmptyStringsAsNull);
             break;
         }
@@ -866,9 +870,8 @@ public class Function extends Expression implements FunctionCall {
             result = ValueInt.get(getIntDatePart(v0, info.type));
             break;
         case MONTH_NAME: {
-            SimpleDateFormat monthName = new SimpleDateFormat("MMMM",
-                    Locale.ENGLISH);
-            result = ValueString.get(monthName.format(v0.getDate()),
+            int month = DateTimeUtils.monthFromDateValue(DateTimeUtils.dateAndTimeFromValue(v0)[0]);
+            result = ValueString.get(getMonthsAndWeeks(0)[month - 1],
                     database.getMode().treatEmptyStringsAsNull);
             break;
         }
@@ -2025,6 +2028,18 @@ public class Function extends Expression implements FunctionCall {
         return r2 - r1;
     }
 
+    private static String[] getMonthsAndWeeks(int field) {
+        String[][] result = MONTHS_AND_WEEKS;
+        if (result == null) {
+            result = new String[2][];
+            DateFormatSymbols dfs = DateFormatSymbols.getInstance(Locale.ENGLISH);
+            result[0] = dfs.getMonths();
+            result[1] = dfs.getWeekdays();
+            MONTHS_AND_WEEKS = result;
+        }
+        return result[field];
+    }
+
     private static String substring(String s, int start, int length) {
         int len = s.length();
         start--;

h2/src/main/org/h2/util/DateTimeUtils.java

@@ -628,20 +628,6 @@ public class DateTimeUtils {
         return ValueTimestamp.fromDateValueAndNanos(dateValue, timeNanos);
     }
 
-    /**
-     * Get the year (positive or negative) from a calendar.
-     *
-     * @param calendar the calendar
-     * @return the year
-     */
-    private static int getYear(Calendar calendar) {
-        int year = calendar.get(Calendar.YEAR);
-        if (calendar.get(Calendar.ERA) == GregorianCalendar.BC) {
-            year = 1 - year;
-        }
-        return year;
-    }
-
     /**
      * Get the number of milliseconds since 1970-01-01 in the local timezone,
      * but without daylight saving time into account.
@@ -1069,10 +1055,12 @@ public class DateTimeUtils {
      * @return the date value
      */
     private static long dateValueFromCalendar(Calendar cal) {
-        int year, month, day;
-        year = getYear(cal);
-        month = cal.get(Calendar.MONTH) + 1;
-        day = cal.get(Calendar.DAY_OF_MONTH);
+        int year = cal.get(Calendar.YEAR);
+        if (cal.get(Calendar.ERA) == GregorianCalendar.BC) {
+            year = 1 - year;
+        }
+        int month = cal.get(Calendar.MONTH) + 1;
+        int day = cal.get(Calendar.DAY_OF_MONTH);
         return ((long) year << SHIFT_YEAR) | (month << SHIFT_MONTH) | day;
     }
 

h2/src/test/org/h2/test/unit/TestClearReferences.java

@@ -26,6 +26,7 @@ public class TestClearReferences extends TestBase {
         "org.h2.compress.CompressLZF.cachedHashTable",
         "org.h2.engine.DbSettings.defaultSettings",
         "org.h2.engine.SessionRemote.sessionFactory",
+        "org.h2.expression.Function.MONTHS_AND_WEEKS",
         "org.h2.jdbcx.JdbcDataSourceFactory.cachedTraceSystem",
         "org.h2.store.RecoverTester.instance",
         "org.h2.store.fs.FilePath.defaultProvider",