in preparation for a release

andreitokar · andreitokar · commit c8eb81be7a30 · 2025-09-22T18:11:12.000-04:00
diff --git 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.3.232</version>
+    <version>2.4.240</version>
 </dependency>
 ```
 
diff --git a/h2/pom.xml b/h2/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>com.h2database</groupId>
   <artifactId>h2</artifactId>
-  <version>2.3.239-SNAPSHOT</version>
+  <version>2.4.240</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
@@ -21,7 +21,14 @@ <h1>Change Log</h1>
 
 <h2>Next Version (unreleased)</h2>
 <ul>
-<li>PR #4273: SHUTDOWN COMPACT: parallel map copy (¼ cores default, override with h2.compactThreads)
+    <li>nothing here yet</li>
+</ul>
+
+<h2>Version 2.4.240 (2025-09-22)</h2>
+<ul>
+<li>PR #4273: SHUTDOWN COMPACT: parallel map copy (&frac14; cores default, override with h2.compactThreads)
+</li>
+<li>PR #4258: Fix compaction of encrypted databases
 </li>
 <li>Issue #4263: Documentation: SET TRUNCATE_LARGE_LENGTH is broken
 </li>
@@ -513,14 +520,6 @@ <h2>Version 2.1.210 (2022-01-17)</h2>
 </li>
 </ul>
 
-<h2>Version 2.0.206 (2022-01-04)</h2>
-<ul>
-<li>Issue #3322: Create linked table fails when the table contains a Geometry with a data type specified
-</li>
-<li>Issue #3297: Unexpected GROUP BY results with indexed IGNORECASE column
-</li>
-</ul>
-
 
 
 <!-- [close] { --></div></td></tr></table><!-- } --><!-- analytics --></body></html>
diff --git 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.232</td>
+<td><a href="https://github.com/h2database/h2database/releases/download/version-2.3.232/h2-setup-2024-08-11.exe">Windows Installer</a></td>
+<td><a href="https://github.com/h2database/h2database/releases/download/version-2.3.232/h2-2024-08-11.zip">Platform-Independent Zip</a></td>
+</tr>
 <tr><td>2.2.230</td>
 <td><a href="https://github.com/h2database/h2database/releases/download/version-2.3.230/h2-setup-2024-07-15.exe">Windows Installer</a></td>
 <td><a href="https://github.com/h2database/h2database/releases/download/version-2.3.230/h2-2024-07-15.zip">Platform-Independent Zip</a></td>
diff --git 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 = "2024-08-11";
+    public static final String BUILD_DATE = "2025-09-22";
 
     /**
      * Sequential version number. Even numbers are used for official releases,
      * odd numbers are used for development builds.
      */
-    public static final int BUILD_ID = 239;
+    public static final int BUILD_ID = 240;
 
     /**
      * 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 = 3;
+    public static final int VERSION_MINOR = 4;
 
     /**
      * The lock mode that means no locking is used at all.
diff --git a/h2/src/main/org/h2/mvstore/MVStore.java b/h2/src/main/org/h2/mvstore/MVStore.java
@@ -351,7 +351,7 @@ public static void compact(String fileName, boolean compress, FileStore<?> fileS
      *                  This fileStore will be closed here.
      */
     public static void compact(String sourceFileName, String targetFileName, boolean compress,
-                               FileStore<?> fileStore) {
+                                FileStore<?> fileStore) {
         try {
             FileUtils.delete(targetFileName);
             Builder targetBuilder = new Builder();
@@ -408,7 +408,8 @@ private static void compact(MVStore source, MVStore target) {
                 }
             }
 
-            int poolSize = Integer.getInteger("h2.compactThreads", Math.max(1, Runtime.getRuntime().availableProcessors() / 4));
+            int poolSize = Integer.getInteger("h2.compactThreads",
+                    Math.max(1, Runtime.getRuntime().availableProcessors() / 4));
             ExecutorService pool = Executors.newFixedThreadPool(poolSize);
             CompletableFuture.allOf(
                 // We are going to cheat a little bit in the copyFrom() by employing "incomplete" pages,
@@ -417,7 +418,7 @@ private static void compact(MVStore source, MVStore target) {
                 // That's why it is important to preserve all chunks
                 // created in the process, especially if retention time
                 // is set to a lower value, or even 0.
-        		source.getMapNames().stream().map(mapName ->
+                source.getMapNames().stream().map(mapName ->
                     CompletableFuture.runAsync(() -> {
                         MVMap.Builder<Object, Object> mp = MVStoreTool.getGenericMapBuilder();
                         // This is a hack to preserve chunks occupancy rate accounting.
@@ -432,7 +433,8 @@ private static void compact(MVStore source, MVStore target) {
                         MVMap<Object, Object> sourceMap = source.openMap(mapName, mp);
                         MVMap<Object, Object> targetMap = target.openMap(mapName, mp);
                         targetMap.copyFrom(sourceMap);
-                        targetMeta.put(MVMap.getMapKey(targetMap.getId()), sourceMeta.get(MVMap.getMapKey(sourceMap.getId())));
+                        targetMeta.put(MVMap.getMapKey(targetMap.getId()),
+                                        sourceMeta.get(MVMap.getMapKey(sourceMap.getId())));
                     }, pool)
                 ).toArray(CompletableFuture[]::new)
             ).join();
diff --git 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
 
+(162, '2.4.240', '2025-09-22'),
 (161, '2.3.232', '2024-08-11'),
 (160, '2.3.230', '2024-07-15'),
 (159, '2.2.224', '2023-09-17'),
@@ -21,8 +22,7 @@ INSERT INTO VERSION VALUES
 (150, '1.4.200', '2019-10-14'),
 (149, '1.4.199', '2019-03-13'),
 (148, '1.4.198', '2019-02-22'),
-(147, '1.4.197', '2018-03-18'),
-(146, '1.4.196', '2017-06-10');
+(147, '1.4.197', '2018-03-18');
 
 CREATE TABLE CHANNEL(TITLE VARCHAR, LINK VARCHAR, DESC VARCHAR,
     LANGUAGE VARCHAR, PUB TIMESTAMP, LAST TIMESTAMP, AUTHOR VARCHAR);
diff --git a/h2/src/tools/org/h2/build/doc/dictionary.txt b/h2/src/tools/org/h2/build/doc/dictionary.txt
@@ -397,7 +397,7 @@ 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
+merchantability merchantable merely merge merged merges merging meridian message
 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
