Merge pull request #3865 from katzyn/loom

Add possibility to enable virtual worker threads in TCP, Web, and PG servers on Java 21+
h2database · Aug 8, 2023 · fcc5461 · fcc5461
2 parents 752b246 + fd022b0
commit fcc5461
Show file tree

Hide file tree

Showing 15 changed files with 154 additions and 7 deletions.
diff --git a/h2/pom.xml b/h2/pom.xml
@@ -232,6 +232,10 @@
         <directory>src/java10/precompiled</directory>
         <targetPath>META-INF/versions/10</targetPath>
       </resource>
+      <resource>
+        <directory>src/java21/precompiled</directory>
+        <targetPath>META-INF/versions/21</targetPath>
+      </resource>
     </resources>
     <testResources>
   <testResource>

diff --git a/h2/src/docsrc/html/changelog.html b/h2/src/docsrc/html/changelog.html
@@ -21,6 +21,10 @@ <h1>Change Log</h1>
 
 <h2>Next Version (unreleased)</h2>
 <ul>
+<li>RP #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>
 <li>Issue #2665: Parser shouldn't suggest compatibility syntax elements on parsing error
 </li>
 <li>Issue #3089: GREATEST and LEAST aren't fully compliant with the SQL Standard

diff --git a/h2/src/java21/precompiled/org/h2/util/Utils21.class b/h2/src/java21/precompiled/org/h2/util/Utils21.class
diff --git a/h2/src/java21/src/org/h2/util/Utils21.java b/h2/src/java21/src/org/h2/util/Utils21.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * and the EPL 1.0 (https://h2database.com/html/license.html).
+ * Initial Developer: H2 Group
+ */
+package org.h2.util;
+
+import java.lang.Thread.Builder.OfVirtual;
+
+/**
+ * Utilities with specialized implementations for Java 21 and later versions.
+ *
+ * This class contains basic implementations for older versions of Java and it
+ * is overridden in multi-release JARs.
+ */
+public final class Utils21 {
+
+    private static final OfVirtual VIRTUAL_THREAD_BUILDER = Thread.ofVirtual();
+
+    /**
+     * Creates a new virtual thread (on Java 21+) for the specified task. Use
+     * {@link Thread#start()} to schedule the thread to execute. On older
+     * versions of Java a platform daemon thread is created instead.
+     *
+     * @param task
+     *            the object to run
+     * @return a new thread
+     */
+    public static Thread newVirtualThread(Runnable task) {
+        return VIRTUAL_THREAD_BUILDER.unstarted(task);
+    }
+
+    private Utils21() {
+    }
+
+}
diff --git a/h2/src/java21/src/org/h2/util/package.html b/h2/src/java21/src/org/h2/util/package.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!--
+Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
+and the EPL 1.0 (https://h2database.com/html/license.html).
+Initial Developer: H2 Group
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+<head><meta http-equiv="Content-Type" content="text/html;charset=utf-8" /><title>
+Javadoc package documentation
+</title></head><body style="font: 9pt/130% Tahoma, Arial, Helvetica, sans-serif; font-weight: normal;"><p>
+
+Internal utility classes reimplemented for Java 21 and later versions.
+
+</p></body></html>
diff --git a/h2/src/main/org/h2/server/TcpServer.java b/h2/src/main/org/h2/server/TcpServer.java
@@ -26,7 +26,9 @@
 import org.h2.util.NetUtils;
 import org.h2.util.StringUtils;
 import org.h2.util.Tool;
+import org.h2.util.Utils;
 import org.h2.util.Utils10;
+import org.h2.util.Utils21;
 
 /**
  * The TCP server implements the native H2 database server protocol.
@@ -62,6 +64,7 @@ public class TcpServer implements Service {
     private boolean allowOthers;
     private boolean isDaemon;
     private boolean ifExists = true;
+    private boolean virtualThreads;
     private JdbcConnection managementDb;
     private PreparedStatement managementDbAdd;
     private PreparedStatement managementDbRemove;
@@ -182,6 +185,8 @@ public void init(String... args) {
                 allowOthers = true;
             } else if (Tool.isOption(a, "-tcpDaemon")) {
                 isDaemon = true;
+            } else if (Tool.isOption(a,  "-tcpVirtualThreads")) {
+                virtualThreads = Utils.parseBoolean(args[++i], virtualThreads, true);
             } else if (Tool.isOption(a, "-ifExists")) {
                 ifExists = true;
             } else if (Tool.isOption(a, "-ifNotExists")) {
@@ -256,8 +261,14 @@ public void listen() {
                 int id = nextThreadId++;
                 TcpServerThread c = new TcpServerThread(s, this, id);
                 running.add(c);
-                Thread thread = new Thread(c, threadName + " thread-" + id);
-                thread.setDaemon(isDaemon);
+                Thread thread;
+                if (virtualThreads) {
+                    thread = Utils21.newVirtualThread(c);
+                } else {
+                    thread = new Thread(c);
+                    thread.setDaemon(isDaemon);
+                }
+                thread.setName(threadName + " thread-" + id);
                 c.setThread(thread);
                 thread.start();
             }

diff --git a/h2/src/main/org/h2/server/pg/PgServer.java b/h2/src/main/org/h2/server/pg/PgServer.java
@@ -19,7 +19,9 @@
 import org.h2.server.Service;
 import org.h2.util.NetUtils;
 import org.h2.util.Tool;
+import org.h2.util.Utils;
 import org.h2.util.Utils10;
+import org.h2.util.Utils21;
 import org.h2.value.TypeInfo;
 import org.h2.value.Value;
 
@@ -79,6 +81,7 @@ public class PgServer implements Service {
     private boolean allowOthers;
     private boolean isDaemon;
     private boolean ifExists = true;
+    private boolean virtualThreads;
     private String key, keyDatabase;
 
     @Override
@@ -97,6 +100,8 @@ public void init(String... args) {
                 allowOthers = true;
             } else if (Tool.isOption(a, "-pgDaemon")) {
                 isDaemon = true;
+            } else if (Tool.isOption(a,  "-pgVirtualThreads")) {
+                virtualThreads = Utils.parseBoolean(args[++i], virtualThreads, true);
             } else if (Tool.isOption(a, "-ifExists")) {
                 ifExists = true;
             } else if (Tool.isOption(a, "-ifNotExists")) {
@@ -197,8 +202,14 @@ public void listen() {
                     running.add(c);
                     int id = pid.incrementAndGet();
                     c.setProcessId(id);
-                    Thread thread = new Thread(c, threadName + " thread-" + id);
-                    thread.setDaemon(isDaemon);
+                    Thread thread;
+                    if (virtualThreads) {
+                        thread = Utils21.newVirtualThread(c);
+                    } else {
+                        thread = new Thread(c);
+                        thread.setDaemon(isDaemon);
+                    }
+                    thread.setName(threadName + " thread-" + id);
                     c.setThread(thread);
                     thread.start();
                 }

diff --git a/h2/src/main/org/h2/server/web/WebServer.java b/h2/src/main/org/h2/server/web/WebServer.java
@@ -177,6 +177,7 @@ public class WebServer implements Service {
     private ShutdownHandler shutdownHandler;
     private Thread listenerThread;
     private boolean ifExists = true;
+    boolean virtualThreads;
     private String key;
     private boolean allowSecureCreation;
     private boolean trace;
@@ -336,6 +337,8 @@ public void init(String... args) {
                 setExternalNames(args[++i]);
             } else if (Tool.isOption(a, "-webDaemon")) {
                 isDaemon = true;
+            } else if (Tool.isOption(a,  "-webVirtualThreads")) {
+                virtualThreads = Utils.parseBoolean(args[++i], virtualThreads, true);
             } else if (Tool.isOption(a, "-baseDir")) {
                 String baseDir = args[++i];
                 SysProperties.setBaseDir(baseDir);

diff --git a/h2/src/main/org/h2/server/web/WebThread.java b/h2/src/main/org/h2/server/web/WebThread.java
@@ -25,6 +25,7 @@
 import org.h2.util.NetworkConnectionInfo;
 import org.h2.util.StringUtils;
 import org.h2.util.Utils;
+import org.h2.util.Utils21;
 
 /**
  * For each connection to a session, an object of this class is created.
@@ -47,7 +48,8 @@ class WebThread extends WebApp implements Runnable {
     WebThread(Socket socket, WebServer server) {
         super(server);
         this.socket = socket;
-        thread = new Thread(this, "H2 Console thread");
+        thread = server.virtualThreads ? Utils21.newVirtualThread(this) : new Thread(this);
+        thread.setName("H2 Console thread");
     }
 
     /**

diff --git a/h2/src/main/org/h2/tools/Console.java b/h2/src/main/org/h2/tools/Console.java
@@ -117,6 +117,8 @@ public void runTool(String... args) throws SQLException {
                     i++;
                 } else if ("-webDaemon".equals(arg)) {
                     // no parameters
+                } else if ("-webVirtualThreads".equals(arg)) {
+                    i++;
                 } else if ("-webSSL".equals(arg)) {
                     // no parameters
                 } else if ("-webPort".equals(arg)) {
@@ -140,6 +142,8 @@ public void runTool(String... args) throws SQLException {
                     // no parameters
                 } else if ("-tcpDaemon".equals(arg)) {
                     // no parameters
+                } else if ("-tcpVirtualThreads".equals(arg)) {
+                    i++;
                 } else if ("-tcpSSL".equals(arg)) {
                     // no parameters
                 } else if ("-tcpPort".equals(arg)) {
@@ -163,6 +167,8 @@ public void runTool(String... args) throws SQLException {
                     // no parameters
                 } else if ("-pgDaemon".equals(arg)) {
                     // no parameters
+                } else if ("-pgVirtualThreads".equals(arg)) {
+                    i++;
                 } else if ("-pgPort".equals(arg)) {
                     i++;
                 } else {

diff --git a/h2/src/main/org/h2/tools/Server.java b/h2/src/main/org/h2/tools/Server.java
@@ -71,6 +71,8 @@ public Server(Service service, String... args) throws SQLException {
      * used together with -webAllowOthers</td></tr>
      * <tr><td>[-webDaemon]</td>
      * <td>Use a daemon thread</td></tr>
+     * <tr><td>[-webVirtualThreads &lt;true|false&gt;]</td>
+     * <td>Use virtual threads (on Java 21+ only)</td></tr>
      * <tr><td>[-webPort &lt;port&gt;]</td>
      * <td>The port (default: 8082)</td></tr>
      * <tr><td>[-webSSL]</td>
@@ -89,6 +91,8 @@ public Server(Service service, String... args) throws SQLException {
      * <td>Allow other computers to connect - see below</td></tr>
      * <tr><td>[-tcpDaemon]</td>
      * <td>Use a daemon thread</td></tr>
+     * <tr><td>[-tcpVirtualThreads &lt;true|false&gt;]</td>
+     * <td>Use virtual threads (on Java 21+ only)</td></tr>
      * <tr><td>[-tcpPort &lt;port&gt;]</td>
      * <td>The port (default: 9092)</td></tr>
      * <tr><td>[-tcpSSL]</td>
@@ -105,6 +109,8 @@ public Server(Service service, String... args) throws SQLException {
      * <td>Allow other computers to connect - see below</td></tr>
      * <tr><td>[-pgDaemon]</td>
      * <td>Use a daemon thread</td></tr>
+     * <tr><td>[-pgVirtualThreads &lt;true|false&gt;]</td>
+     * <td>Use virtual threads (on Java 21+ only)</td></tr>
      * <tr><td>[-pgPort &lt;port&gt;]</td>
      * <td>The port (default: 5435)</td></tr>
      * <tr><td>[-properties "&lt;dir&gt;"]</td>
@@ -148,6 +154,8 @@ private void verifyArgs(String... args) throws SQLException {
                     i++;
                 }  else if ("-webDaemon".equals(arg)) {
                     // no parameters
+                } else if ("-webVirtualThreads".equals(arg)) {
+                    i++;
                 } else if ("-webSSL".equals(arg)) {
                     // no parameters
                 } else if ("-webPort".equals(arg)) {
@@ -169,6 +177,8 @@ private void verifyArgs(String... args) throws SQLException {
                     // no parameters
                 } else if ("-tcpDaemon".equals(arg)) {
                     // no parameters
+                } else if ("-tcpVirtualThreads".equals(arg)) {
+                    i++;
                 } else if ("-tcpSSL".equals(arg)) {
                     // no parameters
                 } else if ("-tcpPort".equals(arg)) {
@@ -189,6 +199,8 @@ private void verifyArgs(String... args) throws SQLException {
                     // no parameters
                 } else if ("-pgDaemon".equals(arg)) {
                     // no parameters
+                } else if ("-pgVirtualThreads".equals(arg)) {
+                    i++;
                 } else if ("-pgPort".equals(arg)) {
                     i++;
                 } else {

diff --git a/h2/src/main/org/h2/util/Utils21.java b/h2/src/main/org/h2/util/Utils21.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * and the EPL 1.0 (https://h2database.com/html/license.html).
+ * Initial Developer: H2 Group
+ */
+package org.h2.util;
+
+/**
+ * Utilities with specialized implementations for Java 21 and later versions.
+ *
+ * This class contains basic implementations for older versions of Java and it
+ * is overridden in multi-release JARs.
+ */
+public final class Utils21 {
+
+    /*
+     * Signatures of methods should match with
+     * h2/src/java21/src/org/h2/util/Utils21.java and precompiled
+     * h2/src/java21/precompiled/org/h2/util/Utils21.class.
+     */
+
+    /**
+     * Creates a new virtual thread (on Java 21+) for the specified task. Use
+     * {@link Thread#start()} to schedule the thread to execute. On older
+     * versions of Java a platform daemon thread is created instead.
+     *
+     * @param task
+     *            the object to run
+     * @return a new thread
+     */
+    public static Thread newVirtualThread(Runnable task) {
+        Thread thread = new Thread(task);
+        thread.setDaemon(true);
+        return thread;
+    }
+
+    private Utils21() {
+    }
+
+}
diff --git a/h2/src/main/org/h2/value/Value.java b/h2/src/main/org/h2/value/Value.java
@@ -2711,7 +2711,7 @@ public boolean containsNull() {
      * Scans this and specified values until a first NULL occurrence and returns
      * a value where NULL appears earlier, or {@code null} if these two values
      * have first NULL on the same position.
-     * 
+     *
      * @param v
      *            a value of the same data type as this value, must be neither
      *            equal to nor smaller than nor greater than this value

diff --git a/h2/src/tools/org/h2/build/Build.java b/h2/src/tools/org/h2/build/Build.java
@@ -557,6 +557,7 @@ private FileList excludeTestMetaInfFiles(FileList files) {
     private void addVersions() {
         copy("temp/META-INF/versions/9", files("src/java9/precompiled"), "src/java9/precompiled");
         copy("temp/META-INF/versions/10", files("src/java10/precompiled"), "src/java10/precompiled");
+        copy("temp/META-INF/versions/21", files("src/java21/precompiled"), "src/java21/precompiled");
     }
 
     /**
@@ -922,6 +923,9 @@ private void test(boolean ci) {
             cp = "src/java9/precompiled" + File.pathSeparator + cp;
             if (version >= 10) {
                 cp = "src/java10/precompiled" + File.pathSeparator + cp;
+                if (version >= 21) {
+                    cp = "src/java21/precompiled" + File.pathSeparator + cp;
+                }
             }
         }
         int ret;

diff --git a/h2/src/tools/org/h2/build/doc/dictionary.txt b/h2/src/tools/org/h2/build/doc/dictionary.txt
@@ -855,4 +855,4 @@ duplicating unnested hardening sticky massacred
 bck clo cur hwm materializedview udca vol connectionpooldatasource xadatasource
 ampm sssssff sstzh tzs yyyysssss newsequentialid solidus openjdk furthermore ssff secons nashorn fractions
 btrim underscores ffl decomposed decomposition subfield infinities retryable salted establish
-hatchet fis loom birthdate penrosed eve graalvm roberto polyglot truffle scriptengine
+hatchet fis loom birthdate penrosed eve graalvm roberto polyglot truffle scriptengine unstarted