From 98f006ec0e73ff0a58d36f6eb9bbf0c1090531a4 Mon Sep 17 00:00:00 2001
From: Andrei Tokar <andrei.tokar@gmail.com>
Date: Sun, 14 Jul 2024 17:19:34 -0400
Subject: [PATCH] in preparation for release

---
 README.md                                     |  2 +-
 h2/pom.xml                                    |  2 +-
 h2/src/docsrc/html/changelog.html             | 24 ++++++++++++++++++-
 h2/src/docsrc/html/download-archive.html      |  4 ++++
 h2/src/docsrc/html/download.html              |  8 -------
 h2/src/main/org/h2/engine/Constants.java      |  8 +++----
 .../expression/function/DBObjectFunction.java |  6 ++---
 h2/src/test/org/h2/samples/newsfeed.sql       |  5 ++--
 .../org/h2/test/coverage/package-info.java    | 10 ++++++++
 h2/src/test/org/h2/test/db/TestOpenClose.java |  2 +-
 h2/src/tools/org/h2/build/doc/dictionary.txt  | 20 ++++++++--------
 11 files changed, 60 insertions(+), 31 deletions(-)
 create mode 100644 h2/src/test/org/h2/test/coverage/package-info.java

diff --git a/README.md b/README.md
index f7b13d0237..4679c1ba74 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ More information: https://h2database.com
 <dependency>
     <groupId>com.h2database</groupId>
     <artifactId>h2</artifactId>
-    <version>2.2.224</version>
+    <version>2.3.230</version>
 </dependency>
 ```
 
diff --git a/h2/pom.xml b/h2/pom.xml
index 17024ab061..5a2a856310 100644
--- a/h2/pom.xml
+++ b/h2/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>com.h2database</groupId>
   <artifactId>h2</artifactId>
-  <version>2.2.229-SNAPSHOT</version>
+  <version>2.3.230</version>
   <packaging>jar</packaging>
   <name>H2 Database Engine</name>
   <url>https://h2database.com</url>
diff --git a/h2/src/docsrc/html/changelog.html b/h2/src/docsrc/html/changelog.html
index 3aecab1769..def0de2622 100644
--- a/h2/src/docsrc/html/changelog.html
+++ b/h2/src/docsrc/html/changelog.html
@@ -21,6 +21,22 @@ <h1>Change Log</h1>
 
 <h2>Next Version (unreleased)</h2>
 <ul>
+<li>Nothing yet
+</li>
+</ul>
+
+<h2>Version 2.3.230 (2024-07-15)</h2>
+<ul>
+<li>Issue #2752: Fix for "double mark" error at database backup opening
+</li>
+<li>Issue #4052: Allow 0 as a valid chunk id
+</li>
+<li>Issue #4012: Fix "Chunk not found" database corruption by ensure proper prologue/epilogue for every SQL statement in JDBC ";" - separated list
+</li>
+<li>Issue #3960: Fix NPE in page rewrite
+</li>
+<li>Issue #3909: Reduce resource consumption of too aggressive disk space housekeeping
+</li>
 <li>Issue #701: An available index is never used for ordering, when the requested order is DESC
 </li>
 <li>Issue #4036: NULLS NOT DISTINCT constraint changed after column dropped
@@ -91,6 +107,12 @@ <h2>Next Version (unreleased)</h2>
 </li>
 </ul>
 
+<h2>Version 2.2.224 (2023-09-17)</h2>
+<ul>
+<li>Issue #3883 Performance regression in 2.2.222
+</li>
+</ul>
+
 <h2>Version 2.2.222 (2023-08-22)</h2>
 <ul>
 <li>Fixed race condition in MVStore causing database corruption &quot;File corrupted in chunk ###&quot;
@@ -99,7 +121,7 @@ <h2>Version 2.2.222 (2023-08-22)</h2>
 </li>
 <li>Issue #3868: INFORMATION_SCHEMA.SESSIONS.ISOLATION_LEVEL returns isolation level of the current session in all rows
 </li>
-<li>RP #3865: Add possibility to enable virtual worker threads in TCP, Web, and PG servers on Java 21+
+<li>PR #3865: Add possibility to enable virtual worker threads in TCP, Web, and PG servers on Java 21+
 </li>
 <li>PR #3864: Improve performance of TCP client driver when it is used from virtual threads
 </li>
diff --git a/h2/src/docsrc/html/download-archive.html b/h2/src/docsrc/html/download-archive.html
index 507bcd89f7..e63642aab6 100644
--- a/h2/src/docsrc/html/download-archive.html
+++ b/h2/src/docsrc/html/download-archive.html
@@ -28,6 +28,10 @@ <h2>Distribution</h2>
 
 <table>
 <tbody>
+<tr><td>2.2.224</td>
+<td><a href="https://github.com/h2database/h2database/releases/download/version-2.2.224/h2-setup-2023-09-17.exe">Windows Installer</a></td>
+<td><a href="https://github.com/h2database/h2database/releases/download/version-2.2.224/h2-2023-09-17.zip">Platform-Independent Zip</a></td>
+</tr>
 <tr><td>2.2.222</td>
 <td><a href="https://github.com/h2database/h2database/releases/download/version-2.2.222/h2-setup-2023-08-22.exe">Windows Installer</a></td>
 <td><a href="https://github.com/h2database/h2database/releases/download/version-2.2.222/h2-2023-08-22.zip">Platform-Independent Zip</a></td>
diff --git a/h2/src/docsrc/html/download.html b/h2/src/docsrc/html/download.html
index 48014c5bb8..68442d7f43 100644
--- a/h2/src/docsrc/html/download.html
+++ b/h2/src/docsrc/html/download.html
@@ -27,14 +27,6 @@ <h3>Version ${version} (${versionDate})</h3>
 <!-- sha1Zip --><br />
 </p>
 
-<h3>Version 2.1.214 (2022-06-13)</h3>
-<p>
-<a href="https://github.com/h2database/h2database/releases/download/version-2.1.214/h2-setup-2022-06-13.exe">Windows Installer</a>
-(SHA1 checksum: 5f7cd83d394df5882ed01553935463a848979f29)<br />
-<a href="https://github.com/h2database/h2database/releases/download/version-2.1.214/h2-2022-06-13.zip">Platform-Independent Zip</a>
-(SHA1 checksum: 5ff027217098bf6c800ef96b98f3a381b320e53d)<br />
-</p>
-
 <h3>Archive Downloads</h3>
 <p>
 <a href="download-archive.html">Archive Downloads</a>
diff --git a/h2/src/main/org/h2/engine/Constants.java b/h2/src/main/org/h2/engine/Constants.java
index ed80ba3fc0..5362677c68 100644
--- a/h2/src/main/org/h2/engine/Constants.java
+++ b/h2/src/main/org/h2/engine/Constants.java
@@ -15,18 +15,18 @@ public class Constants {
     /**
      * The build date is updated for each public release.
      */
-    public static final String BUILD_DATE = "2023-08-22";
+    public static final String BUILD_DATE = "2024-07-15";
 
     /**
      * Sequential version number. Even numbers are used for official releases,
      * odd numbers are used for development builds.
      */
-    public static final int BUILD_ID = 229;
+    public static final int BUILD_ID = 230;
 
     /**
      * Whether this is a snapshot version.
      */
-    public static final boolean BUILD_SNAPSHOT = true;
+    public static final boolean BUILD_SNAPSHOT = false;
 
     /**
      * If H2 is compiled to be included in a product, this should be set to
@@ -84,7 +84,7 @@ public class Constants {
     /**
      * The minor version of this database.
      */
-    public static final int VERSION_MINOR = 2;
+    public static final int VERSION_MINOR = 3;
 
     /**
      * The lock mode that means no locking is used at all.
diff --git a/h2/src/main/org/h2/expression/function/DBObjectFunction.java b/h2/src/main/org/h2/expression/function/DBObjectFunction.java
index 0ba77f81c2..39dd48bd67 100644
--- a/h2/src/main/org/h2/expression/function/DBObjectFunction.java
+++ b/h2/src/main/org/h2/expression/function/DBObjectFunction.java
@@ -153,12 +153,12 @@ public Value getValue(SessionLocal session, Value v1, Value v2, Value v3) {
         }
     }
 
-    private static Value getDbObjectSize(DbObject object, boolean total, boolean appproximate) {
+    private static Value getDbObjectSize(DbObject object, boolean total, boolean approximate) {
         long size = 0L;
         if (object instanceof Table) {
-            size = ((Table) object).getDiskSpaceUsed(total, appproximate);
+            size = ((Table) object).getDiskSpaceUsed(total, approximate);
         } else if (object instanceof Index) {
-            size = ((Index) object).getDiskSpaceUsed(appproximate);
+            size = ((Index) object).getDiskSpaceUsed(approximate);
         }
         return ValueBigint.get(size);
     }
diff --git a/h2/src/test/org/h2/samples/newsfeed.sql b/h2/src/test/org/h2/samples/newsfeed.sql
index a2017c766b..008a3970c1 100644
--- a/h2/src/test/org/h2/samples/newsfeed.sql
+++ b/h2/src/test/org/h2/samples/newsfeed.sql
@@ -7,6 +7,8 @@
 CREATE TABLE VERSION(ID INT PRIMARY KEY, VERSION VARCHAR, CREATED VARCHAR);
 INSERT INTO VERSION VALUES
 
+(160, '2.3.230', '2024-07-15'),
+(159, '2.2.224', '2023-09-17'),
 (158, '2.2.222', '2023-08-22'),
 (157, '2.2.220', '2023-07-04'),
 (156, '2.1.214', '2022-06-13'),
@@ -20,8 +22,7 @@ INSERT INTO VERSION VALUES
 (148, '1.4.198', '2019-02-22'),
 (147, '1.4.197', '2018-03-18'),
 (146, '1.4.196', '2017-06-10'),
-(145, '1.4.195', '2017-04-23'),
-(144, '1.4.194', '2017-03-10');
+(145, '1.4.195', '2017-04-23');
 
 CREATE TABLE CHANNEL(TITLE VARCHAR, LINK VARCHAR, DESC VARCHAR,
     LANGUAGE VARCHAR, PUB TIMESTAMP, LAST TIMESTAMP, AUTHOR VARCHAR);
diff --git a/h2/src/test/org/h2/test/coverage/package-info.java b/h2/src/test/org/h2/test/coverage/package-info.java
new file mode 100644
index 0000000000..ff5c0775d6
--- /dev/null
+++ b/h2/src/test/org/h2/test/coverage/package-info.java
@@ -0,0 +1,10 @@
+/*
+ * Copyright 2004-2024 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * and the EPL 1.0 (https://h2database.com/html/license.html).
+ * Initial Developer: H2 Group
+ */
+
+/**
+ * Database tests. Most tests are on the SQL level.
+ */
+package org.h2.test.coverage;
\ No newline at end of file
diff --git a/h2/src/test/org/h2/test/db/TestOpenClose.java b/h2/src/test/org/h2/test/db/TestOpenClose.java
index 4bd644de53..dad1289496 100644
--- a/h2/src/test/org/h2/test/db/TestOpenClose.java
+++ b/h2/src/test/org/h2/test/db/TestOpenClose.java
@@ -163,7 +163,7 @@ private void testBackupWithYoungDeadChunks() throws SQLException {
 
             Restore.execute(getBaseDir() + "/test.zip", getBaseDir(), null);
 
-            // Open and close the database twice. Important to do it twice as the two openings will be slightly
+            // Open and close the database twice. Important to do it twice as oach opening will be slightly
             // different: the first opening will assume the database is not "clean" (as it is an online backup) but
             // then the closing will mark the DB as "clean" for the second opening
             for (int i = 0; i < 2; i++) {
diff --git a/h2/src/tools/org/h2/build/doc/dictionary.txt b/h2/src/tools/org/h2/build/doc/dictionary.txt
index fd9dba78ce..819853b5d7 100644
--- a/h2/src/tools/org/h2/build/doc/dictionary.txt
+++ b/h2/src/tools/org/h2/build/doc/dictionary.txt
@@ -220,10 +220,10 @@ endlessly endorse ends enforce enforceability enforceable enforced engine engine
 english enhance enhanced enhancement enhancer enlarge enough enqueued ensp ensure
 ensures ensuring enter entered entering enterprise entire entities entity entrance
 entries entry enum enumerate enumerated enumerator enumerators enumeration env envelope
-environment environments enwiki eof eol epl epoch epoll epsilon equal equality equally
-equals equipment equitable equiv equivalence equivalent equivalents era erase eremainder
-eric erik err error errorlevel errors erwan ery esc escape escaped escapes escaping
-escargots ese espa essential essentials established estimate estimated estimates
+environment environments enwiki eof eol epilogue epl epoch epoll epsilon equal equality
+equally equals equipment equitable equiv equivalence equivalent equivalents era erase
+eremainder eric erik err error errorlevel errors erwan ery esc escape escaped escapes
+escaping escargots ese espa essential essentials established estimate estimated estimates
 estimating estimation estoppel eta etc eth etl euml euro europe europeu euros eva eval
 evaluatable evaluate evaluated evaluates evaluating evaluation evdokimov even evenly
 event events eventually ever every everybody everyone everything everywhere evict
@@ -345,7 +345,7 @@ iteration iterations iterator its itself iuml iushr ixor iyama iyy iyyy jack
 jackcess jackrabbit jackson jacopo jakarta jakob jalpesh jam james jan january
 japan japanese jaqu jar jars jason jaspa java javaagent javac javadoc javadocs
 javascript javaw javax jayaprakash jboolean jbyte jcc jchar jcl jconsole jcr jdbc
-jdbcx jdbm jdk jdo jdouble jdt jech jefferson jena jenkov jens jentsch jequel
+jdbcx jdbm jdk jdo jdouble jdt jech jefferson jehx jena jenkov jens jentsch jequel
 jetty jfloat jia jiang jim jint jlong jmx jmxremote jndi jni jnlp joachim job joe
 joel joerg johann john johnny johnson join joined joining joins joist jon jones
 joonas jooq jopr jorissen jpa jpox jps jre jsessionid json jsp jsr jsse jstack
@@ -355,7 +355,7 @@ karlsson kaspersky kawashima keegan keep keeper keeping keeps ken kept kerberos
 kerry kevent key keyalg keying keypass keys keystore keystores keytool keyword
 keywords khtml kicks kidd kill killed killer killing kills kilobytes kind
 kindergarden kinds kingdom kiritimati kit kiwi knife know knowing knowledge known
-knows knut kobe koi konqueror korea kotek krenger kritchai kupolov kwajalein
+knows knut kobe koi konqueror korea kotek krenger kritchai kupolov kwajalein kwszmy
 kyoto lab label labeled labels lack lacoin ladd ladislav lager laird laload
 lambda lamp land lang language languages laptop laquo large largely larger
 largest larr last lastly lastname lastore lastval latch late later latest latin
@@ -398,7 +398,7 @@ 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
-messager messages messes met meta metadata meteorite method methods mfulton mgmt
+messager messages messes met meta metadata meteorite method methods mfulton mgmt mhpk
 michael michi micro microarray microarrays microsoft mid middle middleware middot
 midnight midori midpoint might migrate migrated migrating migration mill miller
 million millions millis millisecond milliseconds mime mimer min mind mine
@@ -431,7 +431,7 @@ not nota notably notation notch note notes nothing notice notices notification n
 notifies notify notifying notin notranslate notwithstanding nougat nov novelist
 november now nowait nowrap npl nsi nsis nsub ntext ntfs nth ntilde nucleus nul
 null nullable nullid nullif nulls nullsoft num number numbering numbers numeral
-numerals numeric numerical nuxeo nvarchar nvl oacute obey obj object objects
+numerals numeric numerical nuxeo nvarchar nvl oach oacute obey obj object objects
 obligation obligations observer obsolete obtain obtained obtains obviously
 occasionally occupied occupies occupy occur occurred occurrence occurrences occurs
 ocirc octal octet october octype odbc odbcad odd odg off offending offer offered
@@ -494,7 +494,7 @@ probably problem problematic problems proc procedural procedure procedures
 proceed process processed processes processing processor processors procurement
 prod produce produced produces product production products prof profile profiler
 profiles profiling profit profits program programmed programming programs
-progress prohibited prohibits project projection projects prominent promote
+progress prohibited prohibits project projection projects prologue prominent promote
 prompt promptly proof prop propagate propagated proper properly properties
 property proposal proposed prospective prospectively protect protected protecting
 protection protects protocol protocols prototype prototyping prove proven provide
@@ -502,7 +502,7 @@ provided provider providers provides providing provision provisionally provision
 proxies proxy prune pruned pruning pseudo psi psm psqlodbc pst ptn ptr pub public
 publicly publish published publishing pulakka pull puppy pure purely purge purged
 purpose purposes pursuant push pushed put putfield puts putstatic putting pwd
-pwds qian qty qua quadratic quaere quaint qualified qualifier qualify quality
+pwds qgl qian qty qua quadratic quaere quaint qualified qualifier qualify quality
 quantified quantifieds quantity quarter quercus queried queries query querydsl
 queryframework querying question questions queue queues qui quick quicker quickly
 quicksort quickstart quickstarter quiet quirre quit quite qujd qujdra quot quota