From 814de578e1ced8c5e1b9511bfb84b2ff47756c88 Mon Sep 17 00:00:00 2001
From: Andrei Tokar <andrei.tokar@gmail.com>
Date: Sat, 6 Nov 2021 00:20:05 -0400
Subject: [PATCH 01/15] make Javadoc happy

---
 h2/src/docsrc/html/changelog.html        | 1 +
 h2/src/main/org/h2/command/dml/Help.java | 2 +-
 h2/src/main/org/h2/jdbc/JdbcSQLXML.java  | 7 ++++---
 h2/src/main/org/h2/value/ValueLob.java   | 4 ++--
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/h2/src/docsrc/html/changelog.html b/h2/src/docsrc/html/changelog.html
index 04d51baa6d..9c448d0a4a 100644
--- a/h2/src/docsrc/html/changelog.html
+++ b/h2/src/docsrc/html/changelog.html
@@ -22,6 +22,7 @@ <h1>Change Log</h1>
 <h2>Next Version (unreleased)</h2>
 <ul>
 <li>Issue #3174: Add keyword AUTOCOMMIT on create linked table to control the commit mode
+</li>
 <li>Issue #3130: Precision of NUMERIC values isn't verified in the Oracle compatibility mode
 </li>
 <li>Issue #3122: Documentation: Syntax diagram for RENAME CONSTRAINT incorrect
diff --git a/h2/src/main/org/h2/command/dml/Help.java b/h2/src/main/org/h2/command/dml/Help.java
index cfc55cd27b..acfc14c4eb 100644
--- a/h2/src/main/org/h2/command/dml/Help.java
+++ b/h2/src/main/org/h2/command/dml/Help.java
@@ -86,7 +86,7 @@ public ResultInterface query(long maxrows) {
     /**
      * Strip out the special annotations we use to help build the railroad/BNF diagrams
      * @param s to process
-     * @return sanitized text
+     * @return cleaned text
      */
     public static String stripAnnotationsFromSyntax(String s) {
         // SYNTAX column - Strip out the special annotations we use to
diff --git a/h2/src/main/org/h2/jdbc/JdbcSQLXML.java b/h2/src/main/org/h2/jdbc/JdbcSQLXML.java
index b600227979..4a9be689e9 100644
--- a/h2/src/main/org/h2/jdbc/JdbcSQLXML.java
+++ b/h2/src/main/org/h2/jdbc/JdbcSQLXML.java
@@ -56,7 +56,7 @@
 public final class JdbcSQLXML extends JdbcLob implements SQLXML {
 
     private static final Map<String,Boolean> secureFeatureMap = new HashMap<>();
-    private static final EntityResolver NOOP_ENTITY_RESOLVER = (publicId, systemId) -> new InputSource(new StringReader(""));
+    private static final EntityResolver NOOP_ENTITY_RESOLVER = (pubId, sysId) -> new InputSource(new StringReader(""));
     private static final URIResolver NOOP_URI_RESOLVER = (href, base) -> new StreamSource(new StringReader(""));
 
     static {
@@ -128,7 +128,7 @@ public <T extends Source> T getSource(Class<T> sourceClass) throws SQLException
                         "getSource(" + (sourceClass != null ? sourceClass.getSimpleName() + ".class" : "null") + ')');
             }
             checkReadable();
-            // According to https://cheatsheetseries.owasp.org/cheatsheets/XML_External_Entity_Prevention_Cheat_Sheet.html
+            // see https://cheatsheetseries.owasp.org/cheatsheets/XML_External_Entity_Prevention_Cheat_Sheet.html
             if (sourceClass == null || sourceClass == DOMSource.class) {
                 DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
                 for (Map.Entry<String,Boolean> entry : secureFeatureMap.entrySet()) {
@@ -162,7 +162,8 @@ public <T extends Source> T getSource(Class<T> sourceClass) throws SQLException
                 tf.setAttribute(XMLConstants.ACCESS_EXTERNAL_DTD, "");
                 tf.setAttribute(XMLConstants.ACCESS_EXTERNAL_STYLESHEET, "");
                 tf.setURIResolver(NOOP_URI_RESOLVER);
-                tf.newTransformer().transform(new StreamSource(value.getInputStream()), new SAXResult(new DefaultHandler()));
+                tf.newTransformer().transform(new StreamSource(value.getInputStream()),
+                                                new SAXResult(new DefaultHandler()));
                 return (T) new StreamSource(value.getInputStream());
             }
             throw unsupported(sourceClass.getName());
diff --git a/h2/src/main/org/h2/value/ValueLob.java b/h2/src/main/org/h2/value/ValueLob.java
index ad8483406f..89b966181d 100644
--- a/h2/src/main/org/h2/value/ValueLob.java
+++ b/h2/src/main/org/h2/value/ValueLob.java
@@ -115,9 +115,9 @@ static Reader rangeReader(Reader reader, long oneBasedOffset, long length, long
     }
 
     /**
-     * Create file name for tem LOB storage
+     * Create file name for temporary LOB storage
      * @param handler to get path from
-     * @return full pathname of the created file
+     * @return full path and name of the created file
      * @throws IOException if file creation fails
      */
     static String createTempLobFileName(DataHandler handler) throws IOException {

From 9ce7b22c7f13f89ffa3105a535f18a3ebbd8a01a Mon Sep 17 00:00:00 2001
From: Andrei Tokar <andrei.tokar@gmail.com>
Date: Sat, 6 Nov 2021 13:06:03 -0400
Subject: [PATCH 02/15] fix help.csv location for docs

---
 h2/src/tools/org/h2/build/doc/GenerateDoc.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/h2/src/tools/org/h2/build/doc/GenerateDoc.java b/h2/src/tools/org/h2/build/doc/GenerateDoc.java
index fdea726b66..16536aa79e 100644
--- a/h2/src/tools/org/h2/build/doc/GenerateDoc.java
+++ b/h2/src/tools/org/h2/build/doc/GenerateDoc.java
@@ -36,7 +36,7 @@
  */
 public class GenerateDoc {
 
-    private static final String IN_HELP = "src/docsrc/help/help.csv";
+    private static final String IN_HELP = "src/main/org/h2/res/help.csv";
     private Path inDir = Paths.get("src/docsrc/html");
     private Path outDir = Paths.get("docs/html");
     private Connection conn;

From 578e58ba2b56bd8e07322b9322f9c15bd5288287 Mon Sep 17 00:00:00 2001
From: Andrei Tokar <andrei.tokar@gmail.com>
Date: Sat, 6 Nov 2021 13:08:33 -0400
Subject: [PATCH 03/15] version change in release preparation

---
 README.md                                |   4 +-
 h2/src/docsrc/html/changelog.html        | 522 +----------------------
 h2/src/installer/release.txt             |   4 +-
 h2/src/main/org/h2/engine/Constants.java |  10 +-
 h2/src/test/org/h2/samples/newsfeed.sql  |   1 +
 5 files changed, 16 insertions(+), 525 deletions(-)

diff --git a/README.md b/README.md
index 7dcb3e591b..de125bc548 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Welcome to H2, the Java SQL database. [![CI](https://github.com/h2database/h2database/workflows/CI/badge.svg?event=push)](https://github.com/h2database/h2database/actions?query=workflow%3ACI)
+# Welcome to H2, the Java SQL database. [![CI](/home/andrei/java-projects/h2database-clean/h2/src/docsrc/images/h2-logo.png)](https://github.com/h2database/h2database/actions?query=workflow%3ACI)
 
 ## The main features of H2 are:
 
@@ -21,7 +21,7 @@ More information: https://h2database.com
 <dependency>
     <groupId>com.h2database</groupId>
     <artifactId>h2</artifactId>
-    <version>1.4.200</version>
+    <version>2.0.202</version>
 </dependency>
 ```
 
diff --git a/h2/src/docsrc/html/changelog.html b/h2/src/docsrc/html/changelog.html
index 9c448d0a4a..d915969822 100644
--- a/h2/src/docsrc/html/changelog.html
+++ b/h2/src/docsrc/html/changelog.html
@@ -21,6 +21,12 @@ <h1>Change Log</h1>
 
 <h2>Next Version (unreleased)</h2>
 <ul>
+<li>Nothing yet...
+</li>
+</ul>
+
+<h2>Version 2.0.202 (2021-11-06)</h2>
+<ul>
 <li>Issue #3174: Add keyword AUTOCOMMIT on create linked table to control the commit mode
 </li>
 <li>Issue #3130: Precision of NUMERIC values isn't verified in the Oracle compatibility mode
@@ -2023,520 +2029,4 @@ <h2>Version 1.4.198 (2019-02-22)</h2>
 </li>
 </ul>
 
-<h2>Version 1.4.197 (2018-03-18)</h2>
-<ul>
-<li>PR #988: Fix RangeTable.getRowCount() for non-default step
-</li>
-<li>PR #987: ValueBoolean constants are not cleared and may be used directly
-</li>
-<li>PR #986: Check parameters in JdbcPreparedStatement.addBatch()
-</li>
-<li>PR #984: Minor refactorings in Parser
-</li>
-<li>PR #983: Code cleanups via IntelliJ IDEA inspections
-</li>
-<li>Issue #960: Implement remaining time unit in "date_trunc" function
-</li>
-<li>Issue #933: MVStore background writer endless loop
-</li>
-<li>PR #981: Reorganize date-time functions
-</li>
-<li>PR #980: Add Parser.toString() method for improved debugging experience
-</li>
-<li>PR #979: Remove support of TCP protocol versions 6 and 7
-</li>
-<li>PR #977: Add database versions to javadoc of TCP protocol versions and update dictionary.txt
-</li>
-<li>PR #976: Add and use incrementDateValue() and decrementDateValue()
-</li>
-<li>Issue #974: Inline PRIMARY KEY definition loses its name
-</li>
-<li>PR #972: Add META-INF/versions to all non-Android jars that use Bits
-</li>
-<li>PR #971: Update ASM from 6.1-beta to 6.1
-</li>
-<li>PR #970: Added support for ENUM in prepared statement where clause
-</li>
-<li>PR #968: Assorted changes
-</li>
-<li>PR #967: Adds ARRAY_AGG function
-</li>
-<li>PR #966: Do not include help and images in client jar
-</li>
-<li>PR #965: Do not include mvstore.DataUtils in client jar and other changes
-</li>
-<li>PR #964: Fix TestFunctions.testToCharFromDateTime()
-</li>
-<li>PR #963 / Issue #962: Improve documentation of compatibility modes and fix ssl URL description
-</li>
-<li>Issue #219: H2 mode MySQL- ON UPDATE CURRENT_TIMESTAMP not supported
-</li>
-<li>PR #958: More fixes for PgServer
-</li>
-<li>PR #957: Update database size information and links in README.md
-</li>
-<li>PR #956: Move tests added in 821117f1db120a265647a063dca13ab5bee98efc to a proper place
-</li>
-<li>PR #955: Support getObject(?, Class) in generated keys
-</li>
-<li>PR #954: Avoid incorrect reads in iterators of TransactionMap
-</li>
-<li>PR #952: Optimize arguments for MVMap.init()
-</li>
-<li>PR #949: Fix table borders in PDF and other changes
-</li>
-<li>PR #948: Fix some grammar descriptions and ALTER TABLE DROP COLUMN parsing
-</li>
-<li>PR #947: Fix building of documentation and use modern names of Java versions
-</li>
-<li>PR #943: Assorted changes in documentation and a fix for current-time.sql
-</li>
-<li>PR #942: Fix page numbers in TOC in PDF and move System Tables into own HTML / section in PDF
-</li>
-<li>PR #941: Use >> syntax in median.sql and move out more tests from testScript.sql
-</li>
-<li>PR #940: add Support for MySQL: DROP INDEX index_name ON tbl_name
-</li>
-<li>PR #939: Short syntax for SQL tests
-</li>
-<li>Issue #935: The "date_trunc" function is not recognized for 'day'
-</li>
-<li>PR #936: Fix font size, line length, TOC, and many broken links in PDF
-</li>
-<li>PR #931: Assorted changes in documentation
-</li>
-<li>PR #930: Use Math.log10() and remove Mode.getOracle()
-</li>
-<li>PR #929: Remove Mode.supportOffsetFetch
-</li>
-<li>PR #928: Show information about office configuration instead of fallback PDF generation mode
-</li>
-<li>PR #926: Describe datetime fields in documentation
-</li>
-<li>PR #925: Fix time overflow in DATEADD
-</li>
-<li>Issue #416: Add support for DROP SCHEMA x { RESTRICT | CASCADE }
-</li>
-<li>PR #922: Parse and treat fractional seconds precision as described in SQL standard
-</li>
-<li>Issue #919: Add support for mixing adding constraints and columns in multi-add ALTER TABLE statement
-</li>
-<li>PR #916: Implement TABLE_CONSTRAINTS and REFERENTIAL_CONSTRAINTS from the SQL standard
-</li>
-<li>PR #915: Implement INFORMATION_SCHEMA.KEY_COLUMN_USAGE from SQL standard
-</li>
-<li>PR #914: don't allow null values in ConcurrentArrayList
-</li>
-<li>PR #913: Assorted changes in tests and documentation
-</li>
-<li>Issue #755: Missing FLOAT(precision)?
-</li>
-<li>PR #911: Add support for MySQL-style ALTER TABLE ADD ... FIRST
-</li>
-<li>Issue #409: Support derived column list syntax on table alias
-</li>
-<li>PR #908: remove dead code
-</li>
-<li>PR #907: Nest joins only if required and fix some issues with complex joins
-</li>
-<li>PR #906: Fix obscure error on non-standard SELECT * FROM A LEFT JOIN B NATURAL JOIN C
-</li>
-<li>PR #805: Move some JOIN tests from testScript.sql to own file
-</li>
-<li>PR #804: Remove unused parameters from readJoin() and readTableFilter()
-</li>
-<li>Issue #322: CSVREAD WHERE clause containing ORs duplicates number of rows
-</li>
-<li>PR #902: Remove DbSettings.nestedJoins
-</li>
-<li>PR #900: Convert duplicate anonymous classes in TableFilter to nested for reuse
-</li>
-<li>PR #899: Fix ON DUPLICATE KEY UPDATE for inserts with multiple rows
-</li>
-<li>PR #898: Parse TIME WITHOUT TIME ZONE and fix TIMESTAMP as column name
-</li>
-<li>PR #897: Update JTS to version 1.15.0 from LocationTech
-</li>
-<li>PR #896: Assorted changes in help.csv
-</li>
-<li>PR #895: Parse more variants of timestamps with time zones
-</li>
-<li>PR #893: TIMESTAMP WITHOUT TIME ZONE, TIMEZONE_HOUR, and TIMEZONE_MINUTE
-</li>
-<li>PR #892: Assorted minor changes in Parser
-</li>
-<li>PR #891: Update documentation of date-time types and clean up related code a bit
-</li>
-<li>PR #890: Implement conversions for TIMESTAMP WITH TIME ZONE
-</li>
-<li>PR #888: Fix two-phase commit in MVStore
-</li>
-<li>Issue #884: Wrong test Resources path in pom.xml
-</li>
-<li>PR #886: Fix building of documentation
-</li>
-<li>PR #883: Add support for TIMESTAMP WITH TIME ZONE to FORMATDATETIME
-</li>
-<li>PR #881: Reimplement dateValueFromDate() and nanosFromDate() without a Calendar
-</li>
-<li>PR #880: Assorted date-time related changes
-</li>
-<li>PR #879: Reimplement TO_DATE without a Calendar and fix a lot of bugs an incompatibilities
-</li>
-<li>PR #878: Fix IYYY in TO_CHAR and reimplement TRUNCATE without a Calendar
-</li>
-<li>PR #877: Reimplement TO_CHAR without a Calendar and fix 12 AM / 12 PM in it
-</li>
-<li>PR #876: Test out of memory
-</li>
-<li>PR #875: Improve date-time related parts of documentation
-</li>
-<li>PR #872: Assorted date-time related changes
-</li>
-<li>PR #871: Fix OOME in Transfer.readValue() with large CLOB V2
-</li>
-<li>PR #867: TestOutOfMemory stability
-</li>
-<li>Issue #834: Add support for the SQL standard FILTER clause on aggregate functions
-</li>
-<li>PR #864: Minor changes in DateUtils and Function
-</li>
-<li>PR #863: Polish: use isEmpty() to check whether the collection is empty or not.
-</li>
-<li>PR #862: Convert constraint type into enum
-</li>
-<li>PR #861: Avoid resource leak
-</li>
-<li>PR #860: IndexCursor inList
-</li>
-<li>PR #858 / Issue #690 and others: Return all generated rows and columns from getGeneratedKeys()
-</li>
-<li>Make the JDBC client independent of the database engine
-</li>
-<li>PR #857: Do not write each SQL error multiple times in TestScript
-</li>
-<li>PR #856: Fix TestDateTimeUtils.testDayOfWeek() and example with ANY(?
-</li>
-<li>PR #855: Reimplement DATEADD without a Calendar and fix some incompatibilities
-</li>
-<li>PR #854: Improve test stability
-</li>
-<li>PR #851: Reimplement DATEDIFF without a Calendar
-</li>
-<li>Issue #502: SQL "= ANY (?)" supported?
-</li>
-<li>PR #849: Encode date and time in fast and proper way in PgServerThread
-</li>
-<li>PR #847: Reimplement remaining parts of EXTRACT, ISO_YEAR, etc without a Calendar
-</li>
-<li>PR #846: Read known fields directly in DateTimeUtils.getDatePart()
-</li>
-<li>Issue #832: Extract EPOCH from a timestamp
-</li>
-<li>PR #844: Add simple implementations of isWrapperFor() and unwrap() to JdbcDataSource
-</li>
-<li>PR #843: Add MEDIAN to help.csv and fix building of documentation
-</li>
-<li>PR #841: Support indexes with nulls last for MEDIAN aggregate
-</li>
-<li>PR #840: Add MEDIAN aggregate
-</li>
-<li>PR #839: TestTools should not leave testing thread in interrupted state
-</li>
-<li>PR #838: (tests) Excessive calls to Runtime.getRuntime().gc() cause OOM for no reason
-</li>
-<li>Don't use substring when doing StringBuffer#append
-</li>
-<li>PR #837: Use StringUtils.replaceAll() in Function.replace()
-</li>
-<li>PR #836: Allow to read invalid February 29 dates with LocalDate as March 1
-</li>
-<li>PR #835: Inline getTimeTry() into DateTimeUtils.getMillis()
-</li>
-<li>PR #827: Use dateValueFromDate() and nanosFromDate() in parseTimestamp()
-</li>
-<li>Issue #115: to_char fails with pattern FM0D099
-</li>
-<li>PR #825: Merge code for parsing and formatting timestamp values
-</li>
-<li>Enums for ConstraintActionType, UnionType, and OpType
-</li>
-<li>PR 824: Add partial support for INSERT IGNORE in MySQL mode
-</li>
-<li>PR #823: Use ValueByte.getInt() and ValueShort.getInt() in convertTo()
-</li>
-<li>PR #820: Fix some compiler warnings
-</li>
-<li>PR #818: Fixes for remaining issues with boolean parameters
-</li>
-<li>Use enum for file lock method
-</li>
-<li>PR #817: Parse also 1 as true and 0 as false in Utils.parseBoolean()
-</li>
-<li>PR #815: Fix count of completed statements
-</li>
-<li>PR #814: Method.isVarArgs() is available on all supported platforms
-</li>
-<li>Issue #812: TIME values should be in range 0:00:00.000000000 23:59:59.999999999?
-</li>
-<li>PR #811: Issues with Boolean.parseBoolean()
-</li>
-<li>PR #809: Use type constants from LocalDateTimeUtils directly
-</li>
-<li>PR #808: Use HmacSHA256 provided by JRE
-</li>
-<li>PR #807: Use SHA-256 provided by JRE / Android and use rotateLeft / Right in Fog
-</li>
-<li>PR #806: Implement setBytes() and setString() with offset and len
-</li>
-<li>PR #805: Improve support of TIMESTAMP WITH TIME ZONE
-</li>
-<li>PR #803: Use new ArrayList(Collection) and assertThrows()
-</li>
-<li>PR #802: Use Arrays.copyOf() and Arrays.copyOfRange()
-</li>
-<li>PR #801: Fix NULL support in PgServer for primitive types too
-</li>
-<li>PR #800: More fixes in date-time types for ODBC drivers
-</li>
-<li>PR #798: Add partial support of DATE, TIME, and TIMESTAMP data types to PgServer
-</li>
-<li>PR #799: Use result of ArrayList.remove()
-</li>
-<li>PR #797: Add ceilingKey() and floorKey() to TransactionMap (version 2)
-</li>
-<li>PR #796: Add MDY to DateStyle in PgServerThread
-</li>
-<li>PR #794: Sort files in generated jars
-</li>
-<li>PR #793: Change return type of Value.getBoolean() to boolean (unwrapped)
-</li>
-<li>PR #792: Inherit classpath from parent process
-</li>
-<li>PR #791: Switch to JaCoCo code coverage
-</li>
-<li>PR #788: Update lists of keywords
-</li>
-<li>PR #789: Map DATE in Oracle mode to ValueTimestamp
-</li>
-<li>PR #787: Assorted changes
-</li>
-<li>PR #785: Optimize NULL handling in MVSecondaryIndex.add()
-</li>
-<li>PR #783: Add Bits implementation for Java 9 and later versions
-</li>
-<li>PR #784: Hardcoded port numbers should not be used in unit tests
-</li>
-<li>PR #780: Close JavaFileManager after use.
-</li>
-<li>PR #782: Leftover shared lock after release
-</li>
-<li>PR #781: Locks left behind after commit
-</li>
-<li>PR #778: Reduce code duplication
-</li>
-<li>PR #775: Fix building of documentation and zip
-</li>
-<li>PR #774: Assorted changes
-</li>
-<li>PR #773: Better checks for arguments of partial LOB reading methods
-</li>
-<li>PR #772: getBinaryStream() and getCharacterStream() with pos and length
-</li>
-<li>Issue #754: Make NUMERIC type read as NUMERIC
-</li>
-<li>PR #768: Add DataUtils.parseChecksummedMap()
-</li>
-<li>PR #769: Do not copy result of DataUtils.parseMap() to a new maps
-</li>
-<li>PR #766: Minor clean up of DateTimeUtils
-</li>
-<li>PR #764: Make use of try-with-resources statement
-</li>
-<li>Issue #406: Return from ResultSet.getObject not in line with JDBC specification
-</li>
-<li>Issue #710: Misleading exception message when INSERT has no value for self referential 'AS' column
-</li>
-<li>PR #763: Add DataUtils.getMapName()
-</li>
-<li>PR #762: Add row deletion confirmation to web console
-</li>
-<li>PR #760: Assorted minor optimizations
-</li>
-<li>PR #759: Improve the look of error messages in web console
-</li>
-<li>PR #758: Allocate less amount of garbage
-</li>
-<li>PR #757: Fix handling of UUID in Datatype.readValue()
-</li>
-<li>PR #753: Optimize StringUtils.trim() and remove StringUtils.equals()
-</li>
-<li>PR #752: Use predefined charsets instead of names where possible
-</li>
-<li>PR #750: Use AtomicIntegerArray and StandardCharsets
-</li>
-<li>PR #749: Fix some build checks in sources
-</li>
-<li>Issue #740: TestWeb hangups if webSSL=true specified in configuration
-</li>
-<li>Issue #736: Copyright years in sources
-</li>
-<li>Issue #744: TestFile failure on Java 9 and Java 10
-</li>
-<li>PR #741: More cleanups in LocalDateTimeUtils and other minor changes
-</li>
-<li>PR #743: Change REGEXP_REPLACE mode for MariaDB and PostgreSQL
-</li>
-<li>Issue#646 NPE in CREATE VIEW WITH RECURSIVE &amp; NON_RECURSIVE CTE
-</li>
-<li>PR #738: Copy javadoc to *BackwardsCompat to fix building of documentation
-</li>
-<li>PR #735: Add support of java.time.Instant V2
-</li>
-<li>PR #733: Remove JPA/ORM configuration txt files as they're already integrated
-</li>
-<li>PR #732: Fix ==
-</li>
-<li>PR #730: Implement enquoteIdentifier() and isSimpleIdentifier() from JDBC 4.3
-</li>
-<li>PR #729: Grammar documentation change
-</li>
-<li>PR #727: Integer/Long.compare(x, y) can be used to compare primitive values
-</li>
-<li>PR #726: Fixes in tests
-</li>
-<li>Issue #725: FilePathMem.tryLock() fails since Java 9
-</li>
-<li>PR #723: Clean up LocalDateTimeUtils
-</li>
-<li>PR #724: Use StringBuilder instead of StringBuffer
-</li>
-<li>PR #720: DROP TABLE RESTRICT shouldn't drop foreign keys in other tables
-</li>
-<li>PR #722: Assorted minor changes
-</li>
-<li>Issue #638: Oracle mode: incompatible regexp back-reference syntax
-</li>
-<li>Make ALL a reserved keyword
-</li>
-<li>Issue #311: Avoid calling list.toArray(new X[list.size()]) for performance
-</li>
-<li>PR #715: Better getObject error message
-</li>
-<li>PR #714: SecureRandom is already synchronized
-</li>
-<li>PR #712: Return properly encoded UUID from SimpleResultSet.getBytes()
-</li>
-<li>PR #711: TestFunctions less english dependent
-</li>
-<li>Issue #644: Year changing from negative -509 to a positive 510.
-</li>
-<li>PR #706: SIGNAL function
-</li>
-<li>PR #704: added Javascript support for Triggers' source
-</li>
-<li>Issue #694: Oracle syntax for adding NOT NULL constraint not supported.
-</li>
-<li>Issue #699: When using an index for sorting, the index is ignored when also using NULLS LAST/FIRST
-</li>
-<li>Issue #697: FilePathDisk.newInputStream fails for contextual class loading
-</li>
-<li>Issue #695: jdbc:postgresql protocol connection issue in H2 Console Application in case of redshift driver in classpath
-</li>
-<li>Fix 'file not closed' when using FILE_READ
-</li>
-<li>Fix bug in LinkSchema tool when object exists with same name in different schemas
-</li>
-<li>Issue #675: Fix date operations on Locales with non-Gregorian calendars
-</li>
-<li>Fix removal of LOB when rolling back transaction on a table containing more than one LOB column.
-</li>
-<li>Issue #654: List ENUM type values in INFORMATION_SCHEMA.COLUMNS
-</li>
-<li>Issue #650: Simple nested SELECT causes error for table with TIMESTAMP WITH TIMEZONE column
-</li>
-<li>Issue #654: List ENUM type values in INFORMATION_SCHEMA.COLUMNS
-</li>
-<li>Issue #668: Fail of an update command on large table with ENUM column
-</li>
-<li>Issue #662: column called CONSTRAINT is not properly escaped when storing to metadata
-</li>
-<li>Issue #660: Outdated java version mentioned on https://h2database.com/html/build.html#providing_patches
-</li>
-<li>Issue #643: H2 doesn't use index when I use IN and EQUAL in one query
-</li>
-<li>Reset transaction start timestamp on ROLLBACK
-</li>
-<li>Issue #632: CREATE OR REPLACE VIEW creates incorrect columns names
-</li>
-<li>Issue #630: Integer overflow in CacheLRU can cause unrestricted cache growth
-</li>
-<li>Issue #497: Fix TO_DATE in cases of 'inline' text. E.g. the "T" and "Z" in to_date('2017-04-21T00:00:00Z', 'YYYY-MM-DD"T"HH24:MI:SS"Z"')
-</li>
-<li>Fix bug in MySQL/ORACLE-syntax silently corrupting the modified column in cases of setting the 'NULL'- or 'NOT NULL'-constraint. E.g. alter table T modify C NULL;
-</li>
-<li>Issue #570: MySQL compatibility for ALTER TABLE .. DROP INDEX
-</li>
-<li>Issue #537: Include the COLUMN name in message "Numeric value out of range"
-</li>
-<li>Issue #600: ROW_NUMBER() behaviour change in H2 1.4.195
-</li>
-<li>Fix a bunch of race conditions found by vmlens.com, thank you to vmlens for giving us a license.
-</li>
-<li>PR #597: Support more types in getObject
-</li>
-<li>Issue #591: Generated SQL from WITH-CTEs does not include a table identifier
-</li>
-<li>PR #593: Make it possible to create a cluster without using temporary files.
-</li>
-<li>PR #592: "Connection is broken: "unexpected status 16777216" [90067-192]" message when using older h2 releases as client
-</li>
-<li>Issue #585: MySQL mode DELETE statements compatibility
-</li>
-<li>PR #586: remove extra tx preparation
-</li>
-<li>PR #568: Implement MetaData.getColumns() for synonyms.
-</li>
-<li>Issue #581: org.h2.tools.RunScript assumes -script parameter is part of protocol
-</li>
-<li>Fix a deadlock in the TransactionStore
-</li>
-<li>PR #579: Disallow BLOB type in PostgreSQL mode
-</li>
-<li>Issue #576: Common Table Expression (CTE): WITH supports INSERT, UPDATE, MERGE, DELETE, CREATE TABLE ...
-</li>
-<li>Issue #493: Query with distinct/limit/offset subquery returns unexpected rows
-</li>
-<li>Issue #575: Support for full text search in multithreaded mode
-</li>
-<li>Issue #569: ClassCastException when filtering on ENUM value in WHERE clause
-</li>
-<li>Issue #539: Allow override of builtin functions/aliases
-</li>
-<li>Issue #535: Allow explicit paths on Windows without drive letter
-</li>
-<li>Issue #549: Removed UNION ALL requirements for CTE
-</li>
-<li>Issue #548: Table synonym support
-</li>
-<li>Issue #531: Rollback and delayed meta save.
-</li>
-<li>Issue #515: "Unique index or primary key violation" in TestMvccMultiThreaded
-</li>
-<li>Issue #458: TIMESTAMPDIFF() test failing. Handling of timestamp literals.
-</li>
-<li>PR #546: Fixes the missing file tree.js in the web console
-</li>
-<li>Issue #543: Prepare statement with regexp will not refresh parameter after metadata change
-</li>
-<li>PR #536: Support TIMESTAMP_WITH_TIMEZONE 2014 JDBC type
-</li>
-<li>Fix bug in parsing ANALYZE TABLE xxx SAMPLE_SIZE yyy
-</li>
-<li>Add padding for CHAR(N) values in PostgreSQL mode
-</li>
-<li>Issue #89: Add DB2 timestamp format compatibility
-</li>
-</ul>
-
 <!-- [close] { --></div></td></tr></table><!-- } --><!-- analytics --></body></html>
diff --git a/h2/src/installer/release.txt b/h2/src/installer/release.txt
index 26a5ae16f8..bd976f6b11 100644
--- a/h2/src/installer/release.txt
+++ b/h2/src/installer/release.txt
@@ -51,11 +51,11 @@ Update newsfeed.sql:
     * (150, '1.4.200', '2019-10-14'),
     * remove oldest entry in that list
 
+## Skipped
+
 Update download-archive.html:
     * add new version under Distribution section
 
-## Skipped
-
 * Minor version change: change sourceError.html and source.html
 * If a beta, change download.html: Version ${version} (${versionDate}), Beta
 * If a beta, change mainWeb.html: Version ${version} (${versionDate}), Beta
diff --git a/h2/src/main/org/h2/engine/Constants.java b/h2/src/main/org/h2/engine/Constants.java
index a24199a99a..8b92f99c83 100644
--- a/h2/src/main/org/h2/engine/Constants.java
+++ b/h2/src/main/org/h2/engine/Constants.java
@@ -15,23 +15,23 @@ public class Constants {
     /**
      * The build date is updated for each public release.
      */
-    public static final String BUILD_DATE = "2019-10-14";
+    public static final String BUILD_DATE = "2021-11-06";
 
     /**
      * The build date of the last stable release.
      */
-    public static final String BUILD_DATE_STABLE = "2019-03-13";
+    public static final String BUILD_DATE_STABLE = "2019-10-14";
 
     /**
      * Sequential version number. Even numbers are used for official releases,
      * odd numbers are used for development builds.
      */
-    public static final int BUILD_ID = 201;
+    public static final int BUILD_ID = 202;
 
     /**
      * The build id of the last stable release.
      */
-    public static final int BUILD_ID_STABLE = 199;
+    public static final int BUILD_ID_STABLE = 200;
 
     /**
      * Whether this is a snapshot version.
@@ -84,7 +84,7 @@ public class Constants {
 
     /**
      * The TCP protocol version number 20.
-     * @since 2.0.202 (TODO)
+     * @since 2.0.202 (2021-11-06)
      */
     public static final int TCP_PROTOCOL_VERSION_20 = 20;
 
diff --git a/h2/src/test/org/h2/samples/newsfeed.sql b/h2/src/test/org/h2/samples/newsfeed.sql
index 7d0287e196..8c21cd6776 100644
--- a/h2/src/test/org/h2/samples/newsfeed.sql
+++ b/h2/src/test/org/h2/samples/newsfeed.sql
@@ -7,6 +7,7 @@
 CREATE TABLE VERSION(ID INT PRIMARY KEY, VERSION VARCHAR, CREATED VARCHAR);
 INSERT INTO VERSION VALUES
 
+(151, '2.0.202', '2021-11-06'),
 (150, '1.4.200', '2019-10-14'),
 (149, '1.4.199', '2019-03-13'),
 (148, '1.4.198', '2019-02-22'),

From a16d5d3e8b11dd841e916bc3f388b92c4f003c71 Mon Sep 17 00:00:00 2001
From: Andrei Tokar <andrei.tokar@gmail.com>
Date: Mon, 15 Nov 2021 21:24:23 -0500
Subject: [PATCH 04/15] doc build tweaks

---
 h2/src/installer/h2.nsi                      |  1 +
 h2/src/installer/release.txt                 |  2 +-
 h2/src/main/org/h2/res/javadoc.properties    | 34 ++++++++++----------
 h2/src/tools/org/h2/build/Build.java         | 20 ++++++++----
 h2/src/tools/org/h2/build/BuildBase.java     |  2 +-
 h2/src/tools/org/h2/build/doc/dictionary.txt |  6 ++--
 6 files changed, 37 insertions(+), 28 deletions(-)

diff --git a/h2/src/installer/h2.nsi b/h2/src/installer/h2.nsi
index d1fa6c380e..ffaf509fd9 100644
--- a/h2/src/installer/h2.nsi
+++ b/h2/src/installer/h2.nsi
@@ -1,3 +1,4 @@
+    Unicode True
     !include "MUI.nsh"
 
     SetCompressor /SOLID lzma
diff --git a/h2/src/installer/release.txt b/h2/src/installer/release.txt
index bd976f6b11..99777e86c5 100644
--- a/h2/src/installer/release.txt
+++ b/h2/src/installer/release.txt
@@ -65,7 +65,7 @@ The following can be skipped currently; benchmarks should probably be removed:
 
 ## Build the Release
 
-In Build.java, comment "-Xdoclint:none", but don't commit that change.
+In Build.java, comment "-Xdoclint:...", but don't commit that change.
 
 Run the following commands:
 Non-Windows:
diff --git a/h2/src/main/org/h2/res/javadoc.properties b/h2/src/main/org/h2/res/javadoc.properties
index 24e17ac370..fabf642fa4 100644
--- a/h2/src/main/org/h2/res/javadoc.properties
+++ b/h2/src/main/org/h2/res/javadoc.properties
@@ -11,27 +11,27 @@ org.h2.jmx.DatabaseInfoMBean.isExclusive=Is the database open in exclusive mode?
 org.h2.jmx.DatabaseInfoMBean.isReadOnly=Is the database read-only?
 org.h2.jmx.DatabaseInfoMBean.listSessions=List sessions, including the queries that are in\n progress, and locked tables.
 org.h2.jmx.DatabaseInfoMBean.listSettings=List the database settings.
-org.h2.tools.Backup=Creates a backup of a database.\nThis tool copies all database files. The database must be closed before using\n this tool. To create a backup while the database is in use, run the BACKUP\n SQL statement. In an emergency, for example if the application is not\n responding, creating a backup using the Backup tool is possible by using the\n quiet mode. However, if the database is changed while the backup is running\n in quiet mode, the backup could be corrupt.
-org.h2.tools.Backup.main=Options are case sensitive. Supported options are\:\n[-help] or [-?]     Print the list of options\n[-file <filename>]  The target file name (default\: backup.zip)\n[-dir <dir>]        The source directory (default\: .)\n[-db <database>]    Source database; not required if there is only one\n[-quiet]            Do not print progress information
-org.h2.tools.ChangeFileEncryption=Allows changing the database file encryption password or algorithm.\nThis tool can not be used to change a password of a user.\n The database must be closed before using this tool.
-org.h2.tools.ChangeFileEncryption.main=Options are case sensitive. Supported options are\:\n[-help] or [-?]   Print the list of options\n[-cipher type]    The encryption type (AES)\n[-dir <dir>]      The database directory (default\: .)\n[-db <database>]  Database name (all databases if not set)\n[-decrypt <pwd>]  The decryption password (if not set\: not yet encrypted)\n[-encrypt <pwd>]  The encryption password (if not set\: do not encrypt)\n[-quiet]          Do not print progress information
+org.h2.tools.Backup=Creates a backup of a database.\n\n This tool copies all database files. The database must be closed before using\n this tool. To create a backup while the database is in use, run the BACKUP\n SQL statement. In an emergency, for example if the application is not\n responding, creating a backup using the Backup tool is possible by using the\n quiet mode. However, if the database is changed while the backup is running\n in quiet mode, the backup could be corrupt.
+org.h2.tools.Backup.main=Options are case sensitive.\nSupported options are\:[-help] or [-?]Print the list of options\n[-file <filename>]  The target file name (default\: backup.zip)\n[-dir <dir>]        The source directory (default\: .)\n[-db <database>]    Source database; not required if there is only one\n[-quiet]            Do not print progress information
+org.h2.tools.ChangeFileEncryption=Allows changing the database file encryption password or algorithm.\n\n This tool can not be used to change a password of a user.\n The database must be closed before using this tool.
+org.h2.tools.ChangeFileEncryption.main=Options are case sensitive.\nSupported options[-help] or [-?]Print the list of options\n[-cipher type]    The encryption type (AES)\n[-dir <dir>]      The database directory (default\: .)\n[-db <database>]  Database name (all databases if not set)\n[-decrypt <pwd>]  The decryption password (if not set\: not yet encrypted)\n[-encrypt <pwd>]  The encryption password (if not set\: do not encrypt)\n[-quiet]          Do not print progress information
 org.h2.tools.Console=Starts the H2 Console (web-) server, as well as the TCP and PG server.
-org.h2.tools.Console.main=When running without options, -tcp, -web, -browser and -pg are started.\nOptions are case sensitive. Supported options are\:\n[-help] or [-?]  Print the list of options\n[-url]           Start a browser and connect to this URL\n[-driver]        Used together with -url\: the driver\n[-user]          Used together with -url\: the user name\n[-password]      Used together with -url\: the password\n[-web]           Start the web server with the H2 Console\n[-tool]          Start the icon or window that allows to start a browser\n[-browser]       Start a browser connecting to the web server\n[-tcp]           Start the TCP server\n[-pg]            Start the PG server\nFor each Server, additional options are available;\n for details, see the Server tool.\nIf a service can not be started, the program\n terminates with an exit code of 1.
-org.h2.tools.ConvertTraceFile=Converts a .trace.db file to a SQL script and Java source code.\nSQL statement statistics are listed as well.
-org.h2.tools.ConvertTraceFile.main=Options are case sensitive. Supported options are\:\n[-help] or [-?]      Print the list of options\n[-traceFile <file>]  The trace file name (default\: test.trace.db)\n[-script <file>]     The script file name (default\: test.sql)\n[-javaClass <file>]  The Java directory and class file name (default\: Test)
-org.h2.tools.CreateCluster=Creates a cluster from a stand-alone database.\nCopies a database to another location if required.
-org.h2.tools.CreateCluster.main=Options are case sensitive. Supported options are\:\n[-help] or [-?]       Print the list of options\n[-urlSource "<url>"]  The database URL of the source database (jdbc\:h2\:...)\n[-urlTarget "<url>"]  The database URL of the target database (jdbc\:h2\:...)\n[-user <user>]        The user name (default\: sa)\n[-password <pwd>]     The password\n[-serverList <list>]  The comma separated list of host names or IP addresses
-org.h2.tools.DeleteDbFiles=Deletes all files belonging to a database.\nThe database must be closed before calling this tool.
-org.h2.tools.DeleteDbFiles.main=Options are case sensitive. Supported options are\:\n[-help] or [-?]   Print the list of options\n[-dir <dir>]      The directory (default\: .)\n[-db <database>]  The database name\n[-quiet]          Do not print progress information
+org.h2.tools.Console.main=When running without options, -tcp, -web, -browser and -pg are started.\n\n Options are case sensitive.\nSupported options[-help] or [-?]Print the list of options\n[-url]           Start a browser and connect to this URL\n[-driver]        Used together with -url\: the driver\n[-user]          Used together with -url\: the user name\n[-password]      Used together with -url\: the password\n[-web]           Start the web server with the H2 Console\n[-tool]          Start the icon or window that allows to start a browser\n[-browser]       Start a browser connecting to the web server\n[-tcp]           Start the TCP server\n[-pg]            Start the PG server\nFor each Server, additional options are available;\n for details, see the Server tool.\n If a service can not be started, the program\n terminates with an exit code of 1.
+org.h2.tools.ConvertTraceFile=Converts a .trace.db file to a SQL script and Java source code.\n\n SQL statement statistics are listed as well.
+org.h2.tools.ConvertTraceFile.main=Options are case sensitive.\nSupported options[-help] or [-?]Print the list of options\n[-traceFile <file>]  The trace file name (default\: test.trace.db)\n[-script <file>]     The script file name (default\: test.sql)\n[-javaClass <file>]  The Java directory and class file name (default\: Test)
+org.h2.tools.CreateCluster=Creates a cluster from a stand-alone database.\n\n Copies a database to another location if required.
+org.h2.tools.CreateCluster.main=Options are case sensitive.\nSupported options[-help] or [-?]Print the list of options\n[-urlSource "<url>"]  The database URL of the source database (jdbc\:h2\:...)\n[-urlTarget "<url>"]  The database URL of the target database (jdbc\:h2\:...)\n[-user <user>]        The user name (default\: sa)\n[-password <pwd>]     The password\n[-serverList <list>]  The comma separated list of host names or IP addresses
+org.h2.tools.DeleteDbFiles=Deletes all files belonging to a database.\n\n The database must be closed before calling this tool.
+org.h2.tools.DeleteDbFiles.main=Options are case sensitive.\nSupported options[-help] or [-?]Print the list of options\n[-dir <dir>]      The directory (default\: .)\n[-db <database>]  The database name\n[-quiet]          Do not print progress information
 org.h2.tools.Recover=Helps recovering a corrupted database.
-org.h2.tools.Recover.main=Options are case sensitive. Supported options are\:\n[-help] or [-?]    Print the list of options\n[-dir <dir>]       The directory (default\: .)\n[-db <database>]   The database name (all databases if not set)\n[-trace]           Print additional trace information\n[-transactionLog]  Print the transaction log\nEncrypted databases need to be decrypted first.
+org.h2.tools.Recover.main=Options are case sensitive.\nSupported options[-help] or [-?]Print the list of options\n[-dir <dir>]       The directory (default\: .)\n[-db <database>]   The database name (all databases if not set)\n[-trace]           Print additional trace information\n[-transactionLog]  Print the transaction log\nEncrypted databases need to be decrypted first.
 org.h2.tools.Restore=Restores a H2 database by extracting the database files from a .zip file.
-org.h2.tools.Restore.main=Options are case sensitive. Supported options are\:\n[-help] or [-?]     Print the list of options\n[-file <filename>]  The source file name (default\: backup.zip)\n[-dir <dir>]        The target directory (default\: .)\n[-db <database>]    The target database name (as stored if not set)\n[-quiet]            Do not print progress information
+org.h2.tools.Restore.main=Options are case sensitive. Supported options\nSupported options[-help] or [-?]Print the list of options\n[-file <filename>]  The source file name (default\: backup.zip)\n[-dir <dir>]        The target directory (default\: .)\n[-db <database>]    The target database name (as stored if not set)\n[-quiet]            Do not print progress information
 org.h2.tools.RunScript=Runs a SQL script against a database.
-org.h2.tools.RunScript.main=Options are case sensitive. Supported options are\:\n[-help] or [-?]     Print the list of options\n[-url "<url>"]      The database URL (jdbc\:...)\n[-user <user>]      The user name (default\: sa)\n[-password <pwd>]   The password\n[-script <file>]    The script file to run (default\: backup.sql)\n[-driver <class>]   The JDBC driver class to use (not required in most cases)\n[-showResults]      Show the statements and the results of queries\n[-checkResults]     Check if the query results match the expected results\n[-continueOnError]  Continue even if the script contains errors\n[-options ...]      RUNSCRIPT options (embedded H2; -*Results not supported)
+org.h2.tools.RunScript.main=Options are case sensitive.\nSupported options[-help] or [-?]Print the list of options\n[-url "<url>"]      The database URL (jdbc\:...)\n[-user <user>]      The user name (default\: sa)\n[-password <pwd>]   The password\n[-script <file>]    The script file to run (default\: backup.sql)\n[-driver <class>]   The JDBC driver class to use (not required in most cases)\n[-showResults]      Show the statements and the results of queries\n[-checkResults]     Check if the query results match the expected results\n[-continueOnError]  Continue even if the script contains errors\n[-options ...]      RUNSCRIPT options (embedded H2; -*Results not supported)
 org.h2.tools.Script=Creates a SQL script file by extracting the schema and data of a database.
-org.h2.tools.Script.main=Options are case sensitive. Supported options are\:\n[-help] or [-?]    Print the list of options\n[-url "<url>"]     The database URL (jdbc\:...)\n[-user <user>]     The user name (default\: sa)\n[-password <pwd>]  The password\n[-script <file>]   The target script file name (default\: backup.sql)\n[-options ...]     A list of options (only for embedded H2, see SCRIPT)\n[-quiet]           Do not print progress information
+org.h2.tools.Script.main=Options are case sensitive.\nSupported options[-help] or [-?]Print the list of options\n[-url "<url>"]     The database URL (jdbc\:...)\n[-user <user>]     The user name (default\: sa)\n[-password <pwd>]  The password\n[-script <file>]   The target script file name (default\: backup.sql)\n[-options ...]     A list of options (only for embedded H2, see SCRIPT)\n[-quiet]           Do not print progress information
 org.h2.tools.Server=Starts the H2 Console (web-) server, TCP, and PG server.
-org.h2.tools.Server.main=When running without options, -tcp, -web, -browser and -pg are started.\nOptions are case sensitive. Supported options are\:\n[-help] or [-?]         Print the list of options\n[-web]                  Start the web server with the H2 Console\n[-webAllowOthers]       Allow other computers to connect - see below\n[-webDaemon]            Use a daemon thread\n[-webPort <port>]       The port (default\: 8082)\n[-webSSL]               Use encrypted (HTTPS) connections\n[-webAdminPassword]     Password of DB Console administrator\n[-browser]              Start a browser connecting to the web server\n[-tcp]                  Start the TCP server\n[-tcpAllowOthers]       Allow other computers to connect - see below\n[-tcpDaemon]            Use a daemon thread\n[-tcpPort <port>]       The port (default\: 9092)\n[-tcpSSL]               Use encrypted (SSL) connections\n[-tcpPassword <pwd>]    The password for shutting down a TCP server\n[-tcpShutdown "<url>"]  Stop the TCP server; example\: tcp\://localhost\n[-tcpShutdownForce]     Do not wait until all connections are closed\n[-pg]                   Start the PG server\n[-pgAllowOthers]        Allow other computers to connect - see below\n[-pgDaemon]             Use a daemon thread\n[-pgPort <port>]        The port (default\: 5435)\n[-properties "<dir>"]   Server properties (default\: ~, disable\: null)\n[-baseDir <dir>]        The base directory for H2 databases (all servers)\n[-ifExists]             Only existing databases may be opened (all servers)\n[-ifNotExists]          Databases are created when accessed\n[-trace]                Print additional trace information (all servers)\n[-key <from> <to>]      Allows to map a database name to another (all servers)\nThe options -xAllowOthers are potentially risky.\nFor details, see Advanced Topics / Protection against Remote Access.
+org.h2.tools.Server.main=When running without options, -tcp, -web, -browser and -pg are started.\n\n Options are case sensitive.\nSupported options[-help] or [-?]Print the list of options\n[-web]                  Start the web server with the H2 Console\n[-webAllowOthers]       Allow other computers to connect - see below\n[-webDaemon]            Use a daemon thread\n[-webPort <port>]       The port (default\: 8082)\n[-webSSL]               Use encrypted (HTTPS) connections\n[-webAdminPassword]     Password of DB Console administrator\n[-browser]              Start a browser connecting to the web server\n[-tcp]                  Start the TCP server\n[-tcpAllowOthers]       Allow other computers to connect - see below\n[-tcpDaemon]            Use a daemon thread\n[-tcpPort <port>]       The port (default\: 9092)\n[-tcpSSL]               Use encrypted (SSL) connections\n[-tcpPassword <pwd>]    The password for shutting down a TCP server\n[-tcpShutdown "<url>"]  Stop the TCP server; example\: tcp\://localhost\n[-tcpShutdownForce]     Do not wait until all connections are closed\n[-pg]                   Start the PG server\n[-pgAllowOthers]        Allow other computers to connect - see below\n[-pgDaemon]             Use a daemon thread\n[-pgPort <port>]        The port (default\: 5435)\n[-properties "<dir>"]   Server properties (default\: ~, disable\: null)\n[-baseDir <dir>]        The base directory for H2 databases (all servers)\n[-ifExists]             Only existing databases may be opened (all servers)\n[-ifNotExists]          Databases are created when accessed\n[-trace]                Print additional trace information (all servers)\n[-key <from> <to>]      Allows to map a database name to another (all servers)\nThe options -xAllowOthers are potentially risky.\n\n For details, see Advanced Topics / Protection against Remote Access.
 org.h2.tools.Shell=Interactive command line tool to access a database using JDBC.
-org.h2.tools.Shell.main=Options are case sensitive. Supported options are\:\n[-help] or [-?]        Print the list of options\n[-url "<url>"]         The database URL (jdbc\:h2\:...)\n[-user <user>]         The user name\n[-password <pwd>]      The password\n[-driver <class>]      The JDBC driver class to use (not required in most cases)\n[-sql "<statements>"]  Execute the SQL statements and exit\n[-properties "<dir>"]  Load the server properties from this directory\nIf special characters don't work as expected, you may need to use\n -Dfile.encoding\=UTF-8 (Mac OS X) or CP850 (Windows).
+org.h2.tools.Shell.main=Options are case sensitive.\nSupported options[-help] or [-?]Print the list of options\n[-url "<url>"]         The database URL (jdbc\:h2\:...)\n[-user <user>]         The user name\n[-password <pwd>]      The password\n[-driver <class>]      The JDBC driver class to use (not required in most cases)\n[-sql "<statements>"]  Execute the SQL statements and exit\n[-properties "<dir>"]  Load the server properties from this directory\nIf special characters don't work as expected, you may need to use\n -Dfile.encoding\=UTF-8 (Mac OS X) or CP850 (Windows).
diff --git a/h2/src/tools/org/h2/build/Build.java b/h2/src/tools/org/h2/build/Build.java
index 0351084c29..76205f00a6 100644
--- a/h2/src/tools/org/h2/build/Build.java
+++ b/h2/src/tools/org/h2/build/Build.java
@@ -61,6 +61,8 @@ public class Build extends BuildBase {
 
     private static final String SLF4J_VERSION = "1.7.30";
 
+    private static final String APIGUARDIAN_VERSION = "1.1.0";
+
     private boolean filesMissing;
 
     /**
@@ -397,6 +399,9 @@ private void downloadOrVerify(boolean offline) {
         downloadUsingMaven("ext/asm-" + ASM_VERSION + ".jar",
                 "org.ow2.asm", "asm", ASM_VERSION,
                 "3f5199523fb95304b44563f5d56d9f5a07270669");
+        downloadUsingMaven("ext/apiguardian-" + APIGUARDIAN_VERSION + ".jar",
+                "org.apiguardian", "apiguardian-api", APIGUARDIAN_VERSION,
+                "fc9dff4bb36d627bdc553de77e1f17efd790876c");
     }
 
     private void downloadOrVerify(String target, String group, String artifact,
@@ -444,7 +449,7 @@ public void installer() {
         jar();
         docs();
         try {
-            exec("soffice", args("-invisible", "macro:///Standard.Module1.H2Pdf"));
+            exec("soffice", args("--invisible", "macro:///Standard.Module1.H2Pdf"));
             copy("docs", files("../h2web/h2.pdf"), "../h2web");
         } catch (Exception e) {
             println("OpenOffice / LibreOffice is not available or macros H2Pdf is not installed:");
@@ -469,7 +474,7 @@ public void installer() {
         zip("../h2web/h2.zip", files, "../", false, false);
         boolean installer = false;
         try {
-            exec("makensis", args("/v2", "src/installer/h2.nsi"));
+            exec("makensis", args(isWindows() ? "/V2" : "-V2", "src/installer/h2.nsi"));
             installer = true;
         } catch (Exception e) {
             println("NSIS is not available: " + e);
@@ -597,7 +602,7 @@ public void javadocImpl() {
                 File.pathSeparator + "src/test" +
                 File.pathSeparator + "src/tools",
                 // need to be disabled for java 7
-                "-Xdoclint:none",
+                "-Xdoclint:all,-missing",
                 "-noindex",
                 "-tag", "h2.resource",
                 "-d", "docs/javadocImpl2",
@@ -611,8 +616,10 @@ public void javadocImpl() {
                 File.pathSeparator + "ext/org.osgi.enterprise-" + OSGI_VERSION + ".jar" +
                 File.pathSeparator + "ext/jts-core-" + JTS_VERSION + ".jar" +
                 File.pathSeparator + "ext/asm-" + ASM_VERSION + ".jar" +
-                File.pathSeparator + "ext/junit-jupiter-api-" + JUNIT_VERSION + ".jar",
-                "-subpackages", "org.h2");
+                File.pathSeparator + "ext/junit-jupiter-api-" + JUNIT_VERSION + ".jar" +
+                File.pathSeparator + "ext/apiguardian-api-" + APIGUARDIAN_VERSION + ".jar",
+                "-subpackages", "org.h2",
+                "-exclude", "org.h2.dev:org.h2.java:org.h2.test:org.h2.build.code:org.h2.build.doc");
 
         mkdir("docs/javadocImpl3");
         javadoc("-sourcepath", "src/main",
@@ -646,7 +653,8 @@ public void javadocImpl() {
                 File.pathSeparator + "ext/org.osgi.enterprise-" + OSGI_VERSION + ".jar" +
                 File.pathSeparator + "ext/jts-core-" + JTS_VERSION + ".jar" +
                 File.pathSeparator + "ext/asm-" + ASM_VERSION + ".jar" +
-                File.pathSeparator + "ext/junit-jupiter-api-" + JUNIT_VERSION + ".jar",
+                File.pathSeparator + "ext/junit-jupiter-api-" + JUNIT_VERSION + ".jar" +
+                File.pathSeparator + "ext/apiguardian-api-" + APIGUARDIAN_VERSION + ".jar",
                 "-subpackages", "org.h2",
                 "-package",
                 "-docletpath", "bin" + File.pathSeparator + "temp",
diff --git a/h2/src/tools/org/h2/build/BuildBase.java b/h2/src/tools/org/h2/build/BuildBase.java
index fa16caf0fa..047816e15d 100644
--- a/h2/src/tools/org/h2/build/BuildBase.java
+++ b/h2/src/tools/org/h2/build/BuildBase.java
@@ -327,7 +327,7 @@ protected void projectHelp() {
         sysOut.println();
     }
 
-    private static boolean isWindows() {
+    protected static boolean isWindows() {
         return System.getProperty("os.name").toLowerCase().contains("windows");
     }
 
diff --git a/h2/src/tools/org/h2/build/doc/dictionary.txt b/h2/src/tools/org/h2/build/doc/dictionary.txt
index abfbfe9cea..31719fefbb 100644
--- a/h2/src/tools/org/h2/build/doc/dictionary.txt
+++ b/h2/src/tools/org/h2/build/doc/dictionary.txt
@@ -25,8 +25,8 @@ amt analysis analytics analyze analyzed analyzer analyzers analyzing anatr
 ancestor anchor and andrew android andy anewarray ang angel angle angus animal
 animate aniseed anne annotate annotated annotation annotations annual ano anon
 anonymous another ans ansi ansorg answers ant anthony anti antialias antialiasing
-anton antonio any anybody anyhow anyone anything anyway anywhere anzo apache
-apart api apos app apparatus appear appears append appended appender appending
+anton antonio any anybody anyhow anyone anything anyway anywhere anzo apache apart
+api apiguardian apos app apparatus appear appears append appended appender appending
 appendix appends apple apples applet applets applicable application applications
 applied applies apply applying appreciate approach appropriate appropriateness
 approx approximate approximated approximation apps april aquiles arabic arbitrary
@@ -75,7 +75,7 @@ cached caches caching cafe cajun cal calculate calculated calculates calculating
 calculation calculations calendar calendars call callable callback callbacks
 called caller calling calls cally caload came camel can cancel canceled canceling
 cancellation cancelled cancels candidates cannot canonical cap capabilities
-capability capacity capitalization capitalize capitalized capone caps capture
+capability capacity capitalization capitalize capitalized capone caps caption capture
 captured car card cardinal cardinality care careful carriage carrier cars cartesian
 cas cascade cascading case cases casesensitive casewhen cash casing casqueiro cast
 casting castore cat catalina catalog catalogs cataloguing catch catcher catches

From 1e2007775a946dfa153e288eab2f35a682be530b Mon Sep 17 00:00:00 2001
From: Andrei Tokar <andrei.tokar@gmail.com>
Date: Mon, 15 Nov 2021 21:27:49 -0500
Subject: [PATCH 05/15] make Javadoc happy take 2

---
 h2/src/main/org/h2/Driver.java                |   3 +
 h2/src/main/org/h2/api/Aggregate.java         |   2 +
 h2/src/main/org/h2/api/AggregateFunction.java |   3 +
 h2/src/main/org/h2/api/ErrorCode.java         |   8 +-
 .../main/org/h2/api/JavaObjectSerializer.java |   4 +
 h2/src/main/org/h2/bnf/Bnf.java               |   2 +
 h2/src/main/org/h2/bnf/context/DbColumn.java  |   2 +
 .../main/org/h2/bnf/context/DbContents.java   |   1 +
 h2/src/main/org/h2/bnf/context/DbSchema.java  |   1 +
 .../org/h2/bnf/context/DbTableOrView.java     |   1 +
 .../org/h2/command/dml/ScriptCommand.java     |   2 +
 .../query/SelectListColumnResolver.java       |   2 +-
 h2/src/main/org/h2/engine/DbSettings.java     |  64 +++++-----
 h2/src/main/org/h2/engine/SysProperties.java  |  87 +++++++-------
 h2/src/main/org/h2/expression/Expression.java |   2 +-
 .../org/h2/expression/ParameterRemote.java    |   3 +
 .../expression/function/ToCharFunction.java   |  18 +--
 h2/src/main/org/h2/fulltext/FullText.java     |  24 +++-
 .../main/org/h2/fulltext/FullTextLucene.java  |  25 +++-
 h2/src/main/org/h2/index/Index.java           |   2 +-
 h2/src/main/org/h2/jdbc/JdbcArray.java        |   3 +
 h2/src/main/org/h2/jdbc/JdbcBlob.java         |   4 +
 h2/src/main/org/h2/jdbc/JdbcClob.java         |   5 +
 h2/src/main/org/h2/jdbc/JdbcConnection.java   |  13 +-
 h2/src/main/org/h2/jdbc/JdbcException.java    |   2 +
 h2/src/main/org/h2/jdbc/JdbcLob.java          |   2 +
 h2/src/main/org/h2/jdbc/JdbcSQLXML.java       |   4 +
 .../h2/jdbc/JdbcStatementBackwardsCompat.java |   2 +
 .../main/org/h2/jdbc/meta/DatabaseMeta.java   | 112 ++++++++++++++++++
 h2/src/main/org/h2/jdbcx/JdbcDataSource.java  |   2 +
 .../org/h2/jdbcx/JdbcDataSourceFactory.java   |   1 +
 h2/src/main/org/h2/jmx/DatabaseInfo.java      |   2 +
 h2/src/main/org/h2/message/TraceObject.java   |   2 +
 h2/src/main/org/h2/message/TraceSystem.java   |   2 +-
 h2/src/main/org/h2/result/ResultColumn.java   |   1 +
 h2/src/main/org/h2/result/UpdatableRow.java   |   3 +
 h2/src/main/org/h2/schema/Sequence.java       |   4 +-
 h2/src/main/org/h2/schema/TriggerObject.java  |   1 +
 .../main/org/h2/security/CipherFactory.java   |   7 +-
 .../org/h2/security/auth/Authenticator.java   |   1 +
 .../security/auth/DefaultAuthenticator.java   |   4 +
 h2/src/main/org/h2/server/Service.java        |   2 +
 h2/src/main/org/h2/server/TcpServer.java      |   1 +
 h2/src/main/org/h2/server/web/WebServer.java  |   1 +
 h2/src/main/org/h2/store/Data.java            |   1 +
 h2/src/main/org/h2/store/DataReader.java      |   6 +
 h2/src/main/org/h2/store/FileStore.java       |   2 +
 .../org/h2/store/LobStorageInterface.java     |   8 +-
 .../main/org/h2/store/fs/FileBaseDefault.java |   2 +-
 h2/src/main/org/h2/store/fs/FilePath.java     |   1 +
 h2/src/main/org/h2/store/fs/FileUtils.java    |   7 ++
 h2/src/main/org/h2/tools/Backup.java          |   7 +-
 .../org/h2/tools/ChangeFileEncryption.java    |   6 +-
 h2/src/main/org/h2/tools/CompressTool.java    |  18 ++-
 h2/src/main/org/h2/tools/Console.java         |   8 +-
 .../main/org/h2/tools/ConvertTraceFile.java   |   6 +-
 h2/src/main/org/h2/tools/CreateCluster.java   |   7 +-
 h2/src/main/org/h2/tools/Csv.java             |   7 +-
 h2/src/main/org/h2/tools/DeleteDbFiles.java   |   6 +-
 h2/src/main/org/h2/tools/MultiDimension.java  |   1 +
 h2/src/main/org/h2/tools/Recover.java         |  16 ++-
 h2/src/main/org/h2/tools/Restore.java         |   4 +-
 h2/src/main/org/h2/tools/RunScript.java       |   6 +-
 h2/src/main/org/h2/tools/Script.java          |   6 +-
 h2/src/main/org/h2/tools/Server.java          |  17 ++-
 h2/src/main/org/h2/tools/Shell.java           |   5 +-
 h2/src/main/org/h2/tools/SimpleRowSource.java |   1 +
 h2/src/main/org/h2/util/IOUtils.java          |  10 ++
 h2/src/main/org/h2/util/JdbcUtils.java        |  18 +--
 h2/src/main/org/h2/util/MathUtils.java        |   2 +-
 h2/src/main/org/h2/util/NetUtils.java         |   7 ++
 h2/src/main/org/h2/util/SortedProperties.java |   2 +
 h2/src/main/org/h2/util/SourceCompiler.java   |   3 +
 h2/src/main/org/h2/util/Tool.java             |   3 +
 h2/src/main/org/h2/util/Utils.java            |   5 +
 h2/src/main/org/h2/value/DataType.java        |   1 +
 h2/src/main/org/h2/value/Transfer.java        |  29 +++++
 77 files changed, 527 insertions(+), 138 deletions(-)

diff --git a/h2/src/main/org/h2/Driver.java b/h2/src/main/org/h2/Driver.java
index b823737520..5790217c62 100644
--- a/h2/src/main/org/h2/Driver.java
+++ b/h2/src/main/org/h2/Driver.java
@@ -141,6 +141,7 @@ public Logger getParentLogger() {
 
     /**
      * INTERNAL
+     * @return instance of the driver registered with the DriverManager
      */
     public static synchronized Driver load() {
         try {
@@ -172,6 +173,7 @@ public static synchronized void unload() {
      * INTERNAL
      * Sets, on a per-thread basis, the default-connection for
      * user-defined functions.
+     * @param c to set default to
      */
     public static void setDefaultConnection(Connection c) {
         if (c == null) {
@@ -183,6 +185,7 @@ public static void setDefaultConnection(Connection c) {
 
     /**
      * INTERNAL
+     * @param thread to set context class loader for
      */
     public static void setThreadContextClassLoader(Thread thread) {
         // Apache Tomcat: use the classloader of the driver to avoid the
diff --git a/h2/src/main/org/h2/api/Aggregate.java b/h2/src/main/org/h2/api/Aggregate.java
index cd5eb45853..6df633f98a 100644
--- a/h2/src/main/org/h2/api/Aggregate.java
+++ b/h2/src/main/org/h2/api/Aggregate.java
@@ -43,6 +43,7 @@ default void init(Connection conn) throws SQLException {
      * those are passed as array.
      *
      * @param value the value(s) for this row
+     * @throws SQLException on failure
      */
     void add(Object value) throws SQLException;
 
@@ -52,6 +53,7 @@ default void init(Connection conn) throws SQLException {
      * more values were added since its previous invocation.
      *
      * @return the aggregated value
+     * @throws SQLException on failure
      */
     Object getResult() throws SQLException;
 
diff --git a/h2/src/main/org/h2/api/AggregateFunction.java b/h2/src/main/org/h2/api/AggregateFunction.java
index ec2a9412a3..276dd39aa3 100644
--- a/h2/src/main/org/h2/api/AggregateFunction.java
+++ b/h2/src/main/org/h2/api/AggregateFunction.java
@@ -37,6 +37,7 @@ default void init(Connection conn) throws SQLException {
      *
      * @param inputTypes the SQL type of the parameters, {@link java.sql.Types}
      * @return the SQL type of the result
+     * @throws SQLException on failure
      */
     int getType(int[] inputTypes) throws SQLException;
 
@@ -46,6 +47,7 @@ default void init(Connection conn) throws SQLException {
      * those are passed as array.
      *
      * @param value the value(s) for this row
+     * @throws SQLException on failure
      */
     void add(Object value) throws SQLException;
 
@@ -55,6 +57,7 @@ default void init(Connection conn) throws SQLException {
      * more values were added since its previous invocation.
      *
      * @return the aggregated value
+     * @throws SQLException on failure
      */
     Object getResult() throws SQLException;
 
diff --git a/h2/src/main/org/h2/api/ErrorCode.java b/h2/src/main/org/h2/api/ErrorCode.java
index ce535927c9..df1684e3af 100644
--- a/h2/src/main/org/h2/api/ErrorCode.java
+++ b/h2/src/main/org/h2/api/ErrorCode.java
@@ -1817,8 +1817,8 @@ public class ErrorCode {
      * Example:
      * <pre>
      * CREATE DOMAIN INTEGER AS VARCHAR;
-     * CREATE DOMAIN EMAIL AS VARCHAR CHECK LOCATE('@', VALUE) > 0;
-     * CREATE DOMAIN EMAIL AS VARCHAR CHECK LOCATE('@', VALUE) > 0;
+     * CREATE DOMAIN EMAIL AS VARCHAR CHECK LOCATE('@', VALUE) &gt; 0;
+     * CREATE DOMAIN EMAIL AS VARCHAR CHECK LOCATE('@', VALUE) &gt; 0;
      * </pre>
      */
     public static final int DOMAIN_ALREADY_EXISTS_1 = 90119;
@@ -2248,6 +2248,8 @@ private ErrorCode() {
 
     /**
      * INTERNAL
+     * @param errorCode to check
+     * @return true if provided code is common, false otherwise
      */
     public static boolean isCommon(int errorCode) {
         // this list is sorted alphabetically
@@ -2276,6 +2278,8 @@ public static boolean isCommon(int errorCode) {
 
     /**
      * INTERNAL
+     * @param errorCode to get state for
+     * @return error state
      */
     public static String getState(int errorCode) {
         // To convert SQLState to error code, replace
diff --git a/h2/src/main/org/h2/api/JavaObjectSerializer.java b/h2/src/main/org/h2/api/JavaObjectSerializer.java
index 56ccb99d4f..2fb75febb3 100644
--- a/h2/src/main/org/h2/api/JavaObjectSerializer.java
+++ b/h2/src/main/org/h2/api/JavaObjectSerializer.java
@@ -5,6 +5,8 @@
  */
 package org.h2.api;
 
+import java.sql.SQLException;
+
 /**
  * Custom serialization mechanism for java objects being stored in column of
  * type OTHER.
@@ -18,6 +20,7 @@ public interface JavaObjectSerializer {
      *
      * @param obj the object to serialize
      * @return the byte array of the serialized object
+     * @throws Exception on failure
      */
     byte[] serialize(Object obj) throws Exception;
 
@@ -26,6 +29,7 @@ public interface JavaObjectSerializer {
      *
      * @param bytes the byte array of the serialized object
      * @return the object
+     * @throws Exception on failure
      */
     Object deserialize(byte[] bytes) throws Exception;
 
diff --git a/h2/src/main/org/h2/bnf/Bnf.java b/h2/src/main/org/h2/bnf/Bnf.java
index 9c361f7559..22dabbf57d 100644
--- a/h2/src/main/org/h2/bnf/Bnf.java
+++ b/h2/src/main/org/h2/bnf/Bnf.java
@@ -45,6 +45,8 @@ public class Bnf {
      *
      * @param csv if not specified, the help.csv is used
      * @return a new instance
+     * @throws SQLException on failure
+     * @throws IOException on failure
      */
     public static Bnf getInstance(Reader csv) throws SQLException, IOException {
         Bnf bnf = new Bnf();
diff --git a/h2/src/main/org/h2/bnf/context/DbColumn.java b/h2/src/main/org/h2/bnf/context/DbColumn.java
index 7bb2d7fffb..7891defc35 100644
--- a/h2/src/main/org/h2/bnf/context/DbColumn.java
+++ b/h2/src/main/org/h2/bnf/context/DbColumn.java
@@ -64,6 +64,7 @@ private DbColumn(DbContents contents, ResultSet rs, boolean procedureColumn)
      * @param contents the database contents
      * @param rs the result set
      * @return the column
+     * @throws SQLException on failure
      */
     public static DbColumn getProcedureColumn(DbContents contents, ResultSet rs)
             throws SQLException {
@@ -76,6 +77,7 @@ public static DbColumn getProcedureColumn(DbContents contents, ResultSet rs)
      * @param contents the database contents
      * @param rs the result set
      * @return the column
+     * @throws SQLException on failure
      */
     public static DbColumn getColumn(DbContents contents, ResultSet rs)
             throws SQLException {
diff --git a/h2/src/main/org/h2/bnf/context/DbContents.java b/h2/src/main/org/h2/bnf/context/DbContents.java
index 7dbbd69b49..a657fc09fe 100644
--- a/h2/src/main/org/h2/bnf/context/DbContents.java
+++ b/h2/src/main/org/h2/bnf/context/DbContents.java
@@ -139,6 +139,7 @@ public void setMayHaveStandardViews(boolean mayHaveStandardViews) {
      *
      * @param url the database URL
      * @param conn the connection
+     * @throws SQLException on failure
      */
     public synchronized void readContents(String url, Connection conn)
             throws SQLException {
diff --git a/h2/src/main/org/h2/bnf/context/DbSchema.java b/h2/src/main/org/h2/bnf/context/DbSchema.java
index a9d3a88c07..342366a6f7 100644
--- a/h2/src/main/org/h2/bnf/context/DbSchema.java
+++ b/h2/src/main/org/h2/bnf/context/DbSchema.java
@@ -114,6 +114,7 @@ public DbProcedure[] getProcedures() {
      *
      * @param meta the database meta data
      * @param tableTypes the table types to read
+     * @throws SQLException on failure
      */
     public void readTables(DatabaseMetaData meta, String[] tableTypes)
             throws SQLException {
diff --git a/h2/src/main/org/h2/bnf/context/DbTableOrView.java b/h2/src/main/org/h2/bnf/context/DbTableOrView.java
index 7ff9f908f1..0d304353c2 100644
--- a/h2/src/main/org/h2/bnf/context/DbTableOrView.java
+++ b/h2/src/main/org/h2/bnf/context/DbTableOrView.java
@@ -91,6 +91,7 @@ public String getQuotedName() {
      * @param meta the database meta data
      * @param ps prepared statement with custom query for H2 database, null for
      *           others
+     * @throws SQLException on failure
      */
     public void readColumns(DatabaseMetaData meta, PreparedStatement ps) throws SQLException {
         ResultSet rs;
diff --git a/h2/src/main/org/h2/command/dml/ScriptCommand.java b/h2/src/main/org/h2/command/dml/ScriptCommand.java
index acae5849dc..dee45b89c4 100644
--- a/h2/src/main/org/h2/command/dml/ScriptCommand.java
+++ b/h2/src/main/org/h2/command/dml/ScriptCommand.java
@@ -639,6 +639,7 @@ private int writeLobStream(Value v) throws IOException {
      * @param conn a connection
      * @param id the lob id
      * @return a stream for the combined data
+     * @throws SQLException on failure
      */
     public static InputStream combineBlob(Connection conn, int id)
             throws SQLException {
@@ -696,6 +697,7 @@ public void close() throws IOException {
      * @param conn a connection
      * @param id the lob id
      * @return a reader for the combined data
+     * @throws SQLException on failure
      */
     public static Reader combineClob(Connection conn, int id) throws SQLException {
         if (id < 0) {
diff --git a/h2/src/main/org/h2/command/query/SelectListColumnResolver.java b/h2/src/main/org/h2/command/query/SelectListColumnResolver.java
index 0975b99824..c8263ec239 100644
--- a/h2/src/main/org/h2/command/query/SelectListColumnResolver.java
+++ b/h2/src/main/org/h2/command/query/SelectListColumnResolver.java
@@ -21,7 +21,7 @@
  * statement. It is used to resolve select column aliases in the HAVING clause.
  * Example:
  * <p>
- * SELECT X/3 AS A, COUNT(*) FROM SYSTEM_RANGE(1, 10) GROUP BY A HAVING A>2;
+ * SELECT X/3 AS A, COUNT(*) FROM SYSTEM_RANGE(1, 10) GROUP BY A HAVING A &gt; 2;
  * </p>
  *
  * @author Thomas Mueller
diff --git a/h2/src/main/org/h2/engine/DbSettings.java b/h2/src/main/org/h2/engine/DbSettings.java
index 71160b8823..e5510ccd06 100644
--- a/h2/src/main/org/h2/engine/DbSettings.java
+++ b/h2/src/main/org/h2/engine/DbSettings.java
@@ -36,7 +36,7 @@ public class DbSettings extends SettingsBase {
     public static final DbSettings DEFAULT = new DbSettings(new HashMap<>(TABLE_SIZE));
 
     /**
-     * Database setting <code>ANALYZE_AUTO</code> (default: 2000).<br />
+     * Database setting <code>ANALYZE_AUTO</code> (default: 2000).
      * After changing this many rows, ANALYZE is automatically run for a table.
      * Automatically running ANALYZE is disabled if set to 0. If set to 1000,
      * then ANALYZE will run against each user table after about 1000 changes to
@@ -47,26 +47,26 @@ public class DbSettings extends SettingsBase {
     public final int analyzeAuto = get("ANALYZE_AUTO", 2000);
 
     /**
-     * Database setting <code>ANALYZE_SAMPLE</code> (default: 10000).<br />
+     * Database setting <code>ANALYZE_SAMPLE</code> (default: 10000).
      * The default sample size when analyzing a table.
      */
     public final int analyzeSample = get("ANALYZE_SAMPLE", 10_000);
 
     /**
      * Database setting <code>AUTO_COMPACT_FILL_RATE</code>
-     * (default: 90, which means 90%, 0 disables auto-compacting).<br />
+     * (default: 90, which means 90%, 0 disables auto-compacting).
      * Set the auto-compact target fill rate. If the average fill rate (the
      * percentage of the storage space that contains active data) of the
      * chunks is lower, then the chunks with a low fill rate are re-written.
      * Also, if the percentage of empty space between chunks is higher than
      * this value, then chunks at the end of the file are moved. Compaction
-     * stops if the target fill rate is reached.<br />
+     * stops if the target fill rate is reached.
      * This setting only affects MVStore engine.
      */
     public final int autoCompactFillRate = get("AUTO_COMPACT_FILL_RATE", 90);
 
     /**
-     * Database setting <code>DATABASE_TO_LOWER</code> (default: false).<br />
+     * Database setting <code>DATABASE_TO_LOWER</code> (default: false).
      * When set to true unquoted identifiers and short name of database are
      * converted to lower case. Value of this setting should not be changed
      * after creation of database. Setting this to "true" is experimental.
@@ -74,7 +74,7 @@ public class DbSettings extends SettingsBase {
     public final boolean databaseToLower;
 
     /**
-     * Database setting <code>DATABASE_TO_UPPER</code> (default: true).<br />
+     * Database setting <code>DATABASE_TO_UPPER</code> (default: true).
      * When set to true unquoted identifiers and short name of database are
      * converted to upper case.
      */
@@ -82,21 +82,21 @@ public class DbSettings extends SettingsBase {
 
     /**
      * Database setting <code>CASE_INSENSITIVE_IDENTIFIERS</code> (default:
-     * false).<br />
+     * false).
      * When set to true, all identifier names (table names, column names) are
      * case insensitive. Setting this to "true" is experimental.
      */
     public final boolean caseInsensitiveIdentifiers = get("CASE_INSENSITIVE_IDENTIFIERS", false);
 
     /**
-     * Database setting <code>DB_CLOSE_ON_EXIT</code> (default: true).<br />
+     * Database setting <code>DB_CLOSE_ON_EXIT</code> (default: true).
      * Close the database when the virtual machine exits normally, using a
      * shutdown hook.
      */
     public final boolean dbCloseOnExit = get("DB_CLOSE_ON_EXIT", true);
 
     /**
-     * Database setting <code>DEFAULT_CONNECTION</code> (default: false).<br />
+     * Database setting <code>DEFAULT_CONNECTION</code> (default: false).
      * Whether Java functions can use
      * <code>DriverManager.getConnection("jdbc:default:connection")</code> to
      * get a database connection. This feature is disabled by default for
@@ -106,14 +106,14 @@ public class DbSettings extends SettingsBase {
     public final boolean defaultConnection = get("DEFAULT_CONNECTION", false);
 
     /**
-     * Database setting <code>DEFAULT_ESCAPE</code> (default: \).<br />
+     * Database setting <code>DEFAULT_ESCAPE</code> (default: \).
      * The default escape character for LIKE comparisons. To select no escape
      * character, use an empty string.
      */
     public final String defaultEscape = get("DEFAULT_ESCAPE", "\\");
 
     /**
-     * Database setting <code>DEFRAG_ALWAYS</code> (default: false).<br />
+     * Database setting <code>DEFRAG_ALWAYS</code> (default: false)
      * Each time the database is closed normally, it is fully defragmented (the
      * same as SHUTDOWN DEFRAG). If you execute SHUTDOWN COMPACT, then this
      * setting is ignored.
@@ -121,7 +121,7 @@ public class DbSettings extends SettingsBase {
     public final boolean defragAlways = get("DEFRAG_ALWAYS", false);
 
     /**
-     * Database setting <code>DROP_RESTRICT</code> (default: true).<br />
+     * Database setting <code>DROP_RESTRICT</code> (default: true)
      * Whether the default action for DROP TABLE, DROP VIEW, DROP SCHEMA, DROP
      * DOMAIN, and DROP CONSTRAINT is RESTRICT.
      */
@@ -129,7 +129,7 @@ public class DbSettings extends SettingsBase {
 
     /**
      * Database setting <code>ESTIMATED_FUNCTION_TABLE_ROWS</code> (default:
-     * 1000).<br />
+     * 1000).
      * The estimated number of rows in a function table (for example, CSVREAD or
      * FTL_SEARCH). This value is used by the optimizer.
      */
@@ -138,7 +138,7 @@ public class DbSettings extends SettingsBase {
 
     /**
      * Database setting <code>LOB_TIMEOUT</code> (default: 300000,
-     * which means 5 minutes).<br />
+     * which means 5 minutes).
      * The number of milliseconds a temporary LOB reference is kept until it
      * times out. After the timeout, the LOB is no longer accessible using this
      * reference.
@@ -146,13 +146,13 @@ public class DbSettings extends SettingsBase {
     public final int lobTimeout = get("LOB_TIMEOUT", 300_000);
 
     /**
-     * Database setting <code>MAX_COMPACT_TIME</code> (default: 200).<br />
+     * Database setting <code>MAX_COMPACT_TIME</code> (default: 200).
      * The maximum time in milliseconds used to compact a database when closing.
      */
     public final int maxCompactTime = get("MAX_COMPACT_TIME", 200);
 
     /**
-     * Database setting <code>MAX_QUERY_TIMEOUT</code> (default: 0).<br />
+     * Database setting <code>MAX_QUERY_TIMEOUT</code> (default: 0).
      * The maximum timeout of a query in milliseconds. The default is 0, meaning
      * no limit. Please note the actual query timeout may be set to a lower
      * value.
@@ -160,7 +160,7 @@ public class DbSettings extends SettingsBase {
     public final int maxQueryTimeout = get("MAX_QUERY_TIMEOUT", 0);
 
     /**
-     * Database setting <code>OPTIMIZE_DISTINCT</code> (default: true).<br />
+     * Database setting <code>OPTIMIZE_DISTINCT</code> (default: true).
      * Improve the performance of simple DISTINCT queries if an index is
      * available for the given column. The optimization is used if:
      * <ul>
@@ -175,7 +175,7 @@ public class DbSettings extends SettingsBase {
 
     /**
      * Database setting <code>OPTIMIZE_EVALUATABLE_SUBQUERIES</code> (default:
-     * true).<br />
+     * true).
      * Optimize subqueries that are not dependent on the outer query.
      */
     public final boolean optimizeEvaluatableSubqueries = get(
@@ -183,7 +183,7 @@ public class DbSettings extends SettingsBase {
 
     /**
      * Database setting <code>OPTIMIZE_INSERT_FROM_SELECT</code>
-     * (default: true).<br />
+     * (default: true).
      * Insert into table from query directly bypassing temporary disk storage.
      * This also applies to create table as select.
      */
@@ -191,34 +191,34 @@ public class DbSettings extends SettingsBase {
             "OPTIMIZE_INSERT_FROM_SELECT", true);
 
     /**
-     * Database setting <code>OPTIMIZE_IN_LIST</code> (default: true).<br />
+     * Database setting <code>OPTIMIZE_IN_LIST</code> (default: true).
      * Optimize IN(...) and IN(SELECT ...) comparisons. This includes
      * optimization for SELECT, DELETE, and UPDATE.
      */
     public final boolean optimizeInList = get("OPTIMIZE_IN_LIST", true);
 
     /**
-     * Database setting <code>OPTIMIZE_IN_SELECT</code> (default: true).<br />
+     * Database setting <code>OPTIMIZE_IN_SELECT</code> (default: true).
      * Optimize IN(SELECT ...) comparisons. This includes
      * optimization for SELECT, DELETE, and UPDATE.
      */
     public final boolean optimizeInSelect = get("OPTIMIZE_IN_SELECT", true);
 
     /**
-     * Database setting <code>OPTIMIZE_OR</code> (default: true).<br />
+     * Database setting <code>OPTIMIZE_OR</code> (default: true).
      * Convert (C=? OR C=?) to (C IN(?, ?)).
      */
     public final boolean optimizeOr = get("OPTIMIZE_OR", true);
 
     /**
-     * Database setting <code>OPTIMIZE_TWO_EQUALS</code> (default: true).<br />
+     * Database setting <code>OPTIMIZE_TWO_EQUALS</code> (default: true).
      * Optimize expressions of the form A=B AND B=1. In this case, AND A=1 is
      * added so an index on A can be used.
      */
     public final boolean optimizeTwoEquals = get("OPTIMIZE_TWO_EQUALS", true);
 
     /**
-     * Database setting <code>QUERY_CACHE_SIZE</code> (default: 8).<br />
+     * Database setting <code>QUERY_CACHE_SIZE</code> (default: 8).
      * The size of the query cache, in number of cached statements. Each session
      * has it's own cache with the given size. The cache is only used if the SQL
      * statement and all parameters match. Only the last returned result per
@@ -231,13 +231,13 @@ public class DbSettings extends SettingsBase {
     public final int queryCacheSize = get("QUERY_CACHE_SIZE", 8);
 
     /**
-     * Database setting <code>RECOMPILE_ALWAYS</code> (default: false).<br />
+     * Database setting <code>RECOMPILE_ALWAYS</code> (default: false).
      * Always recompile prepared statements.
      */
     public final boolean recompileAlways = get("RECOMPILE_ALWAYS", false);
 
     /**
-     * Database setting <code>REUSE_SPACE</code> (default: true).<br />
+     * Database setting <code>REUSE_SPACE</code> (default: true).
      * If disabled, all changes are appended to the database file, and existing
      * content is never overwritten. This setting has no effect if the database
      * is already open.
@@ -246,7 +246,7 @@ public class DbSettings extends SettingsBase {
 
     /**
      * Database setting <code>SHARE_LINKED_CONNECTIONS</code>
-     * (default: true).<br />
+     * (default: true).
      * Linked connections should be shared, that means connections to the same
      * database should be used for all linked tables that connect to the same
      * database.
@@ -256,28 +256,28 @@ public class DbSettings extends SettingsBase {
 
     /**
      * Database setting <code>DEFAULT_TABLE_ENGINE</code>
-     * (default: null).<br />
+     * (default: null).
      * The default table engine to use for new tables.
      */
     public final String defaultTableEngine = get("DEFAULT_TABLE_ENGINE", null);
 
     /**
      * Database setting <code>MV_STORE</code>
-     * (default: true).<br />
+     * (default: true).
      * Use the MVStore storage engine.
      */
     public final boolean mvStore = get("MV_STORE", true);
 
     /**
      * Database setting <code>COMPRESS</code>
-     * (default: false).<br />
+     * (default: false).
      * Compress data when storing.
      */
     public final boolean compressData = get("COMPRESS", false);
 
     /**
      * Database setting <code>IGNORE_CATALOGS</code>
-     * (default: false).<br />
+     * (default: false).
      * If set, all catalog names in identifiers are silently accepted
      * without comparing them with the short name of the database.
      */
@@ -285,7 +285,7 @@ public class DbSettings extends SettingsBase {
 
     /**
      * Database setting <code>ZERO_BASED_ENUMS</code>
-     * (default: false).<br />
+     * (default: false).
      * If set, ENUM ordinal values are 0-based.
      */
     public final boolean zeroBasedEnums = get("ZERO_BASED_ENUMS", false);
diff --git a/h2/src/main/org/h2/engine/SysProperties.java b/h2/src/main/org/h2/engine/SysProperties.java
index 22da478957..f206f5fecf 100644
--- a/h2/src/main/org/h2/engine/SysProperties.java
+++ b/h2/src/main/org/h2/engine/SysProperties.java
@@ -42,7 +42,7 @@ public class SysProperties {
     public static final String H2_BROWSER = "h2.browser";
 
     /**
-     * System property <code>user.home</code> (empty string if not set).<br />
+     * System property <code>user.home</code> (empty string if not set).
      * It is usually set by the system, and used as a replacement for ~ in file
      * names.
      */
@@ -50,21 +50,21 @@ public class SysProperties {
             Utils.getProperty("user.home", "");
 
     /**
-     * System property <code>h2.allowedClasses</code> (default: *).<br />
+     * System property <code>h2.allowedClasses</code> (default: *).
      * Comma separated list of class names or prefixes.
      */
     public static final String ALLOWED_CLASSES =
             Utils.getProperty("h2.allowedClasses", "*");
 
     /**
-     * System property <code>h2.enableAnonymousTLS</code> (default: true).<br />
+     * System property <code>h2.enableAnonymousTLS</code> (default: true).
      * When using TLS connection, the anonymous cipher suites should be enabled.
      */
     public static final boolean ENABLE_ANONYMOUS_TLS =
             Utils.getProperty("h2.enableAnonymousTLS", true);
 
     /**
-     * System property <code>h2.bindAddress</code> (default: null).<br />
+     * System property <code>h2.bindAddress</code> (default: null).
      * The bind address to use.
      */
     public static final String BIND_ADDRESS =
@@ -72,7 +72,7 @@ public class SysProperties {
 
     /**
      * System property <code>h2.check</code>
-     * (default: true for JDK/JRE, false for Android).<br />
+     * (default: true for JDK/JRE, false for Android).
      * Optional additional checks in the database engine.
      */
     public static final boolean CHECK =
@@ -80,7 +80,7 @@ public class SysProperties {
 
     /**
      * System property <code>h2.clientTraceDirectory</code> (default:
-     * trace.db/).<br />
+     * trace.db/).
      * Directory where the trace files of the JDBC client are stored (only for
      * client / server).
      */
@@ -88,7 +88,8 @@ public class SysProperties {
             Utils.getProperty("h2.clientTraceDirectory", "trace.db/");
 
     /**
-     * System property <code>h2.collatorCacheSize</code> (default: 32000).<br />
+     * System property <code>h2.collatorCacheSize</code> (default: 3
+     * 2000).
      * The cache size for collation keys (in elements). Used when a collator has
      * been set for the database.
      */
@@ -97,7 +98,7 @@ public class SysProperties {
 
     /**
      * System property <code>h2.consoleTableIndexes</code>
-     * (default: 100).<br />
+     * (default: 100).
      * Up to this many tables, the column type and indexes are listed.
      */
     public static final int CONSOLE_MAX_TABLES_LIST_INDEXES =
@@ -105,7 +106,7 @@ public class SysProperties {
 
     /**
      * System property <code>h2.consoleTableColumns</code>
-     * (default: 500).<br />
+     * (default: 500).
      * Up to this many tables, the column names are listed.
      */
     public static final int CONSOLE_MAX_TABLES_LIST_COLUMNS =
@@ -113,28 +114,28 @@ public class SysProperties {
 
     /**
      * System property <code>h2.consoleProcedureColumns</code>
-     * (default: 500).<br />
+     * (default: 500).
      * Up to this many procedures, the column names are listed.
      */
     public static final int CONSOLE_MAX_PROCEDURES_LIST_COLUMNS =
             Utils.getProperty("h2.consoleProcedureColumns", 300);
 
     /**
-     * System property <code>h2.consoleStream</code> (default: true).<br />
+     * System property <code>h2.consoleStream</code> (default: true).
      * H2 Console: stream query results.
      */
     public static final boolean CONSOLE_STREAM =
             Utils.getProperty("h2.consoleStream", true);
 
     /**
-     * System property <code>h2.consoleTimeout</code> (default: 1800000).<br />
+     * System property <code>h2.consoleTimeout</code> (default: 1800000).
      * H2 Console: session timeout in milliseconds. The default is 30 minutes.
      */
     public static final int CONSOLE_TIMEOUT =
             Utils.getProperty("h2.consoleTimeout", 30 * 60 * 1000);
 
     /**
-     * System property <code>h2.dataSourceTraceLevel</code> (default: 1).<br />
+     * System property <code>h2.dataSourceTraceLevel</code> (default: 1).
      * The trace level of the data source implementation. Default is 1 for
      * error.
      */
@@ -143,7 +144,7 @@ public class SysProperties {
 
     /**
      * System property <code>h2.delayWrongPasswordMin</code>
-     * (default: 250).<br />
+     * (default: 250).
      * The minimum delay in milliseconds before an exception is thrown for using
      * the wrong user name or password. This slows down brute force attacks. The
      * delay is reset to this value after a successful login. Unsuccessful
@@ -155,7 +156,7 @@ public class SysProperties {
 
     /**
      * System property <code>h2.delayWrongPasswordMax</code>
-     * (default: 4000).<br />
+     * (default: 4000).
      * The maximum delay in milliseconds before an exception is thrown for using
      * the wrong user name or password. This slows down brute force attacks. The
      * delay is reset after a successful login. The value 0 means there is no
@@ -165,7 +166,7 @@ public class SysProperties {
             Utils.getProperty("h2.delayWrongPasswordMax", 4000);
 
     /**
-     * System property <code>h2.javaSystemCompiler</code> (default: true).<br />
+     * System property <code>h2.javaSystemCompiler</code> (default: true).
      * Whether to use the Java system compiler
      * (ToolProvider.getSystemJavaCompiler()) if it is available to compile user
      * defined functions. If disabled or if the system compiler is not
@@ -177,7 +178,7 @@ public class SysProperties {
 
     /**
      * System property <code>h2.lobCloseBetweenReads</code>
-     * (default: false).<br />
+     * (default: false).
      * Close LOB files between read operations.
      */
     public static boolean lobCloseBetweenReads =
@@ -185,7 +186,7 @@ public class SysProperties {
 
     /**
      * System property <code>h2.lobClientMaxSizeMemory</code> (default:
-     * 1048576).<br />
+     * 1048576).
      * The maximum size of a LOB object to keep in memory on the client side
      * when using the server mode.
      */
@@ -193,7 +194,7 @@ public class SysProperties {
             Utils.getProperty("h2.lobClientMaxSizeMemory", 1024 * 1024);
 
     /**
-     * System property <code>h2.maxFileRetry</code> (default: 16).<br />
+     * System property <code>h2.maxFileRetry</code> (default: 16).
      * Number of times to retry file delete and rename. in Windows, files can't
      * be deleted if they are open. Waiting a bit can help (sometimes the
      * Windows Explorer opens the files for a short time) may help. Sometimes,
@@ -204,7 +205,7 @@ public class SysProperties {
             Math.max(1, Utils.getProperty("h2.maxFileRetry", 16));
 
     /**
-     * System property <code>h2.maxReconnect</code> (default: 3).<br />
+     * System property <code>h2.maxReconnect</code> (default: 3).
      * The maximum number of tries to reconnect in a row.
      */
     public static final int MAX_RECONNECT =
@@ -212,7 +213,7 @@ public class SysProperties {
 
     /**
      * System property <code>h2.maxMemoryRows</code>
-     * (default: 40000 per GB of available RAM).<br />
+     * (default: 40000 per GB of available RAM).
      * The default maximum number of rows to be kept in memory in a result set.
      */
     public static final int MAX_MEMORY_ROWS =
@@ -220,7 +221,7 @@ public class SysProperties {
 
     /**
      * System property <code>h2.maxTraceDataLength</code>
-     * (default: 65535).<br />
+     * (default: 65535).
      * The maximum size of a LOB value that is written as data to the trace
      * system.
      */
@@ -228,7 +229,7 @@ public class SysProperties {
             Utils.getProperty("h2.maxTraceDataLength", 65535);
 
     /**
-     * System property <code>h2.nioLoadMapped</code> (default: false).<br />
+     * System property <code>h2.nioLoadMapped</code> (default: false).
      * If the mapped buffer should be loaded when the file is opened.
      * This can improve performance.
      */
@@ -236,7 +237,7 @@ public class SysProperties {
             Utils.getProperty("h2.nioLoadMapped", false);
 
     /**
-     * System property <code>h2.nioCleanerHack</code> (default: false).<br />
+     * System property <code>h2.nioCleanerHack</code> (default: false).
      * If enabled, use the reflection hack to un-map the mapped file if
      * possible. If disabled, System.gc() is called in a loop until the object
      * is garbage collected. See also
@@ -246,7 +247,7 @@ public class SysProperties {
             Utils.getProperty("h2.nioCleanerHack", false);
 
     /**
-     * System property <code>h2.objectCache</code> (default: true).<br />
+     * System property <code>h2.objectCache</code> (default: true).
      * Cache commonly used values (numbers, strings). There is a shared cache
      * for all values.
      */
@@ -255,14 +256,14 @@ public class SysProperties {
 
     /**
      * System property <code>h2.objectCacheMaxPerElementSize</code> (default:
-     * 4096).<br />
+     * 4096).
      * The maximum size (precision) of an object in the cache.
      */
     public static final int OBJECT_CACHE_MAX_PER_ELEMENT_SIZE =
             Utils.getProperty("h2.objectCacheMaxPerElementSize", 4096);
 
     /**
-     * System property <code>h2.objectCacheSize</code> (default: 1024).<br />
+     * System property <code>h2.objectCacheSize</code> (default: 1024).
      * The maximum number of objects in the cache.
      * This value must be a power of 2.
      */
@@ -277,7 +278,7 @@ public class SysProperties {
     }
 
     /**
-     * System property <code>h2.pgClientEncoding</code> (default: UTF-8).<br />
+     * System property <code>h2.pgClientEncoding</code> (default: UTF-8).
      * Default client encoding for PG server. It is used if the client does not
      * sends his encoding.
      */
@@ -285,21 +286,21 @@ public class SysProperties {
             Utils.getProperty("h2.pgClientEncoding", "UTF-8");
 
     /**
-     * System property <code>h2.prefixTempFile</code> (default: h2.temp).<br />
+     * System property <code>h2.prefixTempFile</code> (default: h2.temp).
      * The prefix for temporary files in the temp directory.
      */
     public static final String PREFIX_TEMP_FILE =
             Utils.getProperty("h2.prefixTempFile", "h2.temp");
 
     /**
-     * System property <code>h2.forceAutoCommitOffOnCommit</code> (default: false).<br />
+     * System property <code>h2.forceAutoCommitOffOnCommit</code> (default: false).
      * Throw error if transaction's auto-commit property is true when a commit is executed.
      */
     public static boolean FORCE_AUTOCOMMIT_OFF_ON_COMMIT =
             Utils.getProperty("h2.forceAutoCommitOffOnCommit", false);
 
     /**
-     * System property <code>h2.serverCachedObjects</code> (default: 64).<br />
+     * System property <code>h2.serverCachedObjects</code> (default: 64).
      * TCP Server: number of cached objects per session.
      */
     public static final int SERVER_CACHED_OBJECTS =
@@ -307,14 +308,14 @@ public class SysProperties {
 
     /**
      * System property <code>h2.serverResultSetFetchSize</code>
-     * (default: 100).<br />
+     * (default: 100).
      * The default result set fetch size when using the server mode.
      */
     public static final int SERVER_RESULT_SET_FETCH_SIZE =
             Utils.getProperty("h2.serverResultSetFetchSize", 100);
 
     /**
-     * System property <code>h2.socketConnectRetry</code> (default: 16).<br />
+     * System property <code>h2.socketConnectRetry</code> (default: 16).
      * The number of times to retry opening a socket. Windows sometimes fails
      * to open a socket, see bug
      * https://bugs.openjdk.java.net/browse/JDK-6213296
@@ -324,21 +325,21 @@ public class SysProperties {
 
     /**
      * System property <code>h2.socketConnectTimeout</code>
-     * (default: 2000).<br />
+     * (default: 2000).
      * The timeout in milliseconds to connect to a server.
      */
     public static final int SOCKET_CONNECT_TIMEOUT =
             Utils.getProperty("h2.socketConnectTimeout", 2000);
 
     /**
-     * System property <code>h2.splitFileSizeShift</code> (default: 30).<br />
+     * System property <code>h2.splitFileSizeShift</code> (default: 30).
      * The maximum file size of a split file is 1L &lt;&lt; x.
      */
     public static final long SPLIT_FILE_SIZE_SHIFT =
             Utils.getProperty("h2.splitFileSizeShift", 30);
 
     /**
-     * System property <code>h2.traceIO</code> (default: false).<br />
+     * System property <code>h2.traceIO</code> (default: false).
      * Trace all I/O operations.
      */
     public static final boolean TRACE_IO =
@@ -346,14 +347,14 @@ public class SysProperties {
 
     /**
      * System property <code>h2.threadDeadlockDetector</code>
-     * (default: false).<br />
+     * (default: false).
      * Detect thread deadlocks in a background thread.
      */
     public static final boolean THREAD_DEADLOCK_DETECTOR =
             Utils.getProperty("h2.threadDeadlockDetector", false);
 
     /**
-     * System property <code>h2.urlMap</code> (default: null).<br />
+     * System property <code>h2.urlMap</code> (default: null).
      * A properties file that contains a mapping between database URLs. New
      * connections are written into the file. An empty value in the map means no
      * redirection is used for the given URL.
@@ -363,7 +364,7 @@ public class SysProperties {
 
     /**
      * System property <code>h2.useThreadContextClassLoader</code>
-     * (default: false).<br />
+     * (default: false).
      * Instead of using the default class loader when deserializing objects, the
      * current thread-context class loader will be used.
      */
@@ -372,7 +373,7 @@ public class SysProperties {
 
     /**
      * System property <code>h2.javaObjectSerializer</code>
-     * (default: null).<br />
+     * (default: null).
      * The JavaObjectSerializer class name for java objects being stored in
      * column of type OTHER. It must be the same on client and server to work
      * correctly.
@@ -382,7 +383,7 @@ public class SysProperties {
 
     /**
      * System property <code>h2.authConfigFile</code>
-     * (default: null).<br />
+     * (default: null).
      * authConfigFile define the URL of configuration file
      * of {@link org.h2.security.auth.DefaultAuthenticator}
      *
@@ -398,6 +399,7 @@ private SysProperties() {
 
     /**
      * INTERNAL
+     * @param dir base directory
      */
     public static void setBaseDir(String dir) {
         if (!dir.endsWith("/")) {
@@ -408,6 +410,7 @@ public static void setBaseDir(String dir) {
 
     /**
      * INTERNAL
+     * @return base directory
      */
     public static String getBaseDir() {
         return Utils.getProperty(H2_BASE_DIR, null);
@@ -415,7 +418,7 @@ public static String getBaseDir() {
 
     /**
      * System property <code>h2.scriptDirectory</code> (default: empty
-     * string).<br />
+     * string).
      * Relative or absolute directory where the script files are stored to or
      * read from.
      *
diff --git a/h2/src/main/org/h2/expression/Expression.java b/h2/src/main/org/h2/expression/Expression.java
index 7fda99198f..a019333335 100644
--- a/h2/src/main/org/h2/expression/Expression.java
+++ b/h2/src/main/org/h2/expression/Expression.java
@@ -272,7 +272,7 @@ public final StringBuilder getEnclosedSQL(StringBuilder builder, int sqlFlags) {
 
     /**
      * If it is possible, return the negated expression. This is used
-     * to optimize NOT expressions: NOT ID>10 can be converted to
+     * to optimize NOT expressions: NOT ID&gt;10 can be converted to
      * ID&lt;=10. Returns null if negating is not possible.
      *
      * @param session the session
diff --git a/h2/src/main/org/h2/expression/ParameterRemote.java b/h2/src/main/org/h2/expression/ParameterRemote.java
index a88ed04795..654351a96c 100644
--- a/h2/src/main/org/h2/expression/ParameterRemote.java
+++ b/h2/src/main/org/h2/expression/ParameterRemote.java
@@ -7,6 +7,7 @@
 
 import java.io.IOException;
 import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
 
 import org.h2.api.ErrorCode;
 import org.h2.message.DbException;
@@ -68,6 +69,7 @@ public int getNullable() {
      * Read the parameter meta data from the transfer object.
      *
      * @param transfer the transfer object
+     * @throws IOException on failure
      */
     public void readMetaData(Transfer transfer) throws IOException {
         type = transfer.readTypeInfo();
@@ -79,6 +81,7 @@ public void readMetaData(Transfer transfer) throws IOException {
      *
      * @param transfer the transfer object
      * @param p the parameter
+     * @throws IOException on failure
      */
     public static void writeMetaData(Transfer transfer, ParameterInterface p) throws IOException {
         transfer.writeTypeInfo(p.getType()).writeInt(p.getNullable());
diff --git a/h2/src/main/org/h2/expression/function/ToCharFunction.java b/h2/src/main/org/h2/expression/function/ToCharFunction.java
index 88bf9df7fa..4ed26ac9b6 100644
--- a/h2/src/main/org/h2/expression/function/ToCharFunction.java
+++ b/h2/src/main/org/h2/expression/function/ToCharFunction.java
@@ -76,10 +76,11 @@ public final class ToCharFunction extends FunctionN {
     /**
      * Emulates Oracle's TO_CHAR(number) function.
      *
-     * <p><table border="1">
-     * <th><td>Input</td>
-     * <td>Output</td>
-     * <td>Closest {@link DecimalFormat} Equivalent</td></th>
+     * <table border="1">
+     * <caption>TO_CHAR(number) function</caption>
+     * <tr><th>Input</th>
+     * <th>Output</th>
+     * <th>Closest {@link DecimalFormat} Equivalent</th></tr>
      * <tr><td>,</td>
      * <td>Grouping separator.</td>
      * <td>,</td></tr>
@@ -560,10 +561,11 @@ private static String getTimeZone(SessionLocal session, Value value, boolean tzd
     /**
      * Emulates Oracle's TO_CHAR(datetime) function.
      *
-     * <p><table border="1">
-     * <th><td>Input</td>
-     * <td>Output</td>
-     * <td>Closest {@link SimpleDateFormat} Equivalent</td></th>
+     * <table border="1">
+     * <caption>TO_CHAR(datetime) function</caption>
+     * <tr><th>Input</th>
+     * <th>Output</th>
+     * <th>Closest {@link SimpleDateFormat} Equivalent</th></tr>
      * <tr><td>- / , . ; : "text"</td>
      * <td>Reproduced verbatim.</td>
      * <td>'text'</td></tr>
diff --git a/h2/src/main/org/h2/fulltext/FullText.java b/h2/src/main/org/h2/fulltext/FullText.java
index d109531036..6ca50e6ef7 100644
--- a/h2/src/main/org/h2/fulltext/FullText.java
+++ b/h2/src/main/org/h2/fulltext/FullText.java
@@ -103,6 +103,7 @@ public class FullText {
      * </pre>
      *
      * @param conn the connection
+     * @throws SQLException on failure
      */
     public static void init(Connection conn) throws SQLException {
         Statement stat = conn.createStatement();
@@ -165,6 +166,7 @@ public static void init(Connection conn) throws SQLException {
      * @param schema the schema name of the table (case sensitive)
      * @param table the table name (case sensitive)
      * @param columnList the column list (null for all columns)
+     * @throws SQLException on failure
      */
     public static void createIndex(Connection conn, String schema,
             String table, String columnList) throws SQLException {
@@ -184,6 +186,7 @@ public static void createIndex(Connection conn, String schema,
      * usually not needed, as the index is kept up-to-date automatically.
      *
      * @param conn the connection
+     * @throws SQLException on failure
      */
     public static void reindex(Connection conn) throws SQLException {
         init(conn);
@@ -210,6 +213,7 @@ public static void reindex(Connection conn) throws SQLException {
      * @param conn the connection
      * @param schema the schema name of the table (case sensitive)
      * @param table the table name (case sensitive)
+     * @throws SQLException on failure
      */
     public static void dropIndex(Connection conn, String schema, String table)
             throws SQLException {
@@ -252,6 +256,7 @@ public static void dropIndex(Connection conn, String schema, String table)
      * Drops all full text indexes from the database.
      *
      * @param conn the connection
+     * @throws SQLException on failure
      */
     public static void dropAll(Connection conn) throws SQLException {
         init(conn);
@@ -279,6 +284,7 @@ public static void dropAll(Connection conn) throws SQLException {
      * @param limit the maximum number of rows or 0 for no limit
      * @param offset the offset or 0 for no offset
      * @return the result set
+     * @throws SQLException on failure
      */
     public static ResultSet search(Connection conn, String text, int limit,
             int offset) throws SQLException {
@@ -310,6 +316,7 @@ public static ResultSet search(Connection conn, String text, int limit,
      * @param limit the maximum number of rows or 0 for no limit
      * @param offset the offset or 0 for no offset
      * @return the result set
+     * @throws SQLException on failure
      */
     public static ResultSet searchData(Connection conn, String text, int limit,
             int offset) throws SQLException {
@@ -328,6 +335,7 @@ public static ResultSet searchData(Connection conn, String text, int limit,
      *
      * @param conn the connection
      * @param commaSeparatedList the list
+     * @throws SQLException on failure
      */
     public static void setIgnoreList(Connection conn, String commaSeparatedList)
             throws SQLException {
@@ -353,6 +361,7 @@ public static void setIgnoreList(Connection conn, String commaSeparatedList)
      *
      * @param conn the connection
      * @param whitespaceChars the list of characters
+     * @throws SQLException on failure
      */
     public static void setWhitespaceChars(Connection conn,
             String whitespaceChars) throws SQLException {
@@ -377,6 +386,7 @@ public static void setWhitespaceChars(Connection conn,
      * @param data the object
      * @param type the SQL type
      * @return the string
+     * @throws SQLException on failure
      */
     protected static String asString(Object data, int type) throws SQLException {
         if (data == null) {
@@ -477,6 +487,7 @@ protected static String[][] parseKey(Connection conn, String key) {
      * @param data the object
      * @param type the SQL type
      * @return the SQL String
+     * @throws SQLException on failure
      */
     protected static String quoteSQL(Object data, int type) throws SQLException {
         if (data == null) {
@@ -533,6 +544,7 @@ protected static String quoteSQL(Object data, int type) throws SQLException {
      *
      * @param conn the database connection
      * @param prefix the prefix
+     * @throws SQLException on failure
      */
     protected static void removeAllTriggers(Connection conn, String prefix)
             throws SQLException {
@@ -557,6 +569,7 @@ protected static void removeAllTriggers(Connection conn, String prefix)
      * @param index the column indices (will be modified)
      * @param keys the key list
      * @param columns the column list
+     * @throws SQLException on failure
      */
     protected static void setColumns(int[] index, ArrayList<String> keys,
             ArrayList<String> columns) throws SQLException {
@@ -586,6 +599,7 @@ protected static void setColumns(int[] index, ArrayList<String> keys,
      * @param offset the offset
      * @param data whether the raw data should be returned
      * @return the result set
+     * @throws SQLException on failure
      */
     protected static ResultSet search(Connection conn, String text, int limit,
             int offset, boolean data) throws SQLException {
@@ -743,6 +757,7 @@ protected static void addWords(FullTextSettings setting,
      * @param conn the database connection
      * @param schema the schema name
      * @param table the table name
+     * @throws SQLException on failure
      */
     private static void createTrigger(Connection conn, String schema,
             String table) throws SQLException {
@@ -781,6 +796,7 @@ private static void createOrDropTrigger(Connection conn,
      * @param conn the database connection
      * @param schema the schema name
      * @param table the table name
+     * @throws SQLException on failure
      */
     private static void indexExistingRows(Connection conn, String schema,
             String table) throws SQLException {
@@ -875,6 +891,7 @@ public static final class FullTextTrigger implements Trigger {
 
         /**
          * INTERNAL
+         * @see Trigger#init(Connection, String, String, String, boolean, int)
          */
         @Override
         public void init(Connection conn, String schemaName, String triggerName,
@@ -942,6 +959,7 @@ public void init(Connection conn, String schemaName, String triggerName,
 
         /**
          * INTERNAL
+         * @see Trigger#fire(Connection, Object[], Object[])
          */
         @Override
         public void fire(Connection conn, Object[] oldRow, Object[] newRow)
@@ -984,8 +1002,9 @@ public void remove() {
          *
          * @param conn to use
          * @param row the row
+         * @throws SQLException on failure
          */
-        protected void insert(Connection conn, Object[] row) throws SQLException {
+        private void insert(Connection conn, Object[] row) throws SQLException {
             PreparedStatement prepInsertRow = null;
             PreparedStatement prepInsertMap = null;
             try {
@@ -1018,8 +1037,9 @@ protected void insert(Connection conn, Object[] row) throws SQLException {
          *
          * @param conn to use
          * @param row the row
+         * @throws SQLException on failure
          */
-        protected void delete(Connection conn, Object[] row) throws SQLException {
+        private void delete(Connection conn, Object[] row) throws SQLException {
             PreparedStatement prepSelectRow = null;
             PreparedStatement prepDeleteMap = null;
             PreparedStatement prepDeleteRow = null;
diff --git a/h2/src/main/org/h2/fulltext/FullTextLucene.java b/h2/src/main/org/h2/fulltext/FullTextLucene.java
index d39de8b367..354a0e8d6f 100644
--- a/h2/src/main/org/h2/fulltext/FullTextLucene.java
+++ b/h2/src/main/org/h2/fulltext/FullTextLucene.java
@@ -95,6 +95,7 @@ public class FullTextLucene extends FullText {
      * </pre>
      *
      * @param conn the connection
+     * @throws SQLException on failure
      */
     public static void init(Connection conn) throws SQLException {
         try (Statement stat = conn.createStatement()) {
@@ -120,6 +121,7 @@ public static void init(Connection conn) throws SQLException {
      * @param schema the schema name of the table (case sensitive)
      * @param table the table name (case sensitive)
      * @param columnList the column list (null for all columns)
+     * @throws SQLException on failure
      */
     public static void createIndex(Connection conn, String schema,
             String table, String columnList) throws SQLException {
@@ -141,6 +143,7 @@ public static void createIndex(Connection conn, String schema,
      * @param conn the connection
      * @param schema the schema name of the table (case sensitive)
      * @param table the table name (case sensitive)
+     * @throws SQLException on failure
      */
     public static void dropIndex(Connection conn, String schema, String table)
             throws SQLException {
@@ -161,6 +164,7 @@ public static void dropIndex(Connection conn, String schema, String table)
      * usually not needed, as the index is kept up-to-date automatically.
      *
      * @param conn the connection
+     * @throws SQLException on failure
      */
     public static void reindex(Connection conn) throws SQLException {
         init(conn);
@@ -180,6 +184,7 @@ public static void reindex(Connection conn) throws SQLException {
      * Drops all full text indexes from the database.
      *
      * @param conn the connection
+     * @throws SQLException on failure
      */
     public static void dropAll(Connection conn) throws SQLException {
         Statement stat = conn.createStatement();
@@ -202,6 +207,7 @@ public static void dropAll(Connection conn) throws SQLException {
      * @param limit the maximum number of rows or 0 for no limit
      * @param offset the offset or 0 for no offset
      * @return the result set
+     * @throws SQLException on failure
      */
     public static ResultSet search(Connection conn, String text, int limit,
             int offset) throws SQLException {
@@ -227,6 +233,7 @@ public static ResultSet search(Connection conn, String text, int limit,
      * @param limit the maximum number of rows or 0 for no limit
      * @param offset the offset or 0 for no offset
      * @return the result set
+     * @throws SQLException on failure
      */
     public static ResultSet searchData(Connection conn, String text, int limit,
             int offset) throws SQLException {
@@ -249,6 +256,7 @@ protected static SQLException convertException(Exception e) {
      * @param conn the database connection
      * @param schema the schema name
      * @param table the table name
+     * @throws SQLException on failure
      */
     private static void createTrigger(Connection conn, String schema,
             String table) throws SQLException {
@@ -283,6 +291,7 @@ private static void createOrDropTrigger(Connection conn,
      *
      * @param conn the connection
      * @return the index access wrapper
+     * @throws SQLException on failure
      */
     protected static IndexAccess getIndexAccess(Connection conn)
             throws SQLException {
@@ -317,6 +326,7 @@ protected static IndexAccess getIndexAccess(Connection conn)
      *
      * @param conn the database connection
      * @return the path
+     * @throws SQLException on failure
      */
     protected static String getIndexPath(Connection conn) throws SQLException {
         Statement stat = conn.createStatement();
@@ -341,6 +351,7 @@ protected static String getIndexPath(Connection conn) throws SQLException {
      * @param conn the database connection
      * @param schema the schema name
      * @param table the table name
+     * @throws SQLException on failure
      */
     private static void indexExistingRows(Connection conn, String schema,
             String table) throws SQLException {
@@ -373,6 +384,7 @@ private static void removeIndexFiles(Connection conn) throws SQLException {
      * set.
      *
      * @param indexPath the index path
+     * @throws SQLException on failure
      */
     protected static void removeIndexAccess(String indexPath)
             throws SQLException {
@@ -397,6 +409,7 @@ protected static void removeIndexAccess(String indexPath)
      * @param offset the offset
      * @param data whether the raw data should be returned
      * @return the result set
+     * @throws SQLException on failure
      */
     protected static ResultSet search(Connection conn, String text,
             int limit, int offset, boolean data) throws SQLException {
@@ -487,6 +500,7 @@ public FullTextTrigger() {
 
         /**
          * INTERNAL
+         * @see Trigger#init(Connection, String, String, String, boolean, int)
          */
         @Override
         public void init(Connection conn, String schemaName, String triggerName,
@@ -550,6 +564,7 @@ public void init(Connection conn, String schemaName, String triggerName,
 
         /**
          * INTERNAL
+         * @see Trigger#fire(Connection, Object[], Object[])
          */
         @Override
         public void fire(Connection conn, Object[] oldRow, Object[] newRow)
@@ -595,8 +610,9 @@ void commitIndex() throws SQLException {
          *
          * @param row the row
          * @param commitIndex whether to commit the changes to the Lucene index
+         * @throws SQLException on failure
          */
-        protected void insert(Object[] row, boolean commitIndex) throws SQLException {
+        private void insert(Object[] row, boolean commitIndex) throws SQLException {
             String query = getQuery(row);
             Document doc = new Document();
             doc.add(new Field(LUCENE_FIELD_QUERY, query, DOC_ID_FIELD_TYPE));
@@ -639,8 +655,9 @@ protected void insert(Object[] row, boolean commitIndex) throws SQLException {
          *
          * @param row the row
          * @param commitIndex whether to commit the changes to the Lucene index
+         * @throws SQLException on failure
          */
-        protected void delete(Object[] row, boolean commitIndex) throws SQLException {
+        private void delete(Object[] row, boolean commitIndex) throws SQLException {
             String query = getQuery(row);
             try {
                 Term term = new Term(LUCENE_FIELD_QUERY, query);
@@ -700,6 +717,7 @@ private static final class IndexAccess {
          * Start using the searcher.
          *
          * @return the searcher
+         * @throws IOException on failure
          */
         synchronized IndexSearcher getSearcher() throws IOException {
             if (!searcher.getIndexReader().tryIncRef()) {
@@ -717,6 +735,7 @@ private void initializeSearcher() throws IOException {
          * Stop using the searcher.
          *
          * @param searcher the searcher
+         * @throws IOException on failure
          */
         synchronized void returnSearcher(IndexSearcher searcher) throws IOException {
             searcher.getIndexReader().decRef();
@@ -724,6 +743,7 @@ synchronized void returnSearcher(IndexSearcher searcher) throws IOException {
 
         /**
          * Commit the changes.
+         * @throws IOException on failure
          */
         public synchronized void commit() throws IOException {
             writer.commit();
@@ -733,6 +753,7 @@ public synchronized void commit() throws IOException {
 
         /**
          * Close the index.
+         * @throws IOException on failure
          */
         public synchronized void close() throws IOException {
             searcher = null;
diff --git a/h2/src/main/org/h2/index/Index.java b/h2/src/main/org/h2/index/Index.java
index 107e0faf73..ef0b9a1a1e 100644
--- a/h2/src/main/org/h2/index/Index.java
+++ b/h2/src/main/org/h2/index/Index.java
@@ -528,7 +528,7 @@ public DbException getDuplicateKeyException(String key) {
     }
 
     /**
-     * Get "PRIMARY KEY ON <table> [(column)]".
+     * Get "PRIMARY KEY ON &lt;table&gt; [(column)]".
      *
      * @param mainIndexColumn the column index
      * @return the message
diff --git a/h2/src/main/org/h2/jdbc/JdbcArray.java b/h2/src/main/org/h2/jdbc/JdbcArray.java
index 5a65c37874..85f14b0abc 100644
--- a/h2/src/main/org/h2/jdbc/JdbcArray.java
+++ b/h2/src/main/org/h2/jdbc/JdbcArray.java
@@ -31,6 +31,9 @@ public final class JdbcArray extends TraceObject implements Array {
 
     /**
      * INTERNAL
+     * @param conn it belongs to
+     * @param value of
+     * @param id of the trace object
      */
     public JdbcArray(JdbcConnection conn, Value value, int id) {
         setTrace(conn.getSession().getTrace(), TraceObject.ARRAY, id);
diff --git a/h2/src/main/org/h2/jdbc/JdbcBlob.java b/h2/src/main/org/h2/jdbc/JdbcBlob.java
index 79b28bdd52..77cf5014a0 100644
--- a/h2/src/main/org/h2/jdbc/JdbcBlob.java
+++ b/h2/src/main/org/h2/jdbc/JdbcBlob.java
@@ -29,6 +29,10 @@ public final class JdbcBlob extends JdbcLob implements Blob {
 
     /**
      * INTERNAL
+     * @param conn it belongs to
+     * @param value of
+     * @param state of the LOB
+     * @param id of the trace object
      */
     public JdbcBlob(JdbcConnection conn, Value value, State state, int id) {
         super(conn, value, state, TraceObject.BLOB, id);
diff --git a/h2/src/main/org/h2/jdbc/JdbcClob.java b/h2/src/main/org/h2/jdbc/JdbcClob.java
index 7245cf7cfd..4ec251450d 100644
--- a/h2/src/main/org/h2/jdbc/JdbcClob.java
+++ b/h2/src/main/org/h2/jdbc/JdbcClob.java
@@ -29,6 +29,10 @@ public final class JdbcClob extends JdbcLob implements NClob {
 
     /**
      * INTERNAL
+     * @param conn it belongs to
+     * @param value of
+     * @param state of the LOB
+     * @param id of the trace object
      */
     public JdbcClob(JdbcConnection conn, Value value, State state, int id) {
         super(conn, value, state, TraceObject.CLOB, id);
@@ -161,6 +165,7 @@ public String getSubString(long pos, int length) throws SQLException {
      * @param pos where to start writing (the first character is at position 1)
      * @param str the string to add
      * @return the length of the added text
+     * @throws SQLException on failure
      */
     @Override
     public int setString(long pos, String str) throws SQLException {
diff --git a/h2/src/main/org/h2/jdbc/JdbcConnection.java b/h2/src/main/org/h2/jdbc/JdbcConnection.java
index d0174bb2c6..d544f532a3 100644
--- a/h2/src/main/org/h2/jdbc/JdbcConnection.java
+++ b/h2/src/main/org/h2/jdbc/JdbcConnection.java
@@ -97,10 +97,13 @@ public class JdbcConnection extends TraceObject implements Connection, JdbcConne
 
     /**
      * INTERNAL
-     */
-    /*
      * the session closable object does not leak as Eclipse warns - due to the
      * CloseWatcher.
+     * @param url of this connection
+     * @param info of this connection
+     * @param user of this connection
+     * @param password for the user
+     * @throws SQLException on failure
      */
     @SuppressWarnings("resource")
     public JdbcConnection(String url, Properties info, String user, Object password) throws SQLException {
@@ -130,6 +133,7 @@ public JdbcConnection(String url, Properties info, String user, Object password)
 
     /**
      * INTERNAL
+     * @param clone connection to clone
      */
     public JdbcConnection(JdbcConnection clone) {
         this.session = clone.session;
@@ -150,6 +154,9 @@ public JdbcConnection(JdbcConnection clone) {
 
     /**
      * INTERNAL
+     * @param session of this connection
+     * @param user of this connection
+     * @param url of this connection
      */
     public JdbcConnection(Session session, String user, String url) {
         this.session = session;
@@ -300,6 +307,7 @@ public DatabaseMetaData getMetaData() throws SQLException {
 
     /**
      * INTERNAL
+     * @return session
      */
     public Session getSession() {
         return session;
@@ -1833,6 +1841,7 @@ public Mode getMode() {
 
     /**
      * INTERNAL
+     * @return StaticSettings
      */
     public StaticSettings getStaticSettings() {
         checkClosed();
diff --git a/h2/src/main/org/h2/jdbc/JdbcException.java b/h2/src/main/org/h2/jdbc/JdbcException.java
index 48299ef74c..8e195c8504 100644
--- a/h2/src/main/org/h2/jdbc/JdbcException.java
+++ b/h2/src/main/org/h2/jdbc/JdbcException.java
@@ -19,6 +19,7 @@ public interface JdbcException {
 
     /**
      * INTERNAL
+     * @return original message
      */
     String getOriginalMessage();
 
@@ -34,6 +35,7 @@ public interface JdbcException {
 
     /**
      * INTERNAL
+     * @param sql  to set
      */
     void setSQL(String sql);
 
diff --git a/h2/src/main/org/h2/jdbc/JdbcLob.java b/h2/src/main/org/h2/jdbc/JdbcLob.java
index 4ed13f948f..a59ce944a2 100644
--- a/h2/src/main/org/h2/jdbc/JdbcLob.java
+++ b/h2/src/main/org/h2/jdbc/JdbcLob.java
@@ -151,6 +151,7 @@ public void free() {
      * Returns the input stream.
      *
      * @return the input stream
+     * @throws SQLException on failure
      */
     InputStream getBinaryStream() throws SQLException {
         try {
@@ -166,6 +167,7 @@ InputStream getBinaryStream() throws SQLException {
      * Returns the reader.
      *
      * @return the reader
+     * @throws SQLException on failure
      */
     Reader getCharacterStream() throws SQLException {
         try {
diff --git a/h2/src/main/org/h2/jdbc/JdbcSQLXML.java b/h2/src/main/org/h2/jdbc/JdbcSQLXML.java
index 4a9be689e9..a0ce861d13 100644
--- a/h2/src/main/org/h2/jdbc/JdbcSQLXML.java
+++ b/h2/src/main/org/h2/jdbc/JdbcSQLXML.java
@@ -76,6 +76,10 @@ public final class JdbcSQLXML extends JdbcLob implements SQLXML {
 
     /**
      * INTERNAL
+     * @param conn to use
+     * @param value for this JdbcSQLXML
+     * @param state of the LOB
+     * @param id of the trace object
      */
     public JdbcSQLXML(JdbcConnection conn, Value value, State state, int id) {
         super(conn, value, state, TraceObject.SQLXML, id);
diff --git a/h2/src/main/org/h2/jdbc/JdbcStatementBackwardsCompat.java b/h2/src/main/org/h2/jdbc/JdbcStatementBackwardsCompat.java
index 3e4b7162f8..dd9fa805a1 100644
--- a/h2/src/main/org/h2/jdbc/JdbcStatementBackwardsCompat.java
+++ b/h2/src/main/org/h2/jdbc/JdbcStatementBackwardsCompat.java
@@ -25,6 +25,7 @@ public interface JdbcStatementBackwardsCompat {
      * @param alwaysQuote
      *            if {@code true} identifier will be quoted unconditionally
      * @return specified identifier quoted if required or explicitly requested
+     * @throws SQLException on failure
      */
     String enquoteIdentifier(String identifier, boolean alwaysQuote) throws SQLException;
 
@@ -34,6 +35,7 @@ public interface JdbcStatementBackwardsCompat {
      * @param identifier
      *            identifier to check
      * @return is specified identifier may be used without quotes
+     * @throws SQLException on failure
      */
     boolean isSimpleIdentifier(String identifier) throws SQLException;
 }
diff --git a/h2/src/main/org/h2/jdbc/meta/DatabaseMeta.java b/h2/src/main/org/h2/jdbc/meta/DatabaseMeta.java
index 7c6fe2ce5f..9b4c423d1b 100644
--- a/h2/src/main/org/h2/jdbc/meta/DatabaseMeta.java
+++ b/h2/src/main/org/h2/jdbc/meta/DatabaseMeta.java
@@ -20,6 +20,7 @@ public abstract class DatabaseMeta {
      * @see java.sql.DatabaseMetaData#nullsAreSortedLow()
      * @see java.sql.DatabaseMetaData#nullsAreSortedAtStart()
      * @see java.sql.DatabaseMetaData#nullsAreSortedAtEnd()
+     * @return DefaultNullOrdering
      */
     public abstract DefaultNullOrdering defaultNullOrdering();
 
@@ -27,6 +28,7 @@ public abstract class DatabaseMeta {
      * INTERNAL
      *
      * @see java.sql.DatabaseMetaData#getDatabaseProductVersion()
+     * @return product version as String
      */
     public abstract String getDatabaseProductVersion();
 
@@ -34,6 +36,7 @@ public abstract class DatabaseMeta {
      * INTERNAL
      *
      * @see java.sql.DatabaseMetaData#getSQLKeywords()
+     * @return list of supported SQL keywords
      */
     public abstract String getSQLKeywords();
 
@@ -41,6 +44,7 @@ public abstract class DatabaseMeta {
      * INTERNAL
      *
      * @see java.sql.DatabaseMetaData#getNumericFunctions()
+     * @return list of supported numeric functions
      */
     public abstract String getNumericFunctions();
 
@@ -48,6 +52,7 @@ public abstract class DatabaseMeta {
      * INTERNAL
      *
      * @see java.sql.DatabaseMetaData#getStringFunctions()
+     * @return list of supported string functions
      */
     public abstract String getStringFunctions();
 
@@ -55,6 +60,7 @@ public abstract class DatabaseMeta {
      * INTERNAL
      *
      * @see java.sql.DatabaseMetaData#getSystemFunctions()
+     * @return list of supported system functions
      */
     public abstract String getSystemFunctions();
 
@@ -62,6 +68,7 @@ public abstract class DatabaseMeta {
      * INTERNAL
      *
      * @see java.sql.DatabaseMetaData#getTimeDateFunctions()
+     * @return list of supported time/date functions
      */
     public abstract String getTimeDateFunctions();
 
@@ -69,11 +76,16 @@ public abstract class DatabaseMeta {
      * INTERNAL
      *
      * @see java.sql.DatabaseMetaData#getSearchStringEscape()
+     * @return search string escape sequence
      */
     public abstract String getSearchStringEscape();
 
     /**
      * INTERNAL
+     * @param catalog to inspect
+     * @param schemaPattern "LIKE" style pattern to filter result
+     * @param procedureNamePattern "LIKE" style pattern to filter result
+     * @return ResultInterface
      *
      * @see java.sql.DatabaseMetaData#getProcedures(String, String, String)
      */
@@ -81,6 +93,11 @@ public abstract class DatabaseMeta {
 
     /**
      * INTERNAL
+     * @param catalog to inspect
+     * @param schemaPattern "LIKE" style pattern to filter result
+     * @param procedureNamePattern "LIKE" style pattern to filter result
+     * @param columnNamePattern "LIKE" style pattern to filter result
+     * @return ResultInterface
      *
      * @see java.sql.DatabaseMetaData#getProcedureColumns(String, String,
      *      String, String)
@@ -90,6 +107,11 @@ public abstract ResultInterface getProcedureColumns(String catalog, String schem
 
     /**
      * INTERNAL
+     * @param catalog to inspect
+     * @param schemaPattern "LIKE" style pattern to filter result
+     * @param tableNamePattern "LIKE" style pattern to filter result
+     * @param types String[]
+     * @return ResultInterface
      *
      * @see java.sql.DatabaseMetaData#getTables(String, String, String,
      *      String[])
@@ -99,6 +121,7 @@ public abstract ResultInterface getTables(String catalog, String schemaPattern,
 
     /**
      * INTERNAL
+     * @return ResultInterface
      *
      * @see java.sql.DatabaseMetaData#getSchemas()
      */
@@ -106,6 +129,7 @@ public abstract ResultInterface getTables(String catalog, String schemaPattern,
 
     /**
      * INTERNAL
+     * @return ResultInterface
      *
      * @see java.sql.DatabaseMetaData#getCatalogs()
      */
@@ -113,6 +137,7 @@ public abstract ResultInterface getTables(String catalog, String schemaPattern,
 
     /**
      * INTERNAL
+     * @return ResultInterface
      *
      * @see java.sql.DatabaseMetaData#getTableTypes()
      */
@@ -120,6 +145,11 @@ public abstract ResultInterface getTables(String catalog, String schemaPattern,
 
     /**
      * INTERNAL
+     * @param catalog to inspect
+     * @param schemaPattern "LIKE" style pattern to filter result
+     * @param tableNamePattern "LIKE" style pattern to filter result
+     * @param columnNamePattern "LIKE" style pattern to filter result
+     * @return ResultInterface
      *
      * @see java.sql.DatabaseMetaData#getColumns(String, String, String, String)
      */
@@ -128,6 +158,11 @@ public abstract ResultInterface getColumns(String catalog, String schemaPattern,
 
     /**
      * INTERNAL
+     * @param catalog to inspect
+     * @param schema to inspect
+     * @param table to inspect
+     * @param columnNamePattern "LIKE" style pattern to filter result
+     * @return ResultInterface
      *
      * @see java.sql.DatabaseMetaData#getColumnPrivileges(String, String,
      *      String, String)
@@ -137,6 +172,10 @@ public abstract ResultInterface getColumnPrivileges(String catalog, String schem
 
     /**
      * INTERNAL
+     * @param catalog to inspect
+     * @param schemaPattern "LIKE" style pattern to filter result
+     * @param tableNamePattern "LIKE" style pattern to filter result
+     * @return ResultInterface
      *
      * @see java.sql.DatabaseMetaData#getTablePrivileges(String, String, String)
      */
@@ -144,6 +183,12 @@ public abstract ResultInterface getColumnPrivileges(String catalog, String schem
 
     /**
      * INTERNAL
+     * @param catalogPattern "LIKE" style pattern to filter result
+     * @param schemaPattern "LIKE" style pattern to filter result
+     * @param tableName table of interest
+     * @param scope of interest
+     * @param nullable include nullable columns
+     * @return ResultInterface
      *
      * @see java.sql.DatabaseMetaData#getBestRowIdentifier(String, String,
      *      String, int, boolean)
@@ -153,6 +198,10 @@ public abstract ResultInterface getBestRowIdentifier(String catalogPattern, Stri
 
     /**
      * INTERNAL
+     * @param catalog to inspect
+     * @param schema to inspect
+     * @param table to inspect
+     * @return ResultInterface
      *
      * @see java.sql.DatabaseMetaData#getVersionColumns(String, String, String)
      */
@@ -160,6 +209,10 @@ public abstract ResultInterface getBestRowIdentifier(String catalogPattern, Stri
 
     /**
      * INTERNAL
+     * @param catalog to inspect
+     * @param schema to inspect
+     * @param table to inspect
+     * @return ResultInterface
      *
      * @see java.sql.DatabaseMetaData#getPrimaryKeys(String, String, String)
      */
@@ -167,6 +220,10 @@ public abstract ResultInterface getBestRowIdentifier(String catalogPattern, Stri
 
     /**
      * INTERNAL
+     * @param catalog to inspect
+     * @param schema to inspect
+     * @param table to inspect
+     * @return ResultInterface
      *
      * @see java.sql.DatabaseMetaData#getImportedKeys(String, String, String)
      */
@@ -174,6 +231,10 @@ public abstract ResultInterface getBestRowIdentifier(String catalogPattern, Stri
 
     /**
      * INTERNAL
+     * @param catalog to inspect
+     * @param schema to inspect
+     * @param table to inspect
+     * @return ResultInterface
      *
      * @see java.sql.DatabaseMetaData#getExportedKeys(String, String, String)
      */
@@ -181,6 +242,13 @@ public abstract ResultInterface getBestRowIdentifier(String catalogPattern, Stri
 
     /**
      * INTERNAL
+     * @param primaryCatalog to inspect
+     * @param primarySchema to inspect
+     * @param primaryTable to inspect
+     * @param foreignCatalog to inspect
+     * @param foreignSchema to inspect
+     * @param foreignTable to inspect
+     * @return ResultInterface
      *
      * @see java.sql.DatabaseMetaData#getCrossReference(String, String, String,
      *      String, String, String)
@@ -190,6 +258,7 @@ public abstract ResultInterface getCrossReference(String primaryCatalog, String
 
     /**
      * INTERNAL
+     * @return ResultInterface
      *
      * @see java.sql.DatabaseMetaData#getTypeInfo()
      */
@@ -197,6 +266,12 @@ public abstract ResultInterface getCrossReference(String primaryCatalog, String
 
     /**
      * INTERNAL
+     * @param catalog to inspect
+     * @param schema to inspect
+     * @param table to inspect
+     * @param unique only
+     * @param approximate allowed
+     * @return ResultInterface
      *
      * @see java.sql.DatabaseMetaData#getIndexInfo(String, String, String,
      *      boolean, boolean)
@@ -206,6 +281,11 @@ public abstract ResultInterface getIndexInfo(String catalog, String schema, Stri
 
     /**
      * INTERNAL
+     * @param catalog to inspect
+     * @param schemaPattern "LIKE" style pattern to filter result
+     * @param typeNamePattern "LIKE" style pattern to filter result
+     * @param types int[]
+     * @return ResultInterface
      *
      * @see java.sql.DatabaseMetaData#getUDTs(String, String, String, int[])
      */
@@ -213,6 +293,10 @@ public abstract ResultInterface getIndexInfo(String catalog, String schema, Stri
 
     /**
      * INTERNAL
+     * @param catalog to inspect
+     * @param schemaPattern "LIKE" style pattern to filter result
+     * @param typeNamePattern "LIKE" style pattern to filter result
+     * @return ResultInterface
      *
      * @see java.sql.DatabaseMetaData#getSuperTypes(String, String, String)
      */
@@ -220,6 +304,10 @@ public abstract ResultInterface getIndexInfo(String catalog, String schema, Stri
 
     /**
      * INTERNAL
+     * @param catalog to inspect
+     * @param schemaPattern "LIKE" style pattern to filter result
+     * @param tableNamePattern "LIKE" style pattern to filter result
+     * @return ResultInterface
      *
      * @see java.sql.DatabaseMetaData#getSuperTables(String, String, String)
      */
@@ -227,6 +315,11 @@ public abstract ResultInterface getIndexInfo(String catalog, String schema, Stri
 
     /**
      * INTERNAL
+     * @param catalog to inspect
+     * @param schemaPattern "LIKE" style pattern to filter result
+     * @param typeNamePattern "LIKE" style pattern to filter result
+     * @param attributeNamePattern "LIKE" style pattern to filter result
+     * @return ResultInterface
      *
      * @see java.sql.DatabaseMetaData#getAttributes(String, String, String,
      *      String)
@@ -236,6 +329,7 @@ public abstract ResultInterface getAttributes(String catalog, String schemaPatte
 
     /**
      * INTERNAL
+     * @return ResultInterface
      *
      * @see java.sql.DatabaseMetaData#getDatabaseMajorVersion()
      */
@@ -243,6 +337,7 @@ public abstract ResultInterface getAttributes(String catalog, String schemaPatte
 
     /**
      * INTERNAL
+     * @return ResultInterface
      *
      * @see java.sql.DatabaseMetaData#getDatabaseMinorVersion()
      */
@@ -250,6 +345,9 @@ public abstract ResultInterface getAttributes(String catalog, String schemaPatte
 
     /**
      * INTERNAL
+     * @param catalog to inspect
+     * @param schemaPattern "LIKE" style pattern to filter result
+     * @return ResultInterface
      *
      * @see java.sql.DatabaseMetaData#getSchemas(String, String)
      */
@@ -257,6 +355,10 @@ public abstract ResultInterface getAttributes(String catalog, String schemaPatte
 
     /**
      * INTERNAL
+     * @param catalog to inspect
+     * @param schemaPattern "LIKE" style pattern to filter result
+     * @param functionNamePattern "LIKE" style pattern to filter result
+     * @return ResultInterface
      *
      * @see java.sql.DatabaseMetaData#getFunctions(String, String, String)
      */
@@ -264,6 +366,11 @@ public abstract ResultInterface getAttributes(String catalog, String schemaPatte
 
     /**
      * INTERNAL
+     * @param catalog to inspect
+     * @param schemaPattern "LIKE" style pattern to filter result
+     * @param functionNamePattern "LIKE" style pattern to filter result
+     * @param columnNamePattern "LIKE" style pattern to filter result
+     * @return ResultInterface
      *
      * @see java.sql.DatabaseMetaData#getFunctionColumns(String, String, String,
      *      String)
@@ -273,6 +380,11 @@ public abstract ResultInterface getFunctionColumns(String catalog, String schema
 
     /**
      * INTERNAL
+     * @param catalog to inspect
+     * @param schemaPattern "LIKE" style pattern to filter result
+     * @param tableNamePattern "LIKE" style pattern to filter result
+     * @param columnNamePattern "LIKE" style pattern to filter result
+     * @return ResultInterface
      *
      * @see java.sql.DatabaseMetaData#getPseudoColumns(String, String, String,
      *      String)
diff --git a/h2/src/main/org/h2/jdbcx/JdbcDataSource.java b/h2/src/main/org/h2/jdbcx/JdbcDataSource.java
index b906c54856..a35765ff6c 100644
--- a/h2/src/main/org/h2/jdbcx/JdbcDataSource.java
+++ b/h2/src/main/org/h2/jdbcx/JdbcDataSource.java
@@ -84,6 +84,8 @@ public JdbcDataSource() {
      * Called when de-serializing the object.
      *
      * @param in the input stream
+     * @throws IOException on failure
+     * @throws ClassNotFoundException on failure
      */
     private void readObject(ObjectInputStream in) throws IOException,
             ClassNotFoundException {
diff --git a/h2/src/main/org/h2/jdbcx/JdbcDataSourceFactory.java b/h2/src/main/org/h2/jdbcx/JdbcDataSourceFactory.java
index b3cf220f10..e70617bcfc 100644
--- a/h2/src/main/org/h2/jdbcx/JdbcDataSourceFactory.java
+++ b/h2/src/main/org/h2/jdbcx/JdbcDataSourceFactory.java
@@ -77,6 +77,7 @@ public synchronized Object getObjectInstance(Object obj, Name name,
 
     /**
      * INTERNAL
+     * @return TraceSystem
      */
     public static TraceSystem getTraceSystem() {
         return traceSystem;
diff --git a/h2/src/main/org/h2/jmx/DatabaseInfo.java b/h2/src/main/org/h2/jmx/DatabaseInfo.java
index 50cfb98c74..c9096118fa 100644
--- a/h2/src/main/org/h2/jmx/DatabaseInfo.java
+++ b/h2/src/main/org/h2/jmx/DatabaseInfo.java
@@ -64,6 +64,7 @@ private static ObjectName getObjectName(String name, String path)
      *
      * @param connectionInfo connection info
      * @param database database
+     * @throws JMException on failure
      */
     public static void registerMBean(ConnectionInfo connectionInfo,
             Database database) throws JMException {
@@ -83,6 +84,7 @@ public static void registerMBean(ConnectionInfo connectionInfo,
      * Unregisters the MBean for the database if one is registered.
      *
      * @param name database name
+     * @throws JMException on failure
      */
     public static void unregisterMBean(String name) throws Exception {
         ObjectName mbeanObjectName = MBEANS.remove(name);
diff --git a/h2/src/main/org/h2/message/TraceObject.java b/h2/src/main/org/h2/message/TraceObject.java
index 2a5141d414..7c1a408603 100644
--- a/h2/src/main/org/h2/message/TraceObject.java
+++ b/h2/src/main/org/h2/message/TraceObject.java
@@ -130,6 +130,7 @@ protected void setTrace(Trace trace, int type, int id) {
 
     /**
      * INTERNAL
+     * @return id
      */
     public int getTraceId() {
         return id;
@@ -137,6 +138,7 @@ public int getTraceId() {
 
     /**
      * INTERNAL
+     * @return object name
      */
     public String getTraceObjectName() {
         return PREFIX[traceType] + id;
diff --git a/h2/src/main/org/h2/message/TraceSystem.java b/h2/src/main/org/h2/message/TraceSystem.java
index 02e1247b3e..db64906d92 100644
--- a/h2/src/main/org/h2/message/TraceSystem.java
+++ b/h2/src/main/org/h2/message/TraceSystem.java
@@ -269,7 +269,7 @@ private synchronized void writeFile(String s, Throwable t) {
                     JdbcException se = (JdbcException) t;
                     int code = se.getErrorCode();
                     if (ErrorCode.isCommon(code)) {
-                        printWriter.println(t.toString());
+                        printWriter.println(t);
                     } else {
                         t.printStackTrace(printWriter);
                     }
diff --git a/h2/src/main/org/h2/result/ResultColumn.java b/h2/src/main/org/h2/result/ResultColumn.java
index 1505abf47c..6626752dcb 100644
--- a/h2/src/main/org/h2/result/ResultColumn.java
+++ b/h2/src/main/org/h2/result/ResultColumn.java
@@ -75,6 +75,7 @@ public class ResultColumn {
      * @param out the object to where to write the data
      * @param result the result
      * @param i the column index
+     * @throws IOException on failure
      */
     public static void writeColumn(Transfer out, ResultInterface result, int i)
             throws IOException {
diff --git a/h2/src/main/org/h2/result/UpdatableRow.java b/h2/src/main/org/h2/result/UpdatableRow.java
index f95cb45d51..6892e0d5dd 100644
--- a/h2/src/main/org/h2/result/UpdatableRow.java
+++ b/h2/src/main/org/h2/result/UpdatableRow.java
@@ -5,6 +5,7 @@
  */
 package org.h2.result;
 
+import java.io.IOException;
 import java.sql.DatabaseMetaData;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -45,6 +46,7 @@ public class UpdatableRow {
      *
      * @param conn the database connection
      * @param result the result
+     * @throws SQLException on failure
      */
     public UpdatableRow(JdbcConnection conn, ResultInterface result)
             throws SQLException {
@@ -226,6 +228,7 @@ private void appendTableName(StringBuilder builder) {
      *
      * @param row the values that contain the key
      * @return the row
+     * @throws SQLException on failure
      */
     public Value[] readRow(Value[] row) throws SQLException {
         StringBuilder builder = new StringBuilder("SELECT ");
diff --git a/h2/src/main/org/h2/schema/Sequence.java b/h2/src/main/org/h2/schema/Sequence.java
index 822ef69daf..0cd5f37487 100644
--- a/h2/src/main/org/h2/schema/Sequence.java
+++ b/h2/src/main/org/h2/schema/Sequence.java
@@ -140,8 +140,8 @@ public Sequence(SessionLocal session, Schema schema, int id, String name, Sequen
      * Allows the base value, start value, min value, max value, increment and
      * cache size to be updated atomically, including atomic validation. Useful
      * because setting these attributes one after the other could otherwise
-     * result in an invalid sequence state (e.g. min value > max value, start
-     * value < min value, etc).
+     * result in an invalid sequence state (e.g. min value &gt; max value, start
+     * value &lt; min value, etc).
      * @param baseValue
      *            the base value ({@code null} if restart is not requested)
      * @param startValue
diff --git a/h2/src/main/org/h2/schema/TriggerObject.java b/h2/src/main/org/h2/schema/TriggerObject.java
index 0f7e528998..af9e279a3b 100644
--- a/h2/src/main/org/h2/schema/TriggerObject.java
+++ b/h2/src/main/org/h2/schema/TriggerObject.java
@@ -472,6 +472,7 @@ public String getTriggerSource() {
 
     /**
      * Close the trigger.
+     * @throws SQLException on failure
      */
     public void close() throws SQLException {
         if (triggerCallback != null) {
diff --git a/h2/src/main/org/h2/security/CipherFactory.java b/h2/src/main/org/h2/security/CipherFactory.java
index e0d7fd9b44..4758736b63 100644
--- a/h2/src/main/org/h2/security/CipherFactory.java
+++ b/h2/src/main/org/h2/security/CipherFactory.java
@@ -104,10 +104,10 @@ public static BlockCipher getBlockCipher(String algorithm) {
      * @param address the address to connect to
      * @param port the port
      * @return the socket
+     * @throws IOException on failure
      */
     public static Socket createSocket(InetAddress address, int port)
             throws IOException {
-        Socket socket = null;
         setKeystore();
         SSLSocketFactory f = (SSLSocketFactory) SSLSocketFactory.getDefault();
         SSLSocket secureSocket = (SSLSocket) f.createSocket();
@@ -121,8 +121,7 @@ public static Socket createSocket(InetAddress address, int port)
                     secureSocket.getSupportedCipherSuites());
             secureSocket.setEnabledCipherSuites(list);
         }
-        socket = secureSocket;
-        return socket;
+        return secureSocket;
     }
 
 /**
@@ -138,6 +137,7 @@ public static Socket createSocket(InetAddress address, int port)
      * @param bindAddress the address to bind to, or null to bind to all
      *            addresses
      * @return the server socket
+     * @throws IOException on failure
      */
     public static ServerSocket createServerSocket(int port,
             InetAddress bindAddress) throws IOException {
@@ -271,6 +271,7 @@ private static byte[] getKeyStoreBytes(KeyStore store, String password)
      *
      * @param password the keystore password
      * @return the keystore
+     * @throws IOException on failure
      */
     public static KeyStore getKeyStore(String password) throws IOException {
         try {
diff --git a/h2/src/main/org/h2/security/auth/Authenticator.java b/h2/src/main/org/h2/security/auth/Authenticator.java
index 26a1da2892..829513e2ce 100644
--- a/h2/src/main/org/h2/security/auth/Authenticator.java
+++ b/h2/src/main/org/h2/security/auth/Authenticator.java
@@ -20,6 +20,7 @@ public interface Authenticator {
      * @param database target database instance.
      * @return valid database user or null if user doesn't exists in the
      *         database
+     * @throws AuthenticationException on failure
      */
     User authenticate(AuthenticationInfo authenticationInfo, Database database) throws AuthenticationException;
 
diff --git a/h2/src/main/org/h2/security/auth/DefaultAuthenticator.java b/h2/src/main/org/h2/security/auth/DefaultAuthenticator.java
index c93d983f80..56380d67fa 100644
--- a/h2/src/main/org/h2/security/auth/DefaultAuthenticator.java
+++ b/h2/src/main/org/h2/security/auth/DefaultAuthenticator.java
@@ -246,6 +246,10 @@ private void defaultConfiguration() {
      * Configure the authenticator from a configuration file
      *
      * @param configUrl URL of configuration file
+     * @throws AuthenticationException on failure
+     * @throws SAXException on failure
+     * @throws IOException on failure
+     * @throws ParserConfigurationException on failure
      */
     public void configureFromUrl(URL configUrl) throws AuthenticationException,
             SAXException, IOException, ParserConfigurationException {
diff --git a/h2/src/main/org/h2/server/Service.java b/h2/src/main/org/h2/server/Service.java
index 534cdb9db2..1c1b328e2f 100644
--- a/h2/src/main/org/h2/server/Service.java
+++ b/h2/src/main/org/h2/server/Service.java
@@ -19,6 +19,7 @@ public interface Service {
      * Initialize the service from command line options.
      *
      * @param args the command line options
+     * @throws Exception on failure
      */
     void init(String... args) throws Exception;
 
@@ -32,6 +33,7 @@ public interface Service {
     /**
      * Start the service. This usually means create the server socket.
      * This method must not block.
+     * @throws SQLException on failure
      */
     void start() throws SQLException;
 
diff --git a/h2/src/main/org/h2/server/TcpServer.java b/h2/src/main/org/h2/server/TcpServer.java
index b28c5e665c..26425d3e48 100644
--- a/h2/src/main/org/h2/server/TcpServer.java
+++ b/h2/src/main/org/h2/server/TcpServer.java
@@ -431,6 +431,7 @@ boolean getIfExists() {
      * @param force if the server should be stopped immediately
      * @param all whether all TCP servers that are running in the JVM should be
      *            stopped
+     * @throws SQLException on failure
      */
     public static synchronized void shutdown(String url, String password,
             boolean force, boolean all) throws SQLException {
diff --git a/h2/src/main/org/h2/server/web/WebServer.java b/h2/src/main/org/h2/server/web/WebServer.java
index bc7fd83c39..ffa2653bc5 100644
--- a/h2/src/main/org/h2/server/web/WebServer.java
+++ b/h2/src/main/org/h2/server/web/WebServer.java
@@ -803,6 +803,7 @@ public void setShutdownHandler(ShutdownHandler shutdownHandler) {
      *
      * @param conn the connection
      * @return the URL of the web site to access this connection
+     * @throws SQLException on failure
      */
     public String addSession(Connection conn) throws SQLException {
         WebSession session = createNewSession("local");
diff --git a/h2/src/main/org/h2/store/Data.java b/h2/src/main/org/h2/store/Data.java
index 3400e87c7f..5f1b1bab4f 100644
--- a/h2/src/main/org/h2/store/Data.java
+++ b/h2/src/main/org/h2/store/Data.java
@@ -198,6 +198,7 @@ public void fillAligned() {
      *
      * @param source the reader
      * @param target the output stream
+     * @throws IOException on failure
      */
     public static void copyString(Reader source, OutputStream target)
             throws IOException {
diff --git a/h2/src/main/org/h2/store/DataReader.java b/h2/src/main/org/h2/store/DataReader.java
index 7b9d5d86af..36fe6bea3e 100644
--- a/h2/src/main/org/h2/store/DataReader.java
+++ b/h2/src/main/org/h2/store/DataReader.java
@@ -9,6 +9,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Reader;
+import java.sql.SQLException;
 import org.h2.util.IOUtils;
 
 /**
@@ -32,6 +33,7 @@ public DataReader(InputStream in) {
      * Read a byte.
      *
      * @return the byte
+     * @throws IOException on failure
      */
     public byte readByte() throws IOException {
         int x = in.read();
@@ -45,6 +47,7 @@ public byte readByte() throws IOException {
      * Read a variable size integer.
      *
      * @return the value
+     * @throws IOException on failure
      */
     public int readVarInt() throws IOException {
         int b = readByte();
@@ -73,6 +76,7 @@ public int readVarInt() throws IOException {
      * Read a variable size long.
      *
      * @return the value
+     * @throws IOException on failure
      */
     public long readVarLong() throws IOException {
         long x = readByte();
@@ -113,6 +117,7 @@ public long readVarLong() throws IOException {
      *
      * @param buff the target buffer
      * @param len the number of bytes to read
+     * @throws IOException on failure
      */
     public void readFully(byte[] buff, int len) throws IOException {
         int got = IOUtils.readFully(in, buff, len);
@@ -125,6 +130,7 @@ public void readFully(byte[] buff, int len) throws IOException {
      * Read a string from the stream.
      *
      * @return the string
+     * @throws IOException on failure
      */
     public String readString() throws IOException {
         int len = readVarInt();
diff --git a/h2/src/main/org/h2/store/FileStore.java b/h2/src/main/org/h2/store/FileStore.java
index 5932935006..88e1c5cdc2 100644
--- a/h2/src/main/org/h2/store/FileStore.java
+++ b/h2/src/main/org/h2/store/FileStore.java
@@ -442,6 +442,7 @@ public void stopAutoDelete() {
 
     /**
      * Close the file. The file may later be re-opened using openFile.
+     * @throws IOException on failure
      */
     public void closeFile() throws IOException {
         file.close();
@@ -464,6 +465,7 @@ private void closeFileSilently() {
     /**
      * Re-open the file. The file pointer will be reset to the previous
      * location.
+     * @throws IOException on failure
      */
     public void openFile() throws IOException {
         if (file == null) {
diff --git a/h2/src/main/org/h2/store/LobStorageInterface.java b/h2/src/main/org/h2/store/LobStorageInterface.java
index dad3e94376..9efd97b060 100644
--- a/h2/src/main/org/h2/store/LobStorageInterface.java
+++ b/h2/src/main/org/h2/store/LobStorageInterface.java
@@ -51,9 +51,9 @@ public interface LobStorageInterface {
      * @param lobId the lob id
      * @param byteCount the number of bytes to read, or -1 if not known
      * @return the stream
+     * @throws IOException on failure
      */
-    InputStream getInputStream(long lobId, long byteCount)
-            throws IOException;
+    InputStream getInputStream(long lobId, long byteCount) throws IOException;
 
     /**
      * Get the input stream for the given lob
@@ -62,9 +62,9 @@ InputStream getInputStream(long lobId, long byteCount)
      * @param tableId the able id
      * @param byteCount the number of bytes to read, or -1 if not known
      * @return the stream
+     * @throws IOException on failure
      */
-    InputStream getInputStream(long lobId, int tableId, long byteCount)
-            throws IOException;
+    InputStream getInputStream(long lobId, int tableId, long byteCount) throws IOException;
 
     /**
      * Delete a LOB (from the database, if it is stored there).
diff --git a/h2/src/main/org/h2/store/fs/FileBaseDefault.java b/h2/src/main/org/h2/store/fs/FileBaseDefault.java
index dc0895956d..45b406aff6 100644
--- a/h2/src/main/org/h2/store/fs/FileBaseDefault.java
+++ b/h2/src/main/org/h2/store/fs/FileBaseDefault.java
@@ -62,7 +62,7 @@ public final synchronized FileChannel truncate(long newLength) throws IOExceptio
      * The truncate implementation.
      *
      * @param size the new size
+     * @throws IOException on failure
      */
     protected abstract void implTruncate(long size) throws IOException;
-
 }
diff --git a/h2/src/main/org/h2/store/fs/FilePath.java b/h2/src/main/org/h2/store/fs/FilePath.java
index a000433d3a..1cc8d0b9d0 100644
--- a/h2/src/main/org/h2/store/fs/FilePath.java
+++ b/h2/src/main/org/h2/store/fs/FilePath.java
@@ -276,6 +276,7 @@ public InputStream newInputStream() throws IOException {
      * @param suffix the suffix
      * @param inTempDir if the file should be stored in the temporary directory
      * @return the name of the created file
+     * @throws IOException on failure
      */
     @SuppressWarnings("unused")
     public FilePath createTempFile(String suffix, boolean inTempDir) throws IOException {
diff --git a/h2/src/main/org/h2/store/fs/FileUtils.java b/h2/src/main/org/h2/store/fs/FileUtils.java
index 0a0bbc83cf..85507184a9 100644
--- a/h2/src/main/org/h2/store/fs/FileUtils.java
+++ b/h2/src/main/org/h2/store/fs/FileUtils.java
@@ -15,6 +15,7 @@
 import java.nio.file.OpenOption;
 import java.nio.file.StandardOpenOption;
 import java.nio.file.attribute.FileAttribute;
+import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.EnumSet;
@@ -242,6 +243,7 @@ public static boolean isDirectory(String fileName) {
      * @param fileName the file name
      * @param mode the access mode. Supported are r, rw, rws, rwd
      * @return the file object
+     * @throws IOException on failure
      */
     public static FileChannel open(String fileName, String mode)
             throws IOException {
@@ -255,6 +257,7 @@ public static FileChannel open(String fileName, String mode)
      *
      * @param fileName the file name
      * @return the input stream
+     * @throws IOException on failure
      */
     public static InputStream newInputStream(String fileName)
             throws IOException {
@@ -270,6 +273,7 @@ public static InputStream newInputStream(String fileName)
      * @param append if true, the file will grow, if false, the file will be
      *            truncated first
      * @return the output stream
+     * @throws IOException on failure
      */
     public static OutputStream newOutputStream(String fileName, boolean append)
             throws IOException {
@@ -377,6 +381,7 @@ public static boolean tryDelete(String path) {
      * @param suffix the suffix
      * @param inTempDir if the file should be stored in the temporary directory
      * @return the name of the created file
+     * @throws IOException on failure
      */
     public static String createTempFile(String prefix, String suffix,
             boolean inTempDir) throws IOException {
@@ -389,6 +394,7 @@ public static String createTempFile(String prefix, String suffix,
      *
      * @param channel the file channel
      * @param dst the byte buffer
+     * @throws IOException on failure
      */
     public static void readFully(FileChannel channel, ByteBuffer dst)
             throws IOException {
@@ -405,6 +411,7 @@ public static void readFully(FileChannel channel, ByteBuffer dst)
      *
      * @param channel the file channel
      * @param src the byte buffer
+     * @throws IOException on failure
      */
     public static void writeFully(FileChannel channel, ByteBuffer src)
             throws IOException {
diff --git a/h2/src/main/org/h2/tools/Backup.java b/h2/src/main/org/h2/tools/Backup.java
index d5fa928f0d..f531561eab 100644
--- a/h2/src/main/org/h2/tools/Backup.java
+++ b/h2/src/main/org/h2/tools/Backup.java
@@ -23,7 +23,7 @@
 
 /**
  * Creates a backup of a database.
- * <br />
+ *
  * This tool copies all database files. The database must be closed before using
  * this tool. To create a backup while the database is in use, run the BACKUP
  * SQL statement. In an emergency, for example if the application is not
@@ -36,8 +36,9 @@
 public class Backup extends Tool {
 
     /**
-     * Options are case sensitive. Supported options are:
+     * Options are case sensitive.
      * <table>
+     * <caption>Supported options are:</caption>
      * <tr><td>[-help] or [-?]</td>
      * <td>Print the list of options</td></tr>
      * <tr><td>[-file &lt;filename&gt;]</td>
@@ -52,6 +53,7 @@ public class Backup extends Tool {
      * @h2.resource
      *
      * @param args the command line arguments
+     * @throws SQLException on failure
      */
     public static void main(String... args) throws SQLException {
         new Backup().runTool(args);
@@ -95,6 +97,7 @@ public void runTool(String... args) throws SQLException {
      * @param db the source database name (null if there is only one database,
      *            and empty string to backup all files in this directory)
      * @param quiet don't print progress information
+     * @throws SQLException on failure
      */
     public static void execute(String zipFileName, String directory, String db,
             boolean quiet) throws SQLException {
diff --git a/h2/src/main/org/h2/tools/ChangeFileEncryption.java b/h2/src/main/org/h2/tools/ChangeFileEncryption.java
index 15ec57c766..906953773f 100644
--- a/h2/src/main/org/h2/tools/ChangeFileEncryption.java
+++ b/h2/src/main/org/h2/tools/ChangeFileEncryption.java
@@ -26,7 +26,7 @@
 
 /**
  * Allows changing the database file encryption password or algorithm.
- * <br />
+ *
  * This tool can not be used to change a password of a user.
  * The database must be closed before using this tool.
  * @h2.resource
@@ -41,8 +41,9 @@ public class ChangeFileEncryption extends Tool {
     private byte[] encryptKey;
 
     /**
-     * Options are case sensitive. Supported options are:
+     * Options are case sensitive.
      * <table>
+     * <caption>Supported options</caption>
      * <tr><td>[-help] or [-?]</td>
      * <td>Print the list of options</td></tr>
      * <tr><td>[-cipher type]</td>
@@ -137,6 +138,7 @@ private static byte[] getFileEncryptionKey(char[] password) {
      * @param decryptPassword the decryption password as a char array
      * @param encryptPassword the encryption password as a char array
      * @param quiet don't print progress information
+     * @throws SQLException on failure
      */
     public static void execute(String dir, String db, String cipher,
             char[] decryptPassword, char[] encryptPassword, boolean quiet)
diff --git a/h2/src/main/org/h2/tools/CompressTool.java b/h2/src/main/org/h2/tools/CompressTool.java
index 989724bc9b..916dfafecd 100644
--- a/h2/src/main/org/h2/tools/CompressTool.java
+++ b/h2/src/main/org/h2/tools/CompressTool.java
@@ -84,10 +84,9 @@ public byte[] compress(byte[] in, String algorithm) {
 
     private static int compress(byte[] in, int len, Compressor compress,
             byte[] out) {
-        int newLen = 0;
         out[0] = (byte) compress.getAlgorithm();
         int start = 1 + writeVariableInt(out, 1, len);
-        newLen = compress.compress(in, 0, len, out, start);
+        int newLen = compress.compress(in, 0, len, out, start);
         if (newLen > len + start || newLen <= 0) {
             out[0] = Compressor.NO;
             System.arraycopy(in, 0, out, start, len);
@@ -121,6 +120,9 @@ public byte[] expand(byte[] in) {
 
     /**
      * INTERNAL
+     * @param in compressed data
+     * @param out uncompressed result
+     * @param outPos the offset at the output array
      */
     public static void expand(byte[] in, byte[] out, int outPos) {
         int algorithm = in[0];
@@ -240,8 +242,10 @@ private static Compressor getCompressor(String algorithm) {
 
     /**
      * INTERNAL
+     * @param algorithm to translate into index
+     * @return index of the specified algorithm
      */
-    public static int getCompressAlgorithm(String algorithm) {
+    private static int getCompressAlgorithm(String algorithm) {
         algorithm = StringUtils.toUpperEnglish(algorithm);
         if ("NO".equals(algorithm)) {
             return Compressor.NO;
@@ -273,6 +277,10 @@ private static Compressor getCompressor(int algorithm) {
 
     /**
      * INTERNAL
+     * @param out stream
+     * @param compressionAlgorithm to be used
+     * @param entryName in a zip file
+     * @return compressed stream
      */
     public static OutputStream wrapOutputStream(OutputStream out,
             String compressionAlgorithm, String entryName) {
@@ -300,6 +308,10 @@ public static OutputStream wrapOutputStream(OutputStream out,
 
     /**
      * INTERNAL
+     * @param in stream
+     * @param compressionAlgorithm to be used
+     * @param entryName in a zip file
+     * @return in stream or null if there is no such entry
      */
     public static InputStream wrapInputStream(InputStream in,
             String compressionAlgorithm, String entryName) {
diff --git a/h2/src/main/org/h2/tools/Console.java b/h2/src/main/org/h2/tools/Console.java
index d3bed2c664..a19a7d1af3 100644
--- a/h2/src/main/org/h2/tools/Console.java
+++ b/h2/src/main/org/h2/tools/Console.java
@@ -30,9 +30,10 @@ public class Console extends Tool implements ShutdownHandler {
 
     /**
      * When running without options, -tcp, -web, -browser and -pg are started.
-     * <br />
-     * Options are case sensitive. Supported options are:
+     *
+     * Options are case sensitive.
      * <table>
+     * <caption>Supported options</caption>
      * <tr><td>[-help] or [-?]</td>
      * <td>Print the list of options</td></tr>
      * <tr><td>[-url]</td>
@@ -55,12 +56,13 @@ public class Console extends Tool implements ShutdownHandler {
      * <td>Start the PG server</td></tr>
      * </table>
      * For each Server, additional options are available;
-     * for details, see the Server tool.<br />
+     * for details, see the Server tool.
      * If a service can not be started, the program
      * terminates with an exit code of 1.
      * @h2.resource
      *
      * @param args the command line arguments
+     * @throws SQLException on failure
      */
     public static void main(String... args) throws SQLException {
         Console console;
diff --git a/h2/src/main/org/h2/tools/ConvertTraceFile.java b/h2/src/main/org/h2/tools/ConvertTraceFile.java
index 3a9d3d5365..1a7600436a 100644
--- a/h2/src/main/org/h2/tools/ConvertTraceFile.java
+++ b/h2/src/main/org/h2/tools/ConvertTraceFile.java
@@ -20,7 +20,7 @@
 
 /**
  * Converts a .trace.db file to a SQL script and Java source code.
- * <br />
+ *
  * SQL statement statistics are listed as well.
  * @h2.resource
  */
@@ -55,8 +55,9 @@ public int compareTo(Stat other) {
     }
 
     /**
-     * Options are case sensitive. Supported options are:
+     * Options are case sensitive.
      * <table>
+     * <caption>Supported options</caption>
      * <tr><td>[-help] or [-?]</td>
      * <td>Print the list of options</td></tr>
      * <tr><td>[-traceFile &lt;file&gt;]</td>
@@ -69,6 +70,7 @@ public int compareTo(Stat other) {
      * @h2.resource
      *
      * @param args the command line arguments
+     * @throws SQLException on failure
      */
     public static void main(String... args) throws SQLException {
         new ConvertTraceFile().runTool(args);
diff --git a/h2/src/main/org/h2/tools/CreateCluster.java b/h2/src/main/org/h2/tools/CreateCluster.java
index eec5b7981d..13a4e21d3c 100644
--- a/h2/src/main/org/h2/tools/CreateCluster.java
+++ b/h2/src/main/org/h2/tools/CreateCluster.java
@@ -20,15 +20,16 @@
 
 /**
  * Creates a cluster from a stand-alone database.
- * <br />
+ *
  * Copies a database to another location if required.
  * @h2.resource
  */
 public class CreateCluster extends Tool {
 
     /**
-     * Options are case sensitive. Supported options are:
+     * Options are case sensitive.
      * <table>
+     * <caption>Supported options</caption>
      * <tr><td>[-help] or [-?]</td>
      * <td>Print the list of options</td></tr>
      * <tr><td>[-urlSource "&lt;url&gt;"]</td>
@@ -45,6 +46,7 @@ public class CreateCluster extends Tool {
      * @h2.resource
      *
      * @param args the command line arguments
+     * @throws SQLException on failure
      */
     public static void main(String... args) throws SQLException {
         new CreateCluster().runTool(args);
@@ -91,6 +93,7 @@ public void runTool(String... args) throws SQLException {
      * @param user the user name
      * @param password the password
      * @param serverList the server list
+     * @throws SQLException on failure
      */
     public void execute(String urlSource, String urlTarget,
             String user, String password, String serverList) throws SQLException {
diff --git a/h2/src/main/org/h2/tools/Csv.java b/h2/src/main/org/h2/tools/Csv.java
index 6f13bbd42c..dfcde5cc2f 100644
--- a/h2/src/main/org/h2/tools/Csv.java
+++ b/h2/src/main/org/h2/tools/Csv.java
@@ -102,6 +102,7 @@ private int writeResultSet(ResultSet rs) throws SQLException {
      * @param writer the writer
      * @param rs the result set
      * @return the number of rows written
+     * @throws SQLException on failure
      */
     public int write(Writer writer, ResultSet rs) throws SQLException {
         this.output = writer;
@@ -123,6 +124,7 @@ public int write(Writer writer, ResultSet rs) throws SQLException {
      *          first row.
      * @param charset the charset or null to use the system default charset
      * @return the number of rows written
+     * @throws SQLException on failure
      */
     public int write(String outputFileName, ResultSet rs, String charset)
             throws SQLException {
@@ -144,6 +146,7 @@ public int write(String outputFileName, ResultSet rs, String charset)
      * @param charset the charset or null to use the system default charset
      *          (see system property file.encoding)
      * @return the number of rows written
+     * @throws SQLException on failure
      */
     public int write(Connection conn, String outputFileName, String sql,
             String charset) throws SQLException {
@@ -158,7 +161,7 @@ public int write(Connection conn, String outputFileName, String sql,
      * Reads from the CSV file and returns a result set. The rows in the result
      * set are created on demand, that means the file is kept open until all
      * rows are read or the result set is closed.
-     * <br />
+     *
      * If the columns are read from the CSV file, then the following rules are
      * used: columns names that start with a letter or '_', and only
      * contain letters, '_', and digits, are considered case insensitive
@@ -170,6 +173,7 @@ public int write(Connection conn, String outputFileName, String sql,
      *          file
      * @param charset the charset or null to use the system default charset
      * @return the result set
+     * @throws SQLException on failure
      */
     public ResultSet read(String inputFileName, String[] colNames,
             String charset) throws SQLException {
@@ -190,6 +194,7 @@ public ResultSet read(String inputFileName, String[] colNames,
      * @param colNames or null if the column names should be read from the CSV
      *            file
      * @return the result set
+     * @throws IOException on failure
      */
     public ResultSet read(Reader reader, String[] colNames) throws IOException {
         init(null, null);
diff --git a/h2/src/main/org/h2/tools/DeleteDbFiles.java b/h2/src/main/org/h2/tools/DeleteDbFiles.java
index 7803d864ea..3bcc4ca86b 100644
--- a/h2/src/main/org/h2/tools/DeleteDbFiles.java
+++ b/h2/src/main/org/h2/tools/DeleteDbFiles.java
@@ -15,15 +15,16 @@
 
 /**
  * Deletes all files belonging to a database.
- * <br />
+ *
  * The database must be closed before calling this tool.
  * @h2.resource
  */
 public class DeleteDbFiles extends Tool {
 
     /**
-     * Options are case sensitive. Supported options are:
+     * Options are case sensitive.
      * <table>
+     * <caption>Supported options</caption>
      * <tr><td>[-help] or [-?]</td>
      * <td>Print the list of options</td></tr>
      * <tr><td>[-dir &lt;dir&gt;]</td>
@@ -36,6 +37,7 @@ public class DeleteDbFiles extends Tool {
      * @h2.resource
      *
      * @param args the command line arguments
+     * @throws SQLException on failure
      */
     public static void main(String... args) throws SQLException {
         new DeleteDbFiles().runTool(args);
diff --git a/h2/src/main/org/h2/tools/MultiDimension.java b/h2/src/main/org/h2/tools/MultiDimension.java
index ddd909a239..6cc4802ee3 100644
--- a/h2/src/main/org/h2/tools/MultiDimension.java
+++ b/h2/src/main/org/h2/tools/MultiDimension.java
@@ -174,6 +174,7 @@ public String generatePreparedQuery(String table, String scalarColumn,
      * @param min the lower values
      * @param max the upper values
      * @return the result set
+     * @throws SQLException on failure
      */
     public ResultSet getResult(PreparedStatement prep, int[] min, int[] max)
             throws SQLException {
diff --git a/h2/src/main/org/h2/tools/Recover.java b/h2/src/main/org/h2/tools/Recover.java
index 840e68e153..5324451b84 100644
--- a/h2/src/main/org/h2/tools/Recover.java
+++ b/h2/src/main/org/h2/tools/Recover.java
@@ -80,8 +80,9 @@ public class Recover extends Tool implements DataHandler {
     private boolean lobMaps;
 
     /**
-     * Options are case sensitive. Supported options are:
+     * Options are case sensitive.
      * <table>
+     * <caption>Supported options</caption>
      * <tr><td>[-help] or [-?]</td>
      * <td>Print the list of options</td></tr>
      * <tr><td>[-dir &lt;dir&gt;]</td>
@@ -97,6 +98,7 @@ public class Recover extends Tool implements DataHandler {
      * @h2.resource
      *
      * @param args the command line arguments
+     * @throws SQLException on failure
      */
     public static void main(String... args) throws SQLException {
         new Recover().runTool(args);
@@ -112,6 +114,7 @@ public static void main(String... args) throws SQLException {
      * a hardware problem.
      *
      * @param args the command line arguments
+     * @throws SQLException on failure
      */
     @Override
     public void runTool(String... args) throws SQLException {
@@ -137,6 +140,11 @@ public void runTool(String... args) throws SQLException {
 
     /**
      * INTERNAL
+     * @param conn to use
+     * @param lobId id of the LOB stream
+     * @param precision not used
+     * @return InputStream to read LOB content from
+     * @throws SQLException on failure
      */
     public static InputStream readBlobMap(Connection conn, long lobId,
             long precision) throws SQLException {
@@ -183,6 +191,11 @@ public InputStream nextElement() {
 
     /**
      * INTERNAL
+     * @param conn to use
+     * @param lobId id of the LOB stream
+     * @param precision not used
+     * @return Reader to read LOB content from
+     * @throws SQLException on failure
      */
     public static Reader readClobMap(Connection conn, long lobId, long precision)
             throws Exception {
@@ -208,6 +221,7 @@ private void traceError(String message, Throwable t) {
      *
      * @param dir the directory
      * @param db the database name (null for all databases)
+     * @throws SQLException on failure
      */
     public static void execute(String dir, String db) throws SQLException {
         try {
diff --git a/h2/src/main/org/h2/tools/Restore.java b/h2/src/main/org/h2/tools/Restore.java
index 65232ad4a9..27f98cb475 100644
--- a/h2/src/main/org/h2/tools/Restore.java
+++ b/h2/src/main/org/h2/tools/Restore.java
@@ -25,8 +25,9 @@
 public class Restore extends Tool {
 
     /**
-     * Options are case sensitive. Supported options are:
+     * Options are case sensitive. Supported options
      * <table>
+     * <caption>Supported options</caption>
      * <tr><td>[-help] or [-?]</td>
      * <td>Print the list of options</td></tr>
      * <tr><td>[-file &lt;filename&gt;]</td>
@@ -41,6 +42,7 @@ public class Restore extends Tool {
      * @h2.resource
      *
      * @param args the command line arguments
+     * @throws SQLException on failure
      */
     public static void main(String... args) throws SQLException {
         new Restore().runTool(args);
diff --git a/h2/src/main/org/h2/tools/RunScript.java b/h2/src/main/org/h2/tools/RunScript.java
index 1d179f7272..7553241d5f 100644
--- a/h2/src/main/org/h2/tools/RunScript.java
+++ b/h2/src/main/org/h2/tools/RunScript.java
@@ -38,8 +38,9 @@ public class RunScript extends Tool {
     private boolean checkResults;
 
     /**
-     * Options are case sensitive. Supported options are:
+     * Options are case sensitive.
      * <table>
+     * <caption>Supported options</caption>
      * <tr><td>[-help] or [-?]</td>
      * <td>Print the list of options</td></tr>
      * <tr><td>[-url "&lt;url&gt;"]</td>
@@ -64,6 +65,7 @@ public class RunScript extends Tool {
      * @h2.resource
      *
      * @param args the command line arguments
+     * @throws SQLException on failure
      */
     public static void main(String... args) throws SQLException {
         new RunScript().runTool(args);
@@ -153,6 +155,7 @@ public void runTool(String... args) throws SQLException {
      * @param conn the connection to a database
      * @param reader the reader
      * @return the last result set
+     * @throws SQLException on failure
      */
     public static ResultSet execute(Connection conn, Reader reader)
             throws SQLException {
@@ -289,6 +292,7 @@ private static void processRunscript(String url, String user, String password, S
      * @param charset the character set or null for UTF-8
      * @param continueOnError if execution should be continued if an error
      *            occurs
+     * @throws SQLException on failure
      */
     public static void execute(String url, String user, String password,
             String fileName, Charset charset, boolean continueOnError)
diff --git a/h2/src/main/org/h2/tools/Script.java b/h2/src/main/org/h2/tools/Script.java
index 5f8610ad2b..2ae6573f75 100644
--- a/h2/src/main/org/h2/tools/Script.java
+++ b/h2/src/main/org/h2/tools/Script.java
@@ -19,8 +19,9 @@
 public class Script extends Tool {
 
     /**
-     * Options are case sensitive. Supported options are:
+     * Options are case sensitive.
      * <table>
+     * <caption>Supported options</caption>
      * <tr><td>[-help] or [-?]</td>
      * <td>Print the list of options</td></tr>
      * <tr><td>[-url "&lt;url&gt;"]</td>
@@ -39,6 +40,7 @@ public class Script extends Tool {
      * @h2.resource
      *
      * @param args the command line arguments
+     * @throws SQLException on failure
      */
     public static void main(String... args) throws SQLException {
         new Script().runTool(args);
@@ -108,6 +110,7 @@ public void runTool(String... args) throws SQLException {
      * @param fileName the target file name
      * @param options1 the options before the file name (may be an empty string)
      * @param options2 the options after the file name (may be an empty string)
+     * @throws SQLException on failure
      */
     public static void process(String url, String user, String password, String fileName, String options1,
             String options2) throws SQLException {
@@ -124,6 +127,7 @@ public static void process(String url, String user, String password, String file
      * @param fileName the target file name
      * @param options1 the options before the file name
      * @param options2 the options after the file name
+     * @throws SQLException on failure
      */
     public static void process(Connection conn,
             String fileName, String options1, String options2) throws SQLException {
diff --git a/h2/src/main/org/h2/tools/Server.java b/h2/src/main/org/h2/tools/Server.java
index 10b7111845..1f271e7eb8 100644
--- a/h2/src/main/org/h2/tools/Server.java
+++ b/h2/src/main/org/h2/tools/Server.java
@@ -42,6 +42,7 @@ public Server() {
      *
      * @param service the service
      * @param args the command line arguments
+     * @throws SQLException on failure
      */
     public Server(Service service, String... args) throws SQLException {
         verifyArgs(args);
@@ -55,9 +56,10 @@ public Server(Service service, String... args) throws SQLException {
 
     /**
      * When running without options, -tcp, -web, -browser and -pg are started.
-     * <br />
-     * Options are case sensitive. Supported options are:
+     *
+     * Options are case sensitive.
      * <table>
+     * <caption>Supported options</caption>
      * <tr><td>[-help] or [-?]</td>
      * <td>Print the list of options</td></tr>
      * <tr><td>[-web]</td>
@@ -112,11 +114,12 @@ public Server(Service service, String... args) throws SQLException {
      * <td>Allows to map a database name to another (all servers)</td></tr>
      * </table>
      * The options -xAllowOthers are potentially risky.
-     * <br />
+     *
      * For details, see Advanced Topics / Protection against Remote Access.
      * @h2.resource
      *
      * @param args the command line arguments
+     * @throws SQLException on failure
      */
     public static void main(String... args) throws SQLException {
         new Server().runTool(args);
@@ -375,6 +378,7 @@ public void runTool(String... args) throws SQLException {
      * @param force the shutdown (don't wait)
      * @param all whether all TCP servers that are running in the JVM should be
      *            stopped
+     * @throws SQLException on failure
      */
     public static void shutdownTcpServer(String url, String password,
             boolean force, boolean all) throws SQLException {
@@ -424,6 +428,7 @@ public String getStatus() {
      *
      * @param args the argument list
      * @return the server
+     * @throws SQLException on failure
      */
     public static Server createWebServer(String... args) throws SQLException {
         return createWebServer(args, null, false);
@@ -468,6 +473,7 @@ static Server createWebServer(String[] args, String key, boolean allowSecureCrea
      *
      * @param args the argument list
      * @return the server
+     * @throws SQLException on failure
      */
     public static Server createTcpServer(String... args) throws SQLException {
         TcpServer service = new TcpServer();
@@ -495,6 +501,7 @@ public static Server createTcpServer(String... args) throws SQLException {
      *
      * @param args the argument list
      * @return the server
+     * @throws SQLException on failure
      */
     public static Server createPgServer(String... args) throws SQLException {
         return new Server(new PgServer(), args);
@@ -615,6 +622,7 @@ public void run() {
 
     /**
      * INTERNAL
+     * @param shutdownHandler to set
      */
     public void setShutdownHandler(ShutdownHandler shutdownHandler) {
         this.shutdownHandler = shutdownHandler;
@@ -645,6 +653,7 @@ public Service getService() {
      * Open a new browser tab or window with the given URL.
      *
      * @param url the URL to open
+     * @throws Exception on failure
      */
     public static void openBrowser(String url) throws Exception {
         try {
@@ -736,6 +745,7 @@ public static void openBrowser(String url) throws Exception {
      * user has disconnected.
      *
      * @param conn the database connection (the database must be open)
+     * @throws SQLException on failure
      */
     public static void startWebServer(Connection conn) throws SQLException {
         startWebServer(conn, false);
@@ -750,6 +760,7 @@ public static void startWebServer(Connection conn) throws SQLException {
      * @param conn the database connection (the database must be open)
      * @param ignoreProperties if {@code true} properties from
      *         {@code .h2.server.properties} will be ignored
+     * @throws SQLException on failure
      */
     public static void startWebServer(Connection conn, boolean ignoreProperties) throws SQLException {
         WebServer webServer = new WebServer();
diff --git a/h2/src/main/org/h2/tools/Shell.java b/h2/src/main/org/h2/tools/Shell.java
index bcb4ff047b..b13523c248 100644
--- a/h2/src/main/org/h2/tools/Shell.java
+++ b/h2/src/main/org/h2/tools/Shell.java
@@ -53,8 +53,9 @@ public class Shell extends Tool implements Runnable {
     private String serverPropertiesDir = Constants.SERVER_PROPERTIES_DIR;
 
     /**
-     * Options are case sensitive. Supported options are:
+     * Options are case sensitive.
      * <table>
+     * <caption>Supported options</caption>
      * <tr><td>[-help] or [-?]</td>
      * <td>Print the list of options</td></tr>
      * <tr><td>[-url "&lt;url&gt;"]</td>
@@ -75,6 +76,7 @@ public class Shell extends Tool implements Runnable {
      * @h2.resource
      *
      * @param args the command line arguments
+     * @throws SQLException on failure
      */
     public static void main(String... args) throws SQLException {
         new Shell().runTool(args);
@@ -174,6 +176,7 @@ public void runTool(String... args) throws SQLException {
      *
      * @param conn the connection
      * @param args the command line settings
+     * @throws SQLException on failure
      */
     public void runTool(Connection conn, String... args) throws SQLException {
         this.conn = conn;
diff --git a/h2/src/main/org/h2/tools/SimpleRowSource.java b/h2/src/main/org/h2/tools/SimpleRowSource.java
index 90498630bd..6724d8b2a7 100644
--- a/h2/src/main/org/h2/tools/SimpleRowSource.java
+++ b/h2/src/main/org/h2/tools/SimpleRowSource.java
@@ -17,6 +17,7 @@ public interface SimpleRowSource {
      * Get the next row. Must return null if no more rows are available.
      *
      * @return the row or null
+     * @throws SQLException on failure
      */
     Object[] readRow() throws SQLException;
 
diff --git a/h2/src/main/org/h2/util/IOUtils.java b/h2/src/main/org/h2/util/IOUtils.java
index 846ebf50b1..79899bf731 100644
--- a/h2/src/main/org/h2/util/IOUtils.java
+++ b/h2/src/main/org/h2/util/IOUtils.java
@@ -104,6 +104,7 @@ public static void skipFully(Reader reader, long skip) throws IOException {
      * @param in the input stream
      * @param out the output stream
      * @return the number of bytes copied
+     * @throws IOException on failure
      */
     public static long copyAndClose(InputStream in, OutputStream out)
             throws IOException {
@@ -125,6 +126,7 @@ public static long copyAndClose(InputStream in, OutputStream out)
      * @param in the input stream
      * @param out the output stream (null if writing is not required)
      * @return the number of bytes copied
+     * @throws IOException on failure
      */
     public static long copyAndCloseInput(InputStream in, OutputStream out)
             throws IOException {
@@ -144,6 +146,7 @@ public static long copyAndCloseInput(InputStream in, OutputStream out)
      * @param in the input stream
      * @param out the output stream (null if writing is not required)
      * @return the number of bytes copied
+     * @throws IOException on failure
      */
     public static long copy(InputStream in, OutputStream out)
             throws IOException {
@@ -158,6 +161,7 @@ public static long copy(InputStream in, OutputStream out)
      * @param out the output stream (null if writing is not required)
      * @param length the maximum number of bytes to copy
      * @return the number of bytes copied
+     * @throws IOException on failure
      */
     public static long copy(InputStream in, OutputStream out, long length)
             throws IOException {
@@ -191,6 +195,7 @@ public static long copy(InputStream in, OutputStream out, long length)
      * @param out the writer (null if writing is not required)
      * @param length the maximum number of bytes to copy
      * @return the number of characters copied
+     * @throws IOException on failure
      */
     public static long copyAndCloseInput(Reader in, Writer out, long length)
             throws IOException {
@@ -225,6 +230,7 @@ public static long copyAndCloseInput(Reader in, Writer out, long length)
      * @param length the maximum number of bytes to read, or -1 to read until
      *            the end of file
      * @return the bytes read
+     * @throws IOException on failure
      */
     public static byte[] readBytesAndClose(InputStream in, int length)
             throws IOException {
@@ -250,6 +256,7 @@ public static byte[] readBytesAndClose(InputStream in, int length)
      * @param length the maximum number of characters to read, or -1 to read
      *            until the end of file
      * @return the string read
+     * @throws IOException on failure
      */
     public static String readStringAndClose(Reader in, int length)
             throws IOException {
@@ -275,6 +282,7 @@ public static String readStringAndClose(Reader in, int length)
      * @param buffer the output buffer
      * @param max the number of bytes to read at most
      * @return the number of bytes read, 0 meaning EOF
+     * @throws IOException on failure
      */
     public static int readFully(InputStream in, byte[] buffer, int max)
             throws IOException {
@@ -303,6 +311,7 @@ public static int readFully(InputStream in, byte[] buffer, int max)
      * @param buffer the output buffer
      * @param max the number of characters to read at most
      * @return the number of characters read, 0 meaning EOF
+     * @throws IOException on failure
      */
     public static int readFully(Reader in, char[] buffer, int max)
             throws IOException {
@@ -393,6 +402,7 @@ public static InputStream getInputStreamFromString(String s) {
      *
      * @param original the original file name
      * @param copy the file name of the copy
+     * @throws IOException on failure
      */
     public static void copyFiles(String original, String copy) throws IOException {
         InputStream in = FileUtils.newInputStream(original);
diff --git a/h2/src/main/org/h2/util/JdbcUtils.java b/h2/src/main/org/h2/util/JdbcUtils.java
index 11cddb4e5e..45a2f2875c 100644
--- a/h2/src/main/org/h2/util/JdbcUtils.java
+++ b/h2/src/main/org/h2/util/JdbcUtils.java
@@ -136,6 +136,7 @@ public static void removeClassFactory(ClassFactory classFactory) {
      * perform access rights checking, the system property h2.allowedClasses
      * needs to be set to a list of class file name prefixes.
      *
+     * @param <Z> generic return type
      * @param className the name of the class
      * @return the class object
      */
@@ -165,6 +166,7 @@ public static <Z> Class<Z> loadUserClass(String className) {
             for (String s : allowedClassNamePrefixes) {
                 if (className.startsWith(s)) {
                     allowed = true;
+                    break;
                 }
             }
             if (!allowed) {
@@ -261,6 +263,7 @@ public static void closeSilently(ResultSet rs) {
      * @param user the user name
      * @param password the password
      * @return the database connection
+     * @throws SQLException on failure
      */
     public static Connection getConnection(String driver, String url,
             String user, String password) throws SQLException {
@@ -276,6 +279,7 @@ public static Connection getConnection(String driver, String url,
      * @param password the password or {@code null}
      * @param networkConnectionInfo the network connection information, or {@code null}
      * @return the database connection
+     * @throws SQLException on failure
      */
     public static Connection getConnection(String driver, String url, String user, String password,
             NetworkConnectionInfo networkConnectionInfo) throws SQLException {
@@ -451,14 +455,11 @@ public static ValueUuid deserializeUuid(byte[] data) {
     /**
      * Set a value as a parameter in a prepared statement.
      *
-     * @param prep
-     *            the prepared statement
-     * @param parameterIndex
-     *            the parameter index
-     * @param value
-     *            the value
-     * @param conn
-     *            the own connection
+     * @param prep the prepared statement
+     * @param parameterIndex the parameter index
+     * @param value the value
+     * @param conn the own connection
+     * @throws SQLException on failure
      */
     public static void set(PreparedStatement prep, int parameterIndex, Value value, JdbcConnection conn)
             throws SQLException {
@@ -611,6 +612,7 @@ private static void setLob(PreparedStatement prep, int parameterIndex, ValueLob
      * @param conn the connection
      * @param sql the SQL statement
      * @return the metadata
+     * @throws SQLException on failure
      */
     public static ResultSet getMetaResultSet(Connection conn, String sql)
             throws SQLException {
diff --git a/h2/src/main/org/h2/util/MathUtils.java b/h2/src/main/org/h2/util/MathUtils.java
index c34c043f77..c2c02a4381 100644
--- a/h2/src/main/org/h2/util/MathUtils.java
+++ b/h2/src/main/org/h2/util/MathUtils.java
@@ -216,7 +216,7 @@ static void warn(String s, Throwable t) {
      *
      * @param x the original value
      * @return the next power of two value
-     * @throws IllegalArgumentException if x < 0 or x > 0x40000000
+     * @throws IllegalArgumentException if x &lt; 0 or x &gt; 0x40000000
      */
     public static int nextPowerOf2(int x) throws IllegalArgumentException {
         if (x == 0) {
diff --git a/h2/src/main/org/h2/util/NetUtils.java b/h2/src/main/org/h2/util/NetUtils.java
index 1b0640ace3..1a0ec61414 100644
--- a/h2/src/main/org/h2/util/NetUtils.java
+++ b/h2/src/main/org/h2/util/NetUtils.java
@@ -13,6 +13,7 @@
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.net.UnknownHostException;
+import java.sql.SQLException;
 
 import org.h2.api.ErrorCode;
 import org.h2.engine.SysProperties;
@@ -40,6 +41,7 @@ private NetUtils() {
      * @param port the port
      * @param ssl if SSL should be used
      * @return the socket
+     * @throws IOException on failure
      */
     public static Socket createLoopbackSocket(int port, boolean ssl)
             throws IOException {
@@ -64,6 +66,7 @@ public static Socket createLoopbackSocket(int port, boolean ssl)
      *            address)
      * @param ssl if SSL should be used
      * @return the socket
+     * @throws IOException on failure
      */
     public static Socket createSocket(String server, int defaultPort, boolean ssl) throws IOException {
         return createSocket(server, defaultPort, ssl, 0);
@@ -78,6 +81,7 @@ public static Socket createSocket(String server, int defaultPort, boolean ssl) t
      * @param ssl if SSL should be used
      * @param networkTimeout socket so timeout
      * @return the socket
+     * @throws IOException on failure
      */
     public static Socket createSocket(String server, int defaultPort,
             boolean ssl, int networkTimeout) throws IOException {
@@ -103,6 +107,7 @@ public static Socket createSocket(String server, int defaultPort,
      * @param port the port
      * @param ssl if SSL should be used
      * @return the socket
+     * @throws IOException on failure
      */
     public static Socket createSocket(InetAddress address, int port, boolean ssl)
         throws IOException {
@@ -116,6 +121,7 @@ public static Socket createSocket(InetAddress address, int port, boolean ssl)
      * @param ssl if SSL should be used
      * @param networkTimeout socket so timeout
      * @return the socket
+     * @throws IOException on failure
      */
     public static Socket createSocket(InetAddress address, int port, boolean ssl, int networkTimeout)
             throws IOException {
@@ -215,6 +221,7 @@ private static ServerSocket createServerSocketTry(int port, boolean ssl) {
      *
      * @param socket the socket
      * @return true if it is
+     * @throws UnknownHostException on failure
      */
     public static boolean isLocalAddress(Socket socket)
             throws UnknownHostException {
diff --git a/h2/src/main/org/h2/util/SortedProperties.java b/h2/src/main/org/h2/util/SortedProperties.java
index 8c9c78811f..b6830d22e3 100644
--- a/h2/src/main/org/h2/util/SortedProperties.java
+++ b/h2/src/main/org/h2/util/SortedProperties.java
@@ -95,6 +95,7 @@ public static String getStringProperty(Properties prop, String key, String def)
      *
      * @param fileName the name of the properties file
      * @return the properties object
+     * @throws IOException on failure
      */
     public static synchronized SortedProperties loadProperties(String fileName)
             throws IOException {
@@ -111,6 +112,7 @@ public static synchronized SortedProperties loadProperties(String fileName)
      * Store a properties file. The header and the date is not written.
      *
      * @param fileName the target file name
+     * @throws IOException on failure
      */
     public synchronized void store(String fileName) throws IOException {
         ByteArrayOutputStream out = new ByteArrayOutputStream();
diff --git a/h2/src/main/org/h2/util/SourceCompiler.java b/h2/src/main/org/h2/util/SourceCompiler.java
index 79b675c2de..37d1fabfcf 100644
--- a/h2/src/main/org/h2/util/SourceCompiler.java
+++ b/h2/src/main/org/h2/util/SourceCompiler.java
@@ -124,6 +124,7 @@ public void setJavaSystemCompiler(boolean enabled) {
      *
      * @param packageAndClassName the class name
      * @return the class
+     * @throws ClassNotFoundException on failure
      */
     public Class<?> getClass(String packageAndClassName)
             throws ClassNotFoundException {
@@ -201,6 +202,7 @@ public static boolean isJavaxScriptSource(String source) {
      *
      * @param packageAndClassName the package and class name
      * @return the compiled script
+     * @throws ScriptException on failure
      */
     public CompiledScript getCompiledScript(String packageAndClassName) throws ScriptException {
         CompiledScript compiledScript = compiledScripts.get(packageAndClassName);
@@ -227,6 +229,7 @@ public CompiledScript getCompiledScript(String packageAndClassName) throws Scrip
      *
      * @param className the class name
      * @return the method name
+     * @throws ClassNotFoundException on failure
      */
     public Method getMethod(String className) throws ClassNotFoundException {
         Class<?> clazz = getClass(className);
diff --git a/h2/src/main/org/h2/util/Tool.java b/h2/src/main/org/h2/util/Tool.java
index e100c4282c..f2f118cf84 100644
--- a/h2/src/main/org/h2/util/Tool.java
+++ b/h2/src/main/org/h2/util/Tool.java
@@ -41,6 +41,7 @@ public void setOut(PrintStream out) {
      * Run the tool with the given output stream and arguments.
      *
      * @param args the argument list
+     * @throws SQLException on failure
      */
     public abstract void runTool(String... args) throws SQLException;
 
@@ -49,6 +50,7 @@ public void setOut(PrintStream out) {
      *
      * @param option the unsupported option
      * @return this method never returns normally
+     * @throws SQLException on failure
      */
     protected SQLException showUsageAndThrowUnsupportedOption(String option)
             throws SQLException {
@@ -61,6 +63,7 @@ protected SQLException showUsageAndThrowUnsupportedOption(String option)
      *
      * @param option the unsupported option
      * @return this method never returns normally
+     * @throws SQLException on failure
      */
     protected SQLException throwUnsupportedOption(String option)
             throws SQLException {
diff --git a/h2/src/main/org/h2/util/Utils.java b/h2/src/main/org/h2/util/Utils.java
index 7138633b20..dd8618bd5d 100644
--- a/h2/src/main/org/h2/util/Utils.java
+++ b/h2/src/main/org/h2/util/Utils.java
@@ -14,6 +14,7 @@
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
+import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
@@ -378,6 +379,7 @@ private static <X> void partialQuickSort(X[] array, int low, int high,
      *
      * @param name the name of the resource
      * @return the resource data
+     * @throws IOException on failure
      */
     public static byte[] getResource(String name) throws IOException {
         byte[] data = RESOURCES.get(name);
@@ -434,6 +436,7 @@ private static byte[] loadResource(String name) throws IOException {
      *            "java.lang.System.gc"
      * @param params the method parameters
      * @return the return value from this call
+     * @throws Exception on failure
      */
     public static Object callStaticMethod(String classAndMethod,
             Object... params) throws Exception {
@@ -452,6 +455,7 @@ public static Object callStaticMethod(String classAndMethod,
      * @param methodName a string with the method name
      * @param params the method parameters
      * @return the return value from this call
+     * @throws Exception on failure
      */
     public static Object callMethod(
             Object instance,
@@ -491,6 +495,7 @@ private static Object callMethod(
      * @param className a string with the entire class, eg. "java.lang.Integer"
      * @param params the constructor parameters
      * @return the newly created object
+     * @throws Exception on failure
      */
     public static Object newInstance(String className, Object... params)
             throws Exception {
diff --git a/h2/src/main/org/h2/value/DataType.java b/h2/src/main/org/h2/value/DataType.java
index 89520feee0..64332d6285 100644
--- a/h2/src/main/org/h2/value/DataType.java
+++ b/h2/src/main/org/h2/value/DataType.java
@@ -386,6 +386,7 @@ public static int convertSQLTypeToValueType(int sqlType, String sqlTypeName) {
      * @param meta the meta data
      * @param columnIndex the column index (1, 2,...)
      * @return the value type
+     * @throws SQLException on failure
      */
     public static int getValueTypeFromResultSet(ResultSetMetaData meta,
             int columnIndex) throws SQLException {
diff --git a/h2/src/main/org/h2/value/Transfer.java b/h2/src/main/org/h2/value/Transfer.java
index 3c7491b793..53127d4467 100644
--- a/h2/src/main/org/h2/value/Transfer.java
+++ b/h2/src/main/org/h2/value/Transfer.java
@@ -14,6 +14,7 @@
 import java.math.BigDecimal;
 import java.net.InetAddress;
 import java.net.Socket;
+import java.sql.SQLException;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -161,6 +162,7 @@ public Transfer(Session session, Socket s) {
     /**
      * Initialize the transfer object. This method will try to open an input and
      * output stream.
+     * @throws IOException on failure
      */
     public synchronized void init() throws IOException {
         if (socket != null) {
@@ -175,6 +177,7 @@ public synchronized void init() throws IOException {
 
     /**
      * Write pending changes.
+     * @throws IOException on failure
      */
     public void flush() throws IOException {
         out.flush();
@@ -185,6 +188,7 @@ public void flush() throws IOException {
      *
      * @param x the value
      * @return itself
+     * @throws IOException on failure
      */
     public Transfer writeBoolean(boolean x) throws IOException {
         out.writeByte((byte) (x ? 1 : 0));
@@ -195,6 +199,7 @@ public Transfer writeBoolean(boolean x) throws IOException {
      * Read a boolean.
      *
      * @return the value
+     * @throws IOException on failure
      */
     public boolean readBoolean() throws IOException {
         return in.readByte() != 0;
@@ -205,6 +210,7 @@ public boolean readBoolean() throws IOException {
      *
      * @param x the value
      * @return itself
+     * @throws IOException on failure
      */
     public Transfer writeByte(byte x) throws IOException {
         out.writeByte(x);
@@ -215,6 +221,7 @@ public Transfer writeByte(byte x) throws IOException {
      * Read a byte.
      *
      * @return the value
+     * @throws IOException on failure
      */
     public byte readByte() throws IOException {
         return in.readByte();
@@ -225,6 +232,7 @@ public byte readByte() throws IOException {
      *
      * @param x the value
      * @return itself
+     * @throws IOException on failure
      */
     private Transfer writeShort(short x) throws IOException {
         out.writeShort(x);
@@ -235,6 +243,7 @@ private Transfer writeShort(short x) throws IOException {
      * Read a short.
      *
      * @return the value
+     * @throws IOException on failure
      */
     private short readShort() throws IOException {
         return in.readShort();
@@ -245,6 +254,7 @@ private short readShort() throws IOException {
      *
      * @param x the value
      * @return itself
+     * @throws IOException on failure
      */
     public Transfer writeInt(int x) throws IOException {
         out.writeInt(x);
@@ -255,6 +265,7 @@ public Transfer writeInt(int x) throws IOException {
      * Read an int.
      *
      * @return the value
+     * @throws IOException on failure
      */
     public int readInt() throws IOException {
         return in.readInt();
@@ -265,6 +276,7 @@ public int readInt() throws IOException {
      *
      * @param x the value
      * @return itself
+     * @throws IOException on failure
      */
     public Transfer writeLong(long x) throws IOException {
         out.writeLong(x);
@@ -275,6 +287,7 @@ public Transfer writeLong(long x) throws IOException {
      * Read a long.
      *
      * @return the value
+     * @throws IOException on failure
      */
     public long readLong() throws IOException {
         return in.readLong();
@@ -285,6 +298,7 @@ public long readLong() throws IOException {
      *
      * @param i the value
      * @return itself
+     * @throws IOException on failure
      */
     private Transfer writeDouble(double i) throws IOException {
         out.writeDouble(i);
@@ -306,6 +320,7 @@ private Transfer writeFloat(float i) throws IOException {
      * Read a double.
      *
      * @return the value
+     * @throws IOException on failure
      */
     private double readDouble() throws IOException {
         return in.readDouble();
@@ -315,6 +330,7 @@ private double readDouble() throws IOException {
      * Read a float.
      *
      * @return the value
+     * @throws IOException on failure
      */
     private float readFloat() throws IOException {
         return in.readFloat();
@@ -325,6 +341,7 @@ private float readFloat() throws IOException {
      *
      * @param s the value
      * @return itself
+     * @throws IOException on failure
      */
     public Transfer writeString(String s) throws IOException {
         if (s == null) {
@@ -340,6 +357,7 @@ public Transfer writeString(String s) throws IOException {
      * Read a string.
      *
      * @return the value
+     * @throws IOException on failure
      */
     public String readString() throws IOException {
         int len = in.readInt();
@@ -360,6 +378,7 @@ public String readString() throws IOException {
      *
      * @param data the value
      * @return itself
+     * @throws IOException on failure
      */
     public Transfer writeBytes(byte[] data) throws IOException {
         if (data == null) {
@@ -378,6 +397,7 @@ public Transfer writeBytes(byte[] data) throws IOException {
      * @param off the offset
      * @param len the length
      * @return itself
+     * @throws IOException on failure
      */
     public Transfer writeBytes(byte[] buff, int off, int len) throws IOException {
         out.write(buff, off, len);
@@ -388,6 +408,7 @@ public Transfer writeBytes(byte[] buff, int off, int len) throws IOException {
      * Read a byte array.
      *
      * @return the value
+     * @throws IOException on failure
      */
     public byte[] readBytes() throws IOException {
         int len = readInt();
@@ -405,6 +426,7 @@ public byte[] readBytes() throws IOException {
      * @param buff the target buffer
      * @param off the offset
      * @param len the number of bytes to read
+     * @throws IOException on failure
      */
     public void readBytes(byte[] buff, int off, int len) throws IOException {
         in.readFully(buff, off, len);
@@ -433,6 +455,7 @@ public synchronized void close() {
      *
      * @param type data type information
      * @return itself
+     * @throws IOException on failure
      */
     public Transfer writeTypeInfo(TypeInfo type) throws IOException {
         if (version >= Constants.TCP_PROTOCOL_VERSION_20) {
@@ -593,6 +616,7 @@ private void writeTypeInfo19(TypeInfo type) throws IOException {
      * Read a type information.
      *
      * @return the type information
+     * @throws IOException on failure
      */
     public TypeInfo readTypeInfo() throws IOException {
         if (version >= Constants.TCP_PROTOCOL_VERSION_20) {
@@ -740,6 +764,7 @@ private TypeInfo readTypeInfo19() throws IOException {
      * Write a value.
      *
      * @param v the value
+     * @throws IOException on failure
      */
     public void writeValue(Value v) throws IOException {
         int type = v.getValueType();
@@ -1015,6 +1040,7 @@ public void writeValue(Value v) throws IOException {
      *
      * @param columnType the data type of value, or {@code null}
      * @return the value
+     * @throws IOException on failure
      */
     public Value readValue(TypeInfo columnType) throws IOException {
         int type = readInt();
@@ -1192,6 +1218,7 @@ private Value[] readArrayElements(int len, TypeInfo elementType) throws IOExcept
      * Read a row count.
      *
      * @return the row count
+     * @throws IOException on failure
      */
     public long readRowCount() throws IOException {
         return version >= Constants.TCP_PROTOCOL_VERSION_20 ? readLong() : readInt();
@@ -1202,6 +1229,7 @@ public long readRowCount() throws IOException {
      *
      * @param rowCount the row count
      * @return itself
+     * @throws IOException on failure
      */
     public Transfer writeRowCount(long rowCount) throws IOException {
         return version >= Constants.TCP_PROTOCOL_VERSION_20 ? writeLong(rowCount)
@@ -1239,6 +1267,7 @@ public void setSSL(boolean ssl) {
      * Open a new connection to the same address and port as this one.
      *
      * @return the new transfer object
+     * @throws IOException on failure
      */
     public Transfer openNewConnection() throws IOException {
         InetAddress address = socket.getInetAddress();

From 678aadb2b7bca4d19c8bf308d229442314207cae Mon Sep 17 00:00:00 2001
From: Andrei Tokar <andrei.tokar@gmail.com>
Date: Mon, 15 Nov 2021 21:28:50 -0500
Subject: [PATCH 06/15] make tools/test Javadoc happy

---
 h2/src/test/org/h2/samples/CachedPreparedStatements.java | 1 +
 h2/src/test/org/h2/samples/Compact.java                  | 2 ++
 h2/src/test/org/h2/samples/CreateScriptFile.java         | 3 +++
 h2/src/test/org/h2/samples/CsvSample.java                | 1 +
 h2/src/test/org/h2/samples/DirectInsert.java             | 1 +
 h2/src/test/org/h2/samples/FileFunctions.java            | 5 +++++
 h2/src/test/org/h2/samples/Function.java                 | 3 +++
 h2/src/test/org/h2/samples/FunctionMultiReturn.java      | 2 ++
 h2/src/test/org/h2/samples/HelloWorld.java               | 2 ++
 h2/src/test/org/h2/samples/InitDatabaseFromJar.java      | 2 ++
 h2/src/test/org/h2/samples/MixedMode.java                | 1 +
 h2/src/test/org/h2/samples/Newsfeed.java                 | 2 ++
 h2/src/test/org/h2/samples/ReadOnlyDatabaseInZip.java    | 2 ++
 h2/src/test/org/h2/samples/RowAccessRights.java          | 1 +
 h2/src/test/org/h2/samples/SQLInjection.java             | 3 +++
 h2/src/test/org/h2/samples/SecurePassword.java           | 2 ++
 h2/src/test/org/h2/samples/ShowProgress.java             | 1 +
 h2/src/test/org/h2/samples/ShutdownServer.java           | 5 ++++-
 h2/src/test/org/h2/samples/TriggerPassData.java          | 2 ++
 h2/src/test/org/h2/samples/TriggerSample.java            | 1 +
 h2/src/test/org/h2/samples/UpdatableView.java            | 1 +
 h2/src/tools/org/h2/build/doclet/Doclet.java             | 2 ++
 h2/src/tools/org/h2/build/doclet/ResourceDoclet.java     | 2 ++
 h2/src/tools/org/h2/build/indexer/Indexer.java           | 2 ++
 h2/src/tools/org/h2/dev/fs/FileShell.java                | 4 +++-
 h2/src/tools/org/h2/dev/ftp/server/FtpServer.java        | 5 +++--
 h2/src/tools/org/h2/jcr/Railroads.java                   | 2 ++
 27 files changed, 56 insertions(+), 4 deletions(-)

diff --git a/h2/src/test/org/h2/samples/CachedPreparedStatements.java b/h2/src/test/org/h2/samples/CachedPreparedStatements.java
index ae87023e83..a782507e5c 100644
--- a/h2/src/test/org/h2/samples/CachedPreparedStatements.java
+++ b/h2/src/test/org/h2/samples/CachedPreparedStatements.java
@@ -26,6 +26,7 @@ public class CachedPreparedStatements {
      * command line.
      *
      * @param args the command line parameters
+     * @throws Exception on failure
      */
     public static void main(String... args) throws Exception {
         new CachedPreparedStatements().run();
diff --git a/h2/src/test/org/h2/samples/Compact.java b/h2/src/test/org/h2/samples/Compact.java
index 531a948bb4..3bd394a242 100644
--- a/h2/src/test/org/h2/samples/Compact.java
+++ b/h2/src/test/org/h2/samples/Compact.java
@@ -27,6 +27,7 @@ public class Compact {
      * command line.
      *
      * @param args the command line parameters
+     * @throws Exception on failure
      */
     public static void main(String... args) throws Exception {
         DeleteDbFiles.execute("./data", "test", true);
@@ -49,6 +50,7 @@ public static void main(String... args) throws Exception {
      * @param dbName the database name
      * @param user the user name
      * @param password the password
+     * @throws SQLException on failure
      */
     public static void compact(String dir, String dbName,
             String user, String password) throws SQLException {
diff --git a/h2/src/test/org/h2/samples/CreateScriptFile.java b/h2/src/test/org/h2/samples/CreateScriptFile.java
index 57ccd36dde..e1546168d2 100644
--- a/h2/src/test/org/h2/samples/CreateScriptFile.java
+++ b/h2/src/test/org/h2/samples/CreateScriptFile.java
@@ -37,6 +37,7 @@ public class CreateScriptFile {
      * command line.
      *
      * @param args the command line parameters
+     * @throws Exception on failure
      */
     public static void main(String... args) throws Exception {
 
@@ -99,6 +100,7 @@ public static void main(String... args) throws Exception {
      * @param password the encryption password
      * @param charset the character set (for example UTF-8)
      * @return the print writer
+     * @throws IOException on failure
      */
     public static PrintWriter openScriptWriter(String fileName,
             String compressionAlgorithm,
@@ -134,6 +136,7 @@ public static PrintWriter openScriptWriter(String fileName,
      * @param password the encryption password
      * @param charset the character set (for example UTF-8)
      * @return the script reader
+     * @throws IOException on failure
      */
     public static LineNumberReader openScriptReader(String fileName,
             String compressionAlgorithm,
diff --git a/h2/src/test/org/h2/samples/CsvSample.java b/h2/src/test/org/h2/samples/CsvSample.java
index 59f0c77025..3fd6da4442 100644
--- a/h2/src/test/org/h2/samples/CsvSample.java
+++ b/h2/src/test/org/h2/samples/CsvSample.java
@@ -27,6 +27,7 @@ public class CsvSample {
      * command line.
      *
      * @param args the command line parameters
+     * @throws SQLException on failure
      */
     public static void main(String... args) throws SQLException {
         CsvSample.write();
diff --git a/h2/src/test/org/h2/samples/DirectInsert.java b/h2/src/test/org/h2/samples/DirectInsert.java
index b1160889e7..5a5ce2bdbd 100644
--- a/h2/src/test/org/h2/samples/DirectInsert.java
+++ b/h2/src/test/org/h2/samples/DirectInsert.java
@@ -25,6 +25,7 @@ public class DirectInsert {
      * command line.
      *
      * @param args the command line parameters
+     * @throws Exception on failure
      */
     public static void main(String... args) throws Exception {
         Class.forName("org.h2.Driver");
diff --git a/h2/src/test/org/h2/samples/FileFunctions.java b/h2/src/test/org/h2/samples/FileFunctions.java
index d534781806..f1be74f6e8 100644
--- a/h2/src/test/org/h2/samples/FileFunctions.java
+++ b/h2/src/test/org/h2/samples/FileFunctions.java
@@ -10,6 +10,7 @@
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.sql.Statement;
 
 /**
@@ -23,6 +24,7 @@ public class FileFunctions {
      * command line.
      *
      * @param args the command line parameters
+     * @throws Exception on failure
      */
     public static void main(String... args) throws Exception {
         Class.forName("org.h2.Driver");
@@ -50,6 +52,7 @@ public static void main(String... args) throws Exception {
      *
      * @param fileName the file name
      * @return the text
+     * @throws IOException on failure
      */
     public static String readTextFile(String fileName) throws IOException {
         byte[] buff = readFile(fileName);
@@ -63,6 +66,7 @@ public static String readTextFile(String fileName) throws IOException {
      * @param fileName the file name
      * @param encoding the encoding
      * @return the text
+     * @throws IOException on failure
      */
     public static String readTextFileWithEncoding(String fileName,
             String encoding) throws IOException {
@@ -76,6 +80,7 @@ public static String readTextFileWithEncoding(String fileName,
      *
      * @param fileName the file name
      * @return the byte array
+     * @throws IOException on failure
      */
     public static byte[] readFile(String fileName) throws IOException {
         try (RandomAccessFile file = new RandomAccessFile(fileName, "r")) {
diff --git a/h2/src/test/org/h2/samples/Function.java b/h2/src/test/org/h2/samples/Function.java
index 8a948b8feb..34eb2de2f4 100644
--- a/h2/src/test/org/h2/samples/Function.java
+++ b/h2/src/test/org/h2/samples/Function.java
@@ -26,6 +26,7 @@ public class Function {
      * command line.
      *
      * @param args the command line parameters
+     * @throws Exception on failure
      */
     public static void main(String... args) throws Exception {
         Class.forName("org.h2.Driver");
@@ -109,6 +110,7 @@ public static boolean isPrime(int value) {
      * @param conn the connection
      * @param sql the SQL statement
      * @return the result set
+     * @throws SQLException on failure
      */
     public static ResultSet query(Connection conn, String sql) throws SQLException {
         return conn.createStatement().executeQuery(sql);
@@ -133,6 +135,7 @@ public static ResultSet simpleResultSet() {
      * @param conn the connection
      * @param size the number of x and y values
      * @return the result set with two columns
+     * @throws SQLException on failure
      */
     public static ResultSet getMatrix(Connection conn, Integer size)
             throws SQLException {
diff --git a/h2/src/test/org/h2/samples/FunctionMultiReturn.java b/h2/src/test/org/h2/samples/FunctionMultiReturn.java
index 3c14395079..5f3d5c54e4 100644
--- a/h2/src/test/org/h2/samples/FunctionMultiReturn.java
+++ b/h2/src/test/org/h2/samples/FunctionMultiReturn.java
@@ -28,6 +28,7 @@ public class FunctionMultiReturn {
      * command line.
      *
      * @param args the command line parameters
+     * @throws Exception on failure
      */
     public static void main(String... args) throws Exception {
         Class.forName("org.h2.Driver");
@@ -135,6 +136,7 @@ public static Double[] polar2CartesianArray(Double r, Double alpha) {
      * @param conn the connection
      * @param query the query
      * @return a result set with the coordinates
+     * @throws SQLException on failure
      */
     public static ResultSet polar2CartesianSet(Connection conn, String query)
             throws SQLException {
diff --git a/h2/src/test/org/h2/samples/HelloWorld.java b/h2/src/test/org/h2/samples/HelloWorld.java
index 305061f4be..2eead8a91b 100644
--- a/h2/src/test/org/h2/samples/HelloWorld.java
+++ b/h2/src/test/org/h2/samples/HelloWorld.java
@@ -8,6 +8,7 @@
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.sql.Statement;
 import org.h2.tools.DeleteDbFiles;
 
@@ -21,6 +22,7 @@ public class HelloWorld {
      * Called when ran from command line.
      *
      * @param args ignored
+     * @throws Exception on failure
      */
     public static void main(String... args) throws Exception {
         // delete the database named 'test' in the user home directory
diff --git a/h2/src/test/org/h2/samples/InitDatabaseFromJar.java b/h2/src/test/org/h2/samples/InitDatabaseFromJar.java
index 2f81e6d0a2..7200f2ae27 100644
--- a/h2/src/test/org/h2/samples/InitDatabaseFromJar.java
+++ b/h2/src/test/org/h2/samples/InitDatabaseFromJar.java
@@ -10,6 +10,7 @@
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.sql.Statement;
 
 import org.h2.tools.RunScript;
@@ -25,6 +26,7 @@ public class InitDatabaseFromJar {
      * command line.
      *
      * @param args the command line parameters
+     * @throws Exception on failure
      */
     public static void main(String... args) throws Exception {
         createScript();
diff --git a/h2/src/test/org/h2/samples/MixedMode.java b/h2/src/test/org/h2/samples/MixedMode.java
index 79cd25ae1d..5380ede514 100644
--- a/h2/src/test/org/h2/samples/MixedMode.java
+++ b/h2/src/test/org/h2/samples/MixedMode.java
@@ -23,6 +23,7 @@ public class MixedMode {
      * command line.
      *
      * @param args the command line parameters
+     * @throws Exception on failure
      */
     public static void main(String... args) throws Exception {
 
diff --git a/h2/src/test/org/h2/samples/Newsfeed.java b/h2/src/test/org/h2/samples/Newsfeed.java
index 48ffe5cf22..e927595458 100644
--- a/h2/src/test/org/h2/samples/Newsfeed.java
+++ b/h2/src/test/org/h2/samples/Newsfeed.java
@@ -14,6 +14,7 @@
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.ResultSet;
+import java.sql.SQLException;
 
 import org.h2.tools.RunScript;
 import org.h2.util.StringUtils;
@@ -30,6 +31,7 @@ public class Newsfeed {
      * command line.
      *
      * @param args the command line parameters
+     * @throws Exception on failure
      */
     public static void main(String... args) throws Exception {
         Path targetDir = Paths.get(args.length == 0 ? "." : args[0]);
diff --git a/h2/src/test/org/h2/samples/ReadOnlyDatabaseInZip.java b/h2/src/test/org/h2/samples/ReadOnlyDatabaseInZip.java
index d9f3213b7c..932bd6445e 100644
--- a/h2/src/test/org/h2/samples/ReadOnlyDatabaseInZip.java
+++ b/h2/src/test/org/h2/samples/ReadOnlyDatabaseInZip.java
@@ -7,6 +7,7 @@
 
 import java.sql.Connection;
 import java.sql.DriverManager;
+import java.sql.SQLException;
 import java.sql.Statement;
 import org.h2.store.fs.FileUtils;
 import org.h2.tools.Backup;
@@ -25,6 +26,7 @@ public class ReadOnlyDatabaseInZip {
      * command line.
      *
      * @param args the command line parameters
+     * @throws Exception on failure
      */
     public static void main(String... args) throws Exception {
 
diff --git a/h2/src/test/org/h2/samples/RowAccessRights.java b/h2/src/test/org/h2/samples/RowAccessRights.java
index 8907955698..449ce3b055 100644
--- a/h2/src/test/org/h2/samples/RowAccessRights.java
+++ b/h2/src/test/org/h2/samples/RowAccessRights.java
@@ -26,6 +26,7 @@ public class RowAccessRights extends TriggerAdapter {
      * Called when ran from command line.
      *
      * @param args ignored
+     * @throws Exception on failure
      */
     public static void main(String... args) throws Exception {
         DeleteDbFiles.execute("~", "test", true);
diff --git a/h2/src/test/org/h2/samples/SQLInjection.java b/h2/src/test/org/h2/samples/SQLInjection.java
index d099097155..476522f4b3 100644
--- a/h2/src/test/org/h2/samples/SQLInjection.java
+++ b/h2/src/test/org/h2/samples/SQLInjection.java
@@ -30,6 +30,7 @@ public class SQLInjection {
      * command line.
      *
      * @param args the command line parameters
+     * @throws Exception on failure
      */
     public static void main(String... args) throws Exception {
         new SQLInjection().run("org.h2.Driver",
@@ -146,6 +147,7 @@ void loginByNameInsecure() throws Exception {
      * @param userName the user name
      * @param password the password
      * @return a result set with the user record if the password matches
+     * @throws Exception on failure
      */
     public static ResultSet getUser(Connection conn, String userName,
             String password) throws Exception {
@@ -164,6 +166,7 @@ public static ResultSet getUser(Connection conn, String userName,
      * @param userName the user name
      * @param password the password
      * @return the new password
+     * @throws Exception on failure
      */
     public static String changePassword(Connection conn, String userName,
             String password) throws Exception {
diff --git a/h2/src/test/org/h2/samples/SecurePassword.java b/h2/src/test/org/h2/samples/SecurePassword.java
index f2f3c051c9..639bf4178e 100644
--- a/h2/src/test/org/h2/samples/SecurePassword.java
+++ b/h2/src/test/org/h2/samples/SecurePassword.java
@@ -9,6 +9,7 @@
 import java.sql.DriverManager;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.Properties;
 
@@ -23,6 +24,7 @@ public class SecurePassword {
      * command line.
      *
      * @param args the command line parameters
+     * @throws Exception on failure
      */
     public static void main(String... args) throws Exception {
 
diff --git a/h2/src/test/org/h2/samples/ShowProgress.java b/h2/src/test/org/h2/samples/ShowProgress.java
index cc18952f4d..6fe51b3d98 100644
--- a/h2/src/test/org/h2/samples/ShowProgress.java
+++ b/h2/src/test/org/h2/samples/ShowProgress.java
@@ -38,6 +38,7 @@ public ShowProgress() {
      * command line.
      *
      * @param args the command line parameters
+     * @throws Exception on failure
      */
     public static void main(String... args) throws Exception {
         new ShowProgress().test();
diff --git a/h2/src/test/org/h2/samples/ShutdownServer.java b/h2/src/test/org/h2/samples/ShutdownServer.java
index dd02e14024..89cc9cb3bd 100644
--- a/h2/src/test/org/h2/samples/ShutdownServer.java
+++ b/h2/src/test/org/h2/samples/ShutdownServer.java
@@ -5,6 +5,8 @@
  */
 package org.h2.samples;
 
+import java.sql.SQLException;
+
 /**
  * This very simple sample application stops a H2 TCP server
  * if it is running.
@@ -16,8 +18,9 @@ public class ShutdownServer {
      * command line.
      *
      * @param args the command line parameters
+     * @throws SQLException on failure
      */
-    public static void main(String... args) throws Exception {
+    public static void main(String... args) throws SQLException {
         org.h2.tools.Server.shutdownTcpServer("tcp://localhost:9094", "", false, false);
     }
 }
diff --git a/h2/src/test/org/h2/samples/TriggerPassData.java b/h2/src/test/org/h2/samples/TriggerPassData.java
index b1d403316e..df667bfc25 100644
--- a/h2/src/test/org/h2/samples/TriggerPassData.java
+++ b/h2/src/test/org/h2/samples/TriggerPassData.java
@@ -28,6 +28,7 @@ public class TriggerPassData implements Trigger {
      * command line.
      *
      * @param args the command line parameters
+     * @throws Exception on failure
      */
     public static void main(String... args) throws Exception {
         Class.forName("org.h2.Driver");
@@ -68,6 +69,7 @@ public void fire(Connection conn, Object[] old, Object[] row) {
      * @param conn the connection
      * @param trigger the trigger name
      * @param data the data
+     * @throws SQLException on failure
      */
     public static void setTriggerData(Connection conn, String trigger,
             String data) throws SQLException {
diff --git a/h2/src/test/org/h2/samples/TriggerSample.java b/h2/src/test/org/h2/samples/TriggerSample.java
index d04821134d..51ecf838b7 100644
--- a/h2/src/test/org/h2/samples/TriggerSample.java
+++ b/h2/src/test/org/h2/samples/TriggerSample.java
@@ -25,6 +25,7 @@ public class TriggerSample {
      * command line.
      *
      * @param args the command line parameters
+     * @throws Exception on failure
      */
     public static void main(String... args) throws Exception {
         Class.forName("org.h2.Driver");
diff --git a/h2/src/test/org/h2/samples/UpdatableView.java b/h2/src/test/org/h2/samples/UpdatableView.java
index 13b812c896..e7cfe356c6 100644
--- a/h2/src/test/org/h2/samples/UpdatableView.java
+++ b/h2/src/test/org/h2/samples/UpdatableView.java
@@ -27,6 +27,7 @@ public class UpdatableView extends TriggerAdapter {
      * command line.
      *
      * @param args ignored
+     * @throws Exception on failure
      */
     public static void main(String... args) throws Exception {
         Class.forName("org.h2.Driver");
diff --git a/h2/src/tools/org/h2/build/doclet/Doclet.java b/h2/src/tools/org/h2/build/doclet/Doclet.java
index 2abf84b609..9b7397efec 100644
--- a/h2/src/tools/org/h2/build/doclet/Doclet.java
+++ b/h2/src/tools/org/h2/build/doclet/Doclet.java
@@ -9,6 +9,7 @@
 import java.io.PrintWriter;
 import java.nio.file.Files;
 import java.nio.file.Paths;
+import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
@@ -46,6 +47,7 @@ public class Doclet {
      *
      * @param root the root
      * @return true if successful
+     * @throws IOException on failure
      */
     public static boolean start(RootDoc root) throws IOException {
         return new Doclet().startDoc(root);
diff --git a/h2/src/tools/org/h2/build/doclet/ResourceDoclet.java b/h2/src/tools/org/h2/build/doclet/ResourceDoclet.java
index 4371bee0a6..f3fa77e030 100644
--- a/h2/src/tools/org/h2/build/doclet/ResourceDoclet.java
+++ b/h2/src/tools/org/h2/build/doclet/ResourceDoclet.java
@@ -6,6 +6,7 @@
 package org.h2.build.doclet;
 
 import java.io.IOException;
+import java.sql.SQLException;
 import org.h2.build.doc.XMLParser;
 import org.h2.build.indexer.HtmlConverter;
 import org.h2.util.SortedProperties;
@@ -33,6 +34,7 @@ public class ResourceDoclet {
      *
      * @param root the root
      * @return true if successful
+     * @throws IOException on failure
      */
     public static boolean start(RootDoc root) throws IOException {
         return new ResourceDoclet().startDoc(root);
diff --git a/h2/src/tools/org/h2/build/indexer/Indexer.java b/h2/src/tools/org/h2/build/indexer/Indexer.java
index 399e15e09c..41db8fc12f 100644
--- a/h2/src/tools/org/h2/build/indexer/Indexer.java
+++ b/h2/src/tools/org/h2/build/indexer/Indexer.java
@@ -14,6 +14,7 @@
 import java.nio.file.Paths;
 import java.nio.file.SimpleFileVisitor;
 import java.nio.file.attribute.BasicFileAttributes;
+import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -56,6 +57,7 @@ public class Indexer {
      * line.
      *
      * @param args the command line parameters
+     * @throws Exception on failure
      */
     public static void main(String... args) throws Exception {
         new Indexer().run(args);
diff --git a/h2/src/tools/org/h2/dev/fs/FileShell.java b/h2/src/tools/org/h2/dev/fs/FileShell.java
index 7ace45d947..13decbda37 100644
--- a/h2/src/tools/org/h2/dev/fs/FileShell.java
+++ b/h2/src/tools/org/h2/dev/fs/FileShell.java
@@ -41,8 +41,9 @@ public class FileShell extends Tool {
     private String currentWorkingDirectory;
 
     /**
-     * Options are case sensitive. Supported options are:
+     * Options are case sensitive.
      * <table>
+     * <caption>Supported options</caption>
      * <tr><td>[-help] or [-?]</td>
      * <td>Print the list of options</td></tr>
      * <tr><td>[-verbose]</td>
@@ -54,6 +55,7 @@ public class FileShell extends Tool {
      * @h2.resource
      *
      * @param args the command line arguments
+     * @throws SQLException on failure
      */
     public static void main(String... args) throws SQLException {
         new FileShell().runTool(args);
diff --git a/h2/src/tools/org/h2/dev/ftp/server/FtpServer.java b/h2/src/tools/org/h2/dev/ftp/server/FtpServer.java
index 3872fd655e..e1d879ffb1 100644
--- a/h2/src/tools/org/h2/dev/ftp/server/FtpServer.java
+++ b/h2/src/tools/org/h2/dev/ftp/server/FtpServer.java
@@ -91,9 +91,10 @@ public class FtpServer extends Tool implements Service {
 
     /**
      * When running without options, -tcp, -web, -browser,
-     * and -pg are started.<br />
-     * Options are case sensitive. Supported options are:
+     * and -pg are started.
+     * Options are case sensitive.
      * <table>
+     * <caption>Supported options</caption>
      * <tr><td>[-help] or [-?]</td>
      * <td>Print the list of options</td></tr>
      * <tr><td>[-web]</td>
diff --git a/h2/src/tools/org/h2/jcr/Railroads.java b/h2/src/tools/org/h2/jcr/Railroads.java
index 8e5f4bcc2c..39c79f8c56 100644
--- a/h2/src/tools/org/h2/jcr/Railroads.java
+++ b/h2/src/tools/org/h2/jcr/Railroads.java
@@ -12,6 +12,7 @@
 import java.nio.file.Paths;
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -37,6 +38,7 @@ public class Railroads {
      * line.
      *
      * @param args the command line parameters
+     * @throws Exception on failure
      */
     public static void main(String... args) throws Exception {
         new Railroads().process();

From c40fc4cf76fac1e9611ca55fb8b0eb29720931fa Mon Sep 17 00:00:00 2001
From: Andrei Tokar <andrei.tokar@gmail.com>
Date: Wed, 17 Nov 2021 09:23:30 -0500
Subject: [PATCH 07/15] downgrade Derby to be 1.8-compatible

---
 h2/src/tools/org/h2/build/Build.java | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/h2/src/tools/org/h2/build/Build.java b/h2/src/tools/org/h2/build/Build.java
index 76205f00a6..ddf8e6e8bc 100644
--- a/h2/src/tools/org/h2/build/Build.java
+++ b/h2/src/tools/org/h2/build/Build.java
@@ -37,7 +37,7 @@ public class Build extends BuildBase {
 
     private static final String ARGS4J_VERSION = "2.33";
 
-    private static final String DERBY_VERSION = "10.15.2.0";
+    private static final String DERBY_VERSION = "10.14.2.0";
 
     private static final String HSQLDB_VERSION = "2.5.1";
 
@@ -84,16 +84,16 @@ public void benchmark() {
                 "b1f720a63a8756867895cc22dd74b51fb70e90ac");
         downloadUsingMaven("ext/derby-" + DERBY_VERSION,
                 "org.apache.derby", "derby", DERBY_VERSION,
-                "b64da6681994f33ba5783ffae55cdb44885b9e70");
+                "7efad40ef52fbb1f08142f07a83b42d29e47d8ce");
         downloadUsingMaven("ext/derbyclient-" + DERBY_VERSION + ".jar",
                 "org.apache.derby", "derbyclient", DERBY_VERSION,
-                "60ad423e9d7acba99a13b8684927206e94c31e03");
+                "fdd338d43e09bf7cd16f5523a0f717e5ef79a1a8");
         downloadUsingMaven("ext/derbynet-" + DERBY_VERSION + ".jar",
                 "org.apache.derby", "derbynet", DERBY_VERSION,
-                "072c8fb0870227477b64edb2d7a5eccdac5de2af");
-        downloadUsingMaven("ext/derbyshared-" + DERBY_VERSION + ".jar",
-                "org.apache.derby", "derbyshared", DERBY_VERSION,
-                "ff2dfb3e2a92d593cf111baad242d156947abbc1");
+                "d03edf879317c7102884c4689e03a4d1a5f84126");
+//        downloadUsingMaven("ext/derbyshared-" + DERBY_VERSION + ".jar",
+//                "org.apache.derby", "derbyshared", DERBY_VERSION,
+//                "ff2dfb3e2a92d593cf111baad242d156947abbc1");
         downloadUsingMaven("ext/postgresql-" + PGJDBC_VERSION + ".jar",
                 "org.postgresql", "postgresql", PGJDBC_VERSION, PGJDBC_HASH);
         downloadUsingMaven("ext/mysql-connector-java-" + MYSQL_CONNECTOR_VERSION + ".jar",
@@ -107,7 +107,7 @@ public void benchmark() {
                 File.pathSeparator + "ext/derby-" + DERBY_VERSION + ".jar" +
                 File.pathSeparator + "ext/derbyclient-" + DERBY_VERSION + ".jar" +
                 File.pathSeparator + "ext/derbynet-" + DERBY_VERSION + ".jar" +
-                File.pathSeparator + "ext/derbyshared-" + DERBY_VERSION + ".jar" +
+//                File.pathSeparator + "ext/derbyshared-" + DERBY_VERSION + ".jar" +
                 File.pathSeparator + "ext/postgresql-" + PGJDBC_VERSION + ".jar" +
                 File.pathSeparator + "ext/mysql-connector-java-" + MYSQL_CONNECTOR_VERSION + ".jar";
         StringList args = args("-Xmx128m",

From ff0665e6a2a37dc2e9297bd39e4d9b6ca17add4e Mon Sep 17 00:00:00 2001
From: Andrei Tokar <andrei.tokar@gmail.com>
Date: Tue, 23 Nov 2021 23:13:15 -0500
Subject: [PATCH 08/15] adjust performance/scalability tests

---
 h2/src/test/org/h2/test/bench/BenchA.java     |  13 +-
 h2/src/test/org/h2/test/bench/BenchB.java     | 113 +++----
 h2/src/test/org/h2/test/bench/BenchC.java     |   7 +-
 .../test/org/h2/test/bench/BenchSimple.java   |  10 -
 h2/src/test/org/h2/test/bench/Database.java   | 105 +++++--
 .../org/h2/test/bench/TestPerformance.java    | 117 ++-----
 .../org/h2/test/bench/TestScalability.java    | 287 ++++++++++--------
 h2/src/test/org/h2/test/bench/test.properties |  56 ++--
 h2/src/tools/org/h2/build/Build.java          |  16 +-
 h2/src/tools/org/h2/build/doc/dictionary.txt  |   9 +-
 10 files changed, 379 insertions(+), 354 deletions(-)

diff --git a/h2/src/test/org/h2/test/bench/BenchA.java b/h2/src/test/org/h2/test/bench/BenchA.java
index 4a128a0730..c084dcab9c 100644
--- a/h2/src/test/org/h2/test/bench/BenchA.java
+++ b/h2/src/test/org/h2/test/bench/BenchA.java
@@ -103,27 +103,16 @@ public void init(Database db, int size) throws SQLException {
         db.commit();
         db.closeConnection();
         db.end();
-
-//        db.start(this, "Open/Close");
-//        db.openConnection();
-//        db.closeConnection();
-//        db.end();
     }
 
     @Override
     public void runTest() throws SQLException {
-
-        database.start(this, "Transactions");
         database.openConnection();
+        database.start(this, "Transactions");
         processTransactions();
-        database.closeConnection();
         database.end();
-
-        database.openConnection();
-        processTransactions();
         database.logMemory(this, "Memory Usage");
         database.closeConnection();
-
     }
 
     private void processTransactions() throws SQLException {
diff --git a/h2/src/test/org/h2/test/bench/BenchB.java b/h2/src/test/org/h2/test/bench/BenchB.java
index 1335a9f47d..8b83c3304a 100644
--- a/h2/src/test/org/h2/test/bench/BenchB.java
+++ b/h2/src/test/org/h2/test/bench/BenchB.java
@@ -34,8 +34,8 @@ public class BenchB implements Bench, Runnable {
     // client data
     private BenchB master;
     private Connection conn;
-    private PreparedStatement updateAccount;
     private PreparedStatement selectAccount;
+    private PreparedStatement updateAccount;
     private PreparedStatement updateTeller;
     private PreparedStatement updateBranch;
     private PreparedStatement insertHistory;
@@ -50,10 +50,15 @@ private BenchB(BenchB master, int seed) throws SQLException {
         random = new Random(seed);
         conn = master.database.openNewConnection();
         conn.setAutoCommit(false);
+        try {
+            selectAccount = conn.prepareStatement(
+                    "SELECT ABALANCE FROM ACCOUNTS WHERE AID=? FOR UPDATE");
+        } catch (SQLException ignored) {
+            selectAccount = conn.prepareStatement(
+                    "SELECT ABALANCE FROM ACCOUNTS WHERE AID=?");
+        }
         updateAccount = conn.prepareStatement(
                 "UPDATE ACCOUNTS SET ABALANCE=ABALANCE+? WHERE AID=?");
-        selectAccount = conn.prepareStatement(
-                "SELECT ABALANCE FROM ACCOUNTS WHERE AID=?");
         updateTeller = conn.prepareStatement(
                 "UPDATE TELLERS SET TBALANCE=TBALANCE+? WHERE TID=?");
         updateBranch = conn.prepareStatement(
@@ -85,7 +90,7 @@ public void init(Database db, int size) throws SQLException {
                         "BID INT, ABALANCE INT, FILLER VARCHAR(84))",
                 "CREATE TABLE HISTORY(" +
                         "TID INT, BID INT, AID INT, " +
-                        "DELTA INT, TIME DATETIME, FILLER VARCHAR(22))" };
+                        "DELTA INT, HTS DATETIME, FILLER VARCHAR(22))" };
         for (String sql : create) {
             db.update(sql);
         }
@@ -127,10 +132,6 @@ public void init(Database db, int size) throws SQLException {
         db.commit();
         db.closeConnection();
         db.end();
-//        db.start(this, "Open/Close");
-//        db.openConnection();
-//        db.closeConnection();
-//        db.end();
     }
 
     /**
@@ -147,72 +148,74 @@ protected int getTransactionsPerClient(int size) {
     public void run() {
         int accountsPerBranch = ACCOUNTS / BRANCHES;
         for (int i = 0; i < master.transactionPerClient; i++) {
-            int branch = random.nextInt(BRANCHES);
-            int teller = random.nextInt(TELLERS);
-            int account;
-            if (random.nextInt(100) < 85) {
-                account = random.nextInt(accountsPerBranch) + branch * accountsPerBranch;
-            } else {
-                account = random.nextInt(ACCOUNTS);
+            try {
+                int branch = random.nextInt(BRANCHES);
+                int teller = random.nextInt(TELLERS);
+                int account;
+                if (random.nextInt(100) < 85) {
+                    account = random.nextInt(accountsPerBranch) + branch * accountsPerBranch;
+                } else {
+                    account = random.nextInt(ACCOUNTS);
+                }
+                int delta = random.nextInt(1000);
+                doOne(branch, teller, account, -delta);
+                try {
+                    conn.commit();
+                } catch (SQLException e) {
+                    e.printStackTrace();
+                }
+            } catch (SQLException ignore) {
+                try {
+                    conn.rollback();
+                } catch (SQLException e) {
+                    e.printStackTrace();
+                }
             }
-            int delta = random.nextInt(1000);
-            doOne(branch, teller, account, delta);
         }
         try {
+            conn.setAutoCommit(true);
             conn.close();
         } catch (SQLException e) {
-            // ignore
+            e.printStackTrace();
         }
     }
 
-    private void doOne(int branch, int teller, int account, int delta) {
-        try {
-            // UPDATE ACCOUNTS SET ABALANCE=ABALANCE+? WHERE AID=?
-            updateAccount.setInt(1, delta);
-            updateAccount.setInt(2, account);
-            master.database.update(updateAccount, "UpdateAccounts");
-
-            // SELECT ABALANCE FROM ACCOUNTS WHERE AID=?
-            selectAccount.setInt(1, account);
-            ResultSet rs = master.database.query(selectAccount);
-            while (rs.next()) {
-                rs.getInt(1);
-            }
+    private void doOne(int branch, int teller, int account, int delta) throws SQLException {
+        selectAccount.setInt(1, account);
+        master.database.queryReadResult(selectAccount);
 
-            // UPDATE TELLERS SET TBALANCE=TABLANCE+? WHERE TID=?
-            updateTeller.setInt(1, delta);
-            updateTeller.setInt(2, teller);
-            master.database.update(updateTeller, "UpdateTeller");
-
-            // UPDATE BRANCHES SET BBALANCE=BBALANCE+? WHERE BID=?
-            updateBranch.setInt(1, delta);
-            updateBranch.setInt(2, branch);
-            master.database.update(updateBranch, "UpdateBranch");
-
-            // INSERT INTO HISTORY(TID, BID, AID, DELTA) VALUES(?, ?, ?, ?)
-            insertHistory.setInt(1, teller);
-            insertHistory.setInt(2, branch);
-            insertHistory.setInt(3, account);
-            insertHistory.setInt(4, delta);
-            master.database.update(insertHistory, "InsertHistory");
-            conn.commit();
-        } catch (SQLException e) {
-            e.printStackTrace();
-        }
+        updateAccount.setInt(1, delta);
+        updateAccount.setInt(2, account);
+        master.database.update(updateAccount, "UpdateAccounts");
+
+        updateTeller.setInt(1, delta);
+        updateTeller.setInt(2, teller);
+        master.database.update(updateTeller, "UpdateTeller");
+
+        updateBranch.setInt(1, delta);
+        updateBranch.setInt(2, branch);
+        master.database.update(updateBranch, "UpdateBranch");
+
+        insertHistory.setInt(1, teller);
+        insertHistory.setInt(2, branch);
+        insertHistory.setInt(3, account);
+        insertHistory.setInt(4, delta);
+        master.database.update(insertHistory, "InsertHistory");
     }
 
+    private void clearHistory() throws SQLException {
+        database.update("DELETE FROM HISTORY");
+    }
 
     @Override
     public void runTest() throws Exception {
         Database db = database;
-        db.start(this, "Transactions");
         db.openConnection();
+        db.start(this, "Transactions");
         processTransactions();
-        db.closeConnection();
         db.end();
-        db.openConnection();
-        processTransactions();
         db.logMemory(this, "Memory Usage");
+        clearHistory();
         db.closeConnection();
     }
 
diff --git a/h2/src/test/org/h2/test/bench/BenchC.java b/h2/src/test/org/h2/test/bench/BenchC.java
index cae24c24e3..a14fb7e22a 100644
--- a/h2/src/test/org/h2/test/bench/BenchC.java
+++ b/h2/src/test/org/h2/test/bench/BenchC.java
@@ -545,18 +545,13 @@ private void loadDistrict(int wId) throws SQLException {
 
     @Override
     public void runTest() throws SQLException {
-        database.start(this, "Transactions");
         database.openConnection();
+        database.start(this, "Transactions");
         for (int i = 0; i < 70; i++) {
             BenchCThread process = new BenchCThread(database, this, random, i);
             process.process();
         }
-        database.closeConnection();
         database.end();
-
-        database.openConnection();
-        BenchCThread process = new BenchCThread(database, this, random, 0);
-        process.process();
         database.logMemory(this, "Memory Usage");
         database.closeConnection();
     }
diff --git a/h2/src/test/org/h2/test/bench/BenchSimple.java b/h2/src/test/org/h2/test/bench/BenchSimple.java
index fdb5a13feb..24768eb72f 100644
--- a/h2/src/test/org/h2/test/bench/BenchSimple.java
+++ b/h2/src/test/org/h2/test/bench/BenchSimple.java
@@ -92,18 +92,8 @@ public void runTest() throws SQLException {
             db.update(prep, "deleteTest");
         }
         db.end();
-
-        db.closeConnection();
-
-        db.openConnection();
-        prep = db.prepare("SELECT * FROM TEST WHERE ID=?");
-        for (int i = 0; i < records; i++) {
-            prep.setInt(1, random.nextInt(records));
-            db.queryReadResult(prep);
-        }
         db.logMemory(this, "Memory Usage");
         db.closeConnection();
-
     }
 
     @Override
diff --git a/h2/src/test/org/h2/test/bench/Database.java b/h2/src/test/org/h2/test/bench/Database.java
index 2badb83409..4ebe79b85e 100644
--- a/h2/src/test/org/h2/test/bench/Database.java
+++ b/h2/src/test/org/h2/test/bench/Database.java
@@ -5,7 +5,11 @@
  */
 package org.h2.test.bench;
 
+import java.io.IOException;
+import java.io.InputStream;
 import java.io.PrintWriter;
+import java.lang.management.GarbageCollectorMXBean;
+import java.lang.management.ManagementFactory;
 import java.lang.reflect.Method;
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -23,7 +27,6 @@
 import org.h2.test.TestBase;
 import org.h2.tools.Server;
 import org.h2.util.StringUtils;
-import org.h2.util.Utils;
 
 /**
  * Represents a database in the benchmark test application.
@@ -43,11 +46,10 @@ class Database {
     private Statement stat;
     private long lastTrace;
     private final Random random = new Random(1);
-    private final ArrayList<Object[]> results = new ArrayList<>();
+    private ArrayList<Measurement> results = new ArrayList<>();
     private int totalTime;
     private int totalGCTime;
     private final AtomicInteger executedStatements = new AtomicInteger();
-    private int threadCount;
 
     private Server serverH2;
     private Object serverDerby;
@@ -85,10 +87,20 @@ int getTotalGCTime() {
      *
      * @return the result array
      */
-    ArrayList<Object[]> getResults() {
+    ArrayList<Measurement> getResults() {
         return results;
     }
 
+    ArrayList<Measurement> reset() {
+        executedStatements.set(0);
+        totalTime = 0;
+        totalGCTime = 0;
+        lastTrace = 0;
+        ArrayList<Measurement> measurements = results;
+        results = new ArrayList<>();
+        return measurements;
+    }
+
     /**
      * Get the random number generator.
      *
@@ -103,7 +115,11 @@ Random getRandom() {
      */
     void startServer() throws Exception {
         if (url.startsWith("jdbc:h2:tcp:")) {
-            serverH2 = Server.createTcpServer("-ifNotExists").start();
+            try {
+                serverH2 = Server.createTcpServer("-ifNotExists").start();
+            } catch (SQLException e) {
+                serverH2 = Server.createTcpServer().start();
+            }
             Thread.sleep(100);
         } else if (url.startsWith("jdbc:derby://")) {
             serverDerby = Class.forName(
@@ -123,9 +139,9 @@ void startServer() throws Exception {
                 }
                 Method m = c.getMethod("main", String[].class);
                 m.invoke(null, new Object[] { new String[] { "-database.0",
-                        "data/mydb;hsqldb.default_table_type=cached", "-dbname.0", "xdb" } });
-                // org.hsqldb.Server.main(new String[]{"-database.0", "mydb",
-                // "-dbname.0", "xdb"});
+                        "data/mydb;hsqldb.default_table_type=cached;hsqldb.write_delay_millis=1000",
+                        "-dbname.0", "xdb" } });
+                // org.hsqldb.Server.main(new String[]{"-database.0", "mydb", "-dbname.0", "xdb"});
                 serverHSQLDB = true;
                 Thread.sleep(100);
             }
@@ -161,29 +177,28 @@ void stopServer() throws Exception {
      * @param test the test application
      * @param id the database id
      * @param dbString the configuration string
-     * @param threadCount the number of threads to use
+     * @param properties to use
      * @return a new database object with the given settings
      */
-    static Database parse(DatabaseTest test, int id, String dbString,
-            int threadCount) {
+    static Database parse(DatabaseTest test, int id, String dbString, Properties properties) {
         try {
             StringTokenizer tokenizer = new StringTokenizer(dbString, ",");
             Database db = new Database();
             db.id = id;
-            db.threadCount = threadCount;
             db.test = test;
             db.name = tokenizer.nextToken().trim();
             String driver = tokenizer.nextToken().trim();
             Class.forName(driver);
             db.url = tokenizer.nextToken().trim();
             db.user = tokenizer.nextToken().trim();
-            db.password = "";
+            db.password = null;
             if (tokenizer.hasMoreTokens()) {
                 db.password = tokenizer.nextToken().trim();
             }
+            db.setTranslations(properties);
             return db;
         } catch (Exception e) {
-            System.out.println("Cannot load database " + dbString + " :" + e.toString());
+            System.out.println("Cannot load database " + dbString + ": " + e);
             return null;
         }
     }
@@ -284,7 +299,7 @@ private String getSQL(String sql) {
     void start(Bench bench, String action) {
         this.currentAction = bench.getName() + ": " + action;
         this.startTimeNs = System.nanoTime();
-        this.initialGCTime = Utils.getGarbageCollectionTime();
+        this.initialGCTime = getGarbageCollectionTime();
     }
 
     /**
@@ -293,7 +308,7 @@ void start(Bench bench, String action) {
      */
     void end() {
         long time = TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - startTimeNs);
-        long gcCollectionTime = Utils.getGarbageCollectionTime() - initialGCTime;
+        long gcCollectionTime = getGarbageCollectionTime() - initialGCTime;
         log(currentAction, "ms", (int) time);
         if (test.isCollect()) {
             totalTime += time;
@@ -301,6 +316,17 @@ void end() {
         }
     }
 
+    public static long getGarbageCollectionTime() {
+        long totalGCTime = 0;
+        for (GarbageCollectorMXBean gcMXBean : ManagementFactory.getGarbageCollectorMXBeans()) {
+            long collectionTime = gcMXBean.getCollectionTime();
+            if(collectionTime > 0) {
+                totalGCTime += collectionTime;
+            }
+        }
+        return totalGCTime;
+    }
+
     /**
      * Drop a table. Errors are ignored.
      *
@@ -402,12 +428,12 @@ void logMemory(Bench bench, String action) {
      * If data collection is enabled, add this information to the log.
      *
      * @param action the action
-     * @param scale the scale
+     * @param unit of the value
      * @param value the value
      */
-    void log(String action, String scale, int value) {
+    void log(String action, String unit, int value) {
         if (test.isCollect()) {
-            results.add(new Object[] { action, scale, Integer.valueOf(value) });
+            results.add(new Measurement(action, unit, value));
         }
     }
 
@@ -436,12 +462,13 @@ ResultSet query(PreparedStatement prep) throws SQLException {
      * @param prep the prepared statement
      */
     void queryReadResult(PreparedStatement prep) throws SQLException {
-        ResultSet rs = query(prep);
-        ResultSetMetaData meta = rs.getMetaData();
-        int columnCount = meta.getColumnCount();
-        while (rs.next()) {
-            for (int i = 0; i < columnCount; i++) {
-                rs.getString(i + 1);
+        try (ResultSet rs = query(prep)) {
+            ResultSetMetaData meta = rs.getMetaData();
+            int columnCount = meta.getColumnCount();
+            while (rs.next()) {
+                for (int i = 0; i < columnCount; i++) {
+                    rs.getString(i + 1);
+                }
             }
         }
     }
@@ -464,10 +491,6 @@ int getId() {
         return id;
     }
 
-    int getThreadsCount() {
-        return threadCount;
-    }
-
     /**
      * The interface used for a test.
      */
@@ -487,6 +510,30 @@ public interface DatabaseTest {
          */
         void trace(String msg);
 
+        /**
+         * Load testing properties
+         * @return Properties
+         * @throws IOException on failure
+         */
+        default Properties loadProperties() throws IOException {
+            Properties prop = new Properties();
+            try (InputStream in = getClass().getResourceAsStream("test.properties")) {
+                prop.load(in);
+            }
+            return prop;
+        }
     }
 
+    public static final class Measurement
+    {
+        final String name;
+        final String unit;
+        final int value;
+
+        public Measurement(String name, String unit, int value) {
+            this.name = name;
+            this.unit = unit;
+            this.value = value;
+        }
+    }
 }
diff --git a/h2/src/test/org/h2/test/bench/TestPerformance.java b/h2/src/test/org/h2/test/bench/TestPerformance.java
index 1b9bcb1837..ac0c7b0f6c 100644
--- a/h2/src/test/org/h2/test/bench/TestPerformance.java
+++ b/h2/src/test/org/h2/test/bench/TestPerformance.java
@@ -6,7 +6,6 @@
 package org.h2.test.bench;
 
 import java.io.FileWriter;
-import java.io.InputStream;
 import java.io.PrintWriter;
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
@@ -19,7 +18,6 @@
 import java.util.Properties;
 import org.h2.store.fs.FileUtils;
 import org.h2.test.TestBase;
-import org.h2.util.IOUtils;
 import org.h2.util.JdbcUtils;
 
 /**
@@ -72,10 +70,7 @@ private void test(String... args) throws Exception {
         int dbId = -1;
         boolean exit = false;
         String out = "benchmark.html";
-        Properties prop = new Properties();
-        InputStream in = getClass().getResourceAsStream("test.properties");
-        prop.load(in);
-        in.close();
+        Properties prop = loadProperties();
         int size = Integer.parseInt(prop.getProperty("size"));
         for (int i = 0; i < args.length; i++) {
             String arg = args[i];
@@ -100,9 +95,8 @@ private void test(String... args) throws Exception {
             }
             String dbString = prop.getProperty("db" + i);
             if (dbString != null) {
-                Database db = Database.parse(this, i, dbString, 1);
+                Database db = Database.parse(this, i, dbString, prop);
                 if (db != null) {
-                    db.setTranslations(prop);
                     dbs.add(db);
                 }
             }
@@ -117,37 +111,33 @@ private void test(String... args) throws Exception {
         }
         testAll(dbs, tests, size);
         collect = false;
-        if (dbs.size() == 0) {
+        if (dbs.isEmpty()) {
             return;
         }
-        ArrayList<Object[]> results = dbs.get(0).getResults();
-        Connection conn = null;
-        PreparedStatement prep = null;
-        Statement stat = null;
-        PrintWriter writer = null;
-        try {
+        ArrayList<Database.Measurement> results = dbs.get(0).getResults();
+        try (Connection conn = getResultConnection()) {
             openResults();
-            conn = getResultConnection();
-            stat = conn.createStatement();
-            prep = conn.prepareStatement(
+            try (PreparedStatement prep = conn.prepareStatement(
                         "INSERT INTO RESULTS(TESTID, TEST, " +
-                        "UNIT, DBID, DB, RESULT) VALUES(?, ?, ?, ?, ?, ?)");
-            for (int i = 0; i < results.size(); i++) {
-                Object[] res = results.get(i);
-                prep.setInt(1, i);
-                prep.setString(2, res[0].toString());
-                prep.setString(3, res[1].toString());
-                for (Database db : dbs) {
-                    prep.setInt(4, db.getId());
-                    prep.setString(5, db.getName());
-                    Object[] v = db.getResults().get(i);
-                    prep.setString(6, v[2].toString());
-                    prep.execute();
+                        "UNIT, DBID, DB, RESULT) VALUES(?, ?, ?, ?, ?, ?)")) {
+                for (int i = 0; i < results.size(); i++) {
+                    Database.Measurement res = results.get(i);
+                    prep.setInt(1, i);
+                    prep.setString(2, res.name);
+                    prep.setString(3, res.unit);
+                    for (Database db : dbs) {
+                        prep.setInt(4, db.getId());
+                        prep.setString(5, db.getName());
+                        Database.Measurement measurement = db.getResults().get(i);
+                        prep.setString(6, String.valueOf(measurement.value));
+                        prep.execute();
+                    }
                 }
             }
 
-            writer = new PrintWriter(new FileWriter(out));
-            ResultSet rs = stat.executeQuery(
+            try (Statement stat = conn.createStatement();
+                PrintWriter writer = new PrintWriter(new FileWriter(out));
+                ResultSet rs = stat.executeQuery(
                     "CALL '<table><tr><th>Test Case</th><th>Unit</th>' " +
                     "|| (SELECT GROUP_CONCAT('<th>' || DB || '</th>' " +
                     "ORDER BY DBID SEPARATOR '') FROM " +
@@ -160,58 +150,13 @@ private void test(String... args) throws Exception {
                     "R2.TESTID = R1.TESTID) || '</tr>' " +
                     "ORDER BY TESTID SEPARATOR CHAR(10)) FROM " +
                     "(SELECT DISTINCT TESTID, TEST, UNIT FROM RESULTS) R1)" +
-                    "|| '</table>'"
-            );
-            rs.next();
-            String result = rs.getString(1);
-            writer.println(result);
-        } finally {
-            JdbcUtils.closeSilently(prep);
-            JdbcUtils.closeSilently(stat);
-            JdbcUtils.closeSilently(conn);
-            IOUtils.closeSilently(writer);
+                    "|| '</table>'")) {
+                rs.next();
+                String result = rs.getString(1);
+                writer.println(result);
+            }
         }
 
-//        ResultSet rsDbs = conn.createStatement().executeQuery(
-//                "SELECT DB RESULTS GROUP BY DBID, DB ORDER BY DBID");
-//        while(rsDbs.next()) {
-//            writer.println("<th>" + rsDbs.getString(1) + "</th>");
-//        }
-//        ResultSet rs = conn.createStatement().executeQuery(
-//                "SELECT TEST, UNIT FROM RESULTS " +
-//                "GROUP BY TESTID, TEST, UNIT ORDER BY TESTID");
-//        while(rs.next()) {
-//            writer.println("<tr><td>" + rs.getString(1) + "</td>");
-//            writer.println("<td>" + rs.getString(2) + "</td>");
-//            ResultSet rsRes = conn.createStatement().executeQuery(
-//                "SELECT RESULT FROM RESULTS WHERE TESTID=? ORDER BY DBID");
-//
-//
-//        }
-
-//        PrintWriter writer =
-//            new PrintWriter(new FileWriter("benchmark.html"));
-//        writer.println("<table><tr><th>Test Case</th><th>Unit</th>");
-//        for(int j=0; j<dbs.size(); j++) {
-//            Database db = (Database)dbs.get(j);
-//            writer.println("<th>" + db.getName() + "</th>");
-//        }
-//        writer.println("</tr>");
-//        for(int i=0; i<results.size(); i++) {
-//            Object[] res = (Object[])results.get(i);
-//            writer.println("<tr><td>" + res[0] + "</td>");
-//            writer.println("<td>" + res[1] + "</td>");
-//            for(int j=0; j<dbs.size(); j++) {
-//                Database db  = (Database)dbs.get(j);
-//                ArrayList r = db.getResults();
-//                Object[] v = (Object[])r.get(i);
-//                writer.println(
-//                    "<td  style=\"text-align: right\">" + v[2] + "</td>");
-//            }
-//            writer.println("</tr>");
-//        }
-//        writer.println("</table>");
-
         if (exit) {
             System.exit(0);
         }
@@ -231,17 +176,19 @@ private void testAll(ArrayList<Database> dbs, ArrayList<Bench> tests,
             db.startServer();
             Connection conn = db.openNewConnection();
             DatabaseMetaData meta = conn.getMetaData();
-            System.out.println(" " + meta.getDatabaseProductName() + " " +
-                    meta.getDatabaseProductVersion());
+            System.out.println("Database: " + meta.getDatabaseProductName() + " " + meta.getDatabaseProductVersion());
+            System.out.println("Driver: " + meta.getDriverName() + " " + meta.getDriverVersion());
             runDatabase(db, tests, 1);
             runDatabase(db, tests, 1);
+            db.reset();
             collect = true;
             runDatabase(db, tests, size);
             conn.close();
             db.log("Executed statements", "#", db.getExecutedStatements());
             db.log("Total time", "ms", db.getTotalTime());
+            System.out.println("Total time: " + db.getTotalTime() + " ms");
             int statPerSec = (int) (db.getExecutedStatements() * 1000L / db.getTotalTime());
-            db.log("Statements per second", "#", statPerSec);
+            db.log("Statements per second", "#/s", statPerSec);
             System.out.println("Statements per second: " + statPerSec);
             System.out.println("GC overhead: " + (100 * db.getTotalGCTime() / db.getTotalTime()) + "%");
             collect = false;
diff --git a/h2/src/test/org/h2/test/bench/TestScalability.java b/h2/src/test/org/h2/test/bench/TestScalability.java
index f4b9cc806c..6a0039bc14 100644
--- a/h2/src/test/org/h2/test/bench/TestScalability.java
+++ b/h2/src/test/org/h2/test/bench/TestScalability.java
@@ -15,10 +15,11 @@
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
 import org.h2.store.fs.FileUtils;
 import org.h2.test.TestBase;
-import org.h2.util.IOUtils;
-import org.h2.util.JdbcUtils;
+import org.h2.test.bench.Database.Measurement;
 
 /**
  * Used to compare scalability between the old engine and the new MVStore
@@ -42,7 +43,7 @@ public class TestScalability implements Database.DatabaseTest {
      * @param args the command line parameters
      */
     public static void main(String... args) throws Exception {
-        new TestScalability().test();
+        new TestScalability().test(args);
     }
 
     private static Connection getResultConnection() throws SQLException {
@@ -51,40 +52,59 @@ private static Connection getResultConnection() throws SQLException {
     }
 
     private static void openResults() throws SQLException {
-        Connection conn = null;
-        Statement stat = null;
-        try {
-            conn = getResultConnection();
-            stat = conn.createStatement();
+        try (Connection conn = getResultConnection();
+                Statement stat = conn.createStatement()) {
             stat.execute(
                     "CREATE TABLE IF NOT EXISTS RESULTS(TESTID INT, " +
-                    "TEST VARCHAR, UNIT VARCHAR, DBID INT, " +
-                    "DB VARCHAR, TCNT INT, RESULT VARCHAR)");
-        } finally {
-            JdbcUtils.closeSilently(stat);
-            JdbcUtils.closeSilently(conn);
+                            "TEST VARCHAR, UNIT VARCHAR, DBID INT, " +
+                            "DB VARCHAR, TCNT INT, RESULT VARCHAR)");
         }
     }
 
-    private void test() throws Exception {
-        FileUtils.deleteRecursive("data", true);
-        final String out = "benchmark.html";
-        final int size = 400;
-
-        ArrayList<Database> dbs = new ArrayList<>();
-        int id = 1;
-        final String mvUrl = "jdbc:h2:./data/mvTest;" +
-                "LOCK_MODE=0";
-        dbs.add(createDbEntry(id++, "MV", 1, mvUrl));
-        dbs.add(createDbEntry(id++, "MV", 2, mvUrl));
-        dbs.add(createDbEntry(id++, "MV", 4, mvUrl));
-        dbs.add(createDbEntry(id++, "MV", 8, mvUrl));
-        dbs.add(createDbEntry(id++, "MV", 16, mvUrl));
-        dbs.add(createDbEntry(id++, "MV", 32, mvUrl));
-        dbs.add(createDbEntry(id++, "MV", 64, mvUrl));
-        dbs.add(createDbEntry(id++, "MV", 128, mvUrl));
-
-        final BenchB test = new BenchB() {
+    private void test(String... args) throws Exception {
+        int dbId = -1;
+        boolean exit = false;
+        String out = "scalability.html";
+        int size = 400;
+        for (int i = 0; i < args.length; i++) {
+            String arg = args[i];
+            if ("-db".equals(arg)) {
+                dbId = Integer.parseInt(args[++i]);
+            } else if ("-init".equals(arg)) {
+                FileUtils.deleteRecursive("data", true);
+            } else if ("-out".equals(arg)) {
+                out = args[++i];
+            } else if ("-trace".equals(arg)) {
+                trace = true;
+            } else if ("-exit".equals(arg)) {
+                exit = true;
+            } else if ("-size".equals(arg)) {
+                size = Integer.parseInt(args[++i]);
+            }
+        }
+
+        Properties prop = loadProperties();
+
+        ArrayList<RunSequence> dbs = new ArrayList<>();
+        for (int id = 0; id < 100; id++) {
+            if (dbId != -1 && id != dbId) {
+                continue;
+            }
+            String dbString = prop.getProperty("db" + id);
+            if (dbString != null) {
+                Database db = Database.parse(this, id, dbString, prop);
+                if (db != null) {
+                    int runCount = 8;
+                    String valueStr = prop.getProperty("runCount" + id);
+                    if (valueStr != null) {
+                        runCount = Integer.parseInt(valueStr);
+                    }
+                    dbs.add(new RunSequence(db, runCount));
+                }
+            }
+        }
+
+        BenchB test = new BenchB() {
             // Since we focus on scalability here, lets emphasize multi-threaded
             // part of the test (transactions) and minimize impact of the init.
             @Override
@@ -93,110 +113,125 @@ protected int getTransactionsPerClient(int size) {
             }
         };
         testAll(dbs, test, size);
-        collect = false;
 
-        ArrayList<Object[]> results = dbs.get(0).getResults();
-        Connection conn = null;
-        PreparedStatement prep = null;
-        Statement stat = null;
-        PrintWriter writer = null;
-        try {
+        List<Measurement> results = dbs.get(0).results.get(0);
+        try (Connection conn = getResultConnection()) {
             openResults();
-            conn = getResultConnection();
-            stat = conn.createStatement();
-            prep = conn.prepareStatement(
+            try (PreparedStatement prep = conn.prepareStatement(
                     "INSERT INTO RESULTS(TESTID, " +
-                    "TEST, UNIT, DBID, DB, TCNT, RESULT) VALUES(?, ?, ?, ?, ?, ?, ?)");
-            for (int i = 0; i < results.size(); i++) {
-                Object[] res = results.get(i);
-                prep.setInt(1, i);
-                prep.setString(2, res[0].toString());
-                prep.setString(3, res[1].toString());
-                for (Database db : dbs) {
-                    prep.setInt(4, db.getId());
-                    prep.setString(5, db.getName());
-                    prep.setInt(6, db.getThreadsCount());
-                    Object[] v = db.getResults().get(i);
-                    prep.setString(7, v[2].toString());
-                    prep.execute();
+                    "TEST, UNIT, DBID, DB, TCNT, RESULT) VALUES(?, ?, ?, ?, ?, ?, ?)")) {
+                for (int i = 0; i < results.size(); i++) {
+                    Measurement res = results.get(i);
+                    prep.setInt(1, i);
+                    prep.setString(2, res.name);
+                    prep.setString(3, res.unit);
+                    for (RunSequence runSequence : dbs) {
+                        Database db = runSequence.database;
+                        int threadCount = 1;
+                        for (List<Measurement> result : runSequence.results) {
+                            if (result.size() > i) {
+                                Measurement measurement = result.get(i);
+                                prep.setInt(4, db.getId());
+                                prep.setString(5, db.getName());
+                                prep.setInt(6, threadCount);
+                                prep.setString(7, String.valueOf(measurement.value));
+                                prep.execute();
+                                threadCount <<= 1;
+                            }
+                        }
+                    }
                 }
             }
 
-            writer = new PrintWriter(new FileWriter(out));
-            ResultSet rs = stat.executeQuery(
-                "CALL '<table border=\"1\"><tr><th rowspan=\"2\">Test Case</th>" +
-                "<th rowspan=\"2\">Unit</th>' " +
-                "|| (SELECT GROUP_CONCAT('<th colspan=\"' || COLSPAN || '\">' || TCNT || '</th>' " +
-                "ORDER BY TCNT SEPARATOR '') FROM " +
-                "(SELECT TCNT, COUNT(*) COLSPAN FROM (SELECT DISTINCT DB, TCNT FROM RESULTS) GROUP BY TCNT))" +
-                "|| '</tr>' || CHAR(10) " +
-                "|| '<tr>' || (SELECT GROUP_CONCAT('<th>' || DB || '</th>' ORDER BY TCNT, DB SEPARATOR '')" +
-                " FROM (SELECT DISTINCT DB, TCNT FROM RESULTS)) || '</tr>' || CHAR(10) " +
-                "|| (SELECT GROUP_CONCAT('<tr><td>' || TEST || '</td><td>' || UNIT || '</td>' || ( " +
-                "SELECT GROUP_CONCAT('<td>' || RESULT || '</td>' ORDER BY TCNT,DB SEPARATOR '')" +
-                " FROM RESULTS R2 WHERE R2.TESTID = R1.TESTID) || '</tr>' " +
-                "ORDER BY TESTID SEPARATOR CHAR(10)) FROM " +
-                "(SELECT DISTINCT TESTID, TEST, UNIT FROM RESULTS) R1)" +
-                "|| '</table>'");
-            rs.next();
-            String result = rs.getString(1);
-            writer.println(result);
-        } finally {
-            JdbcUtils.closeSilently(prep);
-            JdbcUtils.closeSilently(stat);
-            JdbcUtils.closeSilently(conn);
-            IOUtils.closeSilently(writer);
+            try (Statement stat = conn.createStatement();
+                    PrintWriter writer = new PrintWriter(new FileWriter(out));
+                    ResultSet rs = stat.executeQuery(
+                        "CALL '<table border=\"1\"><tr><th rowspan=\"2\">Test Case</th>" +
+                        "<th rowspan=\"2\">Unit</th>' " +
+                        "|| (SELECT GROUP_CONCAT('<th colspan=\"' || COLSPAN || '\">' || TCNT || '</th>' " +
+                        "ORDER BY TCNT SEPARATOR '') FROM " +
+                        "(SELECT TCNT, COUNT(*) COLSPAN FROM (SELECT DISTINCT DB, TCNT FROM RESULTS) GROUP BY TCNT))" +
+                        "|| '</tr>' || CHAR(10) " +
+                        "|| '<tr>' || (SELECT GROUP_CONCAT('<th>' || DB || '</th>' ORDER BY TCNT, DB SEPARATOR '')" +
+                        " FROM (SELECT DISTINCT DB, TCNT FROM RESULTS)) || '</tr>' || CHAR(10) " +
+                        "|| (SELECT GROUP_CONCAT('<tr><td>' || TEST || '</td><td>' || UNIT || '</td>' || ( " +
+                        "SELECT GROUP_CONCAT('<td>' || RESULT || '</td>' ORDER BY TCNT,DB SEPARATOR '')" +
+                        " FROM RESULTS R2 WHERE R2.TESTID = R1.TESTID) || '</tr>' " +
+                        "ORDER BY TESTID SEPARATOR CHAR(10)) FROM " +
+                        "(SELECT DISTINCT TESTID, TEST, UNIT FROM RESULTS) R1)" +
+                        "|| '</table>'")) {
+                rs.next();
+                String result = rs.getString(1);
+                writer.println(result);
+            }
         }
-    }
 
-    private Database createDbEntry(int id, String namePrefix,
-            int threadCount, String url) {
-        Database db = Database.parse(this, id, namePrefix +
-                ", org.h2.Driver, " + url + ", sa, sa", threadCount);
-        return db;
+        if (exit) {
+            System.exit(0);
+        }
     }
 
+    private void testAll(ArrayList<RunSequence> runSequences, BenchB test, int size) throws Exception {
+        Database lastDb = null;
+        Connection conn = null;
+        for (RunSequence runSequence : runSequences) {
+            Database db = runSequence.database;
+            try {
+                if (lastDb != null) {
+                    conn.close();
+                    lastDb.stopServer();
+                    Thread.sleep(1000);
+                    // calls garbage collection
+                    TestBase.getMemoryUsed();
+                }
+                String dbName = db.getName();
+                System.out.println("------------------");
+                System.out.println("Testing the performance of " + dbName);
+                db.startServer();
+                // hold one connection open during the whole test to keep database up
+                conn = db.openNewConnection();
+                test.init(db, size);
+
+                for (int runNo = 0, threadCount = 1; runNo < runSequence.runCount; runNo++, threadCount <<= 1) {
+                    System.out.println("Testing the performance of " + dbName
+                            + " (" + threadCount + " threads)");
+
+                    DatabaseMetaData meta = conn.getMetaData();
+                    System.out.println(" " + meta.getDatabaseProductName() + " " +
+                            meta.getDatabaseProductVersion());
+                    test.setThreadCount(threadCount);
 
-    private void testAll(ArrayList<Database> dbs, BenchB test, int size)
-            throws Exception {
-        for (int i = 0; i < dbs.size(); i++) {
-            if (i > 0) {
-                Thread.sleep(1000);
+                    test.runTest();
+                    test.runTest();
+                    db.reset();
+                    collect = true;
+                    test.runTest();
+
+                    int executedStatements = db.getExecutedStatements();
+                    int totalTime = db.getTotalTime();
+                    int totalGCTime = db.getTotalGCTime();
+                    db.log("Executed statements", "#", executedStatements);
+                    db.log("Total time", "ms", totalTime);
+                    int statPerSec = (int) (executedStatements * 1000L / totalTime);
+                    db.log("Statements per second", "#/s", statPerSec);
+                    collect = false;
+                    System.out.println("Statements per second: " + statPerSec);
+                    System.out.println("GC overhead: " + (100 * totalGCTime / totalTime) + "%");
+                    ArrayList<Measurement> measurements = db.reset();
+                    runSequence.results.add(measurements);
+                }
+            } catch (Throwable ex) {
+                ex.printStackTrace();
+            } finally {
+                lastDb = db;
             }
-            // calls garbage collection
-            TestBase.getMemoryUsed();
-            Database db = dbs.get(i);
-            System.out.println("Testing the performance of " + db.getName()
-                    + " (" + db.getThreadsCount() + " threads)");
-            db.startServer();
-            Connection conn = db.openNewConnection();
-            DatabaseMetaData meta = conn.getMetaData();
-            System.out.println(" " + meta.getDatabaseProductName() + " " +
-                    meta.getDatabaseProductVersion());
-            runDatabase(db, test, 1);
-            runDatabase(db, test, 1);
-            collect = true;
-            runDatabase(db, test, size);
+        }
+        if (lastDb != null) {
             conn.close();
-            db.log("Executed statements", "#", db.getExecutedStatements());
-            db.log("Total time", "ms", db.getTotalTime());
-            int statPerSec = (int) (db.getExecutedStatements() *
-                    1000L / db.getTotalTime());
-            db.log("Statements per second", "#", statPerSec);
-            System.out.println("Statements per second: " + statPerSec);
-            System.out.println("GC overhead: " + (100 * db.getTotalGCTime() / db.getTotalTime()) + "%");
-            collect = false;
-            db.stopServer();
+            lastDb.stopServer();
         }
     }
 
-    private static void runDatabase(Database db, BenchB bench, int size)
-            throws Exception {
-        bench.init(db, size);
-        bench.setThreadCount(db.getThreadsCount());
-        bench.runTest();
-    }
-
     /**
      * Print a message to system out if trace is enabled.
      *
@@ -213,4 +248,16 @@ public void trace(String s) {
     public boolean isCollect() {
         return collect;
     }
+
+    private static final class RunSequence
+    {
+        final Database database;
+        final int runCount;
+        final List<List<Measurement>> results = new ArrayList<>();
+
+        public RunSequence(Database dataBase, int runCount) {
+            this.database = dataBase;
+            this.runCount = runCount;
+        }
+    }
 }
diff --git a/h2/src/test/org/h2/test/bench/test.properties b/h2/src/test/org/h2/test/bench/test.properties
index 2d8996b42f..f81e595fe3 100644
--- a/h2/src/test/org/h2/test/bench/test.properties
+++ b/h2/src/test/org/h2/test/bench/test.properties
@@ -1,30 +1,29 @@
 db1 = H2, org.h2.Driver, jdbc:h2:./data/test, sa, sa
 
-#xdb1 = H2, org.h2.Driver, jdbc:h2:./data/test;LOCK_TIMEOUT=10000;LOCK_MODE=3;DEFAULT_TABLE_ENGINE=org.h2.mvstore.db.MVTableEngine, sa, sa
-
-#xdb1 = H2, org.h2.Driver, jdbc:h2:./data/test;LOG=1;LOCK_TIMEOUT=10000;LOCK_MODE=3;ACCESS_MODE_DATA=rwd, sa, sa
-#xdb2 = H2 (nio), org.h2.Driver, jdbc:h2:nio:data/test;LOCK_TIMEOUT=10000;LOCK_MODE=3, sa, sa
-#xdb3 = H2 (nioMapped), org.h2.Driver, jdbc:h2:nioMapped:data/test;LOCK_TIMEOUT=10000;LOCK_MODE=3, sa, sa
-#xdb2 = H2 (MVCC), org.h2.Driver, jdbc:h2:./data/test_mvcc;MVCC=TRUE, sa, sa
-#xdb2 = H2 (XTEA), org.h2.Driver, jdbc:h2:./data/test_xtea;LOCK_TIMEOUT=10000;LOCK_MODE=3;CIPHER=XTEA, sa, sa 123
-#xdb3 = H2 (AES), org.h2.Driver, jdbc:h2:./data/test_aes;LOCK_TIMEOUT=10000;LOCK_MODE=3;CIPHER=AES, sa, sa 123
-#xdb4 = H2, org.h2.Driver, jdbc:h2:./data/test;LOCK_TIMEOUT=10000;LOCK_MODE=3;write_mode_log=rws;write_delay=0, sa, sa
-#xdb5 = H2_PG, org.postgresql.Driver, jdbc:postgresql://localhost:5435/h2test, sa, sa
-
-db2 = HSQLDB, org.hsqldb.jdbcDriver, jdbc:hsqldb:data/test;hsqldb.default_table_type=cached;sql.enforce_size=true, sa
-db3 = Derby, org.apache.derby.iapi.jdbc.AutoloadedDriver, jdbc:derby:data/derby;create=true, sa, sa
-
-db4 = H2 (Server), org.h2.Driver, jdbc:h2:tcp://localhost/./data/testServer, sa, sa
-db5 = HSQLDB, org.hsqldb.jdbcDriver, jdbc:hsqldb:hsql://localhost/xdb, sa
-db6 = Derby, org.apache.derby.client.ClientAutoloadedDriver, jdbc:derby://localhost/data/derbyServer;create=true, sa, sa
-db7 = PostgreSQL, org.postgresql.Driver, jdbc:postgresql:test, sa, sa
-db8 = MySQL, com.mysql.cj.jdbc.Driver, jdbc:mysql://localhost/test?jdbcCompliantTruncation=false, sa, sa
-
-#db2 = MSSQLServer, com.microsoft.jdbc.sqlserver.SQLServerDriver, jdbc:microsoft:sqlserver://127.0.0.1:1433;DatabaseName=test, test, test
-#db2 = Oracle, oracle.jdbc.driver.OracleDriver, jdbc:oracle:thin:@localhost:1521:XE, client, client
-#db2 = Firebird, org.firebirdsql.jdbc.FBDriver, jdbc:firebirdsql:localhost:c:/temp/firebird/test, sysdba, masterkey
-#db2 = DB2, COM.ibm.db2.jdbc.net.DB2Driver, jdbc:db2://localhost/test, test, test
-#db2 = OneDollarDB, in.co.daffodil.db.jdbc.DaffodilDBDriver, jdbc:daffodilDB_embedded:school;path=C:/temp;create=true, sa
+#db1 = H2 (forced), org.h2.Driver, jdbc:h2:./data/test;LOG=1;LOCK_TIMEOUT=10000;LOCK_MODE=3;ACCESS_MODE_DATA=rwd, sa, sa
+#db1 = H2 (nio), org.h2.Driver, jdbc:h2:nio:data/test;LOCK_TIMEOUT=10000;LOCK_MODE=3, sa, sa
+#db1 = H2 (nioMapped), org.h2.Driver, jdbc:h2:nioMapped:data/test;LOCK_TIMEOUT=10000;LOCK_MODE=3, sa, sa
+#db1 = H2 (XTEA), org.h2.Driver, jdbc:h2:./data/test_xtea;LOCK_TIMEOUT=10000;LOCK_MODE=3;CIPHER=XTEA, sa, sa 123
+#db1 = H2 (AES), org.h2.Driver, jdbc:h2:./data/test_aes;LOCK_TIMEOUT=10000;LOCK_MODE=3;CIPHER=AES, sa, sa 123
+
+db2 = HSQLDB, org.hsqldb.jdbc.JDBCDriver, jdbc:hsqldb:file:./data/test;hsqldb.default_table_type=cached;hsqldb.write_delay_millis=1000;shutdown=true, sa
+db3 = Derby, org.apache.derby.jdbc.AutoloadedDriver, jdbc:derby:data/derby;create=true, sa, sa
+
+db4 = H2 (C/S), org.h2.Driver, jdbc:h2:tcp://localhost/./data/testServer, sa, sa
+db5 = HSQLDB (C/S), org.hsqldb.jdbcDriver, jdbc:hsqldb:hsql://localhost/xdb, sa
+db6 = Derby (C/S), org.apache.derby.jdbc.ClientDriver, jdbc:derby://localhost/data/derbyServer;create=true, sa, sa
+db7 = PG (C/S), org.postgresql.Driver, jdbc:postgresql://localhost:5432/test, sa, sa
+db8 = MySQL (C/S), com.mysql.cj.jdbc.Driver, jdbc:mysql://localhost:3306/test, sa, sa
+
+#db9 = MSSQLServer, com.microsoft.jdbc.sqlserver.SQLServerDriver, jdbc:microsoft:sqlserver://127.0.0.1:1433;DatabaseName=test, test, test
+#db9 = Oracle, oracle.jdbc.driver.OracleDriver, jdbc:oracle:thin:@localhost:1521:XE, client, client
+#db9 = Firebird, org.firebirdsql.jdbc.FBDriver, jdbc:firebirdsql:localhost:test?encoding=UTF8, sa, sa
+#db9 = DB2, COM.ibm.db2.jdbc.net.DB2Driver, jdbc:db2://localhost/test, test, test
+#db9 = OneDollarDB, in.co.daffodil.db.jdbc.DaffodilDBDriver, jdbc:daffodilDB_embedded:school;path=C:/temp;create=true, sa
+#db9 = SQLite, org.sqlite.JDBC, jdbc:sqlite:data/testSQLite.db, sa, sa
+
+db11 = H2 (mem), org.h2.Driver, jdbc:h2:mem:test;LOCK_MODE=0, sa, sa
+db12 = HSQLDB (mem), org.hsqldb.jdbcDriver, jdbc:hsqldb:mem:data/test;hsqldb.tx=mvcc;shutdown=true, sa
 
 firebirdsql.datetime = TIMESTAMP
 postgresql.datetime = TIMESTAMP
@@ -37,3 +36,10 @@ test3 = org.h2.test.bench.BenchB
 test4 = org.h2.test.bench.BenchC
 
 size = 5000
+
+runCount3 = 4
+runCount5 = 4
+runCount6 = 4
+runCount7 = 7
+runCount8 = 4
+runCount12 = 5
\ No newline at end of file
diff --git a/h2/src/tools/org/h2/build/Build.java b/h2/src/tools/org/h2/build/Build.java
index ddf8e6e8bc..f26af99a22 100644
--- a/h2/src/tools/org/h2/build/Build.java
+++ b/h2/src/tools/org/h2/build/Build.java
@@ -49,7 +49,7 @@ public class Build extends BuildBase {
 
     private static final String LUCENE_VERSION = "8.5.2";
 
-    private static final String MYSQL_CONNECTOR_VERSION = "8.0.20";
+    private static final String MYSQL_CONNECTOR_VERSION = "8.0.27";
 
     private static final String OSGI_VERSION = "5.0.0";
 
@@ -82,7 +82,7 @@ public void benchmark() {
         downloadUsingMaven("ext/hsqldb-" + HSQLDB_VERSION + ".jar",
                 "org.hsqldb", "hsqldb", HSQLDB_VERSION,
                 "b1f720a63a8756867895cc22dd74b51fb70e90ac");
-        downloadUsingMaven("ext/derby-" + DERBY_VERSION,
+        downloadUsingMaven("ext/derby-" + DERBY_VERSION + ".jar",
                 "org.apache.derby", "derby", DERBY_VERSION,
                 "7efad40ef52fbb1f08142f07a83b42d29e47d8ce");
         downloadUsingMaven("ext/derbyclient-" + DERBY_VERSION + ".jar",
@@ -98,7 +98,7 @@ public void benchmark() {
                 "org.postgresql", "postgresql", PGJDBC_VERSION, PGJDBC_HASH);
         downloadUsingMaven("ext/mysql-connector-java-" + MYSQL_CONNECTOR_VERSION + ".jar",
                 "mysql", "mysql-connector-java", MYSQL_CONNECTOR_VERSION,
-                "d8d388e71c823570662a45dd33f4284141921280");
+                "f1da9f10a3de6348725a413304aab6d0aa04f923");
         compile();
 
         String cp = "temp" +
@@ -111,7 +111,7 @@ public void benchmark() {
                 File.pathSeparator + "ext/postgresql-" + PGJDBC_VERSION + ".jar" +
                 File.pathSeparator + "ext/mysql-connector-java-" + MYSQL_CONNECTOR_VERSION + ".jar";
         StringList args = args("-Xmx128m",
-                "-cp", cp, "org.h2.test.bench.TestPerformance");
+                "-cp", cp, "-Dderby.system.durability=test", "org.h2.test.bench.TestPerformance");
         execJava(args.plus("-init", "-db", "1"));
         execJava(args.plus("-db", "2"));
         execJava(args.plus("-db", "3", "-out", "pe.html"));
@@ -806,11 +806,11 @@ public void mavenInstallLocal() {
         // MVStore
         jarMVStore();
         String pom = new String(readFile(Paths.get("src/installer/pom-mvstore-template.xml")));
-        pom = replaceAll(pom, "@version@", "1.0-SNAPSHOT");
+        pom = replaceAll(pom, "@version@", getVersion());
         writeFile(Paths.get("bin/pom.xml"), pom.getBytes());
         execScript("mvn", args(
                 "install:install-file",
-                "-Dversion=1.0-SNAPSHOT",
+                "-Dversion=" + getVersion(),
                 "-Dfile=bin/h2-mvstore" + getJarSuffix(),
                 "-Dpackaging=jar",
                 "-DpomFile=bin/pom.xml",
@@ -819,11 +819,11 @@ public void mavenInstallLocal() {
         // database
         jar();
         pom = new String(readFile(Paths.get("src/installer/pom-template.xml")));
-        pom = replaceAll(pom, "@version@", "1.0-SNAPSHOT");
+        pom = replaceAll(pom, "@version@", getVersion());
         writeFile(Paths.get("bin/pom.xml"), pom.getBytes());
         execScript("mvn", args(
                 "install:install-file",
-                "-Dversion=1.0-SNAPSHOT",
+                "-Dversion=" + getVersion(),
                 "-Dfile=bin/h2" + getJarSuffix(),
                 "-Dpackaging=jar",
                 "-DpomFile=bin/pom.xml",
diff --git a/h2/src/tools/org/h2/build/doc/dictionary.txt b/h2/src/tools/org/h2/build/doc/dictionary.txt
index 31719fefbb..c4c7c270e4 100644
--- a/h2/src/tools/org/h2/build/doc/dictionary.txt
+++ b/h2/src/tools/org/h2/build/doc/dictionary.txt
@@ -55,7 +55,7 @@ becomes becoming been beep before begin beginning behalf behave behaving behavio
 behaviour behind being bel belgium believes bellinzona belong belonging belongs
 below bench benchmark benchmarks beneficial benefit bennet berger berkeley
 berlini bern bernd berne best beta better between beverages beware beyond bfff
-bgcolor biased bid biel bienne big bigger biggest bigint biginteger bigserial
+bgcolor biased bid biel bienne big bigger biggest bigint biginteger bigserial binlog
 bilinear bilingual billion bin binaries binary bind bindings bio biodiversity
 biological bipush birth birthday biscuits bit bitand bitmap bitnot bitor bits bitwise
 bitxor biz bjorn black blank blanked blanks bleyl blind blitz blob blobs block
@@ -155,7 +155,7 @@ database databaseaccess databases dataflyer datagram datalink datareader
 datasource datasources datastore datatext datatype datatypes datawriter date
 dateadd datediff datepart dates datestyle datetime datetimes datum david davide
 day daylight dayname dayofmonth dayofweek dayofyear days dba dbbench dbcp dbid
-dbms dbname dbo dbs dbserv dbsnmp dclassifier dcmpg dcmpl dconst ddiv ddl
+dbms dbname dbo dbs dbserv dbsnmp dclassifier dcmpg dcmpl dconst dderby ddiv ddl
 ddladmin deactivate deactivated deactivation dead deadlock deadlocked deadlocks
 deal dealing deallocate death debug debugging dec decade december decide decided decimal
 decision deck declaration declarations declarative declaratory declare declared
@@ -244,7 +244,7 @@ fact factor factorial factories factory factual fadd fail failed failing fails f
 failures fair fake fall fallback falls faload false familiar families family faq
 far fashion fashioned fast faster fastest fastore fat fatal faulhaber fault
 favicon favorite fbj fcmpg fcmpl fconst fdiv feature features feb februar
-february federal federated federation fedotovs fee feed feedback fees feff fetch
+february federal federated federation fedora fedotovs fee feed feedback fees feff fetch
 fetched fetching few fewer ffeecc fffe fid field fields fiery fifo fifty file
 filed filename filepwd files filesystem fill filled filler fillers filling fills
 filo filter filtered filtering filters fin final finalization finalize finalizer
@@ -393,7 +393,8 @@ matcher matches matching material materialized materials math mathematical
 mathematicians mathematics matrix matter matters maurice maven max maxbqualsize
 maxed maxgtridsize maximum maxlength maxrows maxvalue maxwidth may maybe mbean
 mbeans mcleod mdash mdd mddata mdsys mdtm mean meaning meaningful means meant
-meantime meanwhile measurable measure measured meat mechanism media median medium
+meantime meanwhile measurable measure measured measurement measurements
+meat mechanism media median medium
 mediumblob mediumint mediumtext megabyte megabytes mehner meier meijer melbourne
 mem member members memcpy memmove memo memory mendonca mentioned menu
 merchantability merchantable merge merged merges merging meridian message

From 61a48fc8d866ebe50cba93afebc32404a7c24d57 Mon Sep 17 00:00:00 2001
From: Andrei Tokar <andrei.tokar@gmail.com>
Date: Tue, 23 Nov 2021 23:24:07 -0500
Subject: [PATCH 09/15] update performance results

---
 h2/src/docsrc/html/performance.html | 126 +++++++++++++---------------
 1 file changed, 60 insertions(+), 66 deletions(-)

diff --git a/h2/src/docsrc/html/performance.html b/h2/src/docsrc/html/performance.html
index e85e367155..fd5ba091d9 100644
--- a/h2/src/docsrc/html/performance.html
+++ b/h2/src/docsrc/html/performance.html
@@ -52,54 +52,54 @@ <h2 id="performance_comparison">Performance Comparison</h2>
 <h3>Embedded</h3>
 <table class="main">
 <tr><th>Test Case</th><th>Unit</th><th>H2</th><th>HSQLDB</th><th>Derby</th></tr>
-<tr><td>Simple: Init</td><td>ms</td><td>1019</td><td>1907</td><td>8280</td></tr>
-<tr><td>Simple: Query (random)</td><td>ms</td><td>1304</td><td>873</td><td>1912</td></tr>
-<tr><td>Simple: Query (sequential)</td><td>ms</td><td>835</td><td>1839</td><td>5415</td></tr>
-<tr><td>Simple: Update (sequential)</td><td>ms</td><td>961</td><td>2333</td><td>21759</td></tr>
-<tr><td>Simple: Delete (sequential)</td><td>ms</td><td>950</td><td>1922</td><td>32016</td></tr>
-<tr><td>Simple: Memory Usage</td><td>MB</td><td>21</td><td>10</td><td>8</td></tr>
-<tr><td>BenchA: Init</td><td>ms</td><td>919</td><td>2133</td><td>7528</td></tr>
-<tr><td>BenchA: Transactions</td><td>ms</td><td>1219</td><td>2297</td><td>8541</td></tr>
-<tr><td>BenchA: Memory Usage</td><td>MB</td><td>12</td><td>15</td><td>7</td></tr>
-<tr><td>BenchB: Init</td><td>ms</td><td>905</td><td>1993</td><td>8049</td></tr>
-<tr><td>BenchB: Transactions</td><td>ms</td><td>1091</td><td>583</td><td>1165</td></tr>
-<tr><td>BenchB: Memory Usage</td><td>MB</td><td>17</td><td>11</td><td>8</td></tr>
-<tr><td>BenchC: Init</td><td>ms</td><td>2491</td><td>4003</td><td>8064</td></tr>
-<tr><td>BenchC: Transactions</td><td>ms</td><td>1979</td><td>803</td><td>2840</td></tr>
-<tr><td>BenchC: Memory Usage</td><td>MB</td><td>19</td><td>22</td><td>9</td></tr>
-<tr><td>Executed statements</td><td>#</td><td>1930995</td><td>1930995</td><td>1930995</td></tr>
-<tr><td>Total time</td><td>ms</td><td>13673</td><td>20686</td><td>105569</td></tr>
-<tr><td>Statements per second</td><td>#</td><td>141226</td><td>93347</td><td>18291</td></tr>
+<tr><td>Simple: Init</td><td>ms</td><td>1021</td><td>2510</td><td>6762</td></tr>
+<tr><td>Simple: Query (random)</td><td>ms</td><td>513</td><td>653</td><td>2035</td></tr>
+<tr><td>Simple: Query (sequential)</td><td>ms</td><td>1344</td><td>2210</td><td>7665</td></tr>
+<tr><td>Simple: Update (sequential)</td><td>ms</td><td>1642</td><td>3040</td><td>7034</td></tr>
+<tr><td>Simple: Delete (sequential)</td><td>ms</td><td>1697</td><td>2310</td><td>9981</td></tr>
+<tr><td>Simple: Memory Usage</td><td>MB</td><td>18</td><td>15</td><td>13</td></tr>
+<tr><td>BenchA: Init</td><td>ms</td><td>801</td><td>2877</td><td>6576</td></tr>
+<tr><td>BenchA: Transactions</td><td>ms</td><td>1369</td><td>2629</td><td>4987</td></tr>
+<tr><td>BenchA: Memory Usage</td><td>MB</td><td>12</td><td>15</td><td>9</td></tr>
+<tr><td>BenchB: Init</td><td>ms</td><td>966</td><td>2544</td><td>7161</td></tr>
+<tr><td>BenchB: Transactions</td><td>ms</td><td>341</td><td>2316</td><td>815</td></tr>
+<tr><td>BenchB: Memory Usage</td><td>MB</td><td>14</td><td>10</td><td>10</td></tr>
+<tr><td>BenchC: Init</td><td>ms</td><td>2630</td><td>3144</td><td>7420</td></tr>
+<tr><td>BenchC: Transactions</td><td>ms</td><td>1732</td><td>1742</td><td>2735</td></tr>
+<tr><td>BenchC: Memory Usage</td><td>MB</td><td>19</td><td>34</td><td>11</td></tr>
+<tr><td>Executed statements</td><td>#</td><td>2222032</td><td>2222032</td><td>2222032</td></tr>
+<tr><td>Total time</td><td>ms</td><td>14056</td><td>25975</td><td>63171</td></tr>
+<tr><td>Statements per second</td><td>#/s</td><td>158084</td><td>85545</td><td>35174</td></tr>
 </table>
 
 <h3>Client-Server</h3>
 <table class="main">
-<tr><th>Test Case</th><th>Unit</th><th>H2 (Server)</th><th>HSQLDB</th><th>Derby</th><th>PostgreSQL</th><th>MySQL</th></tr>
-<tr><td>Simple: Init</td><td>ms</td><td>16338</td><td>17198</td><td>27860</td><td>30156</td><td>29409</td></tr>
-<tr><td>Simple: Query (random)</td><td>ms</td><td>3399</td><td>2582</td><td>6190</td><td>3315</td><td>3342</td></tr>
-<tr><td>Simple: Query (sequential)</td><td>ms</td><td>21841</td><td>18699</td><td>42347</td><td>30774</td><td>32611</td></tr>
-<tr><td>Simple: Update (sequential)</td><td>ms</td><td>6913</td><td>7745</td><td>28576</td><td>32698</td><td>11350</td></tr>
-<tr><td>Simple: Delete (sequential)</td><td>ms</td><td>8051</td><td>9751</td><td>42202</td><td>44480</td><td>16555</td></tr>
-<tr><td>Simple: Memory Usage</td><td>MB</td><td>22</td><td>11</td><td>9</td><td>0</td><td>1</td></tr>
-<tr><td>BenchA: Init</td><td>ms</td><td>12996</td><td>14720</td><td>24722</td><td>26375</td><td>26060</td></tr>
-<tr><td>BenchA: Transactions</td><td>ms</td><td>10134</td><td>10250</td><td>18452</td><td>21453</td><td>15877</td></tr>
-<tr><td>BenchA: Memory Usage</td><td>MB</td><td>13</td><td>15</td><td>9</td><td>0</td><td>1</td></tr>
-<tr><td>BenchB: Init</td><td>ms</td><td>15264</td><td>16889</td><td>28546</td><td>31610</td><td>29747</td></tr>
-<tr><td>BenchB: Transactions</td><td>ms</td><td>3017</td><td>3376</td><td>1842</td><td>2771</td><td>1433</td></tr>
-<tr><td>BenchB: Memory Usage</td><td>MB</td><td>17</td><td>12</td><td>11</td><td>1</td><td>1</td></tr>
-<tr><td>BenchC: Init</td><td>ms</td><td>14020</td><td>10407</td><td>17655</td><td>19520</td><td>17532</td></tr>
-<tr><td>BenchC: Transactions</td><td>ms</td><td>5076</td><td>3160</td><td>6411</td><td>6063</td><td>4530</td></tr>
-<tr><td>BenchC: Memory Usage</td><td>MB</td><td>19</td><td>21</td><td>11</td><td>1</td><td>1</td></tr>
-<tr><td>Executed statements</td><td>#</td><td>1930995</td><td>1930995</td><td>1930995</td><td>1930995</td><td>1930995</td></tr>
-<tr><td>Total time</td><td>ms</td><td>117049</td><td>114777</td><td>244803</td><td>249215</td><td>188446</td></tr>
-<tr><td>Statements per second</td><td>#</td><td>16497</td><td>16823</td><td>7887</td><td>7748</td><td>10246</td></tr>
+<tr><th>Test Case</th><th>Unit</th><th>H2</th><th>HSQLDB</th><th>Derby</th><th>PostgreSQL</th><th>MySQL</th></tr>
+<tr><td>Simple: Init</td><td>ms</td><td>27989</td><td>48055</td><td>47142</td><td>32972</td><td>109482</td></tr>
+<tr><td>Simple: Query (random)</td><td>ms</td><td>4821</td><td>5984</td><td>14741</td><td>4089</td><td>15140</td></tr>
+<tr><td>Simple: Query (sequential)</td><td>ms</td><td>33656</td><td>49112</td><td>95999</td><td>35676</td><td>143536</td></tr>
+<tr><td>Simple: Update (sequential)</td><td>ms</td><td>9878</td><td>23565</td><td>31418</td><td>26113</td><td>50676</td></tr>
+<tr><td>Simple: Delete (sequential)</td><td>ms</td><td>13056</td><td>28584</td><td>43955</td><td>20985</td><td>64647</td></tr>
+<tr><td>Simple: Memory Usage</td><td>MB</td><td>18</td><td>15</td><td>15</td><td>2</td><td>4</td></tr>
+<tr><td>BenchA: Init</td><td>ms</td><td>20993</td><td>42525</td><td>38335</td><td>27794</td><td>107723</td></tr>
+<tr><td>BenchA: Transactions</td><td>ms</td><td>16549</td><td>29255</td><td>28995</td><td>23113</td><td>65036</td></tr>
+<tr><td>BenchA: Memory Usage</td><td>MB</td><td>12</td><td>18</td><td>11</td><td>1</td><td>4</td></tr>
+<tr><td>BenchB: Init</td><td>ms</td><td>26785</td><td>48772</td><td>39756</td><td>32369</td><td>115398</td></tr>
+<tr><td>BenchB: Transactions</td><td>ms</td><td>898</td><td>10046</td><td>1916</td><td>818</td><td>1794</td></tr>
+<tr><td>BenchB: Memory Usage</td><td>MB</td><td>16</td><td>11</td><td>12</td><td>2</td><td>5</td></tr>
+<tr><td>BenchC: Init</td><td>ms</td><td>18266</td><td>26865</td><td>39325</td><td>24547</td><td>70531</td></tr>
+<tr><td>BenchC: Transactions</td><td>ms</td><td>6569</td><td>7783</td><td>9412</td><td>8916</td><td>19150</td></tr>
+<tr><td>BenchC: Memory Usage</td><td>MB</td><td>17</td><td>35</td><td>13</td><td>2</td><td>7</td></tr>
+<tr><td>Executed statements</td><td>#</td><td>2222032</td><td>2222032</td><td>2222032</td><td>2222032</td><td>2222032</td></tr>
+<tr><td>Total time</td><td>ms</td><td>179460</td><td>320546</td><td>390994</td><td>237392</td><td>763113</td></tr>
+<tr><td>Statements per second</td><td>#/s</td><td>12381</td><td>6932</td><td>5683</td><td>9360</td><td>2911</td></tr>
 </table>
 
 <h3>Benchmark Results and Comments</h3>
 
 <h4>H2</h4>
 <p>
-Version 1.4.177 (2014-04-12) was used for the test.
+Version 2.0.202 (2021-11-17) was used for the test.
 For most operations, the performance of H2 is about the same as for HSQLDB.
 One situation where H2 is slow is large result sets, because they are buffered to
 disk if more than a certain number of records are returned.
@@ -108,14 +108,14 @@ <h4>H2</h4>
 
 <h4>HSQLDB</h4>
 <p>
-Version 2.3.2 was used for the test.
+Version 2.5.1 was used for the test.
 Cached tables are used in this test (<code>hsqldb.default_table_type=cached</code>),
 and the write delay is 1 second (<code>SET WRITE_DELAY 1</code>).
 </p>
 
 <h4>Derby</h4>
 <p>
-Version 10.10.1.1 was used for the test. Derby is clearly the slowest embedded database in this test.
+Version 10.14.2.0 was used for the test. Derby is clearly the slowest embedded database in this test.
 This seems to be a structural problem, because all operations are really slow.
 It will be hard for the developers of Derby to improve the performance to a reasonable level.
 A few problems have been identified: leaving autocommit on is a problem for Derby.
@@ -132,33 +132,42 @@ <h4>Derby</h4>
 
 <h4>PostgreSQL</h4>
 <p>
-Version 9.1.5 was used for the test.
+Version 13.4 was used for the test.
 The following options where changed in <code>postgresql.conf:
-fsync = off, commit_delay = 1000</code>.
+fsync = off, commit_delay = 100000</code> (microseconds).
 PostgreSQL is run in server mode.
 The memory usage number is incorrect, because only the memory usage of the JDBC driver is measured.
 </p>
 
 <h4>MySQL</h4>
 <p>
-Version 5.1.65-log was used for the test.
+Version 8.0.27 was used for the test.
 MySQL was run with the InnoDB backend.
-The setting <code>innodb_flush_log_at_trx_commit</code>
-(found in the <code>my.ini / my.cnf</code> file) was set to 0. Otherwise (and by default), MySQL is slow
-(around 140 statements per second in this test) because it tries to flush the data to disk for each commit.
+    The setting <code>innodb_flush_log_at_trx_commit</code> and <code>sync_binlog</code>code>
+(found in the <code>my.ini / community-mysql-server.cnf</code> file) was set to 0. Otherwise
+(and by default), MySQL is slow (around 140 statements per second in this test)
+because it tries to flush the data to disk for each commit.
 For small transactions (when autocommit is on) this is really slow.
 But many use cases use small or relatively small transactions.
 Too bad this setting is not listed in the configuration wizard,
 and it always overwritten when using the wizard.
-You need to change this setting manually in the file <code>my.ini / my.cnf</code>, and then restart the service.
+You need to change those settings manually in the file <code>my.ini / community-mysql-server.cnf</code>,
+and then restart the service.
 The memory usage number is incorrect, because only the memory usage of the JDBC driver is measured.
 </p>
 
+<h4>SQLite</h4>
+<p>
+SQLite 3.36.0.2 was tested, but the results are not published currently,
+because it's about 50 times slower than H2 in embedded mode.
+Any tips on how to configure SQLite for higher performance are welcome.
+</p>
+
 <h4>Firebird</h4>
 <p>
-Firebird 1.5 (default installation) was tested, but the results are not published currently.
-It is possible to run the performance test with the Firebird database,
-and any information on how to configure Firebird for higher performance are welcome.
+Firebird 3.0 (default installation) was tested, but failed on multi-threaded part of the test.
+It is likely possible to run the performance test with the Firebird database,
+and any information on how to configure Firebird for this are welcome.
 </p>
 
 <h4>Why Oracle / MS SQL Server / DB2 are Not Listed</h4>
@@ -166,7 +175,6 @@ <h4>Why Oracle / MS SQL Server / DB2 are Not Listed</h4>
 The license of these databases does not allow to publish benchmark results.
 This doesn't mean that they are fast. They are in fact quite slow,
 and need a lot of memory. But you will need to test this yourself.
-SQLite was not tested because the JDBC driver doesn't support transactions.
 </p>
 
 <h3>About this Benchmark</h3>
@@ -210,8 +218,7 @@ <h4>Comparing Embedded with Server Databases</h4>
 
 <h4>Test Platform</h4>
 <p>
-This test is run on Mac OS X 10.6. No virus scanner was used, and disk indexing was disabled.
-The JVM used is Sun JDK 1.6.
+This test is run on Fedora v.34 with Oracle JVM 1.8 and SSD drive.
 </p>
 
 <h4>Multiple Runs</h4>
@@ -873,19 +880,6 @@ <h3>Using Multiple Indexes</h3>
 
 <h2 id="fast_import">Fast Database Import</h2>
 <p>
-To speed up large imports, consider using the following options temporarily:
-</p>
-<ul><li><code>SET LOG 0</code> (disabling the transaction log)
-</li><li><code>SET CACHE_SIZE</code> (a large cache is faster)
-</li><li><code>SET LOCK_MODE 0</code> (disable locking)
-</li><li><code>SET UNDO_LOG 0</code> (disable the session undo log)
-</li></ul>
-<p>
-These options can be set in the database URL:
-<code>jdbc:h2:~/test;LOG=0;CACHE_SIZE=65536;LOCK_MODE=0;UNDO_LOG=0</code>.
-Most of those options are not recommended for regular use, that means you need to reset them after use.
-</p>
-<p>
 If you have to import a lot of rows, use a PreparedStatement or use CSV import.
 Please note that <code>CREATE TABLE(...) ... AS SELECT ...</code>
 is faster than <code>CREATE TABLE(...); INSERT INTO ... SELECT ...</code>.

From cebc6fd22b5296400a3a90e827e6de28505c000d Mon Sep 17 00:00:00 2001
From: Andrei Tokar <andrei.tokar@gmail.com>
Date: Tue, 23 Nov 2021 23:25:55 -0500
Subject: [PATCH 10/15] Release date adjustment

---
 h2/src/docsrc/html/changelog.html        | 2 +-
 h2/src/docsrc/html/performance.html      | 2 +-
 h2/src/main/org/h2/engine/Constants.java | 4 ++--
 h2/src/test/org/h2/samples/newsfeed.sql  | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/h2/src/docsrc/html/changelog.html b/h2/src/docsrc/html/changelog.html
index d915969822..595c850898 100644
--- a/h2/src/docsrc/html/changelog.html
+++ b/h2/src/docsrc/html/changelog.html
@@ -25,7 +25,7 @@ <h2>Next Version (unreleased)</h2>
 </li>
 </ul>
 
-<h2>Version 2.0.202 (2021-11-06)</h2>
+<h2>Version 2.0.202 (2021-11-23)</h2>
 <ul>
 <li>Issue #3174: Add keyword AUTOCOMMIT on create linked table to control the commit mode
 </li>
diff --git a/h2/src/docsrc/html/performance.html b/h2/src/docsrc/html/performance.html
index fd5ba091d9..4b5dcc6723 100644
--- a/h2/src/docsrc/html/performance.html
+++ b/h2/src/docsrc/html/performance.html
@@ -99,7 +99,7 @@ <h3>Benchmark Results and Comments</h3>
 
 <h4>H2</h4>
 <p>
-Version 2.0.202 (2021-11-17) was used for the test.
+Version 2.0.202 (2021-11-23) was used for the test.
 For most operations, the performance of H2 is about the same as for HSQLDB.
 One situation where H2 is slow is large result sets, because they are buffered to
 disk if more than a certain number of records are returned.
diff --git a/h2/src/main/org/h2/engine/Constants.java b/h2/src/main/org/h2/engine/Constants.java
index 8b92f99c83..802b717e26 100644
--- a/h2/src/main/org/h2/engine/Constants.java
+++ b/h2/src/main/org/h2/engine/Constants.java
@@ -15,7 +15,7 @@ public class Constants {
     /**
      * The build date is updated for each public release.
      */
-    public static final String BUILD_DATE = "2021-11-06";
+    public static final String BUILD_DATE = "2021-11-23";
 
     /**
      * The build date of the last stable release.
@@ -84,7 +84,7 @@ public class Constants {
 
     /**
      * The TCP protocol version number 20.
-     * @since 2.0.202 (2021-11-06)
+     * @since 2.0.202 (2021-11-23)
      */
     public static final int TCP_PROTOCOL_VERSION_20 = 20;
 
diff --git a/h2/src/test/org/h2/samples/newsfeed.sql b/h2/src/test/org/h2/samples/newsfeed.sql
index 8c21cd6776..e4fd782f48 100644
--- a/h2/src/test/org/h2/samples/newsfeed.sql
+++ b/h2/src/test/org/h2/samples/newsfeed.sql
@@ -7,7 +7,7 @@
 CREATE TABLE VERSION(ID INT PRIMARY KEY, VERSION VARCHAR, CREATED VARCHAR);
 INSERT INTO VERSION VALUES
 
-(151, '2.0.202', '2021-11-06'),
+(151, '2.0.202', '2021-11-23'),
 (150, '1.4.200', '2019-10-14'),
 (149, '1.4.199', '2019-03-13'),
 (148, '1.4.198', '2019-02-22'),

From 7c6399783fb891438f6cb9baa8b9f88bce120cd5 Mon Sep 17 00:00:00 2001
From: Andrei Tokar <andrei.tokar@gmail.com>
Date: Wed, 24 Nov 2021 16:17:56 -0500
Subject: [PATCH 11/15] download links

---
 h2/src/docsrc/html/cheatSheet.html             | 4 ++--
 h2/src/docsrc/html/download.html               | 8 ++++----
 h2/src/docsrc/html/fragments.html              | 2 +-
 h2/src/docsrc/html/mainWeb.html                | 8 ++++----
 h2/src/test/org/h2/test/bench/BenchB.java      | 2 +-
 h2/src/tools/org/h2/build/doc/GenerateDoc.java | 1 +
 6 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/h2/src/docsrc/html/cheatSheet.html b/h2/src/docsrc/html/cheatSheet.html
index a6d505c9ab..8f24394080 100644
--- a/h2/src/docsrc/html/cheatSheet.html
+++ b/h2/src/docsrc/html/cheatSheet.html
@@ -113,8 +113,8 @@ <h2>Using H2</h2>
     <a href="license.html">free to use and distribute</a>.
 </li><li><a href="https://h2database.com/html/download.html">Download</a>:
     <a href="https://repo1.maven.org/maven2/com/h2database/h2/${version}/h2-${version}.jar" class="link">jar</a>,
-    <a href="https://h2database.com/h2-setup-${versionDate}.exe" class="link">installer (Windows)</a>,
-    <a href="https://h2database.com/h2-${versionDate}.zip" class="link">zip</a>.
+    <a href="https://${downloadRoot}/h2-setup-${versionDate}.exe" class="link">installer (Windows)</a>,
+    <a href="https://${downloadRoot}/h2-${versionDate}.zip" class="link">zip</a>.
 </li><li>To start the
     <a href="quickstart.html#h2_console">H2 Console tool</a>, double click the jar file, or
     run <code>java -jar h2*.jar</code>, <code>h2.bat</code>, or <code>h2.sh</code>.
diff --git a/h2/src/docsrc/html/download.html b/h2/src/docsrc/html/download.html
index 244afdd686..8c25948ef3 100644
--- a/h2/src/docsrc/html/download.html
+++ b/h2/src/docsrc/html/download.html
@@ -21,16 +21,16 @@ <h1>Downloads</h1>
 
 <h3>Version ${version} (${versionDate})</h3>
 <p>
-<a href="https://h2database.com/h2-setup-${versionDate}.exe">Windows Installer</a>
+<a href="https://${downloadRoot}/h2-setup-${versionDate}.exe">Windows Installer</a>
 <!-- sha1Exe --><br />
-<a href="https://h2database.com/h2-${versionDate}.zip">Platform-Independent Zip</a>
+<a href="https://${downloadRoot}/h2-${versionDate}.zip">Platform-Independent Zip</a>
 <!-- sha1Zip --><br />
 </p>
 
 <h3>Version ${stableVersion} (${stableVersionDate}), Last Stable</h3>
 <p>
-<a href="https://h2database.com/h2-setup-${stableVersionDate}.exe">Windows Installer</a><br />
-<a href="https://h2database.com/h2-${stableVersionDate}.zip">Platform-Independent Zip</a><br />
+<a href="https://${downloadRoot}/h2-setup-${stableVersionDate}.exe">Windows Installer</a><br />
+<a href="https://${downloadRoot}/h2-${stableVersionDate}.zip">Platform-Independent Zip</a><br />
 </p>
 
 <h3>Archive Downloads</h3>
diff --git a/h2/src/docsrc/html/fragments.html b/h2/src/docsrc/html/fragments.html
index a8b22f4537..28bd34dd2b 100644
--- a/h2/src/docsrc/html/fragments.html
+++ b/h2/src/docsrc/html/fragments.html
@@ -71,7 +71,7 @@
 <a href="installation.html">Installation</a><br />
 <a href="tutorial.html">Tutorial</a><br />
 <a href="features.html">Features</a><br />
-<a href="security.html">Features</a><br />
+<a href="security.html">Security</a><br />
 <a href="performance.html">Performance</a><br />
 <a href="advanced.html">Advanced</a><br />
 <br />
diff --git a/h2/src/docsrc/html/mainWeb.html b/h2/src/docsrc/html/mainWeb.html
index 29a20a279c..fd644e753e 100644
--- a/h2/src/docsrc/html/mainWeb.html
+++ b/h2/src/docsrc/html/mainWeb.html
@@ -40,14 +40,14 @@ <h2 style="margin-top: 1em;">Download</h2>
                 Version ${version} (${versionDate})
             </td></tr>
             <tr><td style="border: 0px; background-color: #eee;">
-                <a href="https://h2database.com/h2-setup-${versionDate}.exe"><img src="images/download-2.png" alt="Download this database" width="22" height="22"/></a>
+                <a href="https://${downloadRoot}/h2-setup-${versionDate}.exe"><img src="images/download-2.png" alt="Download this database" width="22" height="22"/></a>
             </td><td style="vertical-align: middle; border: 0px; background-color: #eee;">
-                <a href="https://h2database.com/h2-setup-${versionDate}.exe">Windows Installer (5 MB)</a>
+                <a href="https://${downloadRoot}/h2-setup-${versionDate}.exe">Windows Installer (6.7 MB)</a>
             </td></tr>
             <tr><td style="border: 0px; background-color: #eee;">
-                <a href="https://h2database.com/h2-${versionDate}.zip"><img src="images/download-2.png" alt="Download this database" width="22" height="22"/></a>
+                <a href="https://${downloadRoot}/h2-${versionDate}.zip"><img src="images/download-2.png" alt="Download this database" width="22" height="22"/></a>
             </td><td style="vertical-align: middle; border: 0px; background-color: #eee;">
-                <a href="https://h2database.com/h2-${versionDate}.zip">All Platforms (zip, 8 MB)</a>
+                <a href="https://${downloadRoot}/h2-${versionDate}.zip">All Platforms (zip, 9.5 MB)</a>
             </td></tr>
             <tr><td style="border: 0px; background-color: #eee;" colspan="2">
                 <a href="download.html">All Downloads</a>
diff --git a/h2/src/test/org/h2/test/bench/BenchB.java b/h2/src/test/org/h2/test/bench/BenchB.java
index 8b83c3304a..cc98af0f96 100644
--- a/h2/src/test/org/h2/test/bench/BenchB.java
+++ b/h2/src/test/org/h2/test/bench/BenchB.java
@@ -90,7 +90,7 @@ public void init(Database db, int size) throws SQLException {
                         "BID INT, ABALANCE INT, FILLER VARCHAR(84))",
                 "CREATE TABLE HISTORY(" +
                         "TID INT, BID INT, AID INT, " +
-                        "DELTA INT, HTS DATETIME, FILLER VARCHAR(22))" };
+                        "DELTA INT, HTIME DATETIME, FILLER VARCHAR(22))" };
         for (String sql : create) {
             db.update(sql);
         }
diff --git a/h2/src/tools/org/h2/build/doc/GenerateDoc.java b/h2/src/tools/org/h2/build/doc/GenerateDoc.java
index 16536aa79e..0cf6cf359a 100644
--- a/h2/src/tools/org/h2/build/doc/GenerateDoc.java
+++ b/h2/src/tools/org/h2/build/doc/GenerateDoc.java
@@ -72,6 +72,7 @@ private void run(String... args) throws Exception {
         session.put("versionDate", Constants.BUILD_DATE);
         session.put("stableVersion", Constants.VERSION_STABLE);
         session.put("stableVersionDate", Constants.BUILD_DATE_STABLE);
+        session.put("downloadRoot", "github.com/h2database/h2database/releases/download/version-" + Constants.VERSION);
         String help = "SELECT ROWNUM ID, * FROM CSVREAD('" +
                 IN_HELP + "', NULL, 'lineComment=#') WHERE SECTION ";
         map("commandsDML",

From 7309020670a0edf2345a5570922a9a83c4522f3b Mon Sep 17 00:00:00 2001
From: Andrei Tokar <andrei.tokar@gmail.com>
Date: Wed, 24 Nov 2021 19:44:24 -0500
Subject: [PATCH 12/15] change release date

---
 h2/src/docsrc/html/changelog.html        | 4 +++-
 h2/src/docsrc/html/performance.html      | 2 +-
 h2/src/main/org/h2/engine/Constants.java | 4 ++--
 h2/src/test/org/h2/samples/newsfeed.sql  | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/h2/src/docsrc/html/changelog.html b/h2/src/docsrc/html/changelog.html
index 595c850898..5409802df2 100644
--- a/h2/src/docsrc/html/changelog.html
+++ b/h2/src/docsrc/html/changelog.html
@@ -25,8 +25,10 @@ <h2>Next Version (unreleased)</h2>
 </li>
 </ul>
 
-<h2>Version 2.0.202 (2021-11-23)</h2>
+<h2>Version 2.0.202 (2021-11-25)</h2>
 <ul>
+<li>Issue #3206: CVE Vulnerability CVE-2018-14335
+</li>
 <li>Issue #3174: Add keyword AUTOCOMMIT on create linked table to control the commit mode
 </li>
 <li>Issue #3130: Precision of NUMERIC values isn't verified in the Oracle compatibility mode
diff --git a/h2/src/docsrc/html/performance.html b/h2/src/docsrc/html/performance.html
index 4b5dcc6723..4d00a9ac94 100644
--- a/h2/src/docsrc/html/performance.html
+++ b/h2/src/docsrc/html/performance.html
@@ -99,7 +99,7 @@ <h3>Benchmark Results and Comments</h3>
 
 <h4>H2</h4>
 <p>
-Version 2.0.202 (2021-11-23) was used for the test.
+Version 2.0.202 (2021-11-25) was used for the test.
 For most operations, the performance of H2 is about the same as for HSQLDB.
 One situation where H2 is slow is large result sets, because they are buffered to
 disk if more than a certain number of records are returned.
diff --git a/h2/src/main/org/h2/engine/Constants.java b/h2/src/main/org/h2/engine/Constants.java
index 802b717e26..fc5a178243 100644
--- a/h2/src/main/org/h2/engine/Constants.java
+++ b/h2/src/main/org/h2/engine/Constants.java
@@ -15,7 +15,7 @@ public class Constants {
     /**
      * The build date is updated for each public release.
      */
-    public static final String BUILD_DATE = "2021-11-23";
+    public static final String BUILD_DATE = "2021-11-25";
 
     /**
      * The build date of the last stable release.
@@ -84,7 +84,7 @@ public class Constants {
 
     /**
      * The TCP protocol version number 20.
-     * @since 2.0.202 (2021-11-23)
+     * @since 2.0.202 (2021-11-25)
      */
     public static final int TCP_PROTOCOL_VERSION_20 = 20;
 
diff --git a/h2/src/test/org/h2/samples/newsfeed.sql b/h2/src/test/org/h2/samples/newsfeed.sql
index e4fd782f48..7eec9860b4 100644
--- a/h2/src/test/org/h2/samples/newsfeed.sql
+++ b/h2/src/test/org/h2/samples/newsfeed.sql
@@ -7,7 +7,7 @@
 CREATE TABLE VERSION(ID INT PRIMARY KEY, VERSION VARCHAR, CREATED VARCHAR);
 INSERT INTO VERSION VALUES
 
-(151, '2.0.202', '2021-11-23'),
+(151, '2.0.202', '2021-11-25'),
 (150, '1.4.200', '2019-10-14'),
 (149, '1.4.199', '2019-03-13'),
 (148, '1.4.198', '2019-02-22'),

From 9ccde2965acc2cab52cfa52915a7adee567d7047 Mon Sep 17 00:00:00 2001
From: Andrei Tokar <andrei.tokar@gmail.com>
Date: Wed, 24 Nov 2021 22:38:41 -0500
Subject: [PATCH 13/15] change link to h2.pdf

---
 h2/src/docsrc/html/cheatSheet.html             | 4 ++--
 h2/src/docsrc/html/download.html               | 8 ++++----
 h2/src/docsrc/html/fragments.html              | 2 +-
 h2/src/docsrc/html/mainWeb.html                | 8 ++++----
 h2/src/tools/org/h2/build/doc/GenerateDoc.java | 3 ++-
 h2/src/tools/org/h2/build/doc/dictionary.txt   | 2 +-
 6 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/h2/src/docsrc/html/cheatSheet.html b/h2/src/docsrc/html/cheatSheet.html
index 8f24394080..370d16cb03 100644
--- a/h2/src/docsrc/html/cheatSheet.html
+++ b/h2/src/docsrc/html/cheatSheet.html
@@ -113,8 +113,8 @@ <h2>Using H2</h2>
     <a href="license.html">free to use and distribute</a>.
 </li><li><a href="https://h2database.com/html/download.html">Download</a>:
     <a href="https://repo1.maven.org/maven2/com/h2database/h2/${version}/h2-${version}.jar" class="link">jar</a>,
-    <a href="https://${downloadRoot}/h2-setup-${versionDate}.exe" class="link">installer (Windows)</a>,
-    <a href="https://${downloadRoot}/h2-${versionDate}.zip" class="link">zip</a>.
+    <a href="${downloadRoot}/h2-setup-${versionDate}.exe" class="link">installer (Windows)</a>,
+    <a href="${downloadRoot}/h2-${versionDate}.zip" class="link">zip</a>.
 </li><li>To start the
     <a href="quickstart.html#h2_console">H2 Console tool</a>, double click the jar file, or
     run <code>java -jar h2*.jar</code>, <code>h2.bat</code>, or <code>h2.sh</code>.
diff --git a/h2/src/docsrc/html/download.html b/h2/src/docsrc/html/download.html
index 8c25948ef3..280763d5bc 100644
--- a/h2/src/docsrc/html/download.html
+++ b/h2/src/docsrc/html/download.html
@@ -21,16 +21,16 @@ <h1>Downloads</h1>
 
 <h3>Version ${version} (${versionDate})</h3>
 <p>
-<a href="https://${downloadRoot}/h2-setup-${versionDate}.exe">Windows Installer</a>
+<a href="${downloadRoot}/h2-setup-${versionDate}.exe">Windows Installer</a>
 <!-- sha1Exe --><br />
-<a href="https://${downloadRoot}/h2-${versionDate}.zip">Platform-Independent Zip</a>
+<a href="${downloadRoot}/h2-${versionDate}.zip">Platform-Independent Zip</a>
 <!-- sha1Zip --><br />
 </p>
 
 <h3>Version ${stableVersion} (${stableVersionDate}), Last Stable</h3>
 <p>
-<a href="https://${downloadRoot}/h2-setup-${stableVersionDate}.exe">Windows Installer</a><br />
-<a href="https://${downloadRoot}/h2-${stableVersionDate}.zip">Platform-Independent Zip</a><br />
+<a href="https://h2database.com/h2-setup-${stableVersionDate}.exe">Windows Installer</a><br />
+<a href="https://h2database.com/h2-${stableVersionDate}.zip">Platform-Independent Zip</a><br />
 </p>
 
 <h3>Archive Downloads</h3>
diff --git a/h2/src/docsrc/html/fragments.html b/h2/src/docsrc/html/fragments.html
index 28bd34dd2b..5cb2deb980 100644
--- a/h2/src/docsrc/html/fragments.html
+++ b/h2/src/docsrc/html/fragments.html
@@ -85,7 +85,7 @@
 <a href="grammar.html">SQL Grammar</a><br />
 <a href="systemtables.html">System Tables</a><br />
 <a href="../javadoc/index.html">Javadoc</a><br />
-<a href="../h2.pdf">PDF (2 MB)</a><br />
+<a href="${downloadRoot}/h2.pdf">PDF (2 MB)</a><br />
 <br />
 <b>Support</b><br />
 <a href="faq.html">FAQ</a><br />
diff --git a/h2/src/docsrc/html/mainWeb.html b/h2/src/docsrc/html/mainWeb.html
index fd644e753e..683ab36be3 100644
--- a/h2/src/docsrc/html/mainWeb.html
+++ b/h2/src/docsrc/html/mainWeb.html
@@ -40,14 +40,14 @@ <h2 style="margin-top: 1em;">Download</h2>
                 Version ${version} (${versionDate})
             </td></tr>
             <tr><td style="border: 0px; background-color: #eee;">
-                <a href="https://${downloadRoot}/h2-setup-${versionDate}.exe"><img src="images/download-2.png" alt="Download this database" width="22" height="22"/></a>
+                <a href="${downloadRoot}/h2-setup-${versionDate}.exe"><img src="images/download-2.png" alt="Download this database" width="22" height="22"/></a>
             </td><td style="vertical-align: middle; border: 0px; background-color: #eee;">
-                <a href="https://${downloadRoot}/h2-setup-${versionDate}.exe">Windows Installer (6.7 MB)</a>
+                <a href="${downloadRoot}/h2-setup-${versionDate}.exe">Windows Installer (6.7 MB)</a>
             </td></tr>
             <tr><td style="border: 0px; background-color: #eee;">
-                <a href="https://${downloadRoot}/h2-${versionDate}.zip"><img src="images/download-2.png" alt="Download this database" width="22" height="22"/></a>
+                <a href="${downloadRoot}/h2-${versionDate}.zip"><img src="images/download-2.png" alt="Download this database" width="22" height="22"/></a>
             </td><td style="vertical-align: middle; border: 0px; background-color: #eee;">
-                <a href="https://${downloadRoot}/h2-${versionDate}.zip">All Platforms (zip, 9.5 MB)</a>
+                <a href="${downloadRoot}/h2-${versionDate}.zip">All Platforms (zip, 9.5 MB)</a>
             </td></tr>
             <tr><td style="border: 0px; background-color: #eee;" colspan="2">
                 <a href="download.html">All Downloads</a>
diff --git a/h2/src/tools/org/h2/build/doc/GenerateDoc.java b/h2/src/tools/org/h2/build/doc/GenerateDoc.java
index 0cf6cf359a..9adb49be82 100644
--- a/h2/src/tools/org/h2/build/doc/GenerateDoc.java
+++ b/h2/src/tools/org/h2/build/doc/GenerateDoc.java
@@ -72,7 +72,8 @@ private void run(String... args) throws Exception {
         session.put("versionDate", Constants.BUILD_DATE);
         session.put("stableVersion", Constants.VERSION_STABLE);
         session.put("stableVersionDate", Constants.BUILD_DATE_STABLE);
-        session.put("downloadRoot", "github.com/h2database/h2database/releases/download/version-" + Constants.VERSION);
+        session.put("downloadRoot",
+                "https://github.com/h2database/h2database/releases/download/version-" + Constants.VERSION);
         String help = "SELECT ROWNUM ID, * FROM CSVREAD('" +
                 IN_HELP + "', NULL, 'lineComment=#') WHERE SECTION ";
         map("commandsDML",
diff --git a/h2/src/tools/org/h2/build/doc/dictionary.txt b/h2/src/tools/org/h2/build/doc/dictionary.txt
index c4c7c270e4..2252da5195 100644
--- a/h2/src/tools/org/h2/build/doc/dictionary.txt
+++ b/h2/src/tools/org/h2/build/doc/dictionary.txt
@@ -148,7 +148,7 @@ cryptoloop css csv csvread csvwrite cte ctid ctor ctrl ctx ctxsys cuaz cube
 cumulative cup curation curdate cure curious curly curr curren currency current
 currently currval cursor cursors curtime curtimestamp curve curves cust custom
 customarily customer customerid customers customizable customized customizer
-customizers customizing cut cutover cvf cvs cwd cycle cycles cyclic cycling cyr
+customizers customizing cut cutover cve cvf cvs cwd cycle cycles cyclic cycling cyr
 czech dadd daemon daffodil dagger dairy daload dalvik damage damages dan dance
 dangerous daniel dark darr darri dartifact darwin dash dashes dastore dat data
 database databaseaccess databases dataflyer datagram datalink datareader

From 3ada1aa41eb095c9ddda493ec063682654f21154 Mon Sep 17 00:00:00 2001
From: Andrei Tokar <andrei.tokar@gmail.com>
Date: Thu, 25 Nov 2021 10:49:43 -0500
Subject: [PATCH 14/15] include trivial bits of #3090

---
 h2/src/main/org/h2/expression/analysis/WindowFrame.java | 2 +-
 h2/src/main/org/h2/store/fs/FileBaseDefault.java        | 2 +-
 h2/src/main/org/h2/util/geometry/GeometryUtils.java     | 2 +-
 h2/src/tools/org/h2/build/doc/LinkChecker.java          | 2 +-
 h2/src/tools/org/h2/build/doc/XMLChecker.java           | 4 ++--
 h2/src/tools/org/h2/dev/fs/ArchiveTool.java             | 6 +++---
 h2/src/tools/org/h2/java/Expr.java                      | 4 ++--
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/h2/src/main/org/h2/expression/analysis/WindowFrame.java b/h2/src/main/org/h2/expression/analysis/WindowFrame.java
index f3c4585671..a7350285a3 100644
--- a/h2/src/main/org/h2/expression/analysis/WindowFrame.java
+++ b/h2/src/main/org/h2/expression/analysis/WindowFrame.java
@@ -27,7 +27,7 @@
  */
 public final class WindowFrame {
 
-    private static abstract class Itr implements Iterator<Value[]> {
+    private abstract static class Itr implements Iterator<Value[]> {
 
         final ArrayList<Value[]> orderedRows;
 
diff --git a/h2/src/main/org/h2/store/fs/FileBaseDefault.java b/h2/src/main/org/h2/store/fs/FileBaseDefault.java
index 45b406aff6..70370df3f9 100644
--- a/h2/src/main/org/h2/store/fs/FileBaseDefault.java
+++ b/h2/src/main/org/h2/store/fs/FileBaseDefault.java
@@ -18,7 +18,7 @@ public abstract class FileBaseDefault extends FileBase {
     private long position = 0;
 
     @Override
-    public synchronized final long position() throws IOException {
+    public final synchronized long position() throws IOException {
         return position;
     }
 
diff --git a/h2/src/main/org/h2/util/geometry/GeometryUtils.java b/h2/src/main/org/h2/util/geometry/GeometryUtils.java
index 79e86b33e1..fdd3fe6a4d 100644
--- a/h2/src/main/org/h2/util/geometry/GeometryUtils.java
+++ b/h2/src/main/org/h2/util/geometry/GeometryUtils.java
@@ -13,7 +13,7 @@ public final class GeometryUtils {
     /**
      * Converter output target.
      */
-    public static abstract class Target {
+    public abstract static class Target {
 
         public Target() {
         }
diff --git a/h2/src/tools/org/h2/build/doc/LinkChecker.java b/h2/src/tools/org/h2/build/doc/LinkChecker.java
index 52e525530f..ae37b39a21 100644
--- a/h2/src/tools/org/h2/build/doc/LinkChecker.java
+++ b/h2/src/tools/org/h2/build/doc/LinkChecker.java
@@ -166,7 +166,7 @@ private void listBadLinks() throws Exception {
         for (String error : errors) {
             System.out.println(error);
         }
-        if (errors.size() > 0) {
+        if (!errors.isEmpty()) {
             throw new Exception("Problems where found by the Link Checker");
         }
     }
diff --git a/h2/src/tools/org/h2/build/doc/XMLChecker.java b/h2/src/tools/org/h2/build/doc/XMLChecker.java
index 591cb157db..c82e88f663 100644
--- a/h2/src/tools/org/h2/build/doc/XMLChecker.java
+++ b/h2/src/tools/org/h2/build/doc/XMLChecker.java
@@ -94,7 +94,7 @@ private static void checkXML(String xml, boolean html) throws Exception {
             if (event == XMLParser.END_DOCUMENT) {
                 break;
             } else if (event == XMLParser.START_ELEMENT) {
-                if (stack.size() == 0) {
+                if (stack.isEmpty()) {
                     if (rootElement) {
                         throw new Exception("Second root element at " + parser.getRemaining());
                     }
@@ -146,7 +146,7 @@ private static void checkXML(String xml, boolean html) throws Exception {
                         + parser.getRemaining());
             }
         }
-        if (stack.size() != 0) {
+        if (!stack.isEmpty()) {
             throw new Exception("Unclosed root element");
         }
     }
diff --git a/h2/src/tools/org/h2/dev/fs/ArchiveTool.java b/h2/src/tools/org/h2/dev/fs/ArchiveTool.java
index 34f001fad8..ea779a7c08 100644
--- a/h2/src/tools/org/h2/dev/fs/ArchiveTool.java
+++ b/h2/src/tools/org/h2/dev/fs/ArchiveTool.java
@@ -255,7 +255,7 @@ public int read() throws IOException {
                     fileIn.close();
                     fileIn = null;
                 }
-                if (files.size() == 0) {
+                if (files.isEmpty()) {
                     // EOF
                     return -1;
                 }
@@ -562,7 +562,7 @@ private static Iterator<Chunk> merge(final TreeSet<ChunkStream> segmentIn, final
 
             @Override
             public boolean hasNext() {
-                return segmentIn.size() > 0;
+                return !segmentIn.isEmpty();
             }
 
             @Override
@@ -948,7 +948,7 @@ public static Chunk read(DataInputStream in, boolean readKey) {
                     }
                     idList.add(x);
                 }
-                if (idList.size() == 0) {
+                if (idList.isEmpty()) {
                     // eof
                     in.close();
                     return null;
diff --git a/h2/src/tools/org/h2/java/Expr.java b/h2/src/tools/org/h2/java/Expr.java
index b499905e45..a0eecb28aa 100644
--- a/h2/src/tools/org/h2/java/Expr.java
+++ b/h2/src/tools/org/h2/java/Expr.java
@@ -80,7 +80,7 @@ public String asString() {
         StringBuilder buff = new StringBuilder();
         initMethod();
         if (method.isIgnore) {
-            if (args.size() == 0) {
+            if (args.isEmpty()) {
                 // ignore
             } else if (args.size() == 1) {
                 buff.append(args.get(0));
@@ -394,7 +394,7 @@ class NewExpr extends ExprBase {
     public String asString() {
         boolean refCount = type.refCount;
         StringBuilder buff = new StringBuilder();
-        if (arrayInitExpr.size() > 0) {
+        if (!arrayInitExpr.isEmpty()) {
             if (refCount) {
                 if (classObj.isPrimitive) {
                     buff.append("ptr< array< " + classObj + " > >");

From 51993870f40d227c80aa56dab063f4cf4cc445f8 Mon Sep 17 00:00:00 2001
From: Andrei Tokar <andrei.tokar@gmail.com>
Date: Thu, 25 Nov 2021 10:54:11 -0500
Subject: [PATCH 15/15] fix link to changelog

---
 h2/src/docsrc/html/history.html | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/h2/src/docsrc/html/history.html b/h2/src/docsrc/html/history.html
index a8475c32fc..a1617ea313 100644
--- a/h2/src/docsrc/html/history.html
+++ b/h2/src/docsrc/html/history.html
@@ -29,10 +29,8 @@ <h1>History</h1>
 
 <h2 id="changelog">Change Log</h2>
 <p>
-The up-to-date change log is available at
-<a href="https://h2database.com/html/changelog.html">
-https://h2database.com/html/changelog.html
-</a>
+The up-to-date change log is available
+<a href="changelog.html">here</a>
 </p>
 
 <h2 id="history">History of this Database Engine</h2>