Merge branch 'master' into datetime

h2/src/docsrc/html/performance.html

@@ -490,7 +490,7 @@ Instead, use a prepared statement with arrays as in the following example:
 </p>
 <pre>
 PreparedStatement prep = conn.prepareStatement(
-    "SELECT * TEST.ID = ANY(?)");
+    "SELECT * FROM TEST WHERE ID = ANY(?)");
 prep.setObject(1, new Object[] { "1", "2" });
 ResultSet rs = prep.executeQuery();
 </pre>

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

@@ -311,7 +311,7 @@ public class Aggregate extends Expression {
                 return v;
             }
             case MEDIAN: {
-                return AggregateDataMedian.getFromIndex(session, on, dataType);
+                return AggregateDataMedian.getResultFromIndex(session, on, dataType);
             }
             default:
                 DbException.throwInternalError("type=" + type);

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

@@ -49,6 +49,12 @@ class AggregateDataMedian extends AggregateData {
                 || (sortType & SortOrder.DESCENDING) != 0 && (sortType & SortOrder.NULLS_FIRST) == 0;
     }
 
+    /**
+     * Get the index (if any) for the column specified in the median aggregate.
+     *
+     * @param on the expression (usually a column expression)
+     * @return the index, or null
+     */
     static Index getMedianColumnIndex(Expression on) {
         if (on instanceof ExpressionColumn) {
             ExpressionColumn col = (ExpressionColumn) on;
@@ -68,8 +74,8 @@ class AggregateDataMedian extends AggregateData {
                         if (!index.isFirstColumn(column)) {
                             continue;
                         }
-                        if (result == null || result.getColumns().length > index.getColumns().length
                         // Prefer index without nulls last for nullable columns
+                        if (result == null || result.getColumns().length > index.getColumns().length
                                 || nullable && isNullsLast(result) && !isNullsLast(index)) {
                             result = index;
                         }
@@ -81,7 +87,15 @@ class AggregateDataMedian extends AggregateData {
         return null;
     }
 
-    static Value getFromIndex(Session session, Expression on, int dataType) {
+    /**
+     * Get the result from the index.
+     *
+     * @param session the session
+     * @param on the expression
+     * @param dataType the data type
+     * @return the result
+     */
+    static Value getResultFromIndex(Session session, Expression on, int dataType) {
         Index index = getMedianColumnIndex(on);
         long count = index.getRowCount(session);
         if (count == 0) {
@@ -94,10 +108,8 @@ class AggregateDataMedian extends AggregateData {
         if (expr.getColumn().isNullable()) {
             boolean hasNulls = false;
             SearchRow row;
-            /*
-             * Try to skip nulls from the start first with the same cursor that will be used
-             * to read values.
-             */
+            // Try to skip nulls from the start first with the same cursor that
+            // will be used to read values.
             while (count > 0) {
                 row = cursor.getSearchRow();
                 if (row == null) {
@@ -113,10 +125,8 @@ class AggregateDataMedian extends AggregateData {
             if (count == 0) {
                 return ValueNull.INSTANCE;
             }
-            /*
-             * If no nulls found and if index orders nulls last create a second cursor to
-             * count nulls at the end.
-             */
+            // If no nulls found and if index orders nulls last create a second
+            // cursor to count nulls at the end.
             if (!hasNulls && isNullsLast(index)) {
                 TableFilter tableFilter = expr.getTableFilter();
                 SearchRow check = tableFilter.getTable().getTemplateSimpleRow(true);
@@ -196,7 +206,7 @@ class AggregateDataMedian extends AggregateData {
         return getMedian(a[idx - 1], v1, dataType, mode);
     }
 
-    static Value getMedian(Value v0, Value v1, int dataType, CompareMode mode) {
+    private static Value getMedian(Value v0, Value v1, int dataType, CompareMode mode) {
         if (v0.compareTo(v1, mode) == 0) {
             return v0.convertTo(dataType);
         }

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

@@ -57,7 +57,7 @@ public class ConditionInParameter extends Condition {
 
     private Expression left;
 
-    final Parameter parameter;
+    private final Parameter parameter;
 
     /**
      * Create a new {@code = ANY(?)} condition.

h2/src/test/org/h2/test/TestBase.java

@@ -464,6 +464,17 @@ public abstract class TestBase {
         throw new AssertionError(string);
     }
 
+   /**
+    * Log an error message.
+    *
+    * @param s the message
+    */
+   public static void logErrorMessage(String s) {
+       System.out.flush();
+       System.err.println("ERROR: " + s + "------------------------------");
+       logThrowable(s, null);
+   }
+
     /**
      * Log an error message.
      *
@@ -478,6 +489,10 @@ public abstract class TestBase {
         System.err.println("ERROR: " + s + " " + e.toString()
                 + " ------------------------------");
         e.printStackTrace();
+        logThrowable(null, e);
+    }
+
+    private static void logThrowable(String s, Throwable e) {
         // synchronize on this class, because file locks are only visible to
         // other JVMs
         synchronized (TestBase.class) {
@@ -494,9 +509,14 @@ public abstract class TestBase {
                 }
                 // append
                 FileWriter fw = new FileWriter("error.txt", true);
+                if (s != null) {
+                    fw.write(s);
+                }
+                if (e != null) {
                     PrintWriter pw = new PrintWriter(fw);
                     e.printStackTrace(pw);
                     pw.close();
+                }
                 fw.close();
                 // unlock
                 lock.release();

h2/src/test/org/h2/test/db/AbstractBaseForCommonTableExpressions.java

@@ -17,7 +17,20 @@ import org.h2.test.TestBase;
  */
 public abstract class AbstractBaseForCommonTableExpressions extends TestBase {
 
-    protected void testRepeatedQueryWithSetup(int maxRetries, String[] expectedRowData, String[] expectedColumnNames,
+    /**
+     * Test a query.
+     *
+     * @param maxRetries the number of times the query is run
+     * @param expectedRowData the expected result data
+     * @param expectedColumnNames the expected columns of the result
+     * @param expectedNumberOfRows the expected number of rows
+     * @param setupSQL the SQL statement used for setup
+     * @param withQuery the query
+     * @param closeAndReopenDatabaseConnectionOnIteration whether the connection
+     *            should be re-opened each time
+     * @param expectedColumnTypes the expected datatypes of the result
+     */
+    void testRepeatedQueryWithSetup(int maxRetries, String[] expectedRowData, String[] expectedColumnNames,
             int expectedNumberOfRows, String setupSQL, String withQuery,
             int closeAndReopenDatabaseConnectionOnIteration, String[] expectedColumnTypes) throws SQLException {
 

h2/src/test/org/h2/test/db/TestOptimizations.java

@@ -68,7 +68,9 @@ public class TestOptimizations extends TestBase {
         testMultiColumnRangeQuery();
         testDistinctOptimization();
         testQueryCacheTimestamp();
+        if (!config.lazy) {
             testQueryCacheSpeed();
+        }
         testQueryCache(true);
         testQueryCache(false);
         testIn();
@@ -800,21 +802,26 @@ public class TestOptimizations extends TestBase {
     }
 
     private void testQuerySpeed(Statement stat, String sql) throws SQLException {
-        stat.execute("set OPTIMIZE_REUSE_RESULTS 0");
+        long totalTime = 0;
+        long totalTimeOptimized = 0;
+        for (int i = 0; i < 3; i++) {
+            totalTime += measureQuerySpeed(stat, sql, false);
+            totalTimeOptimized += measureQuerySpeed(stat, sql, true);
+        }
+        System.out.println(TimeUnit.NANOSECONDS.toMillis(totalTime)+" "+TimeUnit.NANOSECONDS.toMillis(totalTimeOptimized));
+        if (totalTimeOptimized > totalTime) {
+            fail("not optimized: " + TimeUnit.NANOSECONDS.toMillis(totalTime) +
+                    " optimized: " + TimeUnit.NANOSECONDS.toMillis(totalTimeOptimized) +
+                    " sql:" + sql);
+        }
+    }
+
+    private long measureQuerySpeed(Statement stat, String sql, boolean optimized) throws SQLException {
+        stat.execute("set OPTIMIZE_REUSE_RESULTS " + (optimized ? "1" : "0"));
         stat.execute(sql);
         long time = System.nanoTime();
         stat.execute(sql);
-        time = System.nanoTime() - time;
-        stat.execute("set OPTIMIZE_REUSE_RESULTS 1");
-        stat.execute(sql);
-        long time2 = System.nanoTime();
-        stat.execute(sql);
-        time2 = System.nanoTime() - time2;
-        if (time2 > time * 2) {
-            fail("not optimized: " + TimeUnit.NANOSECONDS.toMillis(time) +
-                    " optimized: " + TimeUnit.NANOSECONDS.toMillis(time2) +
-                    " sql:" + sql);
-        }
+        return System.nanoTime() - time;
     }
 
     private void testQueryCache(boolean optimize) throws SQLException {

h2/src/test/org/h2/test/scripts/TestScript.java

@@ -41,6 +41,7 @@ public class TestScript extends TestBase {
     private boolean reconnectOften;
     private Connection conn;
     private Statement stat;
+    private String fileName;
     private LineNumberReader in;
     private int outputLineNo;
     private PrintStream out;
@@ -155,6 +156,7 @@ public class TestScript extends TestBase {
         // we processed.
         conn = null;
         stat = null;
+        fileName = null;
         in = null;
         outputLineNo = 0;
         out = null;
@@ -172,7 +174,7 @@ public class TestScript extends TestBase {
         conn.close();
         out.close();
         if (errors.length() > 0) {
-            throw new Exception("errors:\n" + errors.toString());
+            throw new Exception("errors in " + scriptFileName + " found");
         }
         // new File(outFile).delete();
     }
@@ -200,6 +202,7 @@ public class TestScript extends TestBase {
         if (is == null) {
             throw new IOException("could not find " + inFile);
         }
+        fileName = inFile;
         in = new LineNumberReader(new InputStreamReader(is, "Cp1252"));
         StringBuilder buff = new StringBuilder();
         while (true) {
@@ -435,17 +438,14 @@ public class TestScript extends TestBase {
                 if (reconnectOften && sql.toUpperCase().startsWith("EXPLAIN")) {
                     return;
                 }
-                errors.append("line: ");
-                errors.append(outputLineNo);
-                errors.append("\n" + "exp: ");
-                errors.append(compare);
-                errors.append("\n" + "got: ");
-                errors.append(s);
-                errors.append("\n");
+                errors.append(fileName).append('\n');
+                errors.append("line: ").append(outputLineNo).append('\n');
+                errors.append("exp: ").append(compare).append('\n');
+                errors.append("got: ").append(s).append('\n');
                 if (e != null) {
                     TestBase.logError("script", e);
                 }
-                TestBase.logError(errors.toString(), null);
+                TestBase.logErrorMessage(errors.toString());
                 if (failFast) {
                     conn.close();
                     System.exit(1);

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

@@ -48,7 +48,7 @@ public class TestDateTimeUtils extends TestBase {
      * {@link DateTimeUtils#getIsoDayOfWeek(long)}.
      */
     private void testDayOfWeek() {
-        GregorianCalendar gc = DateTimeUtils.createGregorianCalendar();
+        GregorianCalendar gc = DateTimeUtils.createGregorianCalendar(DateTimeUtils.UTC);
         for (int i = -1_000_000; i <= 1_000_000; i++) {
             gc.clear();
             gc.setTimeInMillis(i * 86400000L);
@@ -66,7 +66,8 @@ public class TestDateTimeUtils extends TestBase {
             int isoDow = (dow + 5) % 7 + 1;
             assertEquals(isoDow, DateTimeUtils.getIsoDayOfWeek(dateValue));
             assertEquals(gc.get(Calendar.WEEK_OF_YEAR),
-                    DateTimeUtils.getWeekOfYear(dateValue, gc.getFirstDayOfWeek() - 1, gc.getMinimalDaysInFirstWeek()));
+                    DateTimeUtils.getWeekOfYear(dateValue, gc.getFirstDayOfWeek() - 1,
+                    gc.getMinimalDaysInFirstWeek()));
         }
     }
 
@@ -86,7 +87,8 @@ public class TestDateTimeUtils extends TestBase {
                     gc.clear();
                     gc.setTimeInMillis(i * 86400000L);
                     assertEquals(gc.get(Calendar.DAY_OF_YEAR), DateTimeUtils.getDayOfYear(dateValue));
-                    assertEquals(gc.get(Calendar.WEEK_OF_YEAR), DateTimeUtils.getWeekOfYear(dateValue, firstDay - 1, minimalDays));
+                    assertEquals(gc.get(Calendar.WEEK_OF_YEAR),
+                            DateTimeUtils.getWeekOfYear(dateValue, firstDay - 1, minimalDays));
                     assertEquals(gc.getWeekYear(), DateTimeUtils.getWeekYear(dateValue, firstDay - 1, minimalDays));
                 }
             }

h2/src/tools/org/h2/build/doc/dictionary.txt

@@ -763,3 +763,6 @@ assorted reimplemented hangups confirmation predefined
 mdy destfile hclf forbids spellchecking selfdestruct expects accident jacocoagent cli historic mitigate
 jacoco xdata invokes sourcefiles classfiles duplication crypto stacktraces prt directions handled overly asm hardcoded
 interpolated thead
+
+die weekdiff osx subprocess dow proleptic
+