Documentation, formatting, javadocs.

h2/src/docsrc/text/_docs_en.utf8.txt

@@ -1346,7 +1346,7 @@ Architecture
  Table/index/constraints
 
 @architecture_1007_a
- Undolog and redolog and transactions layer
+ Undo log, redo log, and transactions layer
 
 @architecture_1008_a
  B-tree engine and page-based storage allocation
@@ -1385,7 +1385,7 @@ Command execution and planning.
 Table/Index/Constraints. 
 
 @architecture_1020_li
-Undolog and redolog and transactions layer. 
+Undo log, redo log, and transactions layer. 
 
 @architecture_1021_li
 B-tree engine and page-based storage allocation. 
@@ -1496,7 +1496,7 @@ org.h2.index
 Implementations of different kinds of indices
 
 @architecture_1057_h2
-Undolog and redolog and transactions layer.
+Undo log, redo log, and transactions layer
 
 @architecture_1058_p
  We have a transaction log, which is shared among all sessions. See also http://en.wikipedia.org/wiki/Transaction_log http://h2database.com/html/grammar.html#set_log 
@@ -1949,7 +1949,7 @@ Query Statistics: new feature which stores the newest 100 SQL queries executed a
 Fix an LOB deadlock between reading and updating LOB columns. 
 
 @changelog_1028_li
-Support the JDBC DatabaseMetaData#getClientInfoProperties() method, in the sense of returning an empty result, in order to make Websphere happy. 
+Support the JDBC DatabaseMetaData#getClientInfoProperties() method, in the sense of returning an empty result, in order to make WebSphere happy. 
 
 @changelog_1029_li
 Make Server#openBrowser respect the $BROWSER environment variable. Add "chromium" to the list of browsers tried. Patch from Felix Kaiser. 

h2/src/docsrc/text/_docs_ja.utf8.txt

@@ -1346,7 +1346,7 @@ XTEA
 # Table/index/constraints
 
 @architecture_1007_a
-# Undolog and redolog and transactions layer
+# Undo log, redo log, and transactions layer
 
 @architecture_1008_a
 # B-tree engine and page-based storage allocation
@@ -1385,7 +1385,7 @@ XTEA
 #Table/Index/Constraints. 
 
 @architecture_1020_li
-#Undolog and redolog and transactions layer. 
+#Undo log, redo log, and transactions layer. 
 
 @architecture_1021_li
 #B-tree engine and page-based storage allocation. 
@@ -1496,7 +1496,7 @@ XTEA
 #Implementations of different kinds of indices
 
 @architecture_1057_h2
-#Undolog and redolog and transactions layer.
+#Undo log, redo log, and transactions layer
 
 @architecture_1058_p
 # We have a transaction log, which is shared among all sessions. See also http://en.wikipedia.org/wiki/Transaction_log http://h2database.com/html/grammar.html#set_log 
@@ -1949,7 +1949,7 @@ Centralリ�?ジトリ�?�利用
 #Fix an LOB deadlock between reading and updating LOB columns. 
 
 @changelog_1028_li
-#Support the JDBC DatabaseMetaData#getClientInfoProperties() method, in the sense of returning an empty result, in order to make Websphere happy. 
+#Support the JDBC DatabaseMetaData#getClientInfoProperties() method, in the sense of returning an empty result, in order to make WebSphere happy. 
 
 @changelog_1029_li
 #Make Server#openBrowser respect the $BROWSER environment variable. Add "chromium" to the list of browsers tried. Patch from Felix Kaiser. 

h2/src/docsrc/textbase/_docs_en.properties

@@ -447,7 +447,7 @@ architecture_1003_a=\ JDBC driver
 architecture_1004_a=\ Connection/session management
 architecture_1005_a=\ Command execution and planning
 architecture_1006_a=\ Table/index/constraints
-architecture_1007_a=\ Undolog and redolog and transactions layer
+architecture_1007_a=\ Undo log, redo log, and transactions layer
 architecture_1008_a=\ B-tree engine and page-based storage allocation
 architecture_1009_a=\ Filesystem abstraction
 architecture_1010_h2=Introduction
@@ -460,7 +460,7 @@ architecture_1016_li=Connection/session management.
 architecture_1017_li=SQL Parser. 
 architecture_1018_li=Command execution and planning. 
 architecture_1019_li=Table/Index/Constraints. 
-architecture_1020_li=Undolog and redolog and transactions layer. 
+architecture_1020_li=Undo log, redo log, and transactions layer. 
 architecture_1021_li=B-tree engine and page-based storage allocation. 
 architecture_1022_li=Filesystem abstraction. 
 architecture_1023_h2=JDBC Driver
@@ -497,7 +497,7 @@ architecture_1053_td=org.h2.table
 architecture_1054_td=Implementations of different kinds of tables
 architecture_1055_td=org.h2.index
 architecture_1056_td=Implementations of different kinds of indices
-architecture_1057_h2=Undolog and redolog and transactions layer.
+architecture_1057_h2=Undo log, redo log, and transactions layer
 architecture_1058_p=\ We have a transaction log, which is shared among all sessions. See also http\://en.wikipedia.org/wiki/Transaction_log http\://h2database.com/html/grammar.html\#set_log 
 architecture_1059_p=\ We also have an undo log, which is per session, to undo an operation (an update that fails for example) and to rollback a transaction. Theoretically, the transaction log could be used, but for simplicity, H2 currently uses it's own "list of operations" (usually in-memory). 
 architecture_1060_p=\ With the MVStore, this is no longer needed (just the transaction log). 
@@ -648,7 +648,7 @@ changelog_1024_li=Session-temporary LOB's could sometimes accumulate, increasing
 changelog_1025_li=There was a bug where a hash index with more than one column would be silently converted to a regular index. It will now throw an exception. 
 changelog_1026_li=Query Statistics\: new feature which stores the newest 100 SQL queries executed and their performance data. Useful for tracking down badly performing queries. 
 changelog_1027_li=Fix an LOB deadlock between reading and updating LOB columns. 
-changelog_1028_li=Support the JDBC DatabaseMetaData\#getClientInfoProperties() method, in the sense of returning an empty result, in order to make Websphere happy. 
+changelog_1028_li=Support the JDBC DatabaseMetaData\#getClientInfoProperties() method, in the sense of returning an empty result, in order to make WebSphere happy. 
 changelog_1029_li=Make Server\#openBrowser respect the $BROWSER environment variable. Add "chromium" to the list of browsers tried. Patch from Felix Kaiser. 
 changelog_1030_li=Fix to org.h2.util.ScriptReader when handling unclosed block comments. 
 changelog_1031_li=Make org.h2.util.ScriptReader throw a better exception when handling broken scripts which generate extremely large statements. 

h2/src/main/org/h2/command/dml/Query.java

@@ -513,11 +513,17 @@ public abstract class Query extends Prepared {
         this.sampleSizeExpr = sampleSize;
     }
 
-    protected final int getSampleSizeValue(Session session) {
+    /**
+     * Get the sample size, if set.
+     *
+     * @param session the session
+     * @return the sample size
+     */
+    int getSampleSizeValue(Session session) {
         if (sampleSizeExpr == null) {
             return 0;
         }
-        Value v = sampleSizeExpr.getValue(session);
+        Value v = sampleSizeExpr.optimize(session).getValue(session);
         if (v == ValueNull.INSTANCE) {
             return 0;
         }

h2/src/main/org/h2/res/help.csv

@@ -20,8 +20,9 @@ INSERT INTO tableName
 ","
 Inserts a new row / new rows into a table."
 "Commands (DML)","UPDATE","
-UPDATE tableName [ [ AS ] newTableAlias ]
-SET { columnName = { DEFAULT | expression } } [,...]
+UPDATE tableName [ [ AS ] newTableAlias ] SET
+{ { columnName = { DEFAULT | expression } } [,...] } |
+    { ( columnName [,...] ) = ( select ) }
 [ WHERE expression ] [ LIMIT expression ]
 ","
 Updates data in a table."

h2/src/test/org/h2/test/store/TestKillProcessWhileWriting.java

@@ -43,7 +43,7 @@ public class TestKillProcessWhileWriting extends TestBase {
         test("unstable:crypt:0007:memFS:killProcess.h3");
     }
 
-    public void test(String fileName) throws Exception {
+    private void test(String fileName) throws Exception {
         for (seed = 0; seed < 10; seed++) {
             this.fileName = fileName;
             FileUtils.delete(fileName);

h2/src/test/org/h2/test/store/TestRandomMapOps.java

@@ -45,7 +45,7 @@ public class TestRandomMapOps extends TestBase {
         testMap("memFS:randomOps.h3");
     }
 
-    public void testMap(String fileName) {
+    private void testMap(String fileName) {
         this.fileName = fileName;
         int best = Integer.MAX_VALUE;
         int bestSeed = 0;