-
-The native full text search implementation, and the wrapper for the Lucene full text search implementation.
-
-
\ No newline at end of file
diff --git a/h2/src/main/org/h2/index/package-info.java b/h2/src/main/org/h2/index/package-info.java
new file mode 100644
index 0000000000..81e8b48679
--- /dev/null
+++ b/h2/src/main/org/h2/index/package-info.java
@@ -0,0 +1,11 @@
+/*
+ * 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
+ */
+
+/**
+ * Various table index implementations, as well as cursors to navigate in an
+ * index.
+ */
+package org.h2.index;
diff --git a/h2/src/main/org/h2/index/package.html b/h2/src/main/org/h2/index/package.html
deleted file mode 100644
index 646fa63e0d..0000000000
--- a/h2/src/main/org/h2/index/package.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-Various table index implementations, as well as cursors to navigate in an index.
-
-
\ No newline at end of file
diff --git a/h2/src/main/org/h2/jdbc/JdbcConnection.java b/h2/src/main/org/h2/jdbc/JdbcConnection.java
index 9c8fda40bf..c4c6d20214 100644
--- a/h2/src/main/org/h2/jdbc/JdbcConnection.java
+++ b/h2/src/main/org/h2/jdbc/JdbcConnection.java
@@ -69,8 +69,7 @@
* should be used.
*
*/
-public class JdbcConnection extends TraceObject implements Connection, JdbcConnectionBackwardsCompat,
- CastDataProvider {
+public class JdbcConnection extends TraceObject implements Connection, CastDataProvider {
private static final String NUM_SERVERS = "numServers";
private static final String PREFIX_SERVER = "server";
diff --git a/h2/src/main/org/h2/jdbc/JdbcDatabaseMetaData.java b/h2/src/main/org/h2/jdbc/JdbcDatabaseMetaData.java
index 445d1c5bb7..45bf40b558 100644
--- a/h2/src/main/org/h2/jdbc/JdbcDatabaseMetaData.java
+++ b/h2/src/main/org/h2/jdbc/JdbcDatabaseMetaData.java
@@ -30,8 +30,7 @@
/**
* Represents the meta data for a database.
*/
-public final class JdbcDatabaseMetaData extends TraceObject
- implements DatabaseMetaData, JdbcDatabaseMetaDataBackwardsCompat {
+public final class JdbcDatabaseMetaData extends TraceObject implements DatabaseMetaData {
private final JdbcConnection conn;
@@ -2498,7 +2497,7 @@ public int getJDBCMajorVersion() {
@Override
public int getJDBCMinorVersion() {
debugCodeCall("getJDBCMinorVersion");
- return 2;
+ return 3;
}
/**
diff --git a/h2/src/main/org/h2/jdbc/JdbcDatabaseMetaDataBackwardsCompat.java b/h2/src/main/org/h2/jdbc/JdbcDatabaseMetaDataBackwardsCompat.java
deleted file mode 100644
index e9eb727b0d..0000000000
--- a/h2/src/main/org/h2/jdbc/JdbcDatabaseMetaDataBackwardsCompat.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * 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.jdbc;
-
-/**
- * Allows us to compile on older platforms, while still implementing the methods
- * from the newer JDBC API.
- */
-public interface JdbcDatabaseMetaDataBackwardsCompat {
-
- // compatibility interface
-
-}
diff --git a/h2/src/main/org/h2/jdbc/JdbcStatement.java b/h2/src/main/org/h2/jdbc/JdbcStatement.java
index b0043fa2d5..1eaeebde4f 100644
--- a/h2/src/main/org/h2/jdbc/JdbcStatement.java
+++ b/h2/src/main/org/h2/jdbc/JdbcStatement.java
@@ -45,7 +45,7 @@
* }
*
*/
-public class JdbcStatement extends TraceObject implements Statement, JdbcStatementBackwardsCompat {
+public class JdbcStatement extends TraceObject implements Statement {
protected JdbcConnection conn;
protected Session session;
diff --git a/h2/src/main/org/h2/jdbc/JdbcStatementBackwardsCompat.java b/h2/src/main/org/h2/jdbc/JdbcStatementBackwardsCompat.java
deleted file mode 100644
index ed17310512..0000000000
--- a/h2/src/main/org/h2/jdbc/JdbcStatementBackwardsCompat.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * 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.jdbc;
-
-import java.sql.SQLException;
-
-/**
- * Allows us to compile on older platforms, while still implementing the methods
- * from the newer JDBC API.
- */
-public interface JdbcStatementBackwardsCompat {
-
- // compatibility interface
-
- // JDBC 4.3 (incomplete)
-
- /**
- * Enquotes the specified identifier.
- *
- * @param identifier
- * identifier to quote if required
- * @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;
-
- /**
- * Checks if specified identifier may be used without quotes.
- *
- * @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/package-info.java b/h2/src/main/org/h2/jdbc/meta/package-info.java
new file mode 100644
index 0000000000..ba62359991
--- /dev/null
+++ b/h2/src/main/org/h2/jdbc/meta/package-info.java
@@ -0,0 +1,10 @@
+/*
+ * 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
+ */
+
+/**
+ * Implementation of the JDBC database metadata API (package {@code java.sql}).
+ */
+package org.h2.jdbc.meta;
diff --git a/h2/src/main/org/h2/jdbc/meta/package.html b/h2/src/main/org/h2/jdbc/meta/package.html
deleted file mode 100644
index 972875d6f2..0000000000
--- a/h2/src/main/org/h2/jdbc/meta/package.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-Utility classes for compatibility with other database, for example MySQL.
-
-
\ No newline at end of file
diff --git a/h2/src/main/org/h2/mvstore/cache/package-info.java b/h2/src/main/org/h2/mvstore/cache/package-info.java
new file mode 100644
index 0000000000..7b17a7377b
--- /dev/null
+++ b/h2/src/main/org/h2/mvstore/cache/package-info.java
@@ -0,0 +1,10 @@
+/*
+ * 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
+ */
+
+/**
+ * Classes related to caching.
+ */
+package org.h2.mvstore.cache;
diff --git a/h2/src/main/org/h2/mvstore/cache/package.html b/h2/src/main/org/h2/mvstore/cache/package.html
deleted file mode 100644
index a7e436a0a4..0000000000
--- a/h2/src/main/org/h2/mvstore/cache/package.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-Schema implementation and objects that are stored in a schema (for example, sequences and constants).
-
-
\ No newline at end of file
diff --git a/h2/src/main/org/h2/security/AES.java b/h2/src/main/org/h2/security/AES.java
index e015b60b13..13a78d317a 100644
--- a/h2/src/main/org/h2/security/AES.java
+++ b/h2/src/main/org/h2/security/AES.java
@@ -5,7 +5,7 @@
*/
package org.h2.security;
-import org.h2.util.Bits;
+import static org.h2.util.Bits.INT_VH_BE;
/**
* An implementation of the AES block cipher algorithm,
@@ -137,10 +137,10 @@ public void decrypt(byte[] bytes, int off, int len) {
private void encryptBlock(byte[] in, byte[] out, int off) {
int[] k = encKey;
- int x0 = Bits.readInt(in, off) ^ k[0];
- int x1 = Bits.readInt(in, off + 4) ^ k[1];
- int x2 = Bits.readInt(in, off + 8) ^ k[2];
- int x3 = Bits.readInt(in, off + 12) ^ k[3];
+ int x0 = (int) INT_VH_BE.get(in, off) ^ k[0];
+ int x1 = (int) INT_VH_BE.get(in, off + 4) ^ k[1];
+ int x2 = (int) INT_VH_BE.get(in, off + 8) ^ k[2];
+ int x3 = (int) INT_VH_BE.get(in, off + 12) ^ k[3];
int y0 = FT0[(x0 >> 24) & 255] ^ FT1[(x1 >> 16) & 255]
^ FT2[(x2 >> 8) & 255] ^ FT3[x3 & 255] ^ k[4];
int y1 = FT0[(x1 >> 24) & 255] ^ FT1[(x2 >> 16) & 255]
@@ -221,18 +221,18 @@ private void encryptBlock(byte[] in, byte[] out, int off) {
| (FS[(y0 >> 8) & 255] << 8) | FS[y1 & 255]) ^ k[42];
x3 = ((FS[(y3 >> 24) & 255] << 24) | (FS[(y0 >> 16) & 255] << 16)
| (FS[(y1 >> 8) & 255] << 8) | FS[y2 & 255]) ^ k[43];
- Bits.writeInt(out, off, x0);
- Bits.writeInt(out, off + 4, x1);
- Bits.writeInt(out, off + 8, x2);
- Bits.writeInt(out, off + 12, x3);
+ INT_VH_BE.set(out, off, x0);
+ INT_VH_BE.set(out, off + 4, x1);
+ INT_VH_BE.set(out, off + 8, x2);
+ INT_VH_BE.set(out, off + 12, x3);
}
private void decryptBlock(byte[] in, byte[] out, int off) {
int[] k = decKey;
- int x0 = Bits.readInt(in, off) ^ k[0];
- int x1 = Bits.readInt(in, off + 4) ^ k[1];
- int x2 = Bits.readInt(in, off + 8) ^ k[2];
- int x3 = Bits.readInt(in, off + 12) ^ k[3];
+ int x0 = (int) INT_VH_BE.get(in, off) ^ k[0];
+ int x1 = (int) INT_VH_BE.get(in, off + 4) ^ k[1];
+ int x2 = (int) INT_VH_BE.get(in, off + 8) ^ k[2];
+ int x3 = (int) INT_VH_BE.get(in, off + 12) ^ k[3];
int y0 = RT0[(x0 >> 24) & 255] ^ RT1[(x3 >> 16) & 255]
^ RT2[(x2 >> 8) & 255] ^ RT3[x1 & 255] ^ k[4];
int y1 = RT0[(x1 >> 24) & 255] ^ RT1[(x0 >> 16) & 255]
@@ -313,10 +313,10 @@ private void decryptBlock(byte[] in, byte[] out, int off) {
| (RS[(y0 >> 8) & 255] << 8) | RS[y3 & 255]) ^ k[42];
x3 = ((RS[(y3 >> 24) & 255] << 24) | (RS[(y2 >> 16) & 255] << 16)
| (RS[(y1 >> 8) & 255] << 8) | RS[y0 & 255]) ^ k[43];
- Bits.writeInt(out, off, x0);
- Bits.writeInt(out, off + 4, x1);
- Bits.writeInt(out, off + 8, x2);
- Bits.writeInt(out, off + 12, x3);
+ INT_VH_BE.set(out, off, x0);
+ INT_VH_BE.set(out, off + 4, x1);
+ INT_VH_BE.set(out, off + 8, x2);
+ INT_VH_BE.set(out, off + 12, x3);
}
@Override
diff --git a/h2/src/main/org/h2/security/CipherFactory.java b/h2/src/main/org/h2/security/CipherFactory.java
index a025f4f27c..15175747ce 100644
--- a/h2/src/main/org/h2/security/CipherFactory.java
+++ b/h2/src/main/org/h2/security/CipherFactory.java
@@ -17,16 +17,11 @@
import java.security.KeyFactory;
import java.security.KeyStore;
import java.security.PrivateKey;
-import java.security.Security;
import java.security.cert.Certificate;
import java.security.cert.CertificateFactory;
import java.security.spec.PKCS8EncodedKeySpec;
import java.util.Arrays;
-import java.util.Collections;
import java.util.HashSet;
-import java.util.LinkedHashSet;
-import java.util.LinkedList;
-import java.util.List;
import java.util.Properties;
import javax.net.ServerSocketFactory;
@@ -54,20 +49,6 @@ public class CipherFactory {
public static final String KEYSTORE_PASSWORD =
"h2pass";
- /**
- * The security property which can prevent anonymous TLS connections.
- * Introduced into Java 6, 7, 8 in updates from July 2015.
- */
- public static final String LEGACY_ALGORITHMS_SECURITY_KEY =
- "jdk.tls.legacyAlgorithms";
-
- /**
- * The value of {@value #LEGACY_ALGORITHMS_SECURITY_KEY} security
- * property at the time of class initialization.
- * Null if it is not set.
- */
- public static final String DEFAULT_LEGACY_ALGORITHMS = getLegacyAlgorithmsSilently();
-
private static final String KEYSTORE =
"~/.h2.keystore";
private static final String KEYSTORE_KEY =
@@ -115,23 +96,12 @@ public static Socket createSocket(InetAddress address, int port)
SysProperties.SOCKET_CONNECT_TIMEOUT);
secureSocket.setEnabledProtocols(
disableSSL(secureSocket.getEnabledProtocols()));
- if (SysProperties.ENABLE_ANONYMOUS_TLS) {
- String[] list = enableAnonymous(
- secureSocket.getEnabledCipherSuites(),
- secureSocket.getSupportedCipherSuites());
- secureSocket.setEnabledCipherSuites(list);
- }
return secureSocket;
}
-/**
+ /**
* Create a secure server socket. If a bind address is specified, the
* socket is only bound to this address.
- * If h2.enableAnonymousTLS is true, an attempt is made to modify
- * the security property jdk.tls.legacyAlgorithms (in newer JVMs) to allow
- * anonymous TLS. This system change is effectively permanent for the
- * lifetime of the JVM.
- * @see #removeAnonFromLegacyAlgorithms()
*
* @param port the port to listen on
* @param bindAddress the address to bind to, or null to bind to all
@@ -141,9 +111,6 @@ public static Socket createSocket(InetAddress address, int port)
*/
public static ServerSocket createServerSocket(int port,
InetAddress bindAddress) throws IOException {
- if (SysProperties.ENABLE_ANONYMOUS_TLS) {
- removeAnonFromLegacyAlgorithms();
- }
setKeystore();
ServerSocketFactory f = SSLServerSocketFactory.getDefault();
SSLServerSocket secureSocket;
@@ -154,104 +121,9 @@ public static ServerSocket createServerSocket(int port,
}
secureSocket.setEnabledProtocols(
disableSSL(secureSocket.getEnabledProtocols()));
- if (SysProperties.ENABLE_ANONYMOUS_TLS) {
- String[] list = enableAnonymous(
- secureSocket.getEnabledCipherSuites(),
- secureSocket.getSupportedCipherSuites());
- secureSocket.setEnabledCipherSuites(list);
- }
return secureSocket;
}
- /**
- * Removes DH_anon and ECDH_anon from a comma separated list of ciphers.
- * Only the first occurrence is removed.
- * If there is nothing to remove, returns the reference to the argument.
- * @param list a list of names separated by commas (and spaces)
- * @return a new string without DH_anon and ECDH_anon items,
- * or the original if none were found
- */
- public static String removeDhAnonFromCommaSeparatedList(String list) {
- if (list == null) {
- return list;
- }
- List algorithms = new LinkedList<>(Arrays.asList(list.split("\\s*,\\s*")));
- boolean dhAnonRemoved = algorithms.remove("DH_anon");
- boolean ecdhAnonRemoved = algorithms.remove("ECDH_anon");
- if (dhAnonRemoved || ecdhAnonRemoved) {
- String string = Arrays.toString(algorithms.toArray(new String[algorithms.size()]));
- return (!algorithms.isEmpty()) ? string.substring(1, string.length() - 1): "";
- }
- return list;
- }
-
- /**
- * Attempts to weaken the security properties to allow anonymous TLS.
- * New JREs would not choose an anonymous cipher suite in a TLS handshake
- * if server-side security property
- * {@value #LEGACY_ALGORITHMS_SECURITY_KEY}
- * were not modified from the default value.
- *
- * NOTE: In current (as of 2016) default implementations of JSSE which use
- * this security property, the value is permanently cached inside the
- * ServerHandshake class upon its first use.
- * Therefore the modification accomplished by this method has to be done
- * before the first use of a server SSL socket.
- * Later changes to this property will not have any effect on server socket
- * behavior.
- */
- public static synchronized void removeAnonFromLegacyAlgorithms() {
- String legacyOriginal = getLegacyAlgorithmsSilently();
- if (legacyOriginal == null) {
- return;
- }
- String legacyNew = removeDhAnonFromCommaSeparatedList(legacyOriginal);
- if (!legacyOriginal.equals(legacyNew)) {
- setLegacyAlgorithmsSilently(legacyNew);
- }
- }
-
- /**
- * Attempts to resets the security property to the default value.
- * The default value of {@value #LEGACY_ALGORITHMS_SECURITY_KEY} was
- * obtained at time of class initialization.
- *
- * NOTE: Resetting the property might not have any effect on server
- * socket behavior.
- * @see #removeAnonFromLegacyAlgorithms()
- */
- public static synchronized void resetDefaultLegacyAlgorithms() {
- setLegacyAlgorithmsSilently(DEFAULT_LEGACY_ALGORITHMS);
- }
-
- /**
- * Returns the security property {@value #LEGACY_ALGORITHMS_SECURITY_KEY}.
- * Ignores security exceptions.
- *
- * @return the value of the security property, or null if not set
- * or not accessible
- */
- public static String getLegacyAlgorithmsSilently() {
- String defaultLegacyAlgorithms = null;
- try {
- defaultLegacyAlgorithms = Security.getProperty(LEGACY_ALGORITHMS_SECURITY_KEY);
- } catch (SecurityException e) {
- // ignore
- }
- return defaultLegacyAlgorithms;
- }
-
- private static void setLegacyAlgorithmsSilently(String legacyAlgorithms) {
- if (legacyAlgorithms == null) {
- return;
- }
- try {
- Security.setProperty(LEGACY_ALGORITHMS_SECURITY_KEY, legacyAlgorithms);
- } catch (SecurityException e) {
- // ignore
- }
- }
-
private static byte[] getKeyStoreBytes(KeyStore store, String password)
throws IOException {
ByteArrayOutputStream bout = new ByteArrayOutputStream();
@@ -385,18 +257,6 @@ private static void setKeystore() throws IOException {
}
}
- private static String[] enableAnonymous(String[] enabled, String[] supported) {
- LinkedHashSet set = new LinkedHashSet<>();
- for (String x : supported) {
- if (!x.startsWith("SSL") && x.contains("_anon_") &&
- (x.contains("_AES_") || x.contains("_3DES_")) && x.contains("_SHA")) {
- set.add(x);
- }
- }
- Collections.addAll(set, enabled);
- return set.toArray(new String[0]);
- }
-
private static String[] disableSSL(String[] enabled) {
HashSet set = new HashSet<>();
for (String x : enabled) {
diff --git a/h2/src/main/org/h2/security/Fog.java b/h2/src/main/org/h2/security/Fog.java
index 3aea0cbc97..8ef7bf9a4b 100644
--- a/h2/src/main/org/h2/security/Fog.java
+++ b/h2/src/main/org/h2/security/Fog.java
@@ -5,7 +5,8 @@
*/
package org.h2.security;
-import org.h2.util.Bits;
+import static org.h2.util.Bits.INT_VH_BE;
+import static org.h2.util.Bits.LONG_VH_BE;
/**
* A pseudo-encryption algorithm that makes the data appear to be
@@ -31,35 +32,35 @@ public void decrypt(byte[] bytes, int off, int len) {
}
private void encryptBlock(byte[] in, byte[] out, int off) {
- int x0 = Bits.readInt(in, off);
- int x1 = Bits.readInt(in, off + 4);
- int x2 = Bits.readInt(in, off + 8);
- int x3 = Bits.readInt(in, off + 12);
+ int x0 = (int) INT_VH_BE.get(in, off);
+ int x1 = (int) INT_VH_BE.get(in, off + 4);
+ int x2 = (int) INT_VH_BE.get(in, off + 8);
+ int x3 = (int) INT_VH_BE.get(in, off + 12);
int k = key;
x0 = Integer.rotateLeft(x0 ^ k, x1);
x2 = Integer.rotateLeft(x2 ^ k, x1);
x1 = Integer.rotateLeft(x1 ^ k, x0);
x3 = Integer.rotateLeft(x3 ^ k, x0);
- Bits.writeInt(out, off, x0);
- Bits.writeInt(out, off + 4, x1);
- Bits.writeInt(out, off + 8, x2);
- Bits.writeInt(out, off + 12, x3);
+ INT_VH_BE.set(out, off, x0);
+ INT_VH_BE.set(out, off + 4, x1);
+ INT_VH_BE.set(out, off + 8, x2);
+ INT_VH_BE.set(out, off + 12, x3);
}
private void decryptBlock(byte[] in, byte[] out, int off) {
- int x0 = Bits.readInt(in, off);
- int x1 = Bits.readInt(in, off + 4);
- int x2 = Bits.readInt(in, off + 8);
- int x3 = Bits.readInt(in, off + 12);
+ int x0 = (int) INT_VH_BE.get(in, off);
+ int x1 = (int) INT_VH_BE.get(in, off + 4);
+ int x2 = (int) INT_VH_BE.get(in, off + 8);
+ int x3 = (int) INT_VH_BE.get(in, off + 12);
int k = key;
x1 = Integer.rotateRight(x1, x0) ^ k;
x3 = Integer.rotateRight(x3, x0) ^ k;
x0 = Integer.rotateRight(x0, x1) ^ k;
x2 = Integer.rotateRight(x2, x1) ^ k;
- Bits.writeInt(out, off, x0);
- Bits.writeInt(out, off + 4, x1);
- Bits.writeInt(out, off + 8, x2);
- Bits.writeInt(out, off + 12, x3);
+ INT_VH_BE.set(out, off, x0);
+ INT_VH_BE.set(out, off + 4, x1);
+ INT_VH_BE.set(out, off + 8, x2);
+ INT_VH_BE.set(out, off + 12, x3);
}
@Override
@@ -69,7 +70,7 @@ public int getKeyLength() {
@Override
public void setKey(byte[] key) {
- this.key = (int) Bits.readLong(key, 0);
+ this.key = (int) (long) LONG_VH_BE.get(key, 0);
}
}
diff --git a/h2/src/main/org/h2/security/SHA256.java b/h2/src/main/org/h2/security/SHA256.java
index 2c34cc6b8c..a0a9923fe8 100644
--- a/h2/src/main/org/h2/security/SHA256.java
+++ b/h2/src/main/org/h2/security/SHA256.java
@@ -5,6 +5,8 @@
*/
package org.h2.security;
+import static org.h2.util.Bits.INT_VH_BE;
+
import java.security.GeneralSecurityException;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
@@ -13,8 +15,6 @@
import javax.crypto.Mac;
import javax.crypto.spec.SecretKeySpec;
-import org.h2.util.Bits;
-
/**
* This class implements the cryptographic hash function SHA-256.
*/
@@ -115,7 +115,7 @@ public static byte[] getPBKDF2(byte[] password, byte[] salt,
for (int i = 0; i < iterations; i++) {
if (i == 0) {
System.arraycopy(salt, 0, message, 0, salt.length);
- Bits.writeInt(message, salt.length, k);
+ INT_VH_BE.set(message, salt.length, k);
len = salt.length + 4;
} else {
System.arraycopy(macRes, 0, message, 0, 32);
diff --git a/h2/src/main/org/h2/security/SHA3.java b/h2/src/main/org/h2/security/SHA3.java
index d48d112656..8a46fcd41c 100644
--- a/h2/src/main/org/h2/security/SHA3.java
+++ b/h2/src/main/org/h2/security/SHA3.java
@@ -5,11 +5,12 @@
*/
package org.h2.security;
+import static org.h2.util.Bits.INT_VH_LE;
+import static org.h2.util.Bits.LONG_VH_LE;
+
import java.security.MessageDigest;
import java.util.Arrays;
-import org.h2.util.Bits;
-
/**
* SHA-3 message digest family.
*/
@@ -96,22 +97,22 @@ protected byte[] engineDigest() {
byte[] r = new byte[digestLength];
switch (digestLength) {
case 64:
- Bits.writeLongLE(r, 56, state07);
- Bits.writeLongLE(r, 48, state06);
+ LONG_VH_LE.set(r, 56, state07);
+ LONG_VH_LE.set(r, 48, state06);
//$FALL-THROUGH$
case 48:
- Bits.writeLongLE(r, 40, state05);
- Bits.writeLongLE(r, 32, state04);
+ LONG_VH_LE.set(r, 40, state05);
+ LONG_VH_LE.set(r, 32, state04);
//$FALL-THROUGH$
case 32:
- Bits.writeLongLE(r, 24, state03);
+ LONG_VH_LE.set(r, 24, state03);
break;
case 28:
- Bits.writeIntLE(r, 24, (int) state03);
+ INT_VH_LE.set(r, 24, (int) state03);
}
- Bits.writeLongLE(r, 16, state02);
- Bits.writeLongLE(r, 8, state01);
- Bits.writeLongLE(r, 0, state00);
+ LONG_VH_LE.set(r, 16, state02);
+ LONG_VH_LE.set(r, 8, state01);
+ LONG_VH_LE.set(r, 0, state00);
engineReset();
return r;
}
@@ -174,29 +175,29 @@ private void absorb(byte[] data, int offset) {
*/
switch (digestLength) {
case 28:
- state17 ^= Bits.readLongLE(data, offset + 136);
+ state17 ^= (long) LONG_VH_LE.get(data, offset + 136);
//$FALL-THROUGH$
case 32:
- state13 ^= Bits.readLongLE(data, offset + 104);
- state14 ^= Bits.readLongLE(data, offset + 112);
- state15 ^= Bits.readLongLE(data, offset + 120);
- state16 ^= Bits.readLongLE(data, offset + 128);
+ state13 ^= (long) LONG_VH_LE.get(data, offset + 104);
+ state14 ^= (long) LONG_VH_LE.get(data, offset + 112);
+ state15 ^= (long) LONG_VH_LE.get(data, offset + 120);
+ state16 ^= (long) LONG_VH_LE.get(data, offset + 128);
//$FALL-THROUGH$
case 48:
- state09 ^= Bits.readLongLE(data, offset + 72);
- state10 ^= Bits.readLongLE(data, offset + 80);
- state11 ^= Bits.readLongLE(data, offset + 88);
- state12 ^= Bits.readLongLE(data, offset + 96);
+ state09 ^= (long) LONG_VH_LE.get(data, offset + 72);
+ state10 ^= (long) LONG_VH_LE.get(data, offset + 80);
+ state11 ^= (long) LONG_VH_LE.get(data, offset + 88);
+ state12 ^= (long) LONG_VH_LE.get(data, offset + 96);
}
- state00 ^= Bits.readLongLE(data, offset);
- state01 ^= Bits.readLongLE(data, offset + 8);
- state02 ^= Bits.readLongLE(data, offset + 16);
- state03 ^= Bits.readLongLE(data, offset + 24);
- state04 ^= Bits.readLongLE(data, offset + 32);
- state05 ^= Bits.readLongLE(data, offset + 40);
- state06 ^= Bits.readLongLE(data, offset + 48);
- state07 ^= Bits.readLongLE(data, offset + 56);
- state08 ^= Bits.readLongLE(data, offset + 64);
+ state00 ^= (long) LONG_VH_LE.get(data, offset);
+ state01 ^= (long) LONG_VH_LE.get(data, offset + 8);
+ state02 ^= (long) LONG_VH_LE.get(data, offset + 16);
+ state03 ^= (long) LONG_VH_LE.get(data, offset + 24);
+ state04 ^= (long) LONG_VH_LE.get(data, offset + 32);
+ state05 ^= (long) LONG_VH_LE.get(data, offset + 40);
+ state06 ^= (long) LONG_VH_LE.get(data, offset + 48);
+ state07 ^= (long) LONG_VH_LE.get(data, offset + 56);
+ state08 ^= (long) LONG_VH_LE.get(data, offset + 64);
for (int i = 0; i < 24; i++) {
long c0 = state00 ^ state05 ^ state10 ^ state15 ^ state20;
long c1 = state01 ^ state06 ^ state11 ^ state16 ^ state21;
diff --git a/h2/src/main/org/h2/security/SecureFileStore.java b/h2/src/main/org/h2/security/SecureFileStore.java
index 94566fec4e..fcda17c6cb 100644
--- a/h2/src/main/org/h2/security/SecureFileStore.java
+++ b/h2/src/main/org/h2/security/SecureFileStore.java
@@ -5,10 +5,11 @@
*/
package org.h2.security;
+import static org.h2.util.Bits.LONG_VH_BE;
+
import org.h2.engine.Constants;
import org.h2.store.DataHandler;
import org.h2.store.FileStore;
-import org.h2.util.Bits;
import org.h2.util.MathUtils;
/**
@@ -99,7 +100,7 @@ private void xorInitVector(byte[] b, int off, int len, long p) {
byte[] iv = bufferForInitVector;
while (len > 0) {
for (int i = 0; i < Constants.FILE_BLOCK_SIZE; i += 8) {
- Bits.writeLong(iv, i, (p + i) >>> 3);
+ LONG_VH_BE.set(iv, i, (p + i) >>> 3);
}
cipherForInitVector.encrypt(iv, 0, Constants.FILE_BLOCK_SIZE);
for (int i = 0; i < Constants.FILE_BLOCK_SIZE; i++) {
diff --git a/h2/src/main/org/h2/security/XTEA.java b/h2/src/main/org/h2/security/XTEA.java
index c18f5986b3..7cdd2654ee 100644
--- a/h2/src/main/org/h2/security/XTEA.java
+++ b/h2/src/main/org/h2/security/XTEA.java
@@ -5,8 +5,9 @@
*/
package org.h2.security;
+import static org.h2.util.Bits.INT_VH_BE;
+
import org.h2.message.DbException;
-import org.h2.util.Bits;
/**
* An implementation of the XTEA block cipher algorithm.
@@ -26,7 +27,7 @@ public class XTEA implements BlockCipher {
public void setKey(byte[] b) {
int[] key = new int[4];
for (int i = 0; i < 16; i += 4) {
- key[i / 4] = Bits.readInt(b, i);
+ key[i / 4] = (int) INT_VH_BE.get(b, i);
}
int[] r = new int[32];
for (int i = 0, sum = 0; i < 32;) {
@@ -65,8 +66,8 @@ public void decrypt(byte[] bytes, int off, int len) {
}
private void encryptBlock(byte[] in, byte[] out, int off) {
- int y = Bits.readInt(in, off);
- int z = Bits.readInt(in, off + 4);
+ int y = (int) INT_VH_BE.get(in, off);
+ int z = (int) INT_VH_BE.get(in, off + 4);
y += (((z << 4) ^ (z >>> 5)) + z) ^ k0;
z += (((y >>> 5) ^ (y << 4)) + y) ^ k1;
y += (((z << 4) ^ (z >>> 5)) + z) ^ k2;
@@ -99,13 +100,13 @@ private void encryptBlock(byte[] in, byte[] out, int off) {
z += (((y >>> 5) ^ (y << 4)) + y) ^ k29;
y += (((z << 4) ^ (z >>> 5)) + z) ^ k30;
z += (((y >>> 5) ^ (y << 4)) + y) ^ k31;
- Bits.writeInt(out, off, y);
- Bits.writeInt(out, off + 4, z);
+ INT_VH_BE.set(out, off, y);
+ INT_VH_BE.set(out, off + 4, z);
}
private void decryptBlock(byte[] in, byte[] out, int off) {
- int y = Bits.readInt(in, off);
- int z = Bits.readInt(in, off + 4);
+ int y = (int) INT_VH_BE.get(in, off);
+ int z = (int) INT_VH_BE.get(in, off + 4);
z -= (((y >>> 5) ^ (y << 4)) + y) ^ k31;
y -= (((z << 4) ^ (z >>> 5)) + z) ^ k30;
z -= (((y >>> 5) ^ (y << 4)) + y) ^ k29;
@@ -138,8 +139,8 @@ private void decryptBlock(byte[] in, byte[] out, int off) {
y -= (((z << 4) ^ (z >>> 5)) + z) ^ k2;
z -= (((y >>> 5) ^ (y << 4)) + y) ^ k1;
y -= (((z << 4) ^ (z >>> 5)) + z) ^ k0;
- Bits.writeInt(out, off, y);
- Bits.writeInt(out, off + 4, z);
+ INT_VH_BE.set(out, off, y);
+ INT_VH_BE.set(out, off + 4, z);
}
@Override
diff --git a/h2/src/main/org/h2/security/auth/impl/package-info.java b/h2/src/main/org/h2/security/auth/impl/package-info.java
new file mode 100644
index 0000000000..6b424ca2ae
--- /dev/null
+++ b/h2/src/main/org/h2/security/auth/impl/package-info.java
@@ -0,0 +1,10 @@
+/*
+ * 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
+ */
+
+/**
+ * Authentication classes.
+ */
+package org.h2.security.auth.impl;
diff --git a/h2/src/main/org/h2/security/auth/impl/package.html b/h2/src/main/org/h2/security/auth/impl/package.html
deleted file mode 100644
index 5d891a7c5f..0000000000
--- a/h2/src/main/org/h2/security/auth/impl/package.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-Javadoc package documentation
-
-
-Authentication classes.
-
-
\ No newline at end of file
diff --git a/h2/src/main/org/h2/security/auth/package-info.java b/h2/src/main/org/h2/security/auth/package-info.java
new file mode 100644
index 0000000000..e94ca57099
--- /dev/null
+++ b/h2/src/main/org/h2/security/auth/package-info.java
@@ -0,0 +1,10 @@
+/*
+ * 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
+ */
+
+/**
+ * Authentication classes.
+ */
+package org.h2.security.auth;
diff --git a/h2/src/main/org/h2/security/auth/package.html b/h2/src/main/org/h2/security/auth/package.html
deleted file mode 100644
index 5d891a7c5f..0000000000
--- a/h2/src/main/org/h2/security/auth/package.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-Javadoc package documentation
-
-
-Authentication classes.
-
-
\ No newline at end of file
diff --git a/h2/src/main/org/h2/security/package-info.java b/h2/src/main/org/h2/security/package-info.java
new file mode 100644
index 0000000000..86eb7cce9f
--- /dev/null
+++ b/h2/src/main/org/h2/security/package-info.java
@@ -0,0 +1,11 @@
+/*
+ * 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
+ */
+
+/**
+ * Security classes, such as encryption and cryptographically secure hash
+ * algorithms.
+ */
+package org.h2.security;
diff --git a/h2/src/main/org/h2/security/package.html b/h2/src/main/org/h2/security/package.html
deleted file mode 100644
index e233940e21..0000000000
--- a/h2/src/main/org/h2/security/package.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-Javadoc package documentation
-
-
-Security classes, such as encryption and cryptographically secure hash algorithms.
-
-
\ No newline at end of file
diff --git a/h2/src/main/org/h2/server/package-info.java b/h2/src/main/org/h2/server/package-info.java
new file mode 100644
index 0000000000..971da5bf07
--- /dev/null
+++ b/h2/src/main/org/h2/server/package-info.java
@@ -0,0 +1,10 @@
+/*
+ * 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
+ */
+
+/**
+ * A TCP server.
+ */
+package org.h2.server;
diff --git a/h2/src/main/org/h2/server/package.html b/h2/src/main/org/h2/server/package.html
deleted file mode 100644
index bffffc04e0..0000000000
--- a/h2/src/main/org/h2/server/package.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-Javadoc package documentation
-
-
-A small FTP server.
-
-
\ No newline at end of file
diff --git a/h2/src/main/org/h2/server/pg/PgServerThread.java b/h2/src/main/org/h2/server/pg/PgServerThread.java
index 27522ef779..c86dc38782 100644
--- a/h2/src/main/org/h2/server/pg/PgServerThread.java
+++ b/h2/src/main/org/h2/server/pg/PgServerThread.java
@@ -49,7 +49,6 @@
import org.h2.util.StringUtils;
import org.h2.util.TimeZoneProvider;
import org.h2.util.Utils;
-import org.h2.util.Utils10;
import org.h2.value.CaseInsensitiveMap;
import org.h2.value.TypeInfo;
import org.h2.value.Value;
@@ -159,7 +158,7 @@ private String readString() throws IOException {
}
buff.write(x);
}
- return Utils10.byteArrayOutputStreamToString(buff, getEncoding());
+ return buff.toString(getEncoding());
}
private int readInt() throws IOException {
diff --git a/h2/src/main/org/h2/server/pg/package-info.java b/h2/src/main/org/h2/server/pg/package-info.java
new file mode 100644
index 0000000000..e51707748a
--- /dev/null
+++ b/h2/src/main/org/h2/server/pg/package-info.java
@@ -0,0 +1,10 @@
+/*
+ * 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
+ */
+
+/**
+ * PostgreSQL server implementation of this database.
+ */
+package org.h2.server.pg;
diff --git a/h2/src/main/org/h2/server/pg/package.html b/h2/src/main/org/h2/server/pg/package.html
deleted file mode 100644
index 99d6c79947..0000000000
--- a/h2/src/main/org/h2/server/pg/package.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-Javadoc package documentation
-
-
-PostgreSQL server implementation of this database.
-
-
\ No newline at end of file
diff --git a/h2/src/main/org/h2/server/web/WebApp.java b/h2/src/main/org/h2/server/web/WebApp.java
index 66fbeb69ab..ef5415be59 100644
--- a/h2/src/main/org/h2/server/web/WebApp.java
+++ b/h2/src/main/org/h2/server/web/WebApp.java
@@ -64,7 +64,6 @@
import org.h2.util.StringUtils;
import org.h2.util.Tool;
import org.h2.util.Utils;
-import org.h2.util.Utils10;
import org.h2.value.DataType;
/**
@@ -461,7 +460,7 @@ private String tools() {
try {
tool.runTool(argList);
out.flush();
- String o = Utils10.byteArrayOutputStreamToString(outBuff, StandardCharsets.UTF_8);
+ String o = outBuff.toString(StandardCharsets.UTF_8);
String result = PageParser.escapeHtml(o);
session.put("toolResult", result);
} catch (Exception e) {
diff --git a/h2/src/main/org/h2/server/web/package-info.java b/h2/src/main/org/h2/server/web/package-info.java
new file mode 100644
index 0000000000..ac0418ea13
--- /dev/null
+++ b/h2/src/main/org/h2/server/web/package-info.java
@@ -0,0 +1,10 @@
+/*
+ * 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
+ */
+
+/**
+ * The H2 Console tool.
+ */
+package org.h2.server.web;
diff --git a/h2/src/main/org/h2/server/web/package.html b/h2/src/main/org/h2/server/web/package.html
deleted file mode 100644
index de4dd54caa..0000000000
--- a/h2/src/main/org/h2/server/web/package.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-Javadoc package documentation
-
-
-The H2 Console tool.
-
-
\ No newline at end of file
diff --git a/h2/src/main/org/h2/store/Data.java b/h2/src/main/org/h2/store/Data.java
index 3cb125c6a8..0cd15c465d 100644
--- a/h2/src/main/org/h2/store/Data.java
+++ b/h2/src/main/org/h2/store/Data.java
@@ -8,12 +8,13 @@
*/
package org.h2.store;
+import static org.h2.util.Bits.INT_VH_BE;
+
import java.io.IOException;
import java.io.OutputStream;
import java.io.Reader;
import org.h2.engine.Constants;
-import org.h2.util.Bits;
import org.h2.util.MathUtils;
import org.h2.util.Utils;
@@ -47,7 +48,7 @@ private Data(byte[] data) {
* @param x the value
*/
public void writeInt(int x) {
- Bits.writeInt(data, pos, x);
+ INT_VH_BE.set(data, pos, x);
pos += 4;
}
@@ -58,7 +59,7 @@ public void writeInt(int x) {
* @return the value
*/
public int readInt() {
- int x = Bits.readInt(data, pos);
+ int x = (int) INT_VH_BE.get(data, pos);
pos += 4;
return x;
}
diff --git a/h2/src/main/org/h2/store/fs/async/package-info.java b/h2/src/main/org/h2/store/fs/async/package-info.java
new file mode 100644
index 0000000000..d0371cb601
--- /dev/null
+++ b/h2/src/main/org/h2/store/fs/async/package-info.java
@@ -0,0 +1,11 @@
+/*
+ * 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
+ */
+
+/**
+ * This file system stores files on disk and uses
+ * {@link java.nio.channels.AsynchronousFileChannel} to access the files.
+ */
+package org.h2.store.fs.async;
diff --git a/h2/src/main/org/h2/store/fs/async/package.html b/h2/src/main/org/h2/store/fs/async/package.html
deleted file mode 100644
index 972c674372..0000000000
--- a/h2/src/main/org/h2/store/fs/async/package.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-Javadoc package documentation
-
-
-This file system stores files on disk and uses java.nio.channels.AsynchronousFileChannel to access the files.
-
-
\ No newline at end of file
diff --git a/h2/src/main/org/h2/store/fs/disk/package-info.java b/h2/src/main/org/h2/store/fs/disk/package-info.java
new file mode 100644
index 0000000000..6394f58047
--- /dev/null
+++ b/h2/src/main/org/h2/store/fs/disk/package-info.java
@@ -0,0 +1,14 @@
+/*
+ * 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
+ */
+
+/**
+ * This file system stores files on disk.
+ *
+ *
+ * This is the most common file system.
+ *
+ */
+package org.h2.store.fs.disk;
diff --git a/h2/src/main/org/h2/store/fs/disk/package.html b/h2/src/main/org/h2/store/fs/disk/package.html
deleted file mode 100644
index aa4e05500a..0000000000
--- a/h2/src/main/org/h2/store/fs/disk/package.html
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-Javadoc package documentation
-
-
-This file system stores files on disk.
-
-This is the most common file system.
-
-
\ No newline at end of file
diff --git a/h2/src/main/org/h2/store/fs/encrypt/package-info.java b/h2/src/main/org/h2/store/fs/encrypt/package-info.java
new file mode 100644
index 0000000000..6b73b89f1a
--- /dev/null
+++ b/h2/src/main/org/h2/store/fs/encrypt/package-info.java
@@ -0,0 +1,10 @@
+/*
+ * 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
+ */
+
+/**
+ * An encrypted file system abstraction.
+ */
+package org.h2.store.fs.encrypt;
diff --git a/h2/src/main/org/h2/store/fs/encrypt/package.html b/h2/src/main/org/h2/store/fs/encrypt/package.html
deleted file mode 100644
index 879ec6a896..0000000000
--- a/h2/src/main/org/h2/store/fs/encrypt/package.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-Javadoc package documentation
-
-
-An encrypted file system abstraction.
-
-
\ No newline at end of file
diff --git a/h2/src/main/org/h2/store/fs/mem/package-info.java b/h2/src/main/org/h2/store/fs/mem/package-info.java
new file mode 100644
index 0000000000..7c239bd62b
--- /dev/null
+++ b/h2/src/main/org/h2/store/fs/mem/package-info.java
@@ -0,0 +1,14 @@
+/*
+ * 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
+ */
+
+/**
+ * This file system keeps files fully in memory.
+ *
+ *
+ * There is an option to compress file blocks to save memory.
+ *
+ */
+package org.h2.store.fs.mem;
diff --git a/h2/src/main/org/h2/store/fs/mem/package.html b/h2/src/main/org/h2/store/fs/mem/package.html
deleted file mode 100644
index 75a3322eb3..0000000000
--- a/h2/src/main/org/h2/store/fs/mem/package.html
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-Javadoc package documentation
-
-
-This file system keeps files fully in memory.
-There is an option to compress file blocks to save memory.
-
-
\ No newline at end of file
diff --git a/h2/src/main/org/h2/store/fs/niomapped/package-info.java b/h2/src/main/org/h2/store/fs/niomapped/package-info.java
new file mode 100644
index 0000000000..9774c63a0c
--- /dev/null
+++ b/h2/src/main/org/h2/store/fs/niomapped/package-info.java
@@ -0,0 +1,11 @@
+/*
+ * 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
+ */
+
+/**
+ * This file system stores files on disk and uses {@code java.nio} to access the
+ * memory mapped files.
+ */
+package org.h2.store.fs.niomapped;
diff --git a/h2/src/main/org/h2/store/fs/niomapped/package.html b/h2/src/main/org/h2/store/fs/niomapped/package.html
deleted file mode 100644
index 91aaa1435a..0000000000
--- a/h2/src/main/org/h2/store/fs/niomapped/package.html
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-Javadoc package documentation
-
-
-This file system stores files on disk and uses java.nio to access the files.
-This class used memory mapped files.
-
-
\ No newline at end of file
diff --git a/h2/src/main/org/h2/store/fs/niomem/package-info.java b/h2/src/main/org/h2/store/fs/niomem/package-info.java
new file mode 100644
index 0000000000..fe8aad1196
--- /dev/null
+++ b/h2/src/main/org/h2/store/fs/niomem/package-info.java
@@ -0,0 +1,14 @@
+/*
+ * 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
+ */
+
+/**
+ * This file system keeps files fully in off-java-heap memory.
+ *
+ *
+ * There is an option to compress file blocks to save memory.
+ *
+ */
+package org.h2.store.fs.niomem;
diff --git a/h2/src/main/org/h2/store/fs/niomem/package.html b/h2/src/main/org/h2/store/fs/niomem/package.html
deleted file mode 100644
index 5c290753c2..0000000000
--- a/h2/src/main/org/h2/store/fs/niomem/package.html
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-Javadoc package documentation
-
-
-This file system keeps files fully in off-java-heap memory.
-There is an option to compress file blocks to save memory.
-
-
\ No newline at end of file
diff --git a/h2/src/main/org/h2/store/fs/package-info.java b/h2/src/main/org/h2/store/fs/package-info.java
new file mode 100644
index 0000000000..56b94e69b2
--- /dev/null
+++ b/h2/src/main/org/h2/store/fs/package-info.java
@@ -0,0 +1,10 @@
+/*
+ * 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
+ */
+
+/**
+ * A file system abstraction.
+ */
+package org.h2.store.fs;
diff --git a/h2/src/main/org/h2/store/fs/package.html b/h2/src/main/org/h2/store/fs/package.html
deleted file mode 100644
index f8f4f7a4f8..0000000000
--- a/h2/src/main/org/h2/store/fs/package.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-Javadoc package documentation
-
-
-A file system abstraction.
-
-
\ No newline at end of file
diff --git a/h2/src/main/org/h2/store/fs/rec/package-info.java b/h2/src/main/org/h2/store/fs/rec/package-info.java
new file mode 100644
index 0000000000..dcd67776a5
--- /dev/null
+++ b/h2/src/main/org/h2/store/fs/rec/package-info.java
@@ -0,0 +1,10 @@
+/*
+ * 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
+ */
+
+/**
+ * A file system that records all write operations and can re-play them.
+ */
+package org.h2.store.fs.rec;
diff --git a/h2/src/main/org/h2/store/fs/rec/package.html b/h2/src/main/org/h2/store/fs/rec/package.html
deleted file mode 100644
index e87103566e..0000000000
--- a/h2/src/main/org/h2/store/fs/rec/package.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-Javadoc package documentation
-
-
-A file system that records all write operations and can re-play them.
-
-
\ No newline at end of file
diff --git a/h2/src/main/org/h2/store/fs/retry/package-info.java b/h2/src/main/org/h2/store/fs/retry/package-info.java
new file mode 100644
index 0000000000..0ce6d46ef4
--- /dev/null
+++ b/h2/src/main/org/h2/store/fs/retry/package-info.java
@@ -0,0 +1,15 @@
+/*
+ * 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
+ */
+
+/**
+ * A file system that re-opens and re-tries the operation if the file was
+ * closed, because a thread was interrupted.
+ *
+ * This will clear the interrupt flag. It is mainly useful for applications that
+ * call {@link java.lang.Thread#interrupt()} by mistake.
+ *
+ */
+package org.h2.store.fs.retry;
diff --git a/h2/src/main/org/h2/store/fs/retry/package.html b/h2/src/main/org/h2/store/fs/retry/package.html
deleted file mode 100644
index a665d42e24..0000000000
--- a/h2/src/main/org/h2/store/fs/retry/package.html
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-Javadoc package documentation
-
-
-A file system that re-opens and re-tries the operation if the file was closed, because a thread was interrupted.
-This will clear the interrupt flag.
-It is mainly useful for applications that call Thread.interrupt by mistake.
-
-
\ No newline at end of file
diff --git a/h2/src/main/org/h2/store/fs/split/package-info.java b/h2/src/main/org/h2/store/fs/split/package-info.java
new file mode 100644
index 0000000000..a20a2c32e8
--- /dev/null
+++ b/h2/src/main/org/h2/store/fs/split/package-info.java
@@ -0,0 +1,11 @@
+/*
+ * 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
+ */
+
+/**
+ * A file system that may split files into multiple smaller files (required for
+ * a FAT32 because it only support files up to 2 GiB).
+ */
+package org.h2.store.fs.split;
diff --git a/h2/src/main/org/h2/store/fs/split/package.html b/h2/src/main/org/h2/store/fs/split/package.html
deleted file mode 100644
index 2ecbd26113..0000000000
--- a/h2/src/main/org/h2/store/fs/split/package.html
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-Javadoc package documentation
-
-
-A file system that may split files into multiple smaller files
-(required for a FAT32 because it only support files up to 2 GB).
-
-
\ No newline at end of file
diff --git a/h2/src/main/org/h2/store/fs/zip/package-info.java b/h2/src/main/org/h2/store/fs/zip/package-info.java
new file mode 100644
index 0000000000..8db32ef961
--- /dev/null
+++ b/h2/src/main/org/h2/store/fs/zip/package-info.java
@@ -0,0 +1,10 @@
+/*
+ * 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
+ */
+
+/**
+ * A zip-file base file system abstraction.
+ */
+package org.h2.store.fs.zip;
diff --git a/h2/src/main/org/h2/store/fs/zip/package.html b/h2/src/main/org/h2/store/fs/zip/package.html
deleted file mode 100644
index ad3e96aaa3..0000000000
--- a/h2/src/main/org/h2/store/fs/zip/package.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-Javadoc package documentation
-
-
-A zip-file base file system abstraction.
-
-
\ No newline at end of file
diff --git a/h2/src/main/org/h2/store/package-info.java b/h2/src/main/org/h2/store/package-info.java
new file mode 100644
index 0000000000..f7099ba50e
--- /dev/null
+++ b/h2/src/main/org/h2/store/package-info.java
@@ -0,0 +1,10 @@
+/*
+ * 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
+ */
+
+/**
+ * Storage abstractions and helper classes.
+ */
+package org.h2.store;
diff --git a/h2/src/main/org/h2/store/package.html b/h2/src/main/org/h2/store/package.html
deleted file mode 100644
index ae9e4768b6..0000000000
--- a/h2/src/main/org/h2/store/package.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-Javadoc package documentation
-
-
-Storage abstractions, such as a file with a cache, or a class to convert values to a byte array and vice versa.
-
-
\ No newline at end of file
diff --git a/h2/src/main/org/h2/table/package-info.java b/h2/src/main/org/h2/table/package-info.java
new file mode 100644
index 0000000000..81036e030d
--- /dev/null
+++ b/h2/src/main/org/h2/table/package-info.java
@@ -0,0 +1,10 @@
+/*
+ * 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
+ */
+
+/**
+ * Classes related to a table and table meta data.
+ */
+package org.h2.table;
diff --git a/h2/src/main/org/h2/table/package.html b/h2/src/main/org/h2/table/package.html
deleted file mode 100644
index 2f57e5595b..0000000000
--- a/h2/src/main/org/h2/table/package.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-Javadoc package documentation
-
-
-Classes related to a table and table meta data.
-
-
\ No newline at end of file
diff --git a/h2/src/main/org/h2/tools/CompressTool.java b/h2/src/main/org/h2/tools/CompressTool.java
index 98e07bf26a..5b63744da7 100644
--- a/h2/src/main/org/h2/tools/CompressTool.java
+++ b/h2/src/main/org/h2/tools/CompressTool.java
@@ -5,6 +5,8 @@
*/
package org.h2.tools;
+import static org.h2.util.Bits.INT_VH_BE;
+
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@@ -25,7 +27,6 @@
import org.h2.compress.LZFOutputStream;
import org.h2.engine.Constants;
import org.h2.message.DbException;
-import org.h2.util.Bits;
import org.h2.util.StringUtils;
import org.h2.util.Utils;
@@ -162,7 +163,7 @@ public static int readVariableInt(byte[] buff, int pos) {
((buff[pos++] & 0xff) << 8) +
(buff[pos] & 0xff);
}
- return Bits.readInt(buff, pos);
+ return (int) INT_VH_BE.get(buff, pos);
}
/**
@@ -177,7 +178,7 @@ public static int readVariableInt(byte[] buff, int pos) {
public static int writeVariableInt(byte[] buff, int pos, int x) {
if (x < 0) {
buff[pos++] = (byte) 0xf0;
- Bits.writeInt(buff, pos, x);
+ INT_VH_BE.set(buff, pos, x);
return 5;
} else if (x < 0x80) {
buff[pos] = (byte) x;
@@ -192,11 +193,11 @@ public static int writeVariableInt(byte[] buff, int pos, int x) {
buff[pos] = (byte) x;
return 3;
} else if (x < 0x1000_0000) {
- Bits.writeInt(buff, pos, x | 0xe000_0000);
+ INT_VH_BE.set(buff, pos, x | 0xe000_0000);
return 4;
} else {
buff[pos++] = (byte) 0xf0;
- Bits.writeInt(buff, pos, x);
+ INT_VH_BE.set(buff, pos, x);
return 5;
}
}
diff --git a/h2/src/main/org/h2/tools/package-info.java b/h2/src/main/org/h2/tools/package-info.java
new file mode 100644
index 0000000000..000903bb7f
--- /dev/null
+++ b/h2/src/main/org/h2/tools/package-info.java
@@ -0,0 +1,14 @@
+/*
+ * 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
+ */
+
+/**
+ * Various tools.
+ *
+ *
+ * Most tools are command line driven, but not all (for example the CSV tool).
+ *
+ */
+package org.h2.tools;
diff --git a/h2/src/main/org/h2/tools/package.html b/h2/src/main/org/h2/tools/package.html
deleted file mode 100644
index f086738cd8..0000000000
--- a/h2/src/main/org/h2/tools/package.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-Javadoc package documentation
-
-
-Various tools. Most tools are command line driven, but not all (for example the CSV tool).
-
-
\ No newline at end of file
diff --git a/h2/src/main/org/h2/util/Bits.java b/h2/src/main/org/h2/util/Bits.java
index 6249241acd..7acb74c624 100644
--- a/h2/src/main/org/h2/util/Bits.java
+++ b/h2/src/main/org/h2/util/Bits.java
@@ -5,193 +5,58 @@
*/
package org.h2.util;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
+import java.nio.ByteOrder;
import java.util.UUID;
/**
- * Manipulations with bytes and arrays. This class can be overridden in
- * multi-release JAR with more efficient implementation for a newer versions of
- * Java.
+ * Manipulations with bytes and arrays. Specialized implementation for Java 9
+ * and later versions.
*/
public final class Bits {
- /*
- * Signatures of methods should match with
- * h2/src/java9/src/org/h2/util/Bits.java and precompiled
- * h2/src/java9/precompiled/org/h2/util/Bits.class.
- */
-
/**
- * Compare the contents of two char arrays. If the content or length of the
- * first array is smaller than the second array, -1 is returned. If the content
- * or length of the second array is smaller than the first array, 1 is returned.
- * If the contents and lengths are the same, 0 is returned.
- *
- * @param data1
- * the first char array (must not be null)
- * @param data2
- * the second char array (must not be null)
- * @return the result of the comparison (-1, 1 or 0)
+ * VarHandle giving access to elements of a byte[] array viewed as if it
+ * were a int[] array on big-endian system.
*/
- public static int compareNotNull(char[] data1, char[] data2) {
- if (data1 == data2) {
- return 0;
- }
- int len = Math.min(data1.length, data2.length);
- for (int i = 0; i < len; i++) {
- char b = data1[i];
- char b2 = data2[i];
- if (b != b2) {
- return b > b2 ? 1 : -1;
- }
- }
- return Integer.signum(data1.length - data2.length);
- }
+ public static final VarHandle INT_VH_BE = MethodHandles.byteArrayViewVarHandle(int[].class, //
+ ByteOrder.BIG_ENDIAN);
/**
- * Compare the contents of two byte arrays. If the content or length of the
- * first array is smaller than the second array, -1 is returned. If the content
- * or length of the second array is smaller than the first array, 1 is returned.
- * If the contents and lengths are the same, 0 is returned.
- *
- *
- * This method interprets bytes as signed.
- *
- *
- * @param data1
- * the first byte array (must not be null)
- * @param data2
- * the second byte array (must not be null)
- * @return the result of the comparison (-1, 1 or 0)
+ * VarHandle giving access to elements of a byte[] array viewed as if it
+ * were a int[] array on little-endian system.
*/
- public static int compareNotNullSigned(byte[] data1, byte[] data2) {
- if (data1 == data2) {
- return 0;
- }
- int len = Math.min(data1.length, data2.length);
- for (int i = 0; i < len; i++) {
- byte b = data1[i];
- byte b2 = data2[i];
- if (b != b2) {
- return b > b2 ? 1 : -1;
- }
- }
- return Integer.signum(data1.length - data2.length);
- }
+ public static final VarHandle INT_VH_LE = MethodHandles.byteArrayViewVarHandle(int[].class,
+ ByteOrder.LITTLE_ENDIAN);
/**
- * Compare the contents of two byte arrays. If the content or length of the
- * first array is smaller than the second array, -1 is returned. If the content
- * or length of the second array is smaller than the first array, 1 is returned.
- * If the contents and lengths are the same, 0 is returned.
- *
- *
- * This method interprets bytes as unsigned.
- *
- *
- * @param data1
- * the first byte array (must not be null)
- * @param data2
- * the second byte array (must not be null)
- * @return the result of the comparison (-1, 1 or 0)
+ * VarHandle giving access to elements of a byte[] array viewed as if it
+ * were a long[] array on big-endian system.
*/
- public static int compareNotNullUnsigned(byte[] data1, byte[] data2) {
- if (data1 == data2) {
- return 0;
- }
- int len = Math.min(data1.length, data2.length);
- for (int i = 0; i < len; i++) {
- int b = data1[i] & 0xff;
- int b2 = data2[i] & 0xff;
- if (b != b2) {
- return b > b2 ? 1 : -1;
- }
- }
- return Integer.signum(data1.length - data2.length);
- }
+ public static final VarHandle LONG_VH_BE = MethodHandles.byteArrayViewVarHandle(long[].class, //
+ ByteOrder.BIG_ENDIAN);
/**
- * Reads a int value from the byte array at the given position in big-endian
- * order.
- *
- * @param buff
- * the byte array
- * @param pos
- * the position
- * @return the value
+ * VarHandle giving access to elements of a byte[] array viewed as if it
+ * were a long[] array on little-endian system.
*/
- public static int readInt(byte[] buff, int pos) {
- return (buff[pos++] << 24) + ((buff[pos++] & 0xff) << 16) + ((buff[pos++] & 0xff) << 8) + (buff[pos] & 0xff);
- }
+ public static final VarHandle LONG_VH_LE = MethodHandles.byteArrayViewVarHandle(long[].class,
+ ByteOrder.LITTLE_ENDIAN);
/**
- * Reads a int value from the byte array at the given position in
- * little-endian order.
- *
- * @param buff
- * the byte array
- * @param pos
- * the position
- * @return the value
+ * VarHandle giving access to elements of a byte[] array viewed as if it
+ * were a double[] array on big-endian system.
*/
- public static int readIntLE(byte[] buff, int pos) {
- return (buff[pos++] & 0xff) + ((buff[pos++] & 0xff) << 8) + ((buff[pos++] & 0xff) << 16) + (buff[pos] << 24);
- }
+ public static final VarHandle DOUBLE_VH_BE = MethodHandles.byteArrayViewVarHandle(double[].class,
+ ByteOrder.BIG_ENDIAN);
/**
- * Reads a long value from the byte array at the given position in
- * big-endian order.
- *
- * @param buff
- * the byte array
- * @param pos
- * the position
- * @return the value
+ * VarHandle giving access to elements of a byte[] array viewed as if it
+ * were a double[] array on little-endian system.
*/
- public static long readLong(byte[] buff, int pos) {
- return (((long) readInt(buff, pos)) << 32) + (readInt(buff, pos + 4) & 0xffff_ffffL);
- }
-
- /**
- * Reads a long value from the byte array at the given position in
- * little-endian order.
- *
- * @param buff
- * the byte array
- * @param pos
- * the position
- * @return the value
- */
- public static long readLongLE(byte[] buff, int pos) {
- return (readIntLE(buff, pos) & 0xffff_ffffL) + (((long) readIntLE(buff, pos + 4)) << 32);
- }
-
- /**
- * Reads a double value from the byte array at the given position in
- * big-endian order.
- *
- * @param buff
- * the byte array
- * @param pos
- * the position
- * @return the value
- */
- public static double readDouble(byte[] buff, int pos) {
- return Double.longBitsToDouble(readLong(buff, pos));
- }
-
- /**
- * Reads a double value from the byte array at the given position in
- * little-endian order.
- *
- * @param buff
- * the byte array
- * @param pos
- * the position
- * @return the value
- */
- public static double readDoubleLE(byte[] buff, int pos) {
- return Double.longBitsToDouble(readLongLE(buff, pos));
- }
+ public static final VarHandle DOUBLE_VH_LE = MethodHandles.byteArrayViewVarHandle(double[].class,
+ ByteOrder.LITTLE_ENDIAN);
/**
* Converts UUID value to byte array in big-endian order.
@@ -204,10 +69,8 @@ public static double readDoubleLE(byte[] buff, int pos) {
*/
public static byte[] uuidToBytes(long msb, long lsb) {
byte[] buff = new byte[16];
- for (int i = 0; i < 8; i++) {
- buff[i] = (byte) ((msb >> (8 * (7 - i))) & 0xff);
- buff[8 + i] = (byte) ((lsb >> (8 * (7 - i))) & 0xff);
- }
+ LONG_VH_BE.set(buff, 0, msb);
+ LONG_VH_BE.set(buff, 8, lsb);
return buff;
}
@@ -222,104 +85,7 @@ public static byte[] uuidToBytes(UUID uuid) {
return uuidToBytes(uuid.getMostSignificantBits(), uuid.getLeastSignificantBits());
}
- /**
- * Writes a int value to the byte array at the given position in big-endian
- * order.
- *
- * @param buff
- * the byte array
- * @param pos
- * the position
- * @param x
- * the value to write
- */
- public static void writeInt(byte[] buff, int pos, int x) {
- buff[pos++] = (byte) (x >> 24);
- buff[pos++] = (byte) (x >> 16);
- buff[pos++] = (byte) (x >> 8);
- buff[pos] = (byte) x;
- }
-
- /**
- * Writes a int value to the byte array at the given position in
- * little-endian order.
- *
- * @param buff
- * the byte array
- * @param pos
- * the position
- * @param x
- * the value to write
- */
- public static void writeIntLE(byte[] buff, int pos, int x) {
- buff[pos++] = (byte) x;
- buff[pos++] = (byte) (x >> 8);
- buff[pos++] = (byte) (x >> 16);
- buff[pos] = (byte) (x >> 24);
- }
-
- /**
- * Writes a long value to the byte array at the given position in big-endian
- * order.
- *
- * @param buff
- * the byte array
- * @param pos
- * the position
- * @param x
- * the value to write
- */
- public static void writeLong(byte[] buff, int pos, long x) {
- writeInt(buff, pos, (int) (x >> 32));
- writeInt(buff, pos + 4, (int) x);
- }
-
- /**
- * Writes a long value to the byte array at the given position in
- * little-endian order.
- *
- * @param buff
- * the byte array
- * @param pos
- * the position
- * @param x
- * the value to write
- */
- public static void writeLongLE(byte[] buff, int pos, long x) {
- writeIntLE(buff, pos, (int) x);
- writeIntLE(buff, pos + 4, (int) (x >> 32));
- }
-
- /**
- * Writes a double value to the byte array at the given position in
- * big-endian order.
- *
- * @param buff
- * the byte array
- * @param pos
- * the position
- * @param x
- * the value to write
- */
- public static void writeDouble(byte[] buff, int pos, double x) {
- writeLong(buff, pos, Double.doubleToRawLongBits(x));
- }
-
- /**
- * Writes a double value to the byte array at the given position in
- * little-endian order.
- *
- * @param buff
- * the byte array
- * @param pos
- * the position
- * @param x
- * the value to write
- */
- public static void writeDoubleLE(byte[] buff, int pos, double x) {
- writeLongLE(buff, pos, Double.doubleToRawLongBits(x));
- }
-
private Bits() {
}
+
}
diff --git a/h2/src/main/org/h2/util/DateTimeUtils.java b/h2/src/main/org/h2/util/DateTimeUtils.java
index 5ac68c26dc..e639a9c278 100644
--- a/h2/src/main/org/h2/util/DateTimeUtils.java
+++ b/h2/src/main/org/h2/util/DateTimeUtils.java
@@ -187,7 +187,7 @@ public static long parseDateValue(String s, int start, int end) {
throw new IllegalArgumentException(s);
}
}
- int year = Integer.parseInt(s.substring(start, yEnd));
+ int year = Integer.parseInt(s, start, yEnd, 10);
int month = StringUtils.parseUInt31(s, mStart, mEnd);
int day = StringUtils.parseUInt31(s, dStart, end);
if (!isValidDate(year, month, day)) {
diff --git a/h2/src/main/org/h2/util/JdbcUtils.java b/h2/src/main/org/h2/util/JdbcUtils.java
index bd60ac1aca..83b5f64b49 100644
--- a/h2/src/main/org/h2/util/JdbcUtils.java
+++ b/h2/src/main/org/h2/util/JdbcUtils.java
@@ -5,6 +5,8 @@
*/
package org.h2.util;
+import static org.h2.util.Bits.LONG_VH_BE;
+
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -31,6 +33,7 @@
import javax.naming.Context;
import javax.sql.DataSource;
+
import org.h2.api.ErrorCode;
import org.h2.api.JavaObjectSerializer;
import org.h2.engine.Constants;
@@ -445,13 +448,8 @@ protected Class resolveClass(ObjectStreamClass desc)
* @throws DbException if serialization fails
*/
public static ValueUuid deserializeUuid(byte[] data) {
- uuid: if (data.length == 80) {
- for (int i = 0; i < 64; i++) {
- if (data[i] != UUID_PREFIX[i]) {
- break uuid;
- }
- }
- return ValueUuid.get(Bits.readLong(data, 72), Bits.readLong(data, 64));
+ if (data.length == 80 && Arrays.mismatch(data, 0, 64, UUID_PREFIX, 0, 64) < 0) {
+ return ValueUuid.get((long) LONG_VH_BE.get(data, 72), (long) LONG_VH_BE.get(data, 64));
}
throw DbException.get(ErrorCode.DESERIALIZATION_FAILED_1, "Is not a UUID");
}
diff --git a/h2/src/main/org/h2/util/NetUtils.java b/h2/src/main/org/h2/util/NetUtils.java
index f66230e176..197cfe8be1 100644
--- a/h2/src/main/org/h2/util/NetUtils.java
+++ b/h2/src/main/org/h2/util/NetUtils.java
@@ -158,12 +158,7 @@ public static Socket createSocket(InetAddress address, int port, boolean ssl, in
/**
* Create a server socket. The system property h2.bindAddress is used if
- * set. If SSL is used and h2.enableAnonymousTLS is true, an attempt is
- * made to modify the security property jdk.tls.legacyAlgorithms
- * (in newer JVMs) to allow anonymous TLS.
- *
- * This system change is effectively permanent for the lifetime of the JVM.
- * @see CipherFactory#removeAnonFromLegacyAlgorithms()
+ * set.
*
* @param port the port to listen on
* @param ssl if SSL should be used
diff --git a/h2/src/main/org/h2/util/Profiler.java b/h2/src/main/org/h2/util/Profiler.java
index 77bee9f3b8..e6d570d479 100644
--- a/h2/src/main/org/h2/util/Profiler.java
+++ b/h2/src/main/org/h2/util/Profiler.java
@@ -266,11 +266,11 @@ private static String exec(String... args) {
copyInThread(p.getInputStream(), out);
copyInThread(p.getErrorStream(), err);
p.waitFor();
- String e = Utils10.byteArrayOutputStreamToString(err, StandardCharsets.UTF_8);
+ String e = err.toString(StandardCharsets.UTF_8);
if (e.length() > 0) {
throw new RuntimeException(e);
}
- return Utils10.byteArrayOutputStreamToString(out, StandardCharsets.UTF_8);
+ return out.toString(StandardCharsets.UTF_8);
} catch (Exception e) {
throw new RuntimeException(e);
}
diff --git a/h2/src/main/org/h2/util/SourceCompiler.java b/h2/src/main/org/h2/util/SourceCompiler.java
index 6c2dc34bdd..07a36517bc 100644
--- a/h2/src/main/org/h2/util/SourceCompiler.java
+++ b/h2/src/main/org/h2/util/SourceCompiler.java
@@ -388,7 +388,7 @@ private static int exec(String... args) {
copyInThread(p.getInputStream(), buff);
copyInThread(p.getErrorStream(), buff);
p.waitFor();
- String output = Utils10.byteArrayOutputStreamToString(buff, StandardCharsets.UTF_8);
+ String output = buff.toString(StandardCharsets.UTF_8);
handleSyntaxError(output, p.exitValue());
return p.exitValue();
} catch (Exception e) {
@@ -422,7 +422,7 @@ private static synchronized void javacSun(Path javaFile) {
"-d", COMPILE_DIR,
"-encoding", "UTF-8",
javaFile.toAbsolutePath().toString() });
- String output = Utils10.byteArrayOutputStreamToString(buff, StandardCharsets.UTF_8);
+ String output = buff.toString(StandardCharsets.UTF_8);
handleSyntaxError(output, status);
} catch (Exception e) {
throw DbException.convert(e);
diff --git a/h2/src/main/org/h2/util/Utils10.java b/h2/src/main/org/h2/util/Utils10.java
index 96302ea024..c9b0fd7689 100644
--- a/h2/src/main/org/h2/util/Utils10.java
+++ b/h2/src/main/org/h2/util/Utils10.java
@@ -5,44 +5,18 @@
*/
package org.h2.util;
-import java.io.ByteArrayOutputStream;
import java.io.IOException;
-import java.io.UnsupportedEncodingException;
import java.net.Socket;
-import java.nio.charset.Charset;
+
+import jdk.net.ExtendedSocketOptions;
/**
* Utilities with specialized implementations for Java 10 and later versions.
*
- * This class contains basic implementations for Java 8 and 9 and it is
- * overridden in multi-release JARs.
+ * This class contains implementations for Java 10 and later versions.
*/
public final class Utils10 {
- /*
- * Signatures of methods should match with
- * h2/src/java10/src/org/h2/util/Utils10.java and precompiled
- * h2/src/java10/precompiled/org/h2/util/Utils10.class.
- */
-
- /**
- * Converts the buffer's contents into a string by decoding the bytes using
- * the specified {@link java.nio.charset.Charset charset}.
- *
- * @param baos
- * the buffer to decode
- * @param charset
- * the charset to use
- * @return the decoded string
- */
- public static String byteArrayOutputStreamToString(ByteArrayOutputStream baos, Charset charset) {
- try {
- return baos.toString(charset.name());
- } catch (UnsupportedEncodingException e) {
- throw new RuntimeException(e);
- }
- }
-
/**
* Returns the value of TCP_QUICKACK option.
*
@@ -55,7 +29,7 @@ public static String byteArrayOutputStreamToString(ByteArrayOutputStream baos, C
* if TCP_QUICKACK is not supported
*/
public static boolean getTcpQuickack(Socket socket) throws IOException {
- throw new UnsupportedOperationException();
+ return socket.getOption(ExtendedSocketOptions.TCP_QUICKACK);
}
/**
@@ -68,8 +42,12 @@ public static boolean getTcpQuickack(Socket socket) throws IOException {
* @return whether operation was successful
*/
public static boolean setTcpQuickack(Socket socket, boolean value) {
- // The default implementation does nothing
- return false;
+ try {
+ socket.setOption(ExtendedSocketOptions.TCP_QUICKACK, value);
+ return true;
+ } catch (Throwable t) {
+ return false;
+ }
}
private Utils10() {
diff --git a/h2/src/main/org/h2/util/geometry/EWKBUtils.java b/h2/src/main/org/h2/util/geometry/EWKBUtils.java
index 6f5a15ef7d..a615073df6 100644
--- a/h2/src/main/org/h2/util/geometry/EWKBUtils.java
+++ b/h2/src/main/org/h2/util/geometry/EWKBUtils.java
@@ -5,6 +5,10 @@
*/
package org.h2.util.geometry;
+import static org.h2.util.Bits.DOUBLE_VH_BE;
+import static org.h2.util.Bits.DOUBLE_VH_LE;
+import static org.h2.util.Bits.INT_VH_BE;
+import static org.h2.util.Bits.INT_VH_LE;
import static org.h2.util.geometry.GeometryUtils.DIMENSION_SYSTEM_XYM;
import static org.h2.util.geometry.GeometryUtils.DIMENSION_SYSTEM_XYZ;
import static org.h2.util.geometry.GeometryUtils.DIMENSION_SYSTEM_XYZM;
@@ -24,7 +28,6 @@
import java.io.ByteArrayOutputStream;
-import org.h2.util.Bits;
import org.h2.util.StringUtils;
import org.h2.util.geometry.GeometryUtils.Target;
@@ -165,13 +168,13 @@ protected void addCoordinate(double x, double y, double z, double m, int index,
}
private void writeInt(int v) {
- Bits.writeInt(buf, 0, v);
+ INT_VH_BE.set(buf, 0, v);
output.write(buf, 0, 4);
}
private void writeDouble(double v) {
v = toCanonicalDouble(v);
- Bits.writeDouble(buf, 0, v);
+ DOUBLE_VH_BE.set(buf, 0, v);
output.write(buf, 0, 8);
}
@@ -215,7 +218,7 @@ byte readByte() {
* @return next 32-bit integer
*/
int readInt() {
- int result = bigEndian ? Bits.readInt(ewkb, offset) : Bits.readIntLE(ewkb, offset);
+ int result = bigEndian ? (int) INT_VH_BE.get(ewkb, offset) : (int) INT_VH_LE.get(ewkb, offset);
offset += 4;
return result;
}
@@ -226,7 +229,7 @@ int readInt() {
* @return next 64-bit floating point
*/
double readCoordinate() {
- double v = bigEndian ? Bits.readDouble(ewkb, offset) : Bits.readDoubleLE(ewkb, offset);
+ double v = bigEndian ? (double) DOUBLE_VH_BE.get(ewkb, offset) : (double) DOUBLE_VH_LE.get(ewkb, offset);
offset += 8;
return toCanonicalDouble(v);
}
@@ -528,31 +531,31 @@ public static byte[] envelope2wkb(double[] envelope) {
if (minX == maxX && minY == maxY) {
result = new byte[21];
result[4] = POINT;
- Bits.writeDouble(result, 5, minX);
- Bits.writeDouble(result, 13, minY);
+ DOUBLE_VH_BE.set(result, 5, minX);
+ DOUBLE_VH_BE.set(result, 13, minY);
} else if (minX == maxX || minY == maxY) {
result = new byte[41];
result[4] = LINE_STRING;
result[8] = 2;
- Bits.writeDouble(result, 9, minX);
- Bits.writeDouble(result, 17, minY);
- Bits.writeDouble(result, 25, maxX);
- Bits.writeDouble(result, 33, maxY);
+ DOUBLE_VH_BE.set(result, 9, minX);
+ DOUBLE_VH_BE.set(result, 17, minY);
+ DOUBLE_VH_BE.set(result, 25, maxX);
+ DOUBLE_VH_BE.set(result, 33, maxY);
} else {
result = new byte[93];
result[4] = POLYGON;
result[8] = 1;
result[12] = 5;
- Bits.writeDouble(result, 13, minX);
- Bits.writeDouble(result, 21, minY);
- Bits.writeDouble(result, 29, minX);
- Bits.writeDouble(result, 37, maxY);
- Bits.writeDouble(result, 45, maxX);
- Bits.writeDouble(result, 53, maxY);
- Bits.writeDouble(result, 61, maxX);
- Bits.writeDouble(result, 69, minY);
- Bits.writeDouble(result, 77, minX);
- Bits.writeDouble(result, 85, minY);
+ DOUBLE_VH_BE.set(result, 13, minX);
+ DOUBLE_VH_BE.set(result, 21, minY);
+ DOUBLE_VH_BE.set(result, 29, minX);
+ DOUBLE_VH_BE.set(result, 37, maxY);
+ DOUBLE_VH_BE.set(result, 45, maxX);
+ DOUBLE_VH_BE.set(result, 53, maxY);
+ DOUBLE_VH_BE.set(result, 61, maxX);
+ DOUBLE_VH_BE.set(result, 69, minY);
+ DOUBLE_VH_BE.set(result, 77, minX);
+ DOUBLE_VH_BE.set(result, 85, minY);
}
return result;
}
diff --git a/h2/src/main/org/h2/util/geometry/package-info.java b/h2/src/main/org/h2/util/geometry/package-info.java
new file mode 100644
index 0000000000..ca7194b6f8
--- /dev/null
+++ b/h2/src/main/org/h2/util/geometry/package-info.java
@@ -0,0 +1,10 @@
+/*
+ * 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
+ */
+
+/**
+ * Internal utility classes for GEOMETRY data type.
+ */
+package org.h2.util.geometry;
diff --git a/h2/src/main/org/h2/util/geometry/package.html b/h2/src/main/org/h2/util/geometry/package.html
deleted file mode 100644
index 21c62e092c..0000000000
--- a/h2/src/main/org/h2/util/geometry/package.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-Javadoc package documentation
-
-
-Internal utility classes for GEOMETRY data type.
-
-
\ No newline at end of file
diff --git a/h2/src/main/org/h2/util/json/package-info.java b/h2/src/main/org/h2/util/json/package-info.java
new file mode 100644
index 0000000000..5173a858b1
--- /dev/null
+++ b/h2/src/main/org/h2/util/json/package-info.java
@@ -0,0 +1,10 @@
+/*
+ * 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
+ */
+
+/**
+ * Internal utility classes for JSON data type.
+ */
+package org.h2.util.json;
diff --git a/h2/src/main/org/h2/util/json/package.html b/h2/src/main/org/h2/util/json/package.html
deleted file mode 100644
index 5dfa77423f..0000000000
--- a/h2/src/main/org/h2/util/json/package.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-Javadoc package documentation
-
-
-Internal utility classes for JSON data type.
-
-
\ No newline at end of file
diff --git a/h2/src/main/org/h2/util/package-info.java b/h2/src/main/org/h2/util/package-info.java
new file mode 100644
index 0000000000..9f05c24724
--- /dev/null
+++ b/h2/src/main/org/h2/util/package-info.java
@@ -0,0 +1,10 @@
+/*
+ * 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
+ */
+
+/**
+ * Internal utility classes.
+ */
+package org.h2.util;
diff --git a/h2/src/main/org/h2/util/package.html b/h2/src/main/org/h2/util/package.html
deleted file mode 100644
index e0fa1eb9f1..0000000000
--- a/h2/src/main/org/h2/util/package.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-Javadoc package documentation
-
-
-Internal utility classes.
-
-
\ No newline at end of file
diff --git a/h2/src/main/org/h2/value/CharsetCollator.java b/h2/src/main/org/h2/value/CharsetCollator.java
index 22844e574a..a93d4f71e1 100644
--- a/h2/src/main/org/h2/value/CharsetCollator.java
+++ b/h2/src/main/org/h2/value/CharsetCollator.java
@@ -8,21 +8,14 @@
import java.nio.charset.Charset;
import java.text.CollationKey;
import java.text.Collator;
-import java.util.Comparator;
+import java.util.Arrays;
import java.util.Locale;
-import org.h2.util.Bits;
-
/**
* The charset collator sorts strings according to the order in the given charset.
*/
public class CharsetCollator extends Collator {
- /**
- * The comparator used to compare byte arrays.
- */
- static final Comparator COMPARATOR = Bits::compareNotNullSigned;
-
private final Charset charset;
public CharsetCollator(Charset charset) {
@@ -35,7 +28,7 @@ public Charset getCharset() {
@Override
public int compare(String source, String target) {
- return COMPARATOR.compare(toBytes(source), toBytes(target));
+ return Arrays.compare(toBytes(source), toBytes(target));
}
/**
@@ -73,7 +66,7 @@ private class CharsetCollationKey extends CollationKey {
@Override
public int compareTo(CollationKey target) {
- return COMPARATOR.compare(bytes, target.toByteArray());
+ return Arrays.compare(bytes, target.toByteArray());
}
@Override
@@ -82,4 +75,5 @@ public byte[] toByteArray() {
}
}
+
}
diff --git a/h2/src/main/org/h2/value/Transfer.java b/h2/src/main/org/h2/value/Transfer.java
index 90d81777f5..e787eddb81 100644
--- a/h2/src/main/org/h2/value/Transfer.java
+++ b/h2/src/main/org/h2/value/Transfer.java
@@ -5,6 +5,8 @@
*/
package org.h2.value;
+import static org.h2.util.Bits.LONG_VH_BE;
+
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.DataInputStream;
@@ -17,9 +19,9 @@
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Set;
import java.util.concurrent.locks.ReentrantLock;
-import java.util.Map.Entry;
import org.h2.api.ErrorCode;
import org.h2.api.IntervalQualifier;
@@ -29,7 +31,6 @@
import org.h2.security.SHA256;
import org.h2.store.Data;
import org.h2.store.DataReader;
-import org.h2.util.Bits;
import org.h2.util.DateTimeUtils;
import org.h2.util.IOUtils;
import org.h2.util.MathUtils;
@@ -1352,7 +1353,7 @@ private byte[] calculateLobMac(long lobId) {
lobMacSalt = MathUtils.secureRandomBytes(LOB_MAC_SALT_LENGTH);
}
byte[] data = new byte[8];
- Bits.writeLong(data, 0, lobId);
+ LONG_VH_BE.set(data, 0, lobId);
return SHA256.getHashWithSalt(data, lobMacSalt);
}
diff --git a/h2/src/main/org/h2/value/Value.java b/h2/src/main/org/h2/value/Value.java
index 5047a31b55..b483e142db 100644
--- a/h2/src/main/org/h2/value/Value.java
+++ b/h2/src/main/org/h2/value/Value.java
@@ -5,6 +5,9 @@
*/
package org.h2.value;
+import static org.h2.util.Bits.INT_VH_BE;
+import static org.h2.util.Bits.LONG_VH_BE;
+
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
@@ -26,7 +29,6 @@
import org.h2.engine.SysProperties;
import org.h2.message.DbException;
import org.h2.store.DataHandler;
-import org.h2.util.Bits;
import org.h2.util.DateTimeUtils;
import org.h2.util.HasSQL;
import org.h2.util.IntervalUtils;
@@ -1619,7 +1621,7 @@ public final ValueInteger convertToInt(Object column) {
case VARBINARY: {
byte[] bytes = getBytesNoCopy();
if (bytes.length == 4) {
- return ValueInteger.get(Bits.readInt(bytes, 0));
+ return ValueInteger.get((int) INT_VH_BE.get(bytes, 0));
}
}
//$FALL-THROUGH$
@@ -1674,7 +1676,7 @@ public final ValueBigint convertToBigint(Object column) {
case VARBINARY: {
byte[] bytes = getBytesNoCopy();
if (bytes.length == 8) {
- return ValueBigint.get(Bits.readLong(bytes, 0));
+ return ValueBigint.get((long) LONG_VH_BE.get(bytes, 0));
}
}
//$FALL-THROUGH$
diff --git a/h2/src/main/org/h2/value/ValueBigint.java b/h2/src/main/org/h2/value/ValueBigint.java
index bf533b1b65..b1d4a58448 100644
--- a/h2/src/main/org/h2/value/ValueBigint.java
+++ b/h2/src/main/org/h2/value/ValueBigint.java
@@ -5,13 +5,14 @@
*/
package org.h2.value;
+import static org.h2.util.Bits.LONG_VH_BE;
+
import java.math.BigDecimal;
import java.math.BigInteger;
import org.h2.api.ErrorCode;
import org.h2.engine.CastDataProvider;
import org.h2.message.DbException;
-import org.h2.util.Bits;
/**
* Implementation of the BIGINT data type.
@@ -172,7 +173,7 @@ public int getValueType() {
@Override
public byte[] getBytes() {
byte[] b = new byte[8];
- Bits.writeLong(b, 0, getLong());
+ LONG_VH_BE.set(b, 0, getLong());
return b;
}
diff --git a/h2/src/main/org/h2/value/ValueBlob.java b/h2/src/main/org/h2/value/ValueBlob.java
index cc809dd916..4f45c453ba 100644
--- a/h2/src/main/org/h2/value/ValueBlob.java
+++ b/h2/src/main/org/h2/value/ValueBlob.java
@@ -9,6 +9,7 @@
import java.io.InputStream;
import java.io.Reader;
import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
import org.h2.engine.CastDataProvider;
import org.h2.engine.Constants;
@@ -18,7 +19,6 @@
import org.h2.store.FileStore;
import org.h2.store.FileStoreOutputStream;
import org.h2.store.LobStorageInterface;
-import org.h2.util.Bits;
import org.h2.util.IOUtils;
import org.h2.util.MathUtils;
import org.h2.util.StringUtils;
@@ -175,8 +175,8 @@ public int compareTypeSafe(Value v, CompareMode mode, CastDataProvider provider)
LobData lobData = this.lobData, lobData2 = v2.lobData;
if (lobData.getClass() == lobData2.getClass()) {
if (lobData instanceof LobDataInMemory) {
- return Bits.compareNotNullUnsigned(((LobDataInMemory) lobData).getSmall(),
- ((LobDataInMemory) lobData2).getSmall());
+ return Integer.signum(Arrays.compareUnsigned(((LobDataInMemory) lobData).getSmall(),
+ ((LobDataInMemory) lobData2).getSmall()));
} else if (lobData instanceof LobDataDatabase) {
if (((LobDataDatabase) lobData).getLobId() == ((LobDataDatabase) lobData2).getLobId()) {
return 0;
@@ -209,7 +209,7 @@ private static int compare(ValueBlob v1, ValueBlob v2) {
|| IOUtils.readFully(is2, buf2, BLOCK_COMPARISON_SIZE) != BLOCK_COMPARISON_SIZE) {
throw DbException.getUnsupportedException("Invalid LOB");
}
- int cmp = Bits.compareNotNullUnsigned(buf1, buf2);
+ int cmp = Integer.signum(Arrays.compareUnsigned(buf1, buf2));
if (cmp != 0) {
return cmp;
}
diff --git a/h2/src/main/org/h2/value/ValueBytesBase.java b/h2/src/main/org/h2/value/ValueBytesBase.java
index 724c8d24e7..165d26353b 100644
--- a/h2/src/main/org/h2/value/ValueBytesBase.java
+++ b/h2/src/main/org/h2/value/ValueBytesBase.java
@@ -10,7 +10,6 @@
import org.h2.engine.CastDataProvider;
import org.h2.engine.Constants;
import org.h2.message.DbException;
-import org.h2.util.Bits;
import org.h2.util.StringUtils;
import org.h2.util.Utils;
@@ -50,7 +49,7 @@ public final byte[] getBytesNoCopy() {
@Override
public final int compareTypeSafe(Value v, CompareMode mode, CastDataProvider provider) {
- return Bits.compareNotNullUnsigned(value, ((ValueBytesBase) v).value);
+ return Integer.signum(Arrays.compareUnsigned(value, ((ValueBytesBase) v).value));
}
@Override
diff --git a/h2/src/main/org/h2/value/ValueClob.java b/h2/src/main/org/h2/value/ValueClob.java
index 09c0ee32f5..16bc6ba4b1 100644
--- a/h2/src/main/org/h2/value/ValueClob.java
+++ b/h2/src/main/org/h2/value/ValueClob.java
@@ -10,6 +10,7 @@
import java.io.InputStream;
import java.io.Reader;
import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
import org.h2.engine.CastDataProvider;
import org.h2.engine.Constants;
@@ -20,7 +21,6 @@
import org.h2.store.FileStoreOutputStream;
import org.h2.store.LobStorageInterface;
import org.h2.store.RangeReader;
-import org.h2.util.Bits;
import org.h2.util.IOUtils;
import org.h2.util.MathUtils;
import org.h2.util.StringUtils;
@@ -251,7 +251,7 @@ private static int compare(ValueClob v1, ValueClob v2) {
|| IOUtils.readFully(reader2, buf2, BLOCK_COMPARISON_SIZE) != BLOCK_COMPARISON_SIZE) {
throw DbException.getUnsupportedException("Invalid LOB");
}
- int cmp = Bits.compareNotNull(buf1, buf2);
+ int cmp = Integer.signum(Arrays.compare(buf1, buf2));
if (cmp != 0) {
return cmp;
}
diff --git a/h2/src/main/org/h2/value/ValueGeometry.java b/h2/src/main/org/h2/value/ValueGeometry.java
index 2a01268ede..83bb91ac00 100644
--- a/h2/src/main/org/h2/value/ValueGeometry.java
+++ b/h2/src/main/org/h2/value/ValueGeometry.java
@@ -5,19 +5,19 @@
*/
package org.h2.value;
+import static org.h2.util.Bits.INT_VH_BE;
import static org.h2.util.geometry.EWKBUtils.EWKB_SRID;
import org.h2.api.ErrorCode;
import org.h2.message.DbException;
-import org.h2.util.Bits;
import org.h2.util.MathUtils;
import org.h2.util.StringUtils;
import org.h2.util.geometry.EWKBUtils;
import org.h2.util.geometry.EWKTUtils;
+import org.h2.util.geometry.EWKTUtils.EWKTTarget;
import org.h2.util.geometry.GeometryUtils;
import org.h2.util.geometry.GeometryUtils.EnvelopeTarget;
import org.h2.util.geometry.JTSUtils;
-import org.h2.util.geometry.EWKTUtils.EWKTTarget;
import org.locationtech.jts.geom.Geometry;
/**
@@ -66,8 +66,8 @@ private ValueGeometry(byte[] bytes, double[] envelope) {
}
this.value = bytes;
this.envelope = envelope;
- int t = Bits.readInt(bytes, 1);
- srid = (t & EWKB_SRID) != 0 ? Bits.readInt(bytes, 5) : 0;
+ int t = (int) INT_VH_BE.get(bytes, 1);
+ srid = (t & EWKB_SRID) != 0 ? (int) INT_VH_BE.get(bytes, 5) : 0;
typeAndDimensionSystem = (t & 0xffff) % 1_000 + EWKBUtils.type2dimensionSystem(t) * 1_000;
}
diff --git a/h2/src/main/org/h2/value/ValueInteger.java b/h2/src/main/org/h2/value/ValueInteger.java
index 32815369c6..760ec1ff59 100644
--- a/h2/src/main/org/h2/value/ValueInteger.java
+++ b/h2/src/main/org/h2/value/ValueInteger.java
@@ -5,12 +5,13 @@
*/
package org.h2.value;
+import static org.h2.util.Bits.INT_VH_BE;
+
import java.math.BigDecimal;
import org.h2.api.ErrorCode;
import org.h2.engine.CastDataProvider;
import org.h2.message.DbException;
-import org.h2.util.Bits;
/**
* Implementation of the INTEGER data type.
@@ -144,7 +145,7 @@ public int getValueType() {
@Override
public byte[] getBytes() {
byte[] b = new byte[4];
- Bits.writeInt(b, 0, getInt());
+ INT_VH_BE.set(b, 0, getInt());
return b;
}
diff --git a/h2/src/main/org/h2/value/ValueUuid.java b/h2/src/main/org/h2/value/ValueUuid.java
index b207a13ab3..81c3ea91ae 100644
--- a/h2/src/main/org/h2/value/ValueUuid.java
+++ b/h2/src/main/org/h2/value/ValueUuid.java
@@ -5,6 +5,8 @@
*/
package org.h2.value;
+import static org.h2.util.Bits.LONG_VH_BE;
+
import java.util.UUID;
import org.h2.api.ErrorCode;
@@ -68,7 +70,7 @@ public static ValueUuid get(byte[] binary) {
if (length != 16) {
throw DbException.get(ErrorCode.DATA_CONVERSION_ERROR_1, "UUID requires 16 bytes, got " + length);
}
- return get(Bits.readLong(binary, 0), Bits.readLong(binary, 8));
+ return get((long) LONG_VH_BE.get(binary, 0), (long) LONG_VH_BE.get(binary, 8));
}
/**
diff --git a/h2/src/main/org/h2/value/lob/package-info.java b/h2/src/main/org/h2/value/lob/package-info.java
new file mode 100644
index 0000000000..e07cb3aa20
--- /dev/null
+++ b/h2/src/main/org/h2/value/lob/package-info.java
@@ -0,0 +1,10 @@
+/*
+ * 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
+ */
+
+/**
+ * LOB data for values.
+ */
+package org.h2.value.lob;
diff --git a/h2/src/main/org/h2/value/lob/package.html b/h2/src/main/org/h2/value/lob/package.html
deleted file mode 100644
index 08e9b32909..0000000000
--- a/h2/src/main/org/h2/value/lob/package.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-Javadoc package documentation
-
-
-LOB data for values.
-
-
\ No newline at end of file
diff --git a/h2/src/main/org/h2/value/package-info.java b/h2/src/main/org/h2/value/package-info.java
new file mode 100644
index 0000000000..c26a0ee593
--- /dev/null
+++ b/h2/src/main/org/h2/value/package-info.java
@@ -0,0 +1,10 @@
+/*
+ * 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
+ */
+
+/**
+ * Data type and value implementations.
+ */
+package org.h2.value;
diff --git a/h2/src/main/org/h2/value/package.html b/h2/src/main/org/h2/value/package.html
deleted file mode 100644
index 79d9afef7a..0000000000
--- a/h2/src/main/org/h2/value/package.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-Javadoc package documentation
-
-
-Data type and value implementations.
-
-
\ No newline at end of file
diff --git a/h2/src/test/org/h2/samples/package-info.java b/h2/src/test/org/h2/samples/package-info.java
new file mode 100644
index 0000000000..53e8a23d3f
--- /dev/null
+++ b/h2/src/test/org/h2/samples/package-info.java
@@ -0,0 +1,10 @@
+/*
+ * 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
+ */
+
+/**
+ * Standalone sample applications.
+ */
+package org.h2.samples;
diff --git a/h2/src/test/org/h2/samples/package.html b/h2/src/test/org/h2/samples/package.html
deleted file mode 100644
index 94eebba2cc..0000000000
--- a/h2/src/test/org/h2/samples/package.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-Javadoc package documentation
-
-
-Standalone sample applications.
-
-
\ No newline at end of file
diff --git a/h2/src/test/org/h2/test/TestAll.java b/h2/src/test/org/h2/test/TestAll.java
index 93dc64e886..0153a7e2b1 100644
--- a/h2/src/test/org/h2/test/TestAll.java
+++ b/h2/src/test/org/h2/test/TestAll.java
@@ -207,7 +207,6 @@
import org.h2.test.unit.TestPattern;
import org.h2.test.unit.TestPerfectHash;
import org.h2.test.unit.TestPgServer;
-import org.h2.test.unit.TestReader;
import org.h2.test.unit.TestRecovery;
import org.h2.test.unit.TestReopen;
import org.h2.test.unit.TestSampleApps;
@@ -945,7 +944,6 @@ private void testUtils() {
addTest(new TestObjectDeserialization());
addTest(new TestOverflow());
addTest(new TestPerfectHash());
- addTest(new TestReader());
addTest(new TestScriptReader());
addTest(new TestSecurity());
addTest(new TestShell());
diff --git a/h2/src/test/org/h2/test/ap/package-info.java b/h2/src/test/org/h2/test/ap/package-info.java
new file mode 100644
index 0000000000..381d012d5d
--- /dev/null
+++ b/h2/src/test/org/h2/test/ap/package-info.java
@@ -0,0 +1,10 @@
+/*
+ * 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
+ */
+
+/**
+ * An annotation processor used for testing.
+ */
+package org.h2.test.ap;
diff --git a/h2/src/test/org/h2/test/ap/package.html b/h2/src/test/org/h2/test/ap/package.html
deleted file mode 100644
index 192cca4fb9..0000000000
--- a/h2/src/test/org/h2/test/ap/package.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-Javadoc package documentation
-
-
-An annotation processor used for testing.
-
-
\ No newline at end of file
diff --git a/h2/src/test/org/h2/test/auth/package-info.java b/h2/src/test/org/h2/test/auth/package-info.java
new file mode 100644
index 0000000000..e183fcfd1c
--- /dev/null
+++ b/h2/src/test/org/h2/test/auth/package-info.java
@@ -0,0 +1,10 @@
+/*
+ * 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
+ */
+
+/**
+ * Tests for custom authentication.
+ */
+package org.h2.test.auth;
diff --git a/h2/src/test/org/h2/test/auth/package.html b/h2/src/test/org/h2/test/auth/package.html
deleted file mode 100644
index cf506186c2..0000000000
--- a/h2/src/test/org/h2/test/auth/package.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-Javadoc package documentation
-
-
-Tests for custom authentication.
-
-
\ No newline at end of file
diff --git a/h2/src/test/org/h2/test/bench/package-info.java b/h2/src/test/org/h2/test/bench/package-info.java
new file mode 100644
index 0000000000..c07f9f199e
--- /dev/null
+++ b/h2/src/test/org/h2/test/bench/package-info.java
@@ -0,0 +1,10 @@
+/*
+ * 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
+ */
+
+/**
+ * The implementation of the benchmark application.
+ */
+package org.h2.test.bench;
diff --git a/h2/src/test/org/h2/test/bench/package.html b/h2/src/test/org/h2/test/bench/package.html
deleted file mode 100644
index f3017f5308..0000000000
--- a/h2/src/test/org/h2/test/bench/package.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-Javadoc package documentation
-
-
-The implementation of the benchmark application.
-
-
\ No newline at end of file
diff --git a/h2/src/test/org/h2/test/coverage/package.html b/h2/src/test/org/h2/test/coverage/package.html
deleted file mode 100644
index fbfebcd543..0000000000
--- a/h2/src/test/org/h2/test/coverage/package.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-Javadoc package documentation
-
-
-A standalone code coverage tool.
-
-
\ No newline at end of file
diff --git a/h2/src/test/org/h2/test/db/package-info.java b/h2/src/test/org/h2/test/db/package-info.java
new file mode 100644
index 0000000000..0dcc30f739
--- /dev/null
+++ b/h2/src/test/org/h2/test/db/package-info.java
@@ -0,0 +1,10 @@
+/*
+ * 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
+ */
+
+/**
+ * Database tests. Most tests are on the SQL level.
+ */
+package org.h2.test.db;
diff --git a/h2/src/test/org/h2/test/db/package.html b/h2/src/test/org/h2/test/db/package.html
deleted file mode 100644
index ea1987f0b2..0000000000
--- a/h2/src/test/org/h2/test/db/package.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-Javadoc package documentation
-
-
-Database tests. Most tests are on the SQL level.
-
-
\ No newline at end of file
diff --git a/h2/src/test/org/h2/test/jdbc/TestMetaData.java b/h2/src/test/org/h2/test/jdbc/TestMetaData.java
index 467f7ade28..b1ff0a85e5 100644
--- a/h2/src/test/org/h2/test/jdbc/TestMetaData.java
+++ b/h2/src/test/org/h2/test/jdbc/TestMetaData.java
@@ -526,7 +526,7 @@ private void testStatic() throws SQLException {
meta.getDriverMinorVersion());
int majorVersion = 4;
assertEquals(majorVersion, meta.getJDBCMajorVersion());
- assertEquals(2, meta.getJDBCMinorVersion());
+ assertEquals(3, meta.getJDBCMinorVersion());
assertEquals("H2", meta.getDatabaseProductName());
assertEquals(Connection.TRANSACTION_READ_COMMITTED,
meta.getDefaultTransactionIsolation());
diff --git a/h2/src/test/org/h2/test/jdbc/TestStatement.java b/h2/src/test/org/h2/test/jdbc/TestStatement.java
index 5935645b3f..e23b5a53db 100644
--- a/h2/src/test/org/h2/test/jdbc/TestStatement.java
+++ b/h2/src/test/org/h2/test/jdbc/TestStatement.java
@@ -16,7 +16,6 @@
import org.h2.api.ErrorCode;
import org.h2.engine.SysProperties;
-import org.h2.jdbc.JdbcStatement;
import org.h2.store.fs.FileUtils;
import org.h2.test.TestBase;
import org.h2.test.TestDb;
@@ -442,7 +441,7 @@ private void testPreparedStatement() throws SQLException{
private void testIdentifiers() throws SQLException {
Connection conn = getConnection("statement");
- JdbcStatement stat = (JdbcStatement) conn.createStatement();
+ Statement stat = conn.createStatement();
assertEquals("SOME_ID", stat.enquoteIdentifier("SOME_ID", false));
assertEquals("\"SOME ID\"", stat.enquoteIdentifier("SOME ID", false));
assertEquals("\"SOME_ID\"", stat.enquoteIdentifier("SOME_ID", true));
@@ -480,7 +479,7 @@ private void testIdentifiers() throws SQLException {
deleteDb("statement");
conn = getConnection("statement;DATABASE_TO_LOWER=TRUE");
- JdbcStatement stat2 = (JdbcStatement) conn.createStatement();
+ Statement stat2 = conn.createStatement();
assertEquals("some_id", stat2.enquoteIdentifier("some_id", false));
assertEquals("\"some id\"", stat2.enquoteIdentifier("some id", false));
assertEquals("\"some_id\"", stat2.enquoteIdentifier("some_id", true));
@@ -500,7 +499,7 @@ private void testIdentifiers() throws SQLException {
deleteDb("statement");
conn = getConnection("statement;DATABASE_TO_UPPER=FALSE");
- JdbcStatement stat3 = (JdbcStatement) conn.createStatement();
+ Statement stat3 = conn.createStatement();
assertEquals("SOME_ID", stat3.enquoteIdentifier("SOME_ID", false));
assertEquals("some_id", stat3.enquoteIdentifier("some_id", false));
assertEquals("\"SOME ID\"", stat3.enquoteIdentifier("SOME ID", false));
diff --git a/h2/src/test/org/h2/test/jdbc/package-info.java b/h2/src/test/org/h2/test/jdbc/package-info.java
new file mode 100644
index 0000000000..bfb3a7fbc5
--- /dev/null
+++ b/h2/src/test/org/h2/test/jdbc/package-info.java
@@ -0,0 +1,10 @@
+/*
+ * 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
+ */
+
+/**
+ * JDBC API tests.
+ */
+package org.h2.test.jdbc;
diff --git a/h2/src/test/org/h2/test/jdbc/package.html b/h2/src/test/org/h2/test/jdbc/package.html
deleted file mode 100644
index e97eaf2c0e..0000000000
--- a/h2/src/test/org/h2/test/jdbc/package.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-Javadoc package documentation
-
-
-JDBC API tests.
-
-
\ No newline at end of file
diff --git a/h2/src/test/org/h2/test/jdbcx/package-info.java b/h2/src/test/org/h2/test/jdbcx/package-info.java
new file mode 100644
index 0000000000..99c31f8848
--- /dev/null
+++ b/h2/src/test/org/h2/test/jdbcx/package-info.java
@@ -0,0 +1,10 @@
+/*
+ * 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
+ */
+
+/**
+ * Tests related to distributed transactions.
+ */
+package org.h2.test.jdbcx;
diff --git a/h2/src/test/org/h2/test/jdbcx/package.html b/h2/src/test/org/h2/test/jdbcx/package.html
deleted file mode 100644
index bd9de471cd..0000000000
--- a/h2/src/test/org/h2/test/jdbcx/package.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-Javadoc package documentation
-
-
-Tests related to distributed transactions.
-
-
\ No newline at end of file
diff --git a/h2/src/test/org/h2/test/mvcc/package-info.java b/h2/src/test/org/h2/test/mvcc/package-info.java
new file mode 100644
index 0000000000..15cc7333fd
--- /dev/null
+++ b/h2/src/test/org/h2/test/mvcc/package-info.java
@@ -0,0 +1,10 @@
+/*
+ * 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
+ */
+
+/**
+ * Multi version concurrency tests.
+ */
+package org.h2.test.mvcc;
diff --git a/h2/src/test/org/h2/test/mvcc/package.html b/h2/src/test/org/h2/test/mvcc/package.html
deleted file mode 100644
index a8d0535582..0000000000
--- a/h2/src/test/org/h2/test/mvcc/package.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-Javadoc package documentation
-
-
-Multi version concurrency tests.
-
-
\ No newline at end of file
diff --git a/h2/src/test/org/h2/test/package-info.java b/h2/src/test/org/h2/test/package-info.java
new file mode 100644
index 0000000000..207050a80a
--- /dev/null
+++ b/h2/src/test/org/h2/test/package-info.java
@@ -0,0 +1,10 @@
+/*
+ * 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
+ */
+
+/**
+ * High level test classes.
+ */
+package org.h2.test;
diff --git a/h2/src/test/org/h2/test/package.html b/h2/src/test/org/h2/test/package.html
deleted file mode 100644
index 542793cbe0..0000000000
--- a/h2/src/test/org/h2/test/package.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-Javadoc package documentation
-
-
-High level test classes.
-
-
\ No newline at end of file
diff --git a/h2/src/test/org/h2/test/poweroff/package-info.java b/h2/src/test/org/h2/test/poweroff/package-info.java
new file mode 100644
index 0000000000..4a427a93b9
--- /dev/null
+++ b/h2/src/test/org/h2/test/poweroff/package-info.java
@@ -0,0 +1,10 @@
+/*
+ * 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
+ */
+
+/**
+ * Poweroff and recovery tests.
+ */
+package org.h2.test.poweroff;
diff --git a/h2/src/test/org/h2/test/poweroff/package.html b/h2/src/test/org/h2/test/poweroff/package.html
deleted file mode 100644
index a8d0535582..0000000000
--- a/h2/src/test/org/h2/test/poweroff/package.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-Javadoc package documentation
-
-
-Multi version concurrency tests.
-
-
\ No newline at end of file
diff --git a/h2/src/test/org/h2/test/recover/package-info.java b/h2/src/test/org/h2/test/recover/package-info.java
new file mode 100644
index 0000000000..c768a62b40
--- /dev/null
+++ b/h2/src/test/org/h2/test/recover/package-info.java
@@ -0,0 +1,10 @@
+/*
+ * 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
+ */
+
+/**
+ * Recovery tests.
+ */
+package org.h2.test.recover;
diff --git a/h2/src/test/org/h2/test/recover/package.html b/h2/src/test/org/h2/test/recover/package.html
deleted file mode 100644
index 686cdedfb0..0000000000
--- a/h2/src/test/org/h2/test/recover/package.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-Javadoc package documentation
-
-
-Recovery tests.
-
-
\ No newline at end of file
diff --git a/h2/src/test/org/h2/test/rowlock/package-info.java b/h2/src/test/org/h2/test/rowlock/package-info.java
new file mode 100644
index 0000000000..8e664f7df1
--- /dev/null
+++ b/h2/src/test/org/h2/test/rowlock/package-info.java
@@ -0,0 +1,10 @@
+/*
+ * 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
+ */
+
+/**
+ * Row level locking tests.
+ */
+package org.h2.test.rowlock;
diff --git a/h2/src/test/org/h2/test/rowlock/package.html b/h2/src/test/org/h2/test/rowlock/package.html
deleted file mode 100644
index 8c855c0871..0000000000
--- a/h2/src/test/org/h2/test/rowlock/package.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-Javadoc package documentation
-
-
-Row level locking tests.
-
-
\ No newline at end of file
diff --git a/h2/src/test/org/h2/test/scripts/package-info.java b/h2/src/test/org/h2/test/scripts/package-info.java
new file mode 100644
index 0000000000..63ff51ab26
--- /dev/null
+++ b/h2/src/test/org/h2/test/scripts/package-info.java
@@ -0,0 +1,10 @@
+/*
+ * 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
+ */
+
+/**
+ * Script test files.
+ */
+package org.h2.test.scripts;
diff --git a/h2/src/test/org/h2/test/scripts/package.html b/h2/src/test/org/h2/test/scripts/package.html
deleted file mode 100644
index f5a7a95b97..0000000000
--- a/h2/src/test/org/h2/test/scripts/package.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-Javadoc package documentation
-
-
-Script test files.
-
-
\ No newline at end of file
diff --git a/h2/src/test/org/h2/test/server/TestJakartaWeb.java b/h2/src/test/org/h2/test/server/TestJakartaWeb.java
index 27d565459e..4495841a73 100644
--- a/h2/src/test/org/h2/test/server/TestJakartaWeb.java
+++ b/h2/src/test/org/h2/test/server/TestJakartaWeb.java
@@ -39,7 +39,6 @@
import org.h2.server.web.JakartaWebServlet;
import org.h2.test.TestBase;
import org.h2.test.TestDb;
-import org.h2.util.Utils10;
/**
* Tests the Jakarta Web Servlet for the H2 Console.
@@ -680,7 +679,7 @@ public void write(int b) throws IOException {
@Override
public String toString() {
- return Utils10.byteArrayOutputStreamToString(buff, StandardCharsets.UTF_8);
+ return buff.toString(StandardCharsets.UTF_8);
}
@Override
diff --git a/h2/src/test/org/h2/test/server/TestWeb.java b/h2/src/test/org/h2/test/server/TestWeb.java
index df365bedee..9dddd480eb 100644
--- a/h2/src/test/org/h2/test/server/TestWeb.java
+++ b/h2/src/test/org/h2/test/server/TestWeb.java
@@ -52,7 +52,6 @@
import org.h2.tools.Server;
import org.h2.util.StringUtils;
import org.h2.util.Task;
-import org.h2.util.Utils10;
/**
* Tests the H2 Console application.
@@ -1192,7 +1191,7 @@ public void write(int b) throws IOException {
@Override
public String toString() {
- return Utils10.byteArrayOutputStreamToString(buff, StandardCharsets.UTF_8);
+ return buff.toString(StandardCharsets.UTF_8);
}
@Override
diff --git a/h2/src/test/org/h2/test/server/package-info.java b/h2/src/test/org/h2/test/server/package-info.java
new file mode 100644
index 0000000000..3299b37031
--- /dev/null
+++ b/h2/src/test/org/h2/test/server/package-info.java
@@ -0,0 +1,10 @@
+/*
+ * 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
+ */
+
+/**
+ * This package contains server tests.
+ */
+package org.h2.test.server;
diff --git a/h2/src/test/org/h2/test/server/package.html b/h2/src/test/org/h2/test/server/package.html
deleted file mode 100644
index 483aa60341..0000000000
--- a/h2/src/test/org/h2/test/server/package.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-Javadoc package documentation
-
-
-This package contains server tests.
-
-
\ No newline at end of file
diff --git a/h2/src/test/org/h2/test/store/TestImmutableArray.java b/h2/src/test/org/h2/test/store/TestImmutableArray.java
deleted file mode 100644
index 6875697235..0000000000
--- a/h2/src/test/org/h2/test/store/TestImmutableArray.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * 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.test.store;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.Random;
-import java.util.concurrent.TimeUnit;
-
-import org.h2.dev.util.ImmutableArray2;
-import org.h2.test.TestBase;
-
-/**
- * Test the concurrent linked list.
- */
-public class TestImmutableArray extends TestBase {
-
- /**
- * Run just this test.
- *
- * @param a ignored
- */
- public static void main(String... a) throws Exception {
- TestImmutableArray test = (TestImmutableArray) TestBase.createCaller().init();
- test.test();
- testPerformance();
- }
-
- @Override
- public void test() throws Exception {
- testRandomized();
- }
-
- private static void testPerformance() {
- testPerformance(true);
- testPerformance(false);
- testPerformance(true);
- testPerformance(false);
- testPerformance(true);
- testPerformance(false);
- }
-
- private static void testPerformance(final boolean immutable) {
-// immutable time 2068 dummy: 60000000
-// immutable time 1140 dummy: 60000000
-// ArrayList time 361 dummy: 60000000
-
- System.out.print(immutable ? "immutable" : "ArrayList");
- long start = System.nanoTime();
- int count = 20000000;
- Integer x = 1;
- int sum = 0;
- if (immutable) {
- ImmutableArray2 test = ImmutableArray2.empty();
- for (int i = 0; i < count; i++) {
- if (i % 10 != 0) {
- test = test.insert(test.length(), x);
- } else {
- test = test.insert(i % 30, x);
- }
- if (test.length() > 100) {
- while (test.length() > 30) {
- if (i % 10 != 0) {
- test = test.remove(test.length() - 1);
- } else {
- test = test.remove(0);
- }
- }
- }
- sum += test.get(0);
- sum += test.get(test.length() - 1);
- sum += test.get(test.length() / 2);
- if (i % 10 == 0) {
- test = test.set(0, x);
- }
- }
- } else {
- ArrayList test = new ArrayList<>();
- for (int i = 0; i < count; i++) {
- if (i % 10 != 0) {
- test.add(test.size(), x);
- } else {
- test.add(i % 30, x);
- }
- if (test.size() > 100) {
- while (test.size() > 30) {
- if (i % 2 == 0) {
- test.remove(test.size() - 1);
- } else {
- test.remove(0);
- }
- }
- }
- sum += test.get(0);
- sum += test.get(test.size() - 1);
- sum += test.get(test.size() / 2);
- if (i % 10 == 0) {
- test.set(0, x);
- }
- }
- }
- System.out.println(" time " + TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - start) +
- " dummy: " + sum);
- }
-
- private void testRandomized() {
- Random r = new Random(0);
- for (int i = 0; i < 100; i++) {
- ImmutableArray2 test = ImmutableArray2.empty();
- // ConcurrentRing test = new ConcurrentRing();
- ArrayList x = new ArrayList<>();
- StringBuilder buff = new StringBuilder();
- for (int j = 0; j < 1000; j++) {
- buff.append("[" + j + "] ");
- int opType = r.nextInt(3);
- switch (opType) {
- case 0: {
- int index = test.length() == 0 ? 0 : r.nextInt(test.length());
- int value = r.nextInt(100);
- buff.append("insert " + index + " " + value + "\n");
- test = test.insert(index, value);
- x.add(index, value);
- break;
- }
- case 1: {
- if (test.length() > 0) {
- int index = r.nextInt(test.length());
- int value = r.nextInt(100);
- buff.append("set " + index + " " + value + "\n");
- x.set(index, value);
- test = test.set(index, value);
- }
- break;
- }
- case 2: {
- if (test.length() > 0) {
- int index = r.nextInt(test.length());
- buff.append("remove " + index + "\n");
- x.remove(index);
- test = test.remove(index);
- }
- break;
- }
- }
- assertEquals(x.size(), test.length());
- assertEquals(toString(x.iterator()), toString(test.iterator()));
- }
- }
- }
-
- private static String toString(Iterator it) {
- StringBuilder buff = new StringBuilder();
- while (it.hasNext()) {
- buff.append(' ').append(it.next());
- }
- return buff.toString();
- }
-
-}
diff --git a/h2/src/test/org/h2/test/store/package-info.java b/h2/src/test/org/h2/test/store/package-info.java
new file mode 100644
index 0000000000..0b80f4255e
--- /dev/null
+++ b/h2/src/test/org/h2/test/store/package-info.java
@@ -0,0 +1,10 @@
+/*
+ * 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
+ */
+
+/**
+ * This package contains tests for the map store.
+ */
+package org.h2.test.store;
diff --git a/h2/src/test/org/h2/test/store/package.html b/h2/src/test/org/h2/test/store/package.html
deleted file mode 100644
index 3c109278fe..0000000000
--- a/h2/src/test/org/h2/test/store/package.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-Javadoc package documentation
-
-
-This package contains tests for the map store.
-
-
\ No newline at end of file
diff --git a/h2/src/test/org/h2/test/synth/package-info.java b/h2/src/test/org/h2/test/synth/package-info.java
new file mode 100644
index 0000000000..bcaaaf67dd
--- /dev/null
+++ b/h2/src/test/org/h2/test/synth/package-info.java
@@ -0,0 +1,10 @@
+/*
+ * 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
+ */
+
+/**
+ * Synthetic tests using random operations or statements.
+ */
+package org.h2.test.synth;
diff --git a/h2/src/test/org/h2/test/synth/package.html b/h2/src/test/org/h2/test/synth/package.html
deleted file mode 100644
index 237ed2c4f1..0000000000
--- a/h2/src/test/org/h2/test/synth/package.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-Javadoc package documentation
-
-
-Synthetic tests using random operations or statements.
-
-
\ No newline at end of file
diff --git a/h2/src/test/org/h2/test/synth/sql/package-info.java b/h2/src/test/org/h2/test/synth/sql/package-info.java
new file mode 100644
index 0000000000..d2883826f9
--- /dev/null
+++ b/h2/src/test/org/h2/test/synth/sql/package-info.java
@@ -0,0 +1,11 @@
+/*
+ * 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
+ */
+
+/**
+ * A synthetic test using random SQL statements executed against multiple
+ * databases.
+ */
+package org.h2.test.synth.sql;
diff --git a/h2/src/test/org/h2/test/synth/sql/package.html b/h2/src/test/org/h2/test/synth/sql/package.html
deleted file mode 100644
index 26c403e19f..0000000000
--- a/h2/src/test/org/h2/test/synth/sql/package.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-Javadoc package documentation
-
-
-A synthetic test using random SQL statements executed against multiple databases.
-
-
\ No newline at end of file
diff --git a/h2/src/test/org/h2/test/synth/thread/package-info.java b/h2/src/test/org/h2/test/synth/thread/package-info.java
new file mode 100644
index 0000000000..50577530a7
--- /dev/null
+++ b/h2/src/test/org/h2/test/synth/thread/package-info.java
@@ -0,0 +1,10 @@
+/*
+ * 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
+ */
+
+/**
+ * Synthetic tests using random operations in multiple threads.
+ */
+package org.h2.test.synth.thread;
diff --git a/h2/src/test/org/h2/test/synth/thread/package.html b/h2/src/test/org/h2/test/synth/thread/package.html
deleted file mode 100644
index d75a1e0761..0000000000
--- a/h2/src/test/org/h2/test/synth/thread/package.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-Javadoc package documentation
-
-
-Synthetic tests using random operations in multiple threads.
-
-
\ No newline at end of file
diff --git a/h2/src/test/org/h2/test/todo/package-info.java b/h2/src/test/org/h2/test/todo/package-info.java
new file mode 100644
index 0000000000..db711b75c8
--- /dev/null
+++ b/h2/src/test/org/h2/test/todo/package-info.java
@@ -0,0 +1,10 @@
+/*
+ * 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
+ */
+
+/**
+ * Documentation and tests for open issues.
+ */
+package org.h2.test.todo;
diff --git a/h2/src/test/org/h2/test/todo/package.html b/h2/src/test/org/h2/test/todo/package.html
deleted file mode 100644
index 2b19b66272..0000000000
--- a/h2/src/test/org/h2/test/todo/package.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-Javadoc package documentation
-
-
-Documentation and tests for open issues.
-
-
\ No newline at end of file
diff --git a/h2/src/test/org/h2/test/trace/package-info.java b/h2/src/test/org/h2/test/trace/package-info.java
new file mode 100644
index 0000000000..b10eed94b5
--- /dev/null
+++ b/h2/src/test/org/h2/test/trace/package-info.java
@@ -0,0 +1,10 @@
+/*
+ * 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
+ */
+
+/**
+ * A player to interpret and execute Java statements in a trace file.
+ */
+package org.h2.test.trace;
diff --git a/h2/src/test/org/h2/test/trace/package.html b/h2/src/test/org/h2/test/trace/package.html
deleted file mode 100644
index 6972ba7c5c..0000000000
--- a/h2/src/test/org/h2/test/trace/package.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-Javadoc package documentation
-
-
-A player to interpret and execute Java statements in a trace file.
-
-
\ No newline at end of file
diff --git a/h2/src/test/org/h2/test/unit/TestNetUtils.java b/h2/src/test/org/h2/test/unit/TestNetUtils.java
index eb9deb7cd4..f12a01319d 100644
--- a/h2/src/test/org/h2/test/unit/TestNetUtils.java
+++ b/h2/src/test/org/h2/test/unit/TestNetUtils.java
@@ -12,12 +12,8 @@
import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLServerSocket;
-import javax.net.ssl.SSLSession;
-import javax.net.ssl.SSLSocket;
+
import org.h2.build.BuildBase;
-import org.h2.engine.SysProperties;
import org.h2.test.TestBase;
import org.h2.util.NetUtils;
import org.h2.util.Task;
@@ -33,9 +29,6 @@ public class TestNetUtils extends TestBase {
private static final int WORKER_COUNT = 10;
private static final int PORT = 9111;
- private static final int WAIT_MILLIS = 100;
- private static final int WAIT_LONGER_MILLIS = 2 * WAIT_MILLIS;
- private static final String TASK_PREFIX = "ServerSocketThread-";
/**
* Run just this test.
@@ -48,150 +41,12 @@ public static void main(String... a) throws Exception {
@Override
public void test() throws Exception {
- testAnonymousTlsSession();
- testTlsSessionWithServerSideAnonymousDisabled();
testFrequentConnections(true, 100);
testFrequentConnections(false, 1000);
testIpToShortForm();
testTcpQuickack();
}
- /**
- * With default settings, H2 client SSL socket should be able to connect
- * to an H2 server SSL socket using an anonymous cipher suite
- * (no SSL certificate is needed).
- */
- private void testAnonymousTlsSession() throws Exception {
- if (config.ci || BuildBase.getJavaVersion() >= 11) {
- // Issue #1303
- return;
- }
- assertTrue("Failed assumption: the default value of ENABLE_ANONYMOUS_TLS" +
- " property should be true", SysProperties.ENABLE_ANONYMOUS_TLS);
- boolean ssl = true;
- Task task = null;
- ServerSocket serverSocket = null;
- Socket socket = null;
-
- try {
- serverSocket = NetUtils.createServerSocket(PORT, ssl);
- serverSocket.setSoTimeout(WAIT_LONGER_MILLIS);
- task = createServerSocketTask(serverSocket);
- task.execute(TASK_PREFIX + "AnonEnabled");
- Thread.sleep(WAIT_MILLIS);
- socket = NetUtils.createLoopbackSocket(PORT, ssl);
- assertTrue("loopback anon socket should be connected", socket.isConnected());
- SSLSession session = ((SSLSocket) socket).getSession();
- assertTrue("TLS session should be valid when anonymous TLS is enabled",
- session.isValid());
- // in case of handshake failure:
- // the cipher suite is the pre-handshake SSL_NULL_WITH_NULL_NULL
- assertContains(session.getCipherSuite(), "_anon_");
- } finally {
- closeSilently(socket);
- closeSilently(serverSocket);
- if (task != null) {
- // SSL server socket should succeed using an anonymous cipher
- // suite, and not throw javax.net.ssl.SSLHandshakeException
- assertNull(task.getException());
- task.join();
- }
- }
- }
-
- /**
- * TLS connections (without trusted certificates) should fail if the server
- * does not allow anonymous TLS.
- * The global property ENABLE_ANONYMOUS_TLS cannot be modified for the test;
- * instead, the server socket is altered.
- */
- private void testTlsSessionWithServerSideAnonymousDisabled() throws Exception {
- if (config.ci) {
- // Issue #1303
- return;
- }
- boolean ssl = true;
- Task task = null;
- ServerSocket serverSocket = null;
- Socket socket = null;
- try {
- serverSocket = NetUtils.createServerSocket(PORT, ssl);
- serverSocket.setSoTimeout(WAIT_LONGER_MILLIS);
- // emulate the situation ENABLE_ANONYMOUS_TLS=false on server side
- String[] defaultCipherSuites = SSLContext.getDefault().getServerSocketFactory()
- .getDefaultCipherSuites();
- ((SSLServerSocket) serverSocket).setEnabledCipherSuites(defaultCipherSuites);
- task = createServerSocketTask(serverSocket);
- task.execute(TASK_PREFIX + "AnonDisabled");
- Thread.sleep(WAIT_MILLIS);
- socket = NetUtils.createLoopbackSocket(PORT, ssl);
- assertTrue("loopback socket should be connected", socket.isConnected());
- // Java 6 API does not have getHandshakeSession() which could
- // reveal the actual cipher selected in the attempted handshake
- SSLSession session = ((SSLSocket) socket).getSession();
- assertFalse("TLS session should be invalid when the server" +
- "disables anonymous TLS", session.isValid());
- // the SSL handshake should fail, because non-anon ciphers require
- // a trusted certificate
- assertEquals("SSL_NULL_WITH_NULL_NULL", session.getCipherSuite());
- } finally {
- closeSilently(socket);
- closeSilently(serverSocket);
- if (task != null) {
- assertNotNull(task.getException());
- assertEquals(javax.net.ssl.SSLHandshakeException.class.getName(),
- task.getException().getClass().getName());
- assertContains(task.getException().getMessage(), "certificate_unknown");
- task.join();
- }
- }
- }
-
- private Task createServerSocketTask(final ServerSocket serverSocket) {
- Task task = new Task() {
-
- @Override
- public void call() throws Exception {
- Socket ss = null;
- try {
- ss = serverSocket.accept();
- ss.getOutputStream().write(123);
- } finally {
- closeSilently(ss);
- }
- }
- };
- return task;
- }
-
- /**
- * Close a socket, ignoring errors
- *
- * @param socket the socket
- */
- void closeSilently(Socket socket) {
- try {
- if (socket != null) {
- socket.close();
- }
- } catch (Exception e) {
- // ignore
- }
- }
-
- /**
- * Close a server socket, ignoring errors
- *
- * @param socket the server socket
- */
- void closeSilently(ServerSocket socket) {
- try {
- socket.close();
- } catch (Exception e) {
- // ignore
- }
- }
-
private static void testFrequentConnections(boolean ssl, int count) throws Exception {
final ServerSocket serverSocket = NetUtils.createServerSocket(PORT, ssl);
final AtomicInteger counter = new AtomicInteger(count);
diff --git a/h2/src/test/org/h2/test/unit/TestReader.java b/h2/src/test/org/h2/test/unit/TestReader.java
deleted file mode 100644
index 40d9598c67..0000000000
--- a/h2/src/test/org/h2/test/unit/TestReader.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * 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.test.unit;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.io.Reader;
-import java.io.StringReader;
-
-import org.h2.dev.util.ReaderInputStream;
-import org.h2.test.TestBase;
-import org.h2.util.IOUtils;
-
-/**
- * Tests the stream to UTF-8 reader conversion.
- */
-public class TestReader extends TestBase {
-
- /**
- * Run just this test.
- *
- * @param a ignored
- */
- public static void main(String... a) throws Exception {
- TestBase.createCaller().init().testFromMain();
- }
-
- @Override
- public void test() throws Exception {
- String s = "\u00ef\u00f6\u00fc";
- StringReader r = new StringReader(s);
- InputStream in = new ReaderInputStream(r);
- byte[] buff = IOUtils.readBytesAndClose(in, 0);
- InputStream in2 = new ByteArrayInputStream(buff);
- Reader r2 = IOUtils.getReader(in2);
- String s2 = IOUtils.readStringAndClose(r2, Integer.MAX_VALUE);
- assertEquals(s, s2);
- }
-
-}
diff --git a/h2/src/test/org/h2/test/unit/TestRecovery.java b/h2/src/test/org/h2/test/unit/TestRecovery.java
index 6bcb22fea7..ed26f4cc35 100644
--- a/h2/src/test/org/h2/test/unit/TestRecovery.java
+++ b/h2/src/test/org/h2/test/unit/TestRecovery.java
@@ -16,7 +16,6 @@
import org.h2.test.TestDb;
import org.h2.tools.DeleteDbFiles;
import org.h2.tools.Recover;
-import org.h2.util.Utils10;
/**
* Tests database recovery.
@@ -147,7 +146,7 @@ private void testRunScript() throws Exception {
ByteArrayOutputStream buff = new ByteArrayOutputStream();
rec.setOut(new PrintStream(buff, false, "UTF-8"));
rec.runTool("-dir", getBaseDir(), "-db", "recovery", "-trace");
- String out = Utils10.byteArrayOutputStreamToString(buff, StandardCharsets.UTF_8);
+ String out = buff.toString(StandardCharsets.UTF_8);
assertContains(out, "Created file");
Connection conn2 = getConnection("recovery2");
@@ -190,7 +189,7 @@ private void testRunScript2() throws Exception {
final ByteArrayOutputStream buff = new ByteArrayOutputStream(); // capture the console output
recover.setOut(new PrintStream(buff, false, "UTF-8"));
recover.runTool("-dir", getBaseDir(), "-db", "recovery", "-trace");
- String consoleOut = Utils10.byteArrayOutputStreamToString(buff, StandardCharsets.UTF_8);
+ String consoleOut = buff.toString(StandardCharsets.UTF_8);
assertContains(consoleOut, "Created file");
Connection conn2 = getConnection("recovery2");
diff --git a/h2/src/test/org/h2/test/unit/TestSampleApps.java b/h2/src/test/org/h2/test/unit/TestSampleApps.java
index 017ca80ef9..3885dbfc92 100644
--- a/h2/src/test/org/h2/test/unit/TestSampleApps.java
+++ b/h2/src/test/org/h2/test/unit/TestSampleApps.java
@@ -19,7 +19,6 @@
import org.h2.tools.DeleteDbFiles;
import org.h2.util.IOUtils;
import org.h2.util.StringUtils;
-import org.h2.util.Utils10;
/**
* Tests the sample apps.
@@ -138,7 +137,7 @@ private void testApp(String expected, Class clazz, String... args)
out.flush();
System.setOut(oldOut);
System.setErr(oldErr);
- String s = Utils10.byteArrayOutputStreamToString(buff, StandardCharsets.UTF_8);
+ String s = buff.toString(StandardCharsets.UTF_8);
s = StringUtils.replaceAll(s, "\r\n", "\n");
s = s.trim();
expected = expected.trim();
diff --git a/h2/src/test/org/h2/test/unit/TestSecurity.java b/h2/src/test/org/h2/test/unit/TestSecurity.java
index e06e3afa58..a409b29f60 100644
--- a/h2/src/test/org/h2/test/unit/TestSecurity.java
+++ b/h2/src/test/org/h2/test/unit/TestSecurity.java
@@ -41,8 +41,6 @@ public void test() throws SQLException {
testSHA3();
testAES();
testBlockCiphers();
- testRemoveAnonFromLegacyAlgorithms();
- // testResetLegacyAlgorithms();
}
private static void testConnectWithHash() throws SQLException {
@@ -291,43 +289,4 @@ private static boolean isCompressible(byte[] data) {
return len * r < len * 120;
}
- private void testRemoveAnonFromLegacyAlgorithms() {
- String legacyAlgorithms = "K_NULL, C_NULL, M_NULL, DHE_DSS_EXPORT" +
- ", DHE_RSA_EXPORT, DH_anon_EXPORT, DH_DSS_EXPORT, DH_RSA_EXPORT, RSA_EXPORT" +
- ", DH_anon, ECDH_anon, RC4_128, RC4_40, DES_CBC, DES40_CBC";
- String expectedLegacyWithoutDhAnon = "K_NULL, C_NULL, M_NULL, DHE_DSS_EXPORT" +
- ", DHE_RSA_EXPORT, DH_anon_EXPORT, DH_DSS_EXPORT, DH_RSA_EXPORT, RSA_EXPORT" +
- ", RC4_128, RC4_40, DES_CBC, DES40_CBC";
- assertEquals(expectedLegacyWithoutDhAnon,
- CipherFactory.removeDhAnonFromCommaSeparatedList(legacyAlgorithms));
-
- legacyAlgorithms = "ECDH_anon, DH_anon_EXPORT, DH_anon";
- expectedLegacyWithoutDhAnon = "DH_anon_EXPORT";
- assertEquals(expectedLegacyWithoutDhAnon,
- CipherFactory.removeDhAnonFromCommaSeparatedList(legacyAlgorithms));
-
- legacyAlgorithms = null;
- assertNull(CipherFactory.removeDhAnonFromCommaSeparatedList(legacyAlgorithms));
- }
-
- /**
- * This test is meaningful when run in isolation. However, tests of server
- * sockets or ssl connections may modify the global state given by the
- * jdk.tls.legacyAlgorithms security property (for a good reason).
- * It is best to avoid running it in test suites, as it could itself lead
- * to a modification of the global state with hard-to-track consequences.
- */
- @SuppressWarnings("unused")
- private void testResetLegacyAlgorithms() {
- String legacyAlgorithmsBefore = CipherFactory.getLegacyAlgorithmsSilently();
- assertEquals("Failed assumption: jdk.tls.legacyAlgorithms" +
- " has been modified from its initial setting",
- CipherFactory.DEFAULT_LEGACY_ALGORITHMS, legacyAlgorithmsBefore);
- CipherFactory.removeAnonFromLegacyAlgorithms();
- CipherFactory.resetDefaultLegacyAlgorithms();
- String legacyAlgorithmsAfter = CipherFactory.getLegacyAlgorithmsSilently();
- assertEquals(CipherFactory.DEFAULT_LEGACY_ALGORITHMS, legacyAlgorithmsAfter);
- }
-
-
}
diff --git a/h2/src/test/org/h2/test/unit/TestShell.java b/h2/src/test/org/h2/test/unit/TestShell.java
index 755f7b95d0..59dc89b3de 100644
--- a/h2/src/test/org/h2/test/unit/TestShell.java
+++ b/h2/src/test/org/h2/test/unit/TestShell.java
@@ -17,7 +17,6 @@
import org.h2.test.TestBase;
import org.h2.tools.Shell;
import org.h2.util.Task;
-import org.h2.util.Utils10;
/**
* Test the shell tool.
@@ -53,7 +52,7 @@ public void test() throws Exception {
shell.runTool("-url", "jdbc:h2:mem:", "-driver", "org.h2.Driver",
"-user", "sa", "-password", "sa", "-properties", "null",
"-sql", "select 'Hello ' || 'World' as hi");
- String s = Utils10.byteArrayOutputStreamToString(buff, StandardCharsets.UTF_8);
+ String s = buff.toString(StandardCharsets.UTF_8);
assertContains(s, "HI");
assertContains(s, "Hello World");
assertContains(s, "(1 row, ");
@@ -62,7 +61,7 @@ public void test() throws Exception {
buff = new ByteArrayOutputStream();
shell.setOut(new PrintStream(buff, false, "UTF-8"));
shell.runTool("-help");
- s = Utils10.byteArrayOutputStreamToString(buff, StandardCharsets.UTF_8);
+ s = buff.toString(StandardCharsets.UTF_8);
assertContains(s,
"Interactive command line tool to access a database using JDBC.");
diff --git a/h2/src/test/org/h2/test/unit/TestTools.java b/h2/src/test/org/h2/test/unit/TestTools.java
index 64444f625d..89a83a7e75 100644
--- a/h2/src/test/org/h2/test/unit/TestTools.java
+++ b/h2/src/test/org/h2/test/unit/TestTools.java
@@ -60,7 +60,6 @@
import org.h2.tools.SimpleResultSet.SimpleArray;
import org.h2.util.JdbcUtils;
import org.h2.util.Task;
-import org.h2.util.Utils10;
import org.h2.value.ValueUuid;
/**
@@ -707,7 +706,7 @@ private String runServer(int exitCode, String... args) throws Exception {
}
assertEquals(exitCode, result);
ps.flush();
- return Utils10.byteArrayOutputStreamToString(buff, StandardCharsets.UTF_8);
+ return buff.toString(StandardCharsets.UTF_8);
}
private void shutdownServers() {
@@ -979,7 +978,7 @@ private void testScriptRunscript() throws Exception {
tool.setOut(new PrintStream(buff, false, "UTF-8"));
tool.runTool("-url", url, "-user", user, "-password", password,
"-script", fileName + ".txt", "-showResults");
- assertContains(Utils10.byteArrayOutputStreamToString(buff, StandardCharsets.UTF_8), "Hello");
+ assertContains(buff.toString(StandardCharsets.UTF_8), "Hello");
// test parsing of BLOCKSIZE option
diff --git a/h2/src/test/org/h2/test/unit/TestTraceSystem.java b/h2/src/test/org/h2/test/unit/TestTraceSystem.java
index 11ac066daa..dc5509e915 100644
--- a/h2/src/test/org/h2/test/unit/TestTraceSystem.java
+++ b/h2/src/test/org/h2/test/unit/TestTraceSystem.java
@@ -14,7 +14,6 @@
import org.h2.message.TraceSystem;
import org.h2.store.fs.FileUtils;
import org.h2.test.TestBase;
-import org.h2.util.Utils10;
/**
* Tests the trace system
@@ -61,7 +60,7 @@ private void testTraceDebug() throws Exception {
ts.setLevelSystemOut(TraceSystem.DEBUG);
ts.getTrace("test").debug(new Exception("error"), "test");
ts.close();
- String outString = Utils10.byteArrayOutputStreamToString(out, StandardCharsets.UTF_8);
+ String outString = out.toString(StandardCharsets.UTF_8);
assertContains(outString, "error");
assertContains(outString, "Exception");
assertContains(outString, "test");
diff --git a/h2/src/test/org/h2/test/unit/TestUtils.java b/h2/src/test/org/h2/test/unit/TestUtils.java
index 83255974c2..1c961baf5b 100644
--- a/h2/src/test/org/h2/test/unit/TestUtils.java
+++ b/h2/src/test/org/h2/test/unit/TestUtils.java
@@ -14,8 +14,8 @@
import java.util.Arrays;
import java.util.Comparator;
import java.util.Random;
+
import org.h2.test.TestBase;
-import org.h2.util.Bits;
import org.h2.util.IOUtils;
import org.h2.util.Utils;
@@ -43,8 +43,6 @@ public void test() throws Exception {
testIOUtils();
testSortTopN();
testSortTopNRandom();
- testWriteReadInt();
- testWriteReadLong();
testGetNonPrimitiveClass();
testGetNonPrimitiveClass();
testGetNonPrimitiveClass();
@@ -91,62 +89,6 @@ private void testIOUtils() throws IOException {
}
}
- private void testWriteReadInt() {
- byte[] buff = new byte[4];
- for (int x : new int[]{Integer.MIN_VALUE, Integer.MAX_VALUE, 0, 1, -1,
- Short.MIN_VALUE, Short.MAX_VALUE}) {
- testIntImpl1(buff, x);
- }
- Random r = new Random(1);
- for (int i = 0; i < 1000; i++) {
- testIntImpl1(buff, r.nextInt());
- }
- }
-
- private void testIntImpl1(byte[] buff, int x) {
- int r = Integer.reverseBytes(x);
- Bits.writeInt(buff, 0, x);
- testIntImpl2(buff, x, r);
- Bits.writeIntLE(buff, 0, x);
- testIntImpl2(buff, r, x);
- }
-
- private void testIntImpl2(byte[] buff, int x, int r) {
- assertEquals(x, Bits.readInt(buff, 0));
- assertEquals(r, Bits.readIntLE(buff, 0));
- }
-
- private void testWriteReadLong() {
- byte[] buff = new byte[8];
- for (long x : new long[]{Long.MIN_VALUE, Long.MAX_VALUE, 0, 1, -1,
- Integer.MIN_VALUE, Integer.MAX_VALUE}) {
- testLongImpl1(buff, x);
- }
- Random r = new Random(1);
- for (int i = 0; i < 1000; i++) {
- testLongImpl1(buff, r.nextLong());
- }
- }
-
- private void testLongImpl1(byte[] buff, long x) {
- long r = Long.reverseBytes(x);
- Bits.writeLong(buff, 0, x);
- testLongImpl2(buff, x, r);
- Bits.writeLongLE(buff, 0, x);
- testLongImpl2(buff, r, x);
- Bits.writeDouble(buff, 0, Double.longBitsToDouble(x));
- testLongImpl2(buff, x, r);
- Bits.writeDoubleLE(buff, 0, Double.longBitsToDouble(x));
- testLongImpl2(buff, r, x);
- }
-
- private void testLongImpl2(byte[] buff, long x, long r) {
- assertEquals(x, Bits.readLong(buff, 0));
- assertEquals(r, Bits.readLongLE(buff, 0));
- assertEquals(Double.longBitsToDouble(x), Bits.readDouble(buff, 0));
- assertEquals(Double.longBitsToDouble(r), Bits.readDoubleLE(buff, 0));
- }
-
private void testSortTopN() {
Comparator comp = Comparator.naturalOrder();
Integer[] arr = new Integer[] {};
diff --git a/h2/src/test/org/h2/test/unit/package-info.java b/h2/src/test/org/h2/test/unit/package-info.java
new file mode 100644
index 0000000000..fb9a9072b9
--- /dev/null
+++ b/h2/src/test/org/h2/test/unit/package-info.java
@@ -0,0 +1,10 @@
+/*
+ * 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
+ */
+
+/**
+ * Unit tests that don't start the database (in most cases).
+ */
+package org.h2.test.unit;
diff --git a/h2/src/test/org/h2/test/unit/package.html b/h2/src/test/org/h2/test/unit/package.html
deleted file mode 100644
index 758495027d..0000000000
--- a/h2/src/test/org/h2/test/unit/package.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-Javadoc package documentation
-
-
-Unit tests that don't start the database (in most cases).
-
-
\ No newline at end of file
diff --git a/h2/src/test/org/h2/test/utils/package-info.java b/h2/src/test/org/h2/test/utils/package-info.java
new file mode 100644
index 0000000000..b907a369d6
--- /dev/null
+++ b/h2/src/test/org/h2/test/utils/package-info.java
@@ -0,0 +1,10 @@
+/*
+ * 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
+ */
+
+/**
+ * Utility classes used by the tests.
+ */
+package org.h2.test.utils;
diff --git a/h2/src/test/org/h2/test/utils/package.html b/h2/src/test/org/h2/test/utils/package.html
deleted file mode 100644
index 92d952efcc..0000000000
--- a/h2/src/test/org/h2/test/utils/package.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-Javadoc package documentation
-
-
-Utility classes used by the tests.
-
-
\ 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 05d8d333ad..5d62bb9ac4 100644
--- a/h2/src/tools/org/h2/build/Build.java
+++ b/h2/src/tools/org/h2/build/Build.java
@@ -33,39 +33,39 @@
*/
public class Build extends BuildBase {
- private static final String ASM_VERSION = "9.4";
+ private static final String ASM_VERSION = "9.5";
private static final String ARGS4J_VERSION = "2.33";
- private static final String DERBY_VERSION = "10.14.2.0";
+ private static final String DERBY_VERSION = "10.15.2.0";
- private static final String HSQLDB_VERSION = "2.5.1";
+ private static final String HSQLDB_VERSION = "2.7.2";
- private static final String JACOCO_VERSION = "0.8.5";
+ private static final String JACOCO_VERSION = "0.8.10";
- private static final String JTS_VERSION = "1.17.0";
+ private static final String JTS_VERSION = "1.19.0";
- private static final String JUNIT_VERSION = "5.6.2";
+ private static final String JUNIT_VERSION = "5.10.0";
- private static final String LUCENE_VERSION = "8.5.2";
+ private static final String LUCENE_VERSION = "9.7.0";
- private static final String MYSQL_CONNECTOR_VERSION = "8.0.27";
+ private static final String MYSQL_CONNECTOR_VERSION = "8.1.0";
private static final String OSGI_VERSION = "5.0.0";
private static final String OSGI_JDBC_VERSION = "1.1.0";
- private static final String PGJDBC_VERSION = "42.4.0";
+ private static final String PGJDBC_VERSION = "42.5.4";
- private static final String PGJDBC_HASH = "21ff952426bbfe4a041c175407333d4a07c70931";
+ private static final String PGJDBC_HASH = "015015a54f15e340a9a8a6a2c5457429cb1176b8";
private static final String JAVAX_SERVLET_VERSION = "4.0.1";
private static final String JAKARTA_SERVLET_VERSION = "5.0.0";
- private static final String SLF4J_VERSION = "1.7.30";
+ private static final String SLF4J_VERSION = "2.0.7";
- private static final String APIGUARDIAN_VERSION = "1.1.0";
+ private static final String APIGUARDIAN_VERSION = "1.1.2";
private static final String SQLITE_VERSION = "3.36.0.3";
@@ -89,24 +89,24 @@ public static void main(String... args) {
public void benchmark() {
downloadUsingMaven("ext/hsqldb-" + HSQLDB_VERSION + ".jar",
"org.hsqldb", "hsqldb", HSQLDB_VERSION,
- "b1f720a63a8756867895cc22dd74b51fb70e90ac");
+ "d92d4d2aa515714da2165c9d640d584c2896c9df");
downloadUsingMaven("ext/derby-" + DERBY_VERSION + ".jar",
"org.apache.derby", "derby", DERBY_VERSION,
- "7efad40ef52fbb1f08142f07a83b42d29e47d8ce");
+ "b64da6681994f33ba5783ffae55cdb44885b9e70");
downloadUsingMaven("ext/derbyclient-" + DERBY_VERSION + ".jar",
"org.apache.derby", "derbyclient", DERBY_VERSION,
- "fdd338d43e09bf7cd16f5523a0f717e5ef79a1a8");
+ "60ad423e9d7acba99a13b8684927206e94c31e03");
downloadUsingMaven("ext/derbynet-" + DERBY_VERSION + ".jar",
"org.apache.derby", "derbynet", DERBY_VERSION,
- "d03edf879317c7102884c4689e03a4d1a5f84126");
-// downloadUsingMaven("ext/derbyshared-" + DERBY_VERSION + ".jar",
-// "org.apache.derby", "derbyshared", DERBY_VERSION,
-// "ff2dfb3e2a92d593cf111baad242d156947abbc1");
+ "072c8fb0870227477b64edb2d7a5eccdac5de2af");
+ 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",
- "mysql", "mysql-connector-java", MYSQL_CONNECTOR_VERSION,
- "f1da9f10a3de6348725a413304aab6d0aa04f923");
+ downloadUsingMaven("ext/mysql-connector-j-" + MYSQL_CONNECTOR_VERSION + ".jar",
+ "com.mysql", "mysql-connector-j", MYSQL_CONNECTOR_VERSION,
+ "3f78d2963935f44a61edb3961a591cdc392c8941");
downloadUsingMaven("ext/sqlite-" + SQLITE_VERSION + ".jar",
"org.xerial", "sqlite-jdbc", SQLITE_VERSION, "7fa71c4dfab806490cb909714fb41373ec552c29");
compile();
@@ -117,9 +117,9 @@ 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" +
+ File.pathSeparator + "ext/mysql-connector-j-" + MYSQL_CONNECTOR_VERSION + ".jar" +
File.pathSeparator + "ext/sqlite-" + SQLITE_VERSION + ".jar";
StringList args = args("-Xmx128m",
"-cp", cp, "-Dderby.system.durability=test", "org.h2.test.bench.TestPerformance");
@@ -159,7 +159,7 @@ public void compile() {
File.pathSeparator + "ext/javax.servlet-api-" + JAVAX_SERVLET_VERSION + ".jar" +
File.pathSeparator + "ext/jakarta.servlet-api-" + JAKARTA_SERVLET_VERSION + ".jar" +
File.pathSeparator + "ext/lucene-core-" + LUCENE_VERSION + ".jar" +
- File.pathSeparator + "ext/lucene-analyzers-common-" + LUCENE_VERSION + ".jar" +
+ File.pathSeparator + "ext/lucene-analysis-common-" + LUCENE_VERSION + ".jar" +
File.pathSeparator + "ext/lucene-queryparser-" + LUCENE_VERSION + ".jar" +
File.pathSeparator + "ext/slf4j-api-" + SLF4J_VERSION + ".jar" +
File.pathSeparator + "ext/org.osgi.core-" + OSGI_VERSION + ".jar" +
@@ -201,7 +201,7 @@ public void compile() {
"org.h2.tools", "org.h2.jmx",
"-classpath",
"ext/lucene-core-" + LUCENE_VERSION + ".jar" +
- File.pathSeparator + "ext/lucene-analyzers-common-" + LUCENE_VERSION + ".jar" +
+ File.pathSeparator + "ext/lucene-analysis-common-" + LUCENE_VERSION + ".jar" +
File.pathSeparator + "ext/lucene-queryparser-" + LUCENE_VERSION + ".jar" +
File.pathSeparator + "ext/org.osgi.core-" + OSGI_VERSION + ".jar" +
File.pathSeparator + "ext/org.osgi.service.jdbc-" + OSGI_JDBC_VERSION + ".jar" +
@@ -238,7 +238,7 @@ public void coverage() {
downloadTest();
downloadUsingMaven("ext/org.jacoco.agent-" + JACOCO_VERSION + ".jar",
"org.jacoco", "org.jacoco.agent", JACOCO_VERSION,
- "0fd03a8ab78af3dd03b27647067efa72690d4922");
+ "ffdd953dfe502cd7678743c75905bc3304ae2eb7");
URI uri = URI.create("jar:"
+ Paths.get("ext/org.jacoco.agent-" + JACOCO_VERSION + ".jar").toAbsolutePath().toUri());
try (FileSystem fs = FileSystems.newFileSystem(uri, Collections.emptyMap())) {
@@ -249,13 +249,13 @@ public void coverage() {
}
downloadUsingMaven("ext/org.jacoco.cli-" + JACOCO_VERSION + ".jar",
"org.jacoco", "org.jacoco.cli", JACOCO_VERSION,
- "30155fcd37821879264365693055290dbfe984bb");
+ "b2e14234f8ab0c72d9ed599d2f01d21f453fecc0");
downloadUsingMaven("ext/org.jacoco.core-" + JACOCO_VERSION + ".jar",
"org.jacoco", "org.jacoco.core", JACOCO_VERSION,
- "1ac96769aa83e5492d1a1a694774f6baec4eb704");
+ "669a338279c3f40b154a64c624bab625664a00e6");
downloadUsingMaven("ext/org.jacoco.report-" + JACOCO_VERSION + ".jar",
"org.jacoco", "org.jacoco.report", JACOCO_VERSION,
- "421e4aab2aaa809d1e66a96feb11f61ea698da19");
+ "c361019431d1c88e7004ba5a722e7c3f7c22194b");
downloadUsingMaven("ext/args4j-" + ARGS4J_VERSION + ".jar",
"args4j", "args4j", ARGS4J_VERSION,
"bd87a75374a6d6523de82fef51fc3cfe9baf9fc9");
@@ -270,7 +270,7 @@ public void coverage() {
File.pathSeparator + "ext/javax.servlet-api-" + JAVAX_SERVLET_VERSION + ".jar" +
File.pathSeparator + "ext/jakarta.servlet-api-" + JAKARTA_SERVLET_VERSION + ".jar" +
File.pathSeparator + "ext/lucene-core-" + LUCENE_VERSION + ".jar" +
- File.pathSeparator + "ext/lucene-analyzers-common-" + LUCENE_VERSION + ".jar" +
+ File.pathSeparator + "ext/lucene-analysis-common-" + LUCENE_VERSION + ".jar" +
File.pathSeparator + "ext/lucene-queryparser-" + LUCENE_VERSION + ".jar" +
File.pathSeparator + "ext/org.osgi.core-" + OSGI_VERSION + ".jar" +
File.pathSeparator + "ext/org.osgi.service.jdbc-" + OSGI_JDBC_VERSION + ".jar" +
@@ -390,16 +390,16 @@ private void downloadOrVerify(boolean offline) {
"2e6b8ccde55522c879434ddec3714683ccae6867", offline);
downloadOrVerify("ext/lucene-core-" + LUCENE_VERSION + ".jar",
"org/apache/lucene", "lucene-core", LUCENE_VERSION,
- "b275ca5f39b6dd45d5a7ecb49da65205ad2732ca", offline);
- downloadOrVerify("ext/lucene-analyzers-common-" + LUCENE_VERSION + ".jar",
- "org/apache/lucene", "lucene-analyzers-common", LUCENE_VERSION,
- "2c4a7e8583e2061aa35db85705393b8b6e67a679", offline);
+ "ad391210ffd806931334be9670a35af00c56f959", offline);
+ downloadOrVerify("ext/lucene-analysis-common-" + LUCENE_VERSION + ".jar",
+ "org/apache/lucene", "lucene-analysis-common", LUCENE_VERSION,
+ "27ba6caaa4587a982cd451f7217b5a982bcfc44a", offline);
downloadOrVerify("ext/lucene-queryparser-" + LUCENE_VERSION + ".jar",
"org/apache/lucene", "lucene-queryparser", LUCENE_VERSION,
- "96a104be314d0adaac163635610da8dfc5e4166e", offline);
+ "6e77bde908ff698354e4a2149e6dd4658b56d7b0", offline);
downloadOrVerify("ext/slf4j-api-" + SLF4J_VERSION + ".jar",
"org/slf4j", "slf4j-api", SLF4J_VERSION,
- "b5a4b6d16ab13e34a88fae84c35cd5d68cac922c", offline);
+ "41eb7184ea9d556f23e18b5cb99cad1f8581fc00", offline);
downloadOrVerify("ext/org.osgi.core-" + OSGI_VERSION + ".jar",
"org/osgi", "org.osgi.core", OSGI_VERSION,
"6e5e8cd3c9059c08e1085540442a490b59a7783c", offline);
@@ -408,16 +408,16 @@ private void downloadOrVerify(boolean offline) {
"07673601d60c98d876b82530ff4363ed9e428c1e", offline);
downloadOrVerify("ext/jts-core-" + JTS_VERSION + ".jar",
"org/locationtech/jts", "jts-core", JTS_VERSION,
- "7e1973b5babdd98734b1ab903fc1155714402eec", offline);
+ "3ff3baa0074445384f9e0068df81fbd0a168395a", offline);
downloadOrVerify("ext/junit-jupiter-api-" + JUNIT_VERSION + ".jar",
"org.junit.jupiter", "junit-jupiter-api", JUNIT_VERSION,
- "c9ba885abfe975cda123bf6f8f0a69a1b46956d0", offline);
+ "2fe4ba3d31d5067878e468c96aa039005a9134d3", offline);
downloadUsingMaven("ext/asm-" + ASM_VERSION + ".jar",
"org.ow2.asm", "asm", ASM_VERSION,
- "b4e0e2d2e023aa317b7cfcfc916377ea348e07d1");
+ "dc6ea1875f4d64fbc85e1691c95b96a3d8569c90");
downloadUsingMaven("ext/apiguardian-" + APIGUARDIAN_VERSION + ".jar",
"org.apiguardian", "apiguardian-api", APIGUARDIAN_VERSION,
- "fc9dff4bb36d627bdc553de77e1f17efd790876c");
+ "a231e0d844d2721b0fa1b238006d15c6ded6842a");
}
private void downloadOrVerify(String target, String group, String artifact,
@@ -445,7 +445,7 @@ private void downloadTest() {
// for TestTraceSystem
downloadUsingMaven("ext/slf4j-nop-" + SLF4J_VERSION + ".jar",
"org/slf4j", "slf4j-nop", SLF4J_VERSION,
- "55d4c73dd343efebd236abfeb367c9ef41d55063");
+ "a5b48a1a935615f0cc70148267bc0f6c4e437239");
// for TestTriggersConstraints
if (requiresNashornJavaScriptEngine()) {
downloadUsingMaven("ext/nashorn-core-" + NASHORN_VERSION + ".jar",
@@ -453,14 +453,14 @@ private void downloadTest() {
"f67f5ffaa5f5130cf6fb9b133da00c7df3b532a5");
downloadUsingMaven("ext/asm-util-" + ASM_VERSION + ".jar",
"org.ow2.asm", "asm-util", ASM_VERSION,
- "ab1e0a84b72561dbaf1ee260321e72148ebf4b19");
+ "64b5a1fc8c1b15ed2efd6a063e976bc8d3dc5ffe");
}
downloadUsingMaven("ext/asm-commons-" + ASM_VERSION + ".jar",
"org.ow2.asm", "asm-commons", ASM_VERSION,
- "8fc2810ddbcbbec0a8bbccb3f8eda58321839912");
+ "19ab5b5800a3910d30d3a3e64fdb00fd0cb42de0");
downloadUsingMaven("ext/asm-tree-" + ASM_VERSION + ".jar",
"org.ow2.asm", "asm-tree", ASM_VERSION,
- "a99175a17d7fdc18cbcbd0e8ea6a5d276844190a");
+ "fd33c8b6373abaa675be407082fdfda35021254a");
}
private static String getVersion() {
@@ -552,11 +552,9 @@ private FileList excludeTestMetaInfFiles(FileList files) {
}
/**
- * Add META-INF/versions for Java 9+.
+ * Add META-INF/versions for newer versions of Java.
*/
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");
}
@@ -616,7 +614,7 @@ public void javadoc() {
"org.h2.tools", "org.h2.api", "org.h2.engine", "org.h2.fulltext",
"-classpath",
"ext/lucene-core-" + LUCENE_VERSION + ".jar" +
- File.pathSeparator + "ext/lucene-analyzers-common-" + LUCENE_VERSION + ".jar" +
+ File.pathSeparator + "ext/lucene-analysis-common-" + LUCENE_VERSION + ".jar" +
File.pathSeparator + "ext/lucene-queryparser-" + LUCENE_VERSION + ".jar" +
File.pathSeparator + "ext/org.osgi.core-" + OSGI_VERSION + ".jar" +
File.pathSeparator + "ext/org.osgi.service.jdbc-" + OSGI_JDBC_VERSION + ".jar" +
@@ -641,7 +639,7 @@ public void javadocImpl() {
File.pathSeparator + "ext/javax.servlet-api-" + JAVAX_SERVLET_VERSION + ".jar" +
File.pathSeparator + "ext/jakarta.servlet-api-" + JAKARTA_SERVLET_VERSION + ".jar" +
File.pathSeparator + "ext/lucene-core-" + LUCENE_VERSION + ".jar" +
- File.pathSeparator + "ext/lucene-analyzers-common-" + LUCENE_VERSION + ".jar" +
+ File.pathSeparator + "ext/lucene-analysis-common-" + LUCENE_VERSION + ".jar" +
File.pathSeparator + "ext/lucene-queryparser-" + LUCENE_VERSION + ".jar" +
File.pathSeparator + "ext/org.osgi.core-" + OSGI_VERSION + ".jar" +
File.pathSeparator + "ext/org.osgi.service.jdbc-" + OSGI_JDBC_VERSION + ".jar" +
@@ -661,7 +659,7 @@ public void javadocImpl() {
File.pathSeparator + "ext/javax.servlet-api-" + JAVAX_SERVLET_VERSION + ".jar" +
File.pathSeparator + "ext/jakarta.servlet-api-" + JAKARTA_SERVLET_VERSION + ".jar" +
File.pathSeparator + "ext/lucene-core-" + LUCENE_VERSION + ".jar" +
- File.pathSeparator + "ext/lucene-analyzers-common-" + LUCENE_VERSION + ".jar" +
+ File.pathSeparator + "ext/lucene-analysis-common-" + LUCENE_VERSION + ".jar" +
File.pathSeparator + "ext/lucene-queryparser-" + LUCENE_VERSION + ".jar" +
File.pathSeparator + "ext/org.osgi.core-" + OSGI_VERSION + ".jar" +
File.pathSeparator + "ext/org.osgi.service.jdbc-" + OSGI_JDBC_VERSION + ".jar" +
@@ -681,7 +679,7 @@ public void javadocImpl() {
File.pathSeparator + "ext/javax.servlet-api-" + JAVAX_SERVLET_VERSION + ".jar" +
File.pathSeparator + "ext/jakarta.servlet-api-" + JAKARTA_SERVLET_VERSION + ".jar" +
File.pathSeparator + "ext/lucene-core-" + LUCENE_VERSION + ".jar" +
- File.pathSeparator + "ext/lucene-analyzers-common-" + LUCENE_VERSION + ".jar" +
+ File.pathSeparator + "ext/lucene-analysis-common-" + LUCENE_VERSION + ".jar" +
File.pathSeparator + "ext/lucene-queryparser-" + LUCENE_VERSION + ".jar" +
File.pathSeparator + "ext/org.osgi.core-" + OSGI_VERSION + ".jar" +
File.pathSeparator + "ext/org.osgi.service.jdbc-" + OSGI_JDBC_VERSION + ".jar" +
@@ -908,7 +906,7 @@ private void test(boolean ci) {
File.pathSeparator + "ext/javax.servlet-api-" + JAVAX_SERVLET_VERSION + ".jar" +
File.pathSeparator + "ext/jakarta.servlet-api-" + JAKARTA_SERVLET_VERSION + ".jar" +
File.pathSeparator + "ext/lucene-core-" + LUCENE_VERSION + ".jar" +
- File.pathSeparator + "ext/lucene-analyzers-common-" + LUCENE_VERSION + ".jar" +
+ File.pathSeparator + "ext/lucene-analysis-common-" + LUCENE_VERSION + ".jar" +
File.pathSeparator + "ext/lucene-queryparser-" + LUCENE_VERSION + ".jar" +
File.pathSeparator + "ext/org.osgi.core-" + OSGI_VERSION + ".jar" +
File.pathSeparator + "ext/org.osgi.service.jdbc-" + OSGI_JDBC_VERSION + ".jar" +
@@ -1141,7 +1139,7 @@ protected String getLocalMavenDir() {
return local;
}
- private String addNashornJavaScriptEngineIfNecessary(String cp) {
+ private static String addNashornJavaScriptEngineIfNecessary(String cp) {
if (requiresNashornJavaScriptEngine()) {
return cp +
File.pathSeparator + "ext/nashorn-core-" + NASHORN_VERSION + ".jar" +
@@ -1152,7 +1150,7 @@ private String addNashornJavaScriptEngineIfNecessary(String cp) {
return cp;
}
- private boolean requiresNashornJavaScriptEngine() {
+ private static boolean requiresNashornJavaScriptEngine() {
return getJavaVersion() >= 15; // Nashorn was removed in Java 15
}
diff --git a/h2/src/tools/org/h2/build/BuildBase.java b/h2/src/tools/org/h2/build/BuildBase.java
index ba488c6882..c3e26d30ee 100644
--- a/h2/src/tools/org/h2/build/BuildBase.java
+++ b/h2/src/tools/org/h2/build/BuildBase.java
@@ -886,14 +886,9 @@ protected static String getJavaSpecVersion() {
* @return the Java version (8, 9, 10, 11, 12, 13, etc)
*/
public static int getJavaVersion() {
- int version = 8;
+ int version = 11;
String v = getJavaSpecVersion();
if (v != null) {
- int idx = v.indexOf('.');
- if (idx >= 0) {
- // 1.8
- v = v.substring(idx + 1);
- }
version = Integer.parseInt(v);
}
return version;
diff --git a/h2/src/tools/org/h2/build/code/CheckJavadoc.java b/h2/src/tools/org/h2/build/code/CheckJavadoc.java
index 0fc8a1d05f..63e1782aa7 100644
--- a/h2/src/tools/org/h2/build/code/CheckJavadoc.java
+++ b/h2/src/tools/org/h2/build/code/CheckJavadoc.java
@@ -55,15 +55,13 @@ private int check(Path file) throws Exception {
}
}
if (foundJava && !foundPackageHtml) {
- System.out.println("No package.html file, but a Java file found at: " + file.toAbsolutePath());
+ System.out.println("No package-info.java file, but a Java file found at: " + file.toAbsolutePath());
errorCount++;
}
} else {
if (name.endsWith(".java")) {
checkJavadoc(file);
- return 1;
- } else if (name.equals("package.html")) {
- return 2;
+ return name.equals("package-info.java") ? 2 : 1;
}
}
return 0;
diff --git a/h2/src/tools/org/h2/build/code/package-info.java b/h2/src/tools/org/h2/build/code/package-info.java
new file mode 100644
index 0000000000..cc95039c2b
--- /dev/null
+++ b/h2/src/tools/org/h2/build/code/package-info.java
@@ -0,0 +1,10 @@
+/*
+ * 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
+ */
+
+/**
+ * Source code checking classes.
+ */
+package org.h2.build.code;
diff --git a/h2/src/tools/org/h2/build/code/package.html b/h2/src/tools/org/h2/build/code/package.html
deleted file mode 100644
index a989178648..0000000000
--- a/h2/src/tools/org/h2/build/code/package.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-Javadoc package documentation
-
-
-Source code checking classes.
-
-
\ No newline at end of file
diff --git a/h2/src/tools/org/h2/build/doc/package-info.java b/h2/src/tools/org/h2/build/doc/package-info.java
new file mode 100644
index 0000000000..996a52e45a
--- /dev/null
+++ b/h2/src/tools/org/h2/build/doc/package-info.java
@@ -0,0 +1,10 @@
+/*
+ * 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
+ */
+
+/**
+ * Tools to build the documentation.
+ */
+package org.h2.build.doc;
diff --git a/h2/src/tools/org/h2/build/doc/package.html b/h2/src/tools/org/h2/build/doc/package.html
deleted file mode 100644
index 7ec4e3566d..0000000000
--- a/h2/src/tools/org/h2/build/doc/package.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-Javadoc package documentation
-
-
-Tools to build the documentation.
-
-
\ No newline at end of file
diff --git a/h2/src/tools/org/h2/build/indexer/package-info.java b/h2/src/tools/org/h2/build/indexer/package-info.java
new file mode 100644
index 0000000000..c3a24909ba
--- /dev/null
+++ b/h2/src/tools/org/h2/build/indexer/package-info.java
@@ -0,0 +1,10 @@
+/*
+ * 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
+ */
+
+/**
+ * A Javadoc indexing mechanism.
+ */
+package org.h2.build.indexer;
diff --git a/h2/src/tools/org/h2/build/indexer/package.html b/h2/src/tools/org/h2/build/indexer/package.html
deleted file mode 100644
index f1c931e53e..0000000000
--- a/h2/src/tools/org/h2/build/indexer/package.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-Javadoc package documentation
-
-
-A Javadoc indexing mechanism.
-
-
\ No newline at end of file
diff --git a/h2/src/tools/org/h2/build/package-info.java b/h2/src/tools/org/h2/build/package-info.java
new file mode 100644
index 0000000000..622623008d
--- /dev/null
+++ b/h2/src/tools/org/h2/build/package-info.java
@@ -0,0 +1,10 @@
+/*
+ * 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
+ */
+
+/**
+ * The pure Java build system and implementation.
+ */
+package org.h2.build;
diff --git a/h2/src/tools/org/h2/build/package.html b/h2/src/tools/org/h2/build/package.html
deleted file mode 100644
index 89c90238bb..0000000000
--- a/h2/src/tools/org/h2/build/package.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-Javadoc package documentation
-
-
-The pure Java build system and implementation.
-
-
\ No newline at end of file
diff --git a/h2/src/tools/org/h2/dev/cache/package-info.java b/h2/src/tools/org/h2/dev/cache/package-info.java
new file mode 100644
index 0000000000..7b691b2d95
--- /dev/null
+++ b/h2/src/tools/org/h2/dev/cache/package-info.java
@@ -0,0 +1,10 @@
+/*
+ * 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
+ */
+
+/**
+ * A LIRS cache implementation.
+ */
+package org.h2.dev.cache;
diff --git a/h2/src/tools/org/h2/dev/cache/package.html b/h2/src/tools/org/h2/dev/cache/package.html
deleted file mode 100644
index 63ea510899..0000000000
--- a/h2/src/tools/org/h2/dev/cache/package.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-Javadoc package documentation
-
-
-A LIRS cache implementation.
-
-
\ No newline at end of file
diff --git a/h2/src/tools/org/h2/dev/cluster/package-info.java b/h2/src/tools/org/h2/dev/cluster/package-info.java
new file mode 100644
index 0000000000..81f0eaff24
--- /dev/null
+++ b/h2/src/tools/org/h2/dev/cluster/package-info.java
@@ -0,0 +1,10 @@
+/*
+ * 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
+ */
+
+/**
+ * A clustering implementation.
+ */
+package org.h2.dev.cluster;
diff --git a/h2/src/tools/org/h2/dev/cluster/package.html b/h2/src/tools/org/h2/dev/cluster/package.html
deleted file mode 100644
index 5c77b9255c..0000000000
--- a/h2/src/tools/org/h2/dev/cluster/package.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-Javadoc package documentation
-
-
-A clustering implementation.
-
-
\ No newline at end of file
diff --git a/h2/src/tools/org/h2/dev/fs/package-info.java b/h2/src/tools/org/h2/dev/fs/package-info.java
new file mode 100644
index 0000000000..8e4d0492b8
--- /dev/null
+++ b/h2/src/tools/org/h2/dev/fs/package-info.java
@@ -0,0 +1,10 @@
+/*
+ * 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
+ */
+
+/**
+ * File system tools.
+ */
+package org.h2.dev.fs;
diff --git a/h2/src/tools/org/h2/dev/fs/package.html b/h2/src/tools/org/h2/dev/fs/package.html
deleted file mode 100644
index c7f9588413..0000000000
--- a/h2/src/tools/org/h2/dev/fs/package.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-Javadoc package documentation
-
-
-An encrypting file system.
-
-
\ No newline at end of file
diff --git a/h2/src/tools/org/h2/dev/ftp/package-info.java b/h2/src/tools/org/h2/dev/ftp/package-info.java
new file mode 100644
index 0000000000..9ab4f72669
--- /dev/null
+++ b/h2/src/tools/org/h2/dev/ftp/package-info.java
@@ -0,0 +1,10 @@
+/*
+ * 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
+ */
+
+/**
+ * A simple FTP client.
+ */
+package org.h2.dev.ftp;
diff --git a/h2/src/tools/org/h2/dev/ftp/package.html b/h2/src/tools/org/h2/dev/ftp/package.html
deleted file mode 100644
index 5a373d2062..0000000000
--- a/h2/src/tools/org/h2/dev/ftp/package.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-Javadoc package documentation
-
-
-A simple FTP client.
-
-
\ No newline at end of file
diff --git a/h2/src/tools/org/h2/dev/ftp/server/package-info.java b/h2/src/tools/org/h2/dev/ftp/server/package-info.java
new file mode 100644
index 0000000000..46540eaf14
--- /dev/null
+++ b/h2/src/tools/org/h2/dev/ftp/server/package-info.java
@@ -0,0 +1,10 @@
+/*
+ * 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
+ */
+
+/**
+ * A simple FTP server.
+ */
+package org.h2.dev.ftp.server;
diff --git a/h2/src/tools/org/h2/dev/ftp/server/package.html b/h2/src/tools/org/h2/dev/ftp/server/package.html
deleted file mode 100644
index 6978bbf799..0000000000
--- a/h2/src/tools/org/h2/dev/ftp/server/package.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-Javadoc package documentation
-
-
-A simple FTP server.
-
-
\ No newline at end of file
diff --git a/h2/src/tools/org/h2/dev/hash/package-info.java b/h2/src/tools/org/h2/dev/hash/package-info.java
new file mode 100644
index 0000000000..4b9d370cc5
--- /dev/null
+++ b/h2/src/tools/org/h2/dev/hash/package-info.java
@@ -0,0 +1,10 @@
+/*
+ * 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
+ */
+
+/**
+ * A perfect hash function tool.
+ */
+package org.h2.dev.hash;
diff --git a/h2/src/tools/org/h2/dev/hash/package.html b/h2/src/tools/org/h2/dev/hash/package.html
deleted file mode 100644
index c1d4d21942..0000000000
--- a/h2/src/tools/org/h2/dev/hash/package.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-Javadoc package documentation
-
-
-A perfect hash function tool.
-
-
\ No newline at end of file
diff --git a/h2/src/tools/org/h2/dev/net/package-info.java b/h2/src/tools/org/h2/dev/net/package-info.java
new file mode 100644
index 0000000000..e148ee9ebf
--- /dev/null
+++ b/h2/src/tools/org/h2/dev/net/package-info.java
@@ -0,0 +1,10 @@
+/*
+ * 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
+ */
+
+/**
+ * A tool to redirect and interpret PostgreSQL network protocol packets.
+ */
+package org.h2.dev.net;
diff --git a/h2/src/tools/org/h2/dev/net/package.html b/h2/src/tools/org/h2/dev/net/package.html
deleted file mode 100644
index 99ec8472cd..0000000000
--- a/h2/src/tools/org/h2/dev/net/package.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-Javadoc package documentation
-
-
-A tool to redirect and interpret PostgreSQL network protocol packets.
-
-
\ No newline at end of file
diff --git a/h2/src/tools/org/h2/dev/security/package-info.java b/h2/src/tools/org/h2/dev/security/package-info.java
new file mode 100644
index 0000000000..2c7a59605e
--- /dev/null
+++ b/h2/src/tools/org/h2/dev/security/package-info.java
@@ -0,0 +1,10 @@
+/*
+ * 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
+ */
+
+/**
+ * Security tools.
+ */
+package org.h2.dev.security;
diff --git a/h2/src/tools/org/h2/dev/security/package.html b/h2/src/tools/org/h2/dev/security/package.html
deleted file mode 100644
index 35c06992ef..0000000000
--- a/h2/src/tools/org/h2/dev/security/package.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-Javadoc package documentation
-
-
-Security tools.
-
-
\ No newline at end of file
diff --git a/h2/src/tools/org/h2/dev/sort/package-info.java b/h2/src/tools/org/h2/dev/sort/package-info.java
new file mode 100644
index 0000000000..2060ae6261
--- /dev/null
+++ b/h2/src/tools/org/h2/dev/sort/package-info.java
@@ -0,0 +1,10 @@
+/*
+ * 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
+ */
+
+/**
+ * Sorting utilities.
+ */
+package org.h2.dev.sort;
diff --git a/h2/src/tools/org/h2/dev/sort/package.html b/h2/src/tools/org/h2/dev/sort/package.html
deleted file mode 100644
index cc0832c30c..0000000000
--- a/h2/src/tools/org/h2/dev/sort/package.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-Javadoc package documentation
-
-
-Sorting utilities.
-
-
\ No newline at end of file
diff --git a/h2/src/tools/org/h2/dev/util/ArrayUtils.java b/h2/src/tools/org/h2/dev/util/ArrayUtils.java
deleted file mode 100644
index 075135878c..0000000000
--- a/h2/src/tools/org/h2/dev/util/ArrayUtils.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * 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.dev.util;
-
-import java.util.Comparator;
-
-/**
- * Array utility methods.
- */
-public class ArrayUtils {
-
- /**
- * Sort an array using binary insertion sort
- *
- * @param the type
- * @param d the data
- * @param left the index of the leftmost element
- * @param right the index of the rightmost element
- * @param comp the comparison class
- */
- public static void binaryInsertionSort(T[] d, int left, int right,
- Comparator comp) {
- for (int i = left + 1; i <= right; i++) {
- T t = d[i];
- int l = left;
- for (int r = i; l < r;) {
- int m = (l + r) >>> 1;
- if (comp.compare(t, d[m]) >= 0) {
- l = m + 1;
- } else {
- r = m;
- }
- }
- for (int n = i - l; n > 0;) {
- d[l + n--] = d[l + n];
- }
- d[l] = t;
- }
- }
-
- /**
- * Sort an array using insertion sort
- *
- * @param the type
- * @param d the data
- * @param left the index of the leftmost element
- * @param right the index of the rightmost element
- * @param comp the comparison class
- */
- public static void insertionSort(T[] d, int left, int right,
- Comparator comp) {
- for (int i = left + 1, j; i <= right; i++) {
- T t = d[i];
- for (j = i - 1; j >= left && comp.compare(d[j], t) > 0; j--) {
- d[j + 1] = d[j];
- }
- d[j + 1] = t;
- }
- }
-
-
-}
diff --git a/h2/src/tools/org/h2/dev/util/Base64.java b/h2/src/tools/org/h2/dev/util/Base64.java
deleted file mode 100644
index 0617c6fab5..0000000000
--- a/h2/src/tools/org/h2/dev/util/Base64.java
+++ /dev/null
@@ -1,234 +0,0 @@
-/*
- * 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.dev.util;
-
-import java.util.Random;
-import java.util.concurrent.TimeUnit;
-
-/**
- * This class converts binary to base64 and vice versa.
- */
-public class Base64 {
-
- private static final byte[] CODE = new byte[64];
- private static final byte[] REV = new byte[256];
-
- private Base64() {
- // utility class
- }
-
- static {
- for (int i = 'A'; i <= 'Z'; i++) {
- CODE[i - 'A'] = (byte) i;
- CODE[i - 'A' + 26] = (byte) (i + 'a' - 'A');
- }
- for (int i = 0; i < 10; i++) {
- CODE[i + 2 * 26] = (byte) ('0' + i);
- }
- CODE[62] = (byte) '+';
- CODE[63] = (byte) '/';
- for (int i = 0; i < 255; i++) {
- REV[i] = -1;
- }
- for (int i = 0; i < 64; i++) {
- REV[CODE[i]] = (byte) i;
- }
- }
-
- private static void check(String a, String b) {
- if (!a.equals(b)) {
- throw new RuntimeException("mismatch: " + a + " <> " + b);
- }
- }
-
- /**
- * Run the tests.
- *
- * @param args the command line parameters
- */
- public static void main(String... args) {
- check(new String(encode(new byte[] {})), "");
- check(new String(encode("A".getBytes())), "QQ==");
- check(new String(encode("AB".getBytes())), "QUI=");
- check(new String(encode("ABC".getBytes())), "QUJD");
- check(new String(encode("ABCD".getBytes())), "QUJDRA==");
- check(new String(decode(new byte[] {})), "");
- check(new String(decode("QQ==".getBytes())), "A");
- check(new String(decode("QUI=".getBytes())), "AB");
- check(new String(decode("QUJD".getBytes())), "ABC");
- check(new String(decode("QUJDRA==".getBytes())), "ABCD");
- int len = 10000;
- test(false, len);
- test(true, len);
- test(false, len);
- test(true, len);
- }
-
- private static void test(boolean fast, int len) {
- Random random = new Random(10);
- long time = System.nanoTime();
- byte[] bin = new byte[len];
- random.nextBytes(bin);
- for (int i = 0; i < len; i++) {
- byte[] dec;
- if (fast) {
- byte[] enc = encodeFast(bin);
- dec = decodeFast(enc);
- } else {
- byte[] enc = encode(bin);
- dec = decode(enc);
- }
- test(bin, dec);
- }
- time = System.nanoTime() - time;
- System.out.println("fast=" + fast + " time=" + TimeUnit.NANOSECONDS.toMillis(time));
- }
-
- private static void test(byte[] in, byte[] out) {
- if (in.length != out.length) {
- throw new RuntimeException("Length error");
- }
- for (int i = 0; i < in.length; i++) {
- if (in[i] != out[i]) {
- throw new RuntimeException("Error at " + i);
- }
- }
- }
-
- private static byte[] encode(byte[] bin) {
- byte[] code = CODE;
- int size = bin.length;
- int len = ((size + 2) / 3) * 4;
- byte[] enc = new byte[len];
- int fast = size / 3 * 3, i = 0, j = 0;
- for (; i < fast; i += 3, j += 4) {
- int a = ((bin[i] & 255) << 16) + ((bin[i + 1] & 255) << 8) + (bin[i + 2] & 255);
- enc[j] = code[a >> 18];
- enc[j + 1] = code[(a >> 12) & 63];
- enc[j + 2] = code[(a >> 6) & 63];
- enc[j + 3] = code[a & 63];
- }
- if (i < size) {
- int a = (bin[i++] & 255) << 16;
- enc[j] = code[a >> 18];
- if (i < size) {
- a += (bin[i] & 255) << 8;
- enc[j + 2] = code[(a >> 6) & 63];
- } else {
- enc[j + 2] = (byte) '=';
- }
- enc[j + 1] = code[(a >> 12) & 63];
- enc[j + 3] = (byte) '=';
- }
- return enc;
- }
-
- private static byte[] encodeFast(byte[] bin) {
- byte[] code = CODE;
- int size = bin.length;
- int len = ((size * 4) + 2) / 3;
- byte[] enc = new byte[len];
- int fast = size / 3 * 3, i = 0, j = 0;
- for (; i < fast; i += 3, j += 4) {
- int a = ((bin[i] & 255) << 16) + ((bin[i + 1] & 255) << 8) + (bin[i + 2] & 255);
- enc[j] = code[a >> 18];
- enc[j + 1] = code[(a >> 12) & 63];
- enc[j + 2] = code[(a >> 6) & 63];
- enc[j + 3] = code[a & 63];
- }
- if (i < size) {
- int a = (bin[i++] & 255) << 16;
- enc[j] = code[a >> 18];
- if (i < size) {
- a += (bin[i] & 255) << 8;
- enc[j + 2] = code[(a >> 6) & 63];
- }
- enc[j + 1] = code[(a >> 12) & 63];
- }
- return enc;
- }
-
- private static byte[] trim(byte[] enc) {
- byte[] rev = REV;
- int j = 0, size = enc.length;
- if (size > 1 && enc[size - 2] == '=') {
- size--;
- }
- if (size > 0 && enc[size - 1] == '=') {
- size--;
- }
- for (int i = 0; i < size; i++) {
- if (rev[enc[i] & 255] < 0) {
- j++;
- }
- }
- if (j == 0) {
- return enc;
- }
- byte[] buff = new byte[size - j];
- for (int i = 0, k = 0; i < size; i++) {
- int x = enc[i] & 255;
- if (rev[x] >= 0) {
- buff[k++] = (byte) x;
- }
- }
- return buff;
- }
-
- private static byte[] decode(byte[] enc) {
- enc = trim(enc);
- byte[] rev = REV;
- int len = enc.length, size = (len * 3) / 4;
- if (len > 0 && enc[len - 1] == '=') {
- size--;
- if (len > 1 && enc[len - 2] == '=') {
- size--;
- }
- }
- byte[] bin = new byte[size];
- int fast = size / 3 * 3, i = 0, j = 0;
- for (; i < fast; i += 3, j += 4) {
- int a = (rev[enc[j] & 255] << 18) + (rev[enc[j + 1] & 255] << 12) +
- (rev[enc[j + 2] & 255] << 6) + rev[enc[j + 3] & 255];
- bin[i] = (byte) (a >> 16);
- bin[i + 1] = (byte) (a >> 8);
- bin[i + 2] = (byte) a;
- }
- if (i < size) {
- int a = (rev[enc[j] & 255] << 10) + (rev[enc[j + 1] & 255] << 4);
- bin[i++] = (byte) (a >> 8);
- if (i < size) {
- a += rev[enc[j + 2] & 255] >> 2;
- bin[i] = (byte) a;
- }
- }
- return bin;
- }
-
- private static byte[] decodeFast(byte[] enc) {
- byte[] rev = REV;
- int len = enc.length, size = (len * 3) / 4;
- byte[] bin = new byte[size];
- int fast = size / 3 * 3, i = 0, j = 0;
- for (; i < fast; i += 3, j += 4) {
- int a = (rev[enc[j] & 255] << 18) + (rev[enc[j + 1] & 255] << 12) +
- (rev[enc[j + 2] & 255] << 6) + rev[enc[j + 3] & 255];
- bin[i] = (byte) (a >> 16);
- bin[i + 1] = (byte) (a >> 8);
- bin[i + 2] = (byte) a;
- }
- if (i < size) {
- int a = (rev[enc[j] & 255] << 10) + (rev[enc[j + 1] & 255] << 4);
- bin[i++] = (byte) (a >> 8);
- if (i < size) {
- a += rev[enc[j + 2] & 255] >> 2;
- bin[i] = (byte) a;
- }
- }
- return bin;
- }
-
-}
diff --git a/h2/src/tools/org/h2/dev/util/ConcurrentLinkedList.java b/h2/src/tools/org/h2/dev/util/ConcurrentLinkedList.java
deleted file mode 100644
index 23ba25cfbc..0000000000
--- a/h2/src/tools/org/h2/dev/util/ConcurrentLinkedList.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * 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.dev.util;
-
-import java.util.Iterator;
-
-/**
- * A very simple linked list that supports concurrent access.
- * Internally, it uses immutable objects.
- * It uses recursion and is not meant for long lists.
- *
- * @param the key type
- */
-public class ConcurrentLinkedList {
-
- /**
- * The sentinel entry.
- */
- static final Entry NULL = new Entry<>(null, null);
-
- /**
- * The head entry.
- */
- @SuppressWarnings("unchecked")
- volatile Entry head = (Entry) NULL;
-
- /**
- * Get the first element, or null if none.
- *
- * @return the first element
- */
- public K peekFirst() {
- Entry x = head;
- return x.obj;
- }
-
- /**
- * Get the last element, or null if none.
- *
- * @return the last element
- */
- public K peekLast() {
- Entry x = head;
- while (x != NULL && x.next != NULL) {
- x = x.next;
- }
- return x.obj;
- }
-
- /**
- * Add an element at the end.
- *
- * @param obj the element
- */
- public synchronized void add(K obj) {
- head = Entry.append(head, obj);
- }
-
- /**
- * Remove the first element, if it matches.
- *
- * @param obj the element to remove
- * @return true if the element matched and was removed
- */
- public synchronized boolean removeFirst(K obj) {
- if (head.obj != obj) {
- return false;
- }
- head = head.next;
- return true;
- }
-
- /**
- * Remove the last element, if it matches.
- *
- * @param obj the element to remove
- * @return true if the element matched and was removed
- */
- public synchronized boolean removeLast(K obj) {
- if (peekLast() != obj) {
- return false;
- }
- head = Entry.removeLast(head);
- return true;
- }
-
- /**
- * Get an iterator over all entries.
- *
- * @return the iterator
- */
- public Iterator iterator() {
- return new Iterator() {
-
- Entry current = head;
-
- @Override
- public boolean hasNext() {
- return current != NULL;
- }
-
- @Override
- public K next() {
- K x = current.obj;
- current = current.next;
- return x;
- }
-
- };
- }
-
- /**
- * An entry in the linked list.
- */
- private static class Entry {
- final K obj;
- Entry next;
-
- Entry(K obj, Entry next) {
- this.obj = obj;
- this.next = next;
- }
-
- @SuppressWarnings("unchecked")
- static Entry append(Entry list, K obj) {
- if (list == NULL) {
- return new Entry<>(obj, (Entry) NULL);
- }
- return new Entry<>(list.obj, append(list.next, obj));
- }
-
- @SuppressWarnings("unchecked")
- static Entry removeLast(Entry list) {
- if (list == NULL || list.next == NULL) {
- return (Entry) NULL;
- }
- return new Entry<>(list.obj, removeLast(list.next));
- }
-
- }
-
-}
diff --git a/h2/src/tools/org/h2/dev/util/ConcurrentLinkedListWithTail.java b/h2/src/tools/org/h2/dev/util/ConcurrentLinkedListWithTail.java
deleted file mode 100644
index 1b6e7613fd..0000000000
--- a/h2/src/tools/org/h2/dev/util/ConcurrentLinkedListWithTail.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * 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.dev.util;
-
-import java.util.Iterator;
-
-/**
- * A very simple linked list that supports concurrent access.
- *
- * @param the key type
- */
-public class ConcurrentLinkedListWithTail {
-
- /**
- * The first entry (if any).
- */
- volatile Entry head;
-
- /**
- * The last entry (if any).
- */
- private volatile Entry tail;
-
- /**
- * Get the first element, or null if none.
- *
- * @return the first element
- */
- public K peekFirst() {
- Entry x = head;
- return x == null ? null : x.obj;
- }
-
- /**
- * Get the last element, or null if none.
- *
- * @return the last element
- */
- public K peekLast() {
- Entry x = tail;
- return x == null ? null : x.obj;
- }
-
- /**
- * Add an element at the end.
- *
- * @param obj the element
- */
- public void add(K obj) {
- Entry x = new Entry<>(obj);
- Entry t = tail;
- if (t != null) {
- t.next = x;
- }
- tail = x;
- if (head == null) {
- head = x;
- }
- }
-
- /**
- * Remove the first element, if it matches.
- *
- * @param obj the element to remove
- * @return true if the element matched and was removed
- */
- public boolean removeFirst(K obj) {
- Entry x = head;
- if (x == null || x.obj != obj) {
- return false;
- }
- if (head == tail) {
- tail = x.next;
- }
- head = x.next;
- return true;
- }
-
- /**
- * Remove the last element, if it matches.
- *
- * @param obj the element to remove
- * @return true if the element matched and was removed
- */
- public boolean removeLast(K obj) {
- Entry x = head;
- if (x == null) {
- return false;
- }
- Entry prev = null;
- while (x.next != null) {
- prev = x;
- x = x.next;
- }
- if (x.obj != obj) {
- return false;
- }
- if (prev != null) {
- prev.next = null;
- }
- if (head == tail) {
- head = prev;
- }
- tail = prev;
- return true;
- }
-
- /**
- * Get an iterator over all entries.
- *
- * @return the iterator
- */
- public Iterator iterator() {
- return new Iterator() {
-
- Entry current = head;
-
- @Override
- public boolean hasNext() {
- return current != null;
- }
-
- @Override
- public K next() {
- K x = current.obj;
- current = current.next;
- return x;
- }
-
- };
- }
-
- /**
- * An entry in the linked list.
- */
- private static class Entry {
- final K obj;
- Entry next;
-
- Entry(K obj) {
- this.obj = obj;
- }
- }
-
-}
diff --git a/h2/src/tools/org/h2/dev/util/ConcurrentRing.java b/h2/src/tools/org/h2/dev/util/ConcurrentRing.java
deleted file mode 100644
index 3206250724..0000000000
--- a/h2/src/tools/org/h2/dev/util/ConcurrentRing.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * 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.dev.util;
-
-import java.util.Iterator;
-
-/**
- * A ring buffer that supports concurrent access.
- *
- * @param the key type
- */
-public class ConcurrentRing {
-
- /**
- * The ring buffer.
- */
- K[] buffer;
-
- /**
- * The read position.
- */
- volatile int readPos;
-
- /**
- * The write position.
- */
- volatile int writePos;
-
- @SuppressWarnings("unchecked")
- public ConcurrentRing() {
- buffer = (K[]) new Object[4];
- }
-
- /**
- * Get the first element, or null if none.
- *
- * @return the first element
- */
- public K peekFirst() {
- return buffer[getIndex(readPos)];
- }
-
- /**
- * Get the last element, or null if none.
- *
- * @return the last element
- */
- public K peekLast() {
- return buffer[getIndex(writePos - 1)];
- }
-
- /**
- * Add an element at the end.
- *
- * @param obj the element
- */
- public void add(K obj) {
- buffer[getIndex(writePos)] = obj;
- writePos++;
- if (writePos - readPos >= buffer.length) {
- // double the capacity
- @SuppressWarnings("unchecked")
- K[] b2 = (K[]) new Object[buffer.length * 2];
- for (int i = readPos; i < writePos; i++) {
- K x = buffer[getIndex(i)];
- int i2 = i & b2.length - 1;
- b2[i2] = x;
- }
- buffer = b2;
- }
- }
-
- /**
- * Remove the first element, if it matches.
- *
- * @param obj the element to remove
- * @return true if the element matched and was removed
- */
- public boolean removeFirst(K obj) {
- int p = readPos;
- int idx = getIndex(p);
- if (buffer[idx] != obj) {
- return false;
- }
- buffer[idx] = null;
- readPos = p + 1;
- return true;
- }
-
- /**
- * Remove the last element, if it matches.
- *
- * @param obj the element to remove
- * @return true if the element matched and was removed
- */
- public boolean removeLast(K obj) {
- int p = writePos;
- int idx = getIndex(p - 1);
- if (buffer[idx] != obj) {
- return false;
- }
- buffer[idx] = null;
- writePos = p - 1;
- return true;
- }
-
- /**
- * Get the index in the array of the given position.
- *
- * @param pos the position
- * @return the index
- */
- int getIndex(int pos) {
- return pos & (buffer.length - 1);
- }
-
- /**
- * Get an iterator over all entries.
- *
- * @return the iterator
- */
- public Iterator iterator() {
- return new Iterator() {
-
- int offset;
-
- @Override
- public boolean hasNext() {
- return readPos + offset < writePos;
- }
-
- @Override
- public K next() {
- if (buffer[getIndex(readPos + offset)] == null) {
- System.out.println("" + readPos);
- System.out.println("" + getIndex(readPos + offset));
- System.out.println("null?");
- }
- return buffer[getIndex(readPos + offset++)];
- }
-
- };
- }
-
-}
diff --git a/h2/src/tools/org/h2/dev/util/ImmutableArray.java b/h2/src/tools/org/h2/dev/util/ImmutableArray.java
deleted file mode 100644
index 5d3becc379..0000000000
--- a/h2/src/tools/org/h2/dev/util/ImmutableArray.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * 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.dev.util;
-
-import java.util.Arrays;
-import java.util.Iterator;
-import org.h2.mvstore.DataUtils;
-
-/**
- * An immutable array.
- *
- * @param the type
- */
-public final class ImmutableArray implements Iterable {
-
- private static final ImmutableArray EMPTY = new ImmutableArray<>(
- new Object[0]);
-
- /**
- * The array.
- */
- private final K[] array;
-
- private ImmutableArray(K[] array) {
- this.array = array;
- }
-
- /**
- * Get the entry at this index.
- *
- * @param index the index
- * @return the entry
- */
- public K get(int index) {
- return array[index];
- }
-
- /**
- * Get the length.
- *
- * @return the length
- */
- public int length() {
- return array.length;
- }
-
- /**
- * Set the entry at this index.
- *
- * @param index the index
- * @param obj the object
- * @return the new immutable array
- */
- public ImmutableArray set(int index, K obj) {
- K[] array = this.array.clone();
- array[index] = obj;
- return new ImmutableArray<>(array);
- }
-
- /**
- * Insert an entry at this index.
- *
- * @param index the index
- * @param obj the object
- * @return the new immutable array
- */
- public ImmutableArray insert(int index, K obj) {
- int len = array.length + 1;
- @SuppressWarnings("unchecked")
- K[] array = (K[]) new Object[len];
- DataUtils.copyWithGap(this.array, array, this.array.length, index);
- array[index] = obj;
- return new ImmutableArray<>(array);
- }
-
- /**
- * Remove the entry at this index.
- *
- * @param index the index
- * @return the new immutable array
- */
- public ImmutableArray remove(int index) {
- int len = array.length - 1;
- @SuppressWarnings("unchecked")
- K[] array = (K[]) new Object[len];
- DataUtils.copyExcept(this.array, array, this.array.length, index);
- return new ImmutableArray<>(array);
- }
-
- /**
- * Get a sub-array.
- *
- * @param fromIndex the index of the first entry
- * @param toIndex the end index, plus one
- * @return the new immutable array
- */
- public ImmutableArray subArray(int fromIndex, int toIndex) {
- return new ImmutableArray<>(Arrays.copyOfRange(array, fromIndex, toIndex));
- }
-
- /**
- * Create an immutable array.
- *
- * @param array the data
- * @return the new immutable array
- */
- @SafeVarargs
- public static ImmutableArray create(K... array) {
- return new ImmutableArray<>(array);
- }
-
- /**
- * Get the data.
- *
- * @return the data
- */
- public K[] array() {
- return array;
- }
-
- @Override
- public String toString() {
- StringBuilder buff = new StringBuilder();
- for (K obj : this) {
- buff.append(' ').append(obj);
- }
- return buff.toString();
- }
-
- /**
- * Get an empty immutable array.
- *
- * @param the key type
- * @return the array
- */
- @SuppressWarnings("unchecked")
- public static ImmutableArray empty() {
- return (ImmutableArray) EMPTY;
- }
-
- /**
- * Get an iterator over all entries.
- *
- * @return the iterator
- */
- @Override
- public Iterator iterator() {
- return new Iterator() {
-
- ImmutableArray a = ImmutableArray.this;
- int index;
-
- @Override
- public boolean hasNext() {
- return index < a.length();
- }
-
- @Override
- public K next() {
- return a.get(index++);
- }
-
- };
- }
-
-}
-
-
-
diff --git a/h2/src/tools/org/h2/dev/util/ImmutableArray2.java b/h2/src/tools/org/h2/dev/util/ImmutableArray2.java
deleted file mode 100644
index c4c89c6a88..0000000000
--- a/h2/src/tools/org/h2/dev/util/ImmutableArray2.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
- * 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.dev.util;
-
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.concurrent.atomic.AtomicBoolean;
-import org.h2.mvstore.DataUtils;
-
-/**
- * An immutable array.
- *
- * @param the type
- */
-public final class ImmutableArray2 implements Iterable {
-
- private static final ImmutableArray2 EMPTY = new ImmutableArray2<>(
- new Object[0], 0);
-
- /**
- * The array.
- */
- private final K[] array;
- private final int length;
- private AtomicBoolean canExtend;
-
- private ImmutableArray2(K[] array, int len) {
- this.array = array;
- this.length = len;
- }
-
- private ImmutableArray2(K[] array, int len, boolean canExtend) {
- this.array = array;
- this.length = len;
- if (canExtend) {
- this.canExtend = new AtomicBoolean(true);
- }
- }
-
- /**
- * Get the entry at this index.
- *
- * @param index the index
- * @return the entry
- */
- public K get(int index) {
- if (index >= length) {
- throw new IndexOutOfBoundsException();
- }
- return array[index];
- }
-
- /**
- * Get the length.
- *
- * @return the length
- */
- public int length() {
- return length;
- }
-
- /**
- * Set the entry at this index.
- *
- * @param index the index
- * @param obj the object
- * @return the new immutable array
- */
- public ImmutableArray2 set(int index, K obj) {
- K[] a2 = Arrays.copyOf(array, length);
- a2[index] = obj;
- return new ImmutableArray2<>(a2, length);
- }
-
- /**
- * Insert an entry at this index.
- *
- * @param index the index
- * @param obj the object
- * @return the new immutable array
- */
- public ImmutableArray2 insert(int index, K obj) {
- int len = length + 1;
- int newLen = len;
- boolean extendable;
- if (index == len - 1) {
- AtomicBoolean x = canExtend;
- if (x != null) {
- // can set it to null early - we anyway
- // reset the flag, so it is no longer useful
- canExtend = null;
- if (array.length > index && x.getAndSet(false)) {
- array[index] = obj;
- return new ImmutableArray2<>(array, len, true);
- }
- }
- extendable = true;
- newLen = len + 4;
- } else {
- extendable = false;
- }
- @SuppressWarnings("unchecked")
- K[] a2 = (K[]) new Object[newLen];
- DataUtils.copyWithGap(array, a2, length, index);
- a2[index] = obj;
- return new ImmutableArray2<>(a2, len, extendable);
- }
-
- /**
- * Remove the entry at this index.
- *
- * @param index the index
- * @return the new immutable array
- */
- public ImmutableArray2 remove(int index) {
- int len = length - 1;
- if (index == len) {
- return new ImmutableArray2<>(array, len);
- }
- @SuppressWarnings("unchecked")
- K[] a2 = (K[]) new Object[len];
- DataUtils.copyExcept(array, a2, length, index);
- return new ImmutableArray2<>(a2, len);
- }
-
- /**
- * Get a sub-array.
- *
- * @param fromIndex the index of the first entry
- * @param toIndex the end index, plus one
- * @return the new immutable array
- */
- public ImmutableArray2 subArray(int fromIndex, int toIndex) {
- int len = toIndex - fromIndex;
- if (fromIndex == 0) {
- return new ImmutableArray2<>(array, len);
- }
- return new ImmutableArray2<>(Arrays.copyOfRange(array, fromIndex, toIndex), len);
- }
-
- /**
- * Create an immutable array.
- *
- * @param array the data
- * @return the new immutable array
- */
- @SafeVarargs
- public static ImmutableArray2 create(K... array) {
- return new ImmutableArray2<>(array, array.length);
- }
-
- /**
- * Get the data.
- *
- * @return the data
- */
- public K[] array() {
- return array;
- }
-
- @Override
- public String toString() {
- StringBuilder buff = new StringBuilder();
- for (K obj : this) {
- buff.append(' ').append(obj);
- }
- return buff.toString();
- }
-
- /**
- * Get an empty immutable array.
- *
- * @param the key type
- * @return the array
- */
- @SuppressWarnings("unchecked")
- public static ImmutableArray2 empty() {
- return (ImmutableArray2) EMPTY;
- }
-
- /**
- * Get an iterator over all entries.
- *
- * @return the iterator
- */
- @Override
- public Iterator iterator() {
- return new Iterator() {
-
- ImmutableArray2 a = ImmutableArray2.this;
- int index;
-
- @Override
- public boolean hasNext() {
- return index < a.length();
- }
-
- @Override
- public K next() {
- return a.get(index++);
- }
-
- };
- }
-
-}
-
diff --git a/h2/src/tools/org/h2/dev/util/ImmutableArray3.java b/h2/src/tools/org/h2/dev/util/ImmutableArray3.java
deleted file mode 100644
index f90de1425c..0000000000
--- a/h2/src/tools/org/h2/dev/util/ImmutableArray3.java
+++ /dev/null
@@ -1,451 +0,0 @@
-/*
- * 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.dev.util;
-
-import java.util.Iterator;
-
-/**
- * An immutable array.
- *
- * @param the type
- */
-public abstract class ImmutableArray3 implements Iterable {
-
- private static final int MAX_LEVEL = 4;
-
- private static final ImmutableArray3 EMPTY = new Plain<>(new Object[0]);
-
- /**
- * Get the length.
- *
- * @return the length
- */
- public abstract int length();
-
- /**
- * Get the entry at this index.
- *
- * @param index the index
- * @return the entry
- */
- public abstract K get(int index);
-
- /**
- * Set the entry at this index.
- *
- * @param index the index
- * @param obj the object
- * @return the new immutable array
- */
- public abstract ImmutableArray3 set(int index, K obj);
-
- /**
- * Insert an entry at this index.
- *
- * @param index the index
- * @param obj the object
- * @return the new immutable array
- */
- public abstract ImmutableArray3 insert(int index, K obj);
-
- /**
- * Remove the entry at this index.
- *
- * @param index the index
- * @return the new immutable array
- */
- public abstract ImmutableArray3 remove(int index);
-
- /**
- * Get a sub-array.
- *
- * @param fromIndex the index of the first entry
- * @param toIndex the end index, plus one
- * @return the new immutable array
- */
- public ImmutableArray3 subArray(int fromIndex, int toIndex) {
- int len = toIndex - fromIndex;
- @SuppressWarnings("unchecked")
- K[] array = (K[]) new Object[len];
- for (int i = 0; i < len; i++) {
- array[i] = get(fromIndex + i);
- }
- return new Plain<>(array);
- }
-
- /**
- * Create an immutable array.
- *
- * @param array the data
- * @return the new immutable array
- */
- @SafeVarargs
- public static ImmutableArray3 create(K... array) {
- return new Plain<>(array);
- }
-
- /**
- * Get the data.
- *
- * @return the data
- */
- public K[] array() {
- int len = length();
- @SuppressWarnings("unchecked")
- K[] array = (K[]) new Object[len];
- for (int i = 0; i < len; i++) {
- array[i] = get(i);
- }
- return array;
- }
-
- /**
- * Get the level of "abstraction".
- *
- * @return the level
- */
- abstract int level();
-
- @Override
- public String toString() {
- StringBuilder buff = new StringBuilder();
- for (K obj : this) {
- buff.append(' ').append(obj);
- }
- return buff.toString();
- }
-
- /**
- * Get an empty immutable array.
- *
- * @param the key type
- * @return the array
- */
- @SuppressWarnings("unchecked")
- public static ImmutableArray3 empty() {
- return (ImmutableArray3) EMPTY;
- }
-
- /**
- * Get an iterator over all entries.
- *
- * @return the iterator
- */
- @Override
- public Iterator iterator() {
- return new Iterator() {
-
- ImmutableArray3 a = ImmutableArray3.this;
- int index;
-
- @Override
- public boolean hasNext() {
- return index < a.length();
- }
-
- @Override
- public K next() {
- return a.get(index++);
- }
-
- };
- }
-
-
- /**
- * An immutable array backed by an array.
- *
- * @param the type
- */
- static class Plain extends ImmutableArray3 {
-
- /**
- * The array.
- */
- private final K[] array;
-
- public Plain(K[] array) {
- this.array = array;
- }
-
- @Override
- public K get(int index) {
- return array[index];
- }
-
- @Override
- public int length() {
- return array.length;
- }
-
- @Override
- public ImmutableArray3 set(int index, K obj) {
- return new Set<>(this, index, obj);
- }
-
- @Override
- public ImmutableArray3 insert(int index, K obj) {
- return new Insert<>(this, index, obj);
- }
-
- @Override
- public ImmutableArray3 remove(int index) {
- return new Remove<>(this, index);
- }
-
- /**
- * Get a plain array with the given entry updated.
- *
- * @param the type
- * @param base the base type
- * @param index the index
- * @param obj the object
- * @return the immutable array
- */
- static ImmutableArray3 set(ImmutableArray3 base, int index, K obj) {
- int len = base.length();
- @SuppressWarnings("unchecked")
- K[] array = (K[]) new Object[len];
- for (int i = 0; i < len; i++) {
- array[i] = i == index ? obj : base.get(i);
- }
- return new Plain<>(array);
- }
-
- /**
- * Get a plain array with the given entry inserted.
- *
- * @param the type
- * @param base the base type
- * @param index the index
- * @param obj the object
- * @return the immutable array
- */
- static ImmutableArray3 insert(ImmutableArray3 base, int index, K obj) {
- int len = base.length() + 1;
- @SuppressWarnings("unchecked")
- K[] array = (K[]) new Object[len];
- for (int i = 0; i < len; i++) {
- array[i] = i == index ? obj : i < index ? base.get(i) : base.get(i - 1);
- }
- return new Plain<>(array);
- }
-
- /**
- * Get a plain array with the given entry removed.
- *
- * @param the type
- * @param base the base type
- * @param index the index
- * @return the immutable array
- */
- static ImmutableArray3 remove(ImmutableArray3 base, int index) {
- int len = base.length() - 1;
- @SuppressWarnings("unchecked")
- K[] array = (K[]) new Object[len];
- for (int i = 0; i < len; i++) {
- array[i] = i < index ? base.get(i) : base.get(i + 1);
- }
- return new Plain<>(array);
- }
-
- @Override
- int level() {
- return 0;
- }
-
- }
-
- /**
- * An immutable array backed by another immutable array, with one element
- * changed.
- *
- * @param the type
- */
- static class Set extends ImmutableArray3 {
-
- private final int index;
- private final ImmutableArray3 base;
- private final K obj;
-
- Set(ImmutableArray3 base, int index, K obj) {
- this.base = base;
- this.index = index;
- this.obj = obj;
- }
-
- @Override
- public int length() {
- return base.length();
- }
-
- @Override
- public K get(int index) {
- return this.index == index ? obj : base.get(index);
- }
-
- @Override
- public ImmutableArray3 set(int index, K obj) {
- if (index == this.index) {
- return new Set<>(base, index, obj);
- } else if (level() < MAX_LEVEL) {
- return new Set<>(this, index, obj);
- }
- return Plain.set(this, index, obj);
- }
-
- @Override
- public ImmutableArray3 insert(int index, K obj) {
- if (level() < MAX_LEVEL) {
- return new Insert<>(this, index, obj);
- }
- return Plain.insert(this, index, obj);
- }
-
- @Override
- public ImmutableArray3 remove(int index) {
- if (level() < MAX_LEVEL) {
- return new Remove<>(this, index);
- }
- return Plain.remove(this, index);
- }
-
- @Override
- int level() {
- return base.level() + 1;
- }
-
- }
-
- /**
- * An immutable array backed by another immutable array, with one element
- * added.
- *
- * @param the type
- */
- static class Insert extends ImmutableArray3 {
-
- private final int index;
- private final ImmutableArray3 base;
- private final K obj;
-
- Insert(ImmutableArray3 base, int index, K obj) {
- this.base = base;
- this.index = index;
- this.obj = obj;
- }
-
- @Override
- public ImmutableArray3 set(int index, K obj) {
- if (level() < MAX_LEVEL) {
- return new Set<>(this, index, obj);
- }
- return Plain.set(this, index, obj);
- }
-
- @Override
- public ImmutableArray3 insert(int index, K obj) {
- if (level() < MAX_LEVEL) {
- return new Insert<>(this, index, obj);
- }
- return Plain.insert(this, index, obj);
- }
-
- @Override
- public ImmutableArray3 remove(int index) {
- if (index == this.index) {
- return base;
- } else if (level() < MAX_LEVEL) {
- return new Remove<>(this, index);
- }
- return Plain.remove(this, index);
- }
-
- @Override
- public int length() {
- return base.length() + 1;
- }
-
- @Override
- public K get(int index) {
- if (index == this.index) {
- return obj;
- } else if (index < this.index) {
- return base.get(index);
- }
- return base.get(index - 1);
- }
-
- @Override
- int level() {
- return base.level() + 1;
- }
-
- }
-
- /**
- * An immutable array backed by another immutable array, with one element
- * removed.
- *
- * @param the type
- */
- static class Remove extends ImmutableArray3 {
-
- private final int index;
- private final ImmutableArray3 base;
-
- Remove(ImmutableArray3 base, int index) {
- this.base = base;
- this.index = index;
- }
-
- @Override
- public ImmutableArray3 set(int index, K obj) {
- if (level() < MAX_LEVEL) {
- return new Set<>(this, index, obj);
- }
- return Plain.set(this, index, obj);
- }
-
- @Override
- public ImmutableArray3 insert(int index, K obj) {
- if (index == this.index) {
- return base.set(index, obj);
- } else if (level() < MAX_LEVEL) {
- return new Insert<>(this, index, obj);
- }
- return Plain.insert(this, index, obj);
- }
-
- @Override
- public ImmutableArray3 remove(int index) {
- if (level() < MAX_LEVEL) {
- return new Remove<>(this, index);
- }
- return Plain.remove(this, index);
- }
-
- @Override
- public int length() {
- return base.length() - 1;
- }
-
- @Override
- public K get(int index) {
- if (index < this.index) {
- return base.get(index);
- }
- return base.get(index + 1);
- }
-
- @Override
- int level() {
- return base.level() + 1;
- }
-
- }
-
-}
diff --git a/h2/src/tools/org/h2/dev/util/ReaderInputStream.java b/h2/src/tools/org/h2/dev/util/ReaderInputStream.java
deleted file mode 100644
index 5fc290f105..0000000000
--- a/h2/src/tools/org/h2/dev/util/ReaderInputStream.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * 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.dev.util;
-
-import java.io.BufferedWriter;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStreamWriter;
-import java.io.Reader;
-import java.io.Writer;
-import java.nio.charset.StandardCharsets;
-
-import org.h2.engine.Constants;
-
-/**
- * The reader input stream wraps a reader and convert the character to the UTF-8
- * format.
- */
-public class ReaderInputStream extends InputStream {
-
- private final Reader reader;
- private final char[] chars;
- private final ByteArrayOutputStream out;
- private final Writer writer;
- private int pos;
- private int remaining;
- private byte[] buffer;
-
- public ReaderInputStream(Reader reader) {
- chars = new char[Constants.IO_BUFFER_SIZE];
- this.reader = reader;
- out = new ByteArrayOutputStream(Constants.IO_BUFFER_SIZE);
- writer = new BufferedWriter(new OutputStreamWriter(out, StandardCharsets.UTF_8));
- }
-
- private void fillBuffer() throws IOException {
- if (remaining == 0) {
- pos = 0;
- remaining = reader.read(chars, 0, Constants.IO_BUFFER_SIZE);
- if (remaining < 0) {
- return;
- }
- writer.write(chars, 0, remaining);
- writer.flush();
- buffer = out.toByteArray();
- remaining = buffer.length;
- out.reset();
- }
- }
-
- @Override
- public int read() throws IOException {
- if (remaining == 0) {
- fillBuffer();
- }
- if (remaining < 0) {
- return -1;
- }
- remaining--;
- return buffer[pos++] & 0xff;
- }
-
-}
diff --git a/h2/src/tools/org/h2/dev/util/package-info.java b/h2/src/tools/org/h2/dev/util/package-info.java
new file mode 100644
index 0000000000..ae038cad55
--- /dev/null
+++ b/h2/src/tools/org/h2/dev/util/package-info.java
@@ -0,0 +1,10 @@
+/*
+ * 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
+ */
+
+/**
+ * Utility classes that are currently not used in the database engine.
+ */
+package org.h2.dev.util;
diff --git a/h2/src/tools/org/h2/dev/util/package.html b/h2/src/tools/org/h2/dev/util/package.html
deleted file mode 100644
index 7f32670224..0000000000
--- a/h2/src/tools/org/h2/dev/util/package.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-Javadoc package documentation
-
-
-Utility classes that are currently not used in the database engine.
-
-
\ No newline at end of file
diff --git a/h2/src/tools/org/h2/jcr/package-info.java b/h2/src/tools/org/h2/jcr/package-info.java
new file mode 100644
index 0000000000..34439342b7
--- /dev/null
+++ b/h2/src/tools/org/h2/jcr/package-info.java
@@ -0,0 +1,10 @@
+/*
+ * 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
+ */
+
+/**
+ * Utility classes related to the JCR API.
+ */
+package org.h2.jcr;
diff --git a/h2/src/tools/org/h2/jcr/package.html b/h2/src/tools/org/h2/jcr/package.html
deleted file mode 100644
index f90b49f9ca..0000000000
--- a/h2/src/tools/org/h2/jcr/package.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-Javadoc package documentation
-
-
-Utility classes related to the JCR API.
-
-
\ No newline at end of file