Merge branch 'o-main' into main-perf

Author: theigl

Jenkinsfile

@@ -181,7 +181,7 @@ stage('Build') {
 									state[buildEnv.tag]['containerName'] = "postgres"
 									break;
 								case "edb":
-									docker.image('quay.io/enterprisedb/edb-postgres-advanced:14.5-3.2-postgis').pull()
+									docker.image('quay.io/enterprisedb/edb-postgres-advanced:15.2-3.3-postgis').pull()
 									sh "./docker_db.sh edb"
 									state[buildEnv.tag]['containerName'] = "edb"
 									break;

README.adoc

@@ -1,9 +1,8 @@
-Hibernate ORM is a library providing Object/Relational Mapping (ORM) support
-to applications, libraries, and frameworks.
+Hibernate ORM is a powerful object/relational mapping solution for Java, and makes it easy to develop persistence logic for applications, libraries, and frameworks.
 
-It also provides an implementation of the JPA specification, which is the standard Java specification for ORM.
+Hibernate implements JPA, the standard API for object/relational persistence in Java, but also offers an extensive set of features and APIs which go beyond the specification.
 
-This is the repository of its source code; see https://hibernate.org/orm/[Hibernate.org] for additional information.
+See https://hibernate.org/orm/[Hibernate.org] for more information.
 
 image:https://ci.hibernate.org/job/hibernate-orm-pipeline/job/main/badge/icon[Build Status,link=https://ci.hibernate.org/job/hibernate-orm-pipeline/job/main/]
 image:https://img.shields.io/badge/Revved%20up%20by-Gradle%20Enterprise-06A0CE?logo=Gradle&labelColor=02303A[link=https://ge.hibernate.org/scans]
@@ -18,7 +17,7 @@ for its CI needs. See
 
 == Building from sources
 
-The build requires at least Java 11 JDK.
+The build requires at least Java 11 and at most Java 17.
 
 Hibernate uses https://gradle.org[Gradle] as its build tool. See the _Gradle Primer_ section below if you are new to
 Gradle.

branching.adoc

@@ -0,0 +1,25 @@
+= ORM Branching
+
+Describes the paradigm used for branching within the ORM project
+
+[[branches]]
+== The Branches
+
+* `main` is where we do "latest stable" development. Which specific release family this targets is dependent upon the "critical mass" discussion in <<process>>.
+* "Dedicated release branches" (`5.6`, `6.0`, `6.1`, `6.2`, ...) represent previous, no longer supported releases. Branched for posterity.
+* PR branches for new features, improvements, disruptive bugfixes, etc target main
+* PR branches for performance improvements, security fixes and bugfixes target the affected minor branches (which could be main for a short period of time)
+
+[[process]]
+== THe Process
+
+Process (using 6.3 -> 6.4 as an example):
+
+* As mentioned, all new features, improvements, disruptive bugfixes, etc. are developed on topic branches (PR) against main. Based on sprint planning, these will be given a priority and target a particular major/minor release.
+* Once we have critical mass for topic branches targeting 6.4:
+    * `main` will be branched as `6.3` and a 6.3.x release will be done.
+    * The finished topic branches will be integrated into main and a 6.4.0 Alpha (or Beta or CR)[1] release will be done.
+* A bot will cherry-pick changes made to the latest "dedicated release branch" (here, 6.3) and create a PR against main (on the assumption that these changes might be needed there as well). TBD if we want to auto-apply these PRs on successful build.
+* PRs against older "dedicated release branches", will first be rebased to the latest stable branch and applied. We'll decide between 6.3 and main based mostly on ; if 6.3, the bot will pick it up.
+
+[1] Historically I am not a huge fan of a full Alpha/Beta/CR cycle for minor releases, usually just doing CRs. But open to convincing otherwise.

checkerstubs/java.lang.astub

@@ -0,0 +1,9 @@
+// Checkerframework stubs for java.lang
+
+package java.lang.reflect;
+
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+public final class Method extends Executable {
+    void invoke(@Nullable Object obj, Object @Nullable ... args);
+}

checkerstubs/jboss.logging.astub

@@ -0,0 +1,9 @@
+// Checkerframework stubs for the jboss.logging module
+
+package org.jboss.logging;
+
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+public interface BasicLogger {
+    void tracef(String format, @Nullable Object param1, @Nullable Object param2);
+}

databases/cockroachdb/matrix.gradle

@@ -11,4 +11,4 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-jdbcDependency 'org.postgresql:postgresql:42.2.8'
+jdbcDependency 'org.postgresql:postgresql:42.6.0'

databases/db2/matrix.gradle

@@ -5,4 +5,4 @@
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
 
-jdbcDependency 'com.ibm.db2:jcc:11.5.7.0'
+jdbcDependency 'com.ibm.db2:jcc:11.5.8.0'

databases/derby/matrix.gradle

@@ -5,7 +5,7 @@
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
 //databaseProfile {
-	jdbcDependency 'org.apache.derby:derby:10.14.2.0'
+	jdbcDependency 'org.apache.derby:derby:10.15.2.0'
 
 //	testing {
 //		beforeSuite {

databases/hana/matrix.gradle

@@ -5,4 +5,4 @@
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
 
-jdbcDependency 'com.sap.cloud.db.jdbc:ngdbc:2.4.59'
+jdbcDependency 'com.sap.cloud.db.jdbc:ngdbc:2.16.14'

databases/mariadb/matrix.gradle

@@ -4,4 +4,4 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-jdbcDependency 'org.mariadb.jdbc:mariadb-java-client:2.7.7'
+jdbcDependency 'org.mariadb.jdbc:mariadb-java-client:2.7.9'

databases/mssqlserver/matrix.gradle

@@ -5,4 +5,4 @@
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
 
-jdbcDependency 'com.microsoft.sqlserver:mssql-jdbc:6.4.0.jre8'
+jdbcDependency 'com.microsoft.sqlserver:mssql-jdbc:12.2.0.jre11'

databases/mysql/matrix.gradle

@@ -4,4 +4,4 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-jdbcDependency 'mysql:mysql-connector-java:8.0.27'
+jdbcDependency 'com.mysql:mysql-connector-j:8.0.33'

databases/oracle/matrix.gradle

@@ -4,4 +4,4 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-jdbcDependency 'com.oracle.database.jdbc:ojdbc8:21.8.0.0'
+jdbcDependency 'com.oracle.database.jdbc:ojdbc11:23.2.0.0'

databases/pgsql/matrix.gradle

@@ -4,4 +4,4 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-jdbcDependency 'org.postgresql:postgresql:42.2.19'
+jdbcDependency 'org.postgresql:postgresql:42.6.0'

docker_db.sh

@@ -147,7 +147,7 @@ postgresql_15() {
 }
 
 edb() {
-    edb_14
+    edb_15
 }
 
 edb_10() {
@@ -164,6 +164,13 @@ edb_14() {
     $CONTAINER_CLI run --name edb -e POSTGRES_USER=hibernate_orm_test -e POSTGRES_PASSWORD=hibernate_orm_test -e POSTGRES_DB=hibernate_orm_test -p 5444:5444 -d edb-test:14
 }
 
+edb_15() {
+    $CONTAINER_CLI rm -f edb || true
+    # We need to build a derived image because the existing image is mainly made for use by a kubernetes operator
+    (cd edb; $CONTAINER_CLI build -t edb-test:15 -f edb15.Dockerfile .)
+    $CONTAINER_CLI run --name edb -e POSTGRES_USER=hibernate_orm_test -e POSTGRES_PASSWORD=hibernate_orm_test -e POSTGRES_DB=hibernate_orm_test -p 5444:5444 -d edb-test:15
+}
+
 db2() {
   db2_11_5
 }
@@ -645,6 +652,46 @@ cockroachdb() {
   cockroachdb_22_2
 }
 
+cockroachdb_23_1() {
+  $CONTAINER_CLI rm -f cockroach || true
+  LOG_CONFIG="
+sinks:
+  stderr:
+    channels: all
+    filter: ERROR
+    redact: false
+    exit-on-error: true
+"
+  $CONTAINER_CLI run -d --name=cockroach -m 6g -p 26257:26257 -p 8080:8080 cockroachdb/cockroach-unstable:v23.1.0-rc.1 start-single-node \
+    --insecure --store=type=mem,size=0.25 --advertise-addr=localhost --log="$LOG_CONFIG"
+  OUTPUT=
+  while [[ $OUTPUT != *"CockroachDB node starting"* ]]; do
+        echo "Waiting for CockroachDB to start..."
+        sleep 10
+        # Note we need to redirect stderr to stdout to capture the logs
+        OUTPUT=$($CONTAINER_CLI logs cockroach 2>&1)
+  done
+  echo "Enabling experimental box2d operators and some optimized settings for running the tests"
+  #settings documented in https://www.cockroachlabs.com/docs/v22.1/local-testing.html#use-a-local-single-node-cluster-with-in-memory-storage
+  $CONTAINER_CLI exec cockroach bash -c "cat <<EOF | ./cockroach sql --insecure
+SET CLUSTER SETTING sql.spatial.experimental_box2d_comparison_operators.enabled = on;
+SET CLUSTER SETTING kv.raft_log.disable_synchronization_unsafe = true;
+SET CLUSTER SETTING kv.range_merge.queue_interval = '50ms';
+SET CLUSTER SETTING jobs.registry.interval.gc = '30s';
+SET CLUSTER SETTING jobs.registry.interval.cancel = '180s';
+SET CLUSTER SETTING jobs.retention_time = '15s';
+SET CLUSTER SETTING sql.stats.automatic_collection.enabled = false;
+SET CLUSTER SETTING kv.range_split.by_load_merge_delay = '5s';
+ALTER RANGE default CONFIGURE ZONE USING "gc.ttlseconds" = 600;
+ALTER DATABASE system CONFIGURE ZONE USING "gc.ttlseconds" = 600;
+
+quit
+EOF
+"
+  echo "Cockroachdb successfully started"
+
+}
+
 cockroachdb_22_2() {
   $CONTAINER_CLI rm -f cockroach || true
   LOG_CONFIG="
@@ -800,6 +847,7 @@ if [ -z ${1} ]; then
     echo "No db name provided"
     echo "Provide one of:"
     echo -e "\tcockroachdb"
+    echo -e "\tcockroachdb_23_1"
     echo -e "\tcockroachdb_22_2"
     echo -e "\tcockroachdb_22_1"
     echo -e "\tcockroachdb_21_1"