Merge branch 'o-main' into main-perf

Author: theigl

docker_db.sh

@@ -724,6 +724,7 @@ 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;
+SET CLUSTER SETTING sql.defaults.serial_normalization=sql_sequence;
 
 quit
 EOF
@@ -764,6 +765,7 @@ 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;
+SET CLUSTER SETTING sql.defaults.serial_normalization=sql_sequence;
 
 quit
 EOF
@@ -809,6 +811,7 @@ SET CLUSTER SETTING timeseries.storage.resolution_30m.ttl = '0s';
 ALTER RANGE default CONFIGURE ZONE USING \"gc.ttlseconds\" = 10;
 ALTER DATABASE system CONFIGURE ZONE USING \"gc.ttlseconds\" = 10;
 ALTER DATABASE defaultdb CONFIGURE ZONE USING \"gc.ttlseconds\" = 10;
+SET CLUSTER SETTING sql.defaults.serial_normalization=sql_sequence;
 quit
 EOF
 "

documentation/src/main/asciidoc/introduction/Hibernate_Introduction.adoc

@@ -17,21 +17,11 @@ include::Preface.adoc[]
 :numbered:
 
 include::Introduction.adoc[]
-
 include::Configuration.adoc[]
-
 include::Entities.adoc[]
-
 include::Mapping.adoc[]
-
 include::Interacting.adoc[]
-
 include::Generator.adoc[]
-
-// include::../userguide/chapters/query/hql/Hibernate_Query_Language.adoc[]
-
 include::Tuning.adoc[]
-
 include::Advanced.adoc[]
-
 include::Credits.adoc[]

documentation/src/main/asciidoc/introduction/Interacting.adoc

@@ -705,14 +705,11 @@ query.select(book).where(where)
 
 Here, as before, the classes `Book_` and `Author_` are generated by Hibernate's <<metamodel-generator,JPA Metamodel Generator>>.
 
-[CAUTION]
+[NOTE]
 // .Injection attacks and criteria queries
 ====
 Notice that we did not bother treating `titlePattern` and `namePattern` as parameters.
-That's safe because, _by default_, Hibernate automatically and transparently handles any literal string passed to the `CriteriaBuilder` as a JDBC parameter.
-
-But this behavior is controlled by the configuration setting `hibernate.criteria.value_handling_mode`.
-If you change the default behavior, and set the property to `INLINE` instead of `BIND`, you _must_ pass user-input via a JPA `ParameterExpression`.
+That's safe because, by default, Hibernate automatically and transparently treats strings passed to the `CriteriaBuilder` as JDBC parameters.
 ====
 
 Execution of a criteria query works almost exactly like execution of HQL.
@@ -1214,4 +1211,5 @@ In this section we'll quickly sketch some general strategies for avoiding "quagm
   Instead, _understand_ what you're doing; study the Javadoc of the APIs you're using; read the JPA specification; follow the advice we give in this document; go direct to the Hibernate team on Zulip.
   (Sure, we can be a bit cantankerous at times, but we _do_ always want you to be successful.)
 - Always consider other options.
-  You don't have to use Hibernate for _everything_.
+  You don't have to use Hibernate for _everything_.
+

documentation/src/main/asciidoc/introduction/Tuning.adoc

@@ -220,12 +220,12 @@ Clever, huh?
 Both batch fetching and subselect fetching are disabled by default, but we may enable one or the other globally using properties.
 
 .Configuration settings to enable batch and subselect fetching
-[%breakable,cols="35,~, 20"]
+[%breakable,cols="32,~,28"]
 |===
-| Configuration property name | Property value | Alternative
+| Configuration property name | Property value | Alternatives
 
-| `hibernate.default_batch_fetch_size` | A sensible batch size `>1` to enable batch fetching | `@BatchSize`, `setFetchBatchSize()`
-| `hibernate.use_subselect_fetch` | `true` to enable subselect fetching | `@Fetch(SUBSELECT)`
+| `hibernate.default_batch_fetch_size` | A sensible batch size `>1` to enable batch fetching | `@BatchSize()`, `setFetchBatchSize()`
+| `hibernate.use_subselect_fetch` | `true` to enable subselect fetching | `@Fetch(SUBSELECT)`, `setSubselectFetchingEnabled()`
 |===
 
 Alternatively, we can enable one or the other in a given session:
@@ -1010,4 +1010,11 @@ The comment text may be customized:
 
 Finally, many systems which require high scalability now make use of reactive programming and reactive streams.
 {hr}[Hibernate Reactive] brings O/R mapping to the world of reactive programming.
-You can learn much more about Hibernate Reactive from its {hr-guide}[Reference Documentation].
+You can learn much more about Hibernate Reactive from its {hr-guide}[Reference Documentation].
+
+[TIP]
+====
+Hibernate Reactive may be used alongside vanilla Hibernate in the same program, and can reuse the same entity classes.
+This means you can use the reactive programming model exactly where you need it—perhaps only in one or two places in your system.
+You don't need to rewrite your whole program using reactive streams.
+====

documentation/src/main/asciidoc/querylanguage/Hibernate_Query_Language.adoc

@@ -19,29 +19,13 @@
 :toc:
 :toclevels: 3
 
-<<<
-
 include::Preface.adoc[]
 
-<<<
-
 :numbered:
 
 include::Concepts.adoc[]
-
-<<<
-
 include::Expressions.adoc[]
-
-<<<
-
 include::From.adoc[]
-
-<<<
-
 include::Relational.adoc[]
-
-<<<
-
 include::Credits.adoc[]
 

gradle.properties

@@ -1,8 +1,10 @@
 # Keep all these properties in sync unless you know what you are doing!
-org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=256m -XX:+HeapDumpOnOutOfMemoryError -Duser.language=en -Duser.country=US -Duser.timezone=UTC -Dfile.encoding=UTF-8
-toolchain.compiler.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=256m -XX:+HeapDumpOnOutOfMemoryError -Duser.language=en -Duser.country=US -Duser.timezone=UTC -Dfile.encoding=UTF-8
-toolchain.javadoc.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=256m -XX:+HeapDumpOnOutOfMemoryError -Duser.language=en -Duser.country=US -Duser.timezone=UTC -Dfile.encoding=UTF-8
-toolchain.launcher.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=384m -XX:+HeapDumpOnOutOfMemoryError -Duser.language=en -Duser.country=US -Duser.timezone=UTC -Dfile.encoding=UTF-8
+# We set '-Dlog4j2.disableJmx=true' to prevent classloader leaks triggered by the logger.
+# (Some of these settings need to be repeated in the test.jvmArgs blocks of each module)
+org.gradle.jvmargs=-Dlog4j2.disableJmx -Xmx2g -XX:MaxMetaspaceSize=256m -XX:+HeapDumpOnOutOfMemoryError -Duser.language=en -Duser.country=US -Duser.timezone=UTC -Dfile.encoding=UTF-8
+toolchain.compiler.jvmargs=-Dlog4j2.disableJmx=true -Xmx2g -XX:MaxMetaspaceSize=256m -XX:+HeapDumpOnOutOfMemoryError -Duser.language=en -Duser.country=US -Duser.timezone=UTC -Dfile.encoding=UTF-8
+toolchain.javadoc.jvmargs=-Dlog4j2.disableJmx=true -Xmx2g -XX:MaxMetaspaceSize=256m -XX:+HeapDumpOnOutOfMemoryError -Duser.language=en -Duser.country=US -Duser.timezone=UTC -Dfile.encoding=UTF-8
+toolchain.launcher.jvmargs=-Dlog4j2.disableJmx=true -Xmx2g -XX:MaxMetaspaceSize=384m -XX:+HeapDumpOnOutOfMemoryError -Duser.language=en -Duser.country=US -Duser.timezone=UTC -Dfile.encoding=UTF-8
 
 org.gradle.parallel=true
 

gradle/databases.gradle

@@ -18,7 +18,7 @@ ext {
                         'jdbc.driver': 'org.h2.Driver',
                         'jdbc.user'  : 'sa',
                         'jdbc.pass'  : '',
-                        'jdbc.url'   : 'jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1;LOCK_TIMEOUT=10000',
+                        'jdbc.url'   : 'jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE',
                         'connection.init_sql' : '',
                         'hibernate.dialect.native_param_markers' : 'true'
                 ],

gradle/java-module.gradle

@@ -376,6 +376,7 @@ test {
 		// Used in the Travis build so that Travis doesn't end up panicking because there's no output for a long time.
 		testLogging {
 			events "passed", "skipped", "failed"
+			exceptionFormat = 'full'
 		}
 	}
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2LegacySqlAstTranslator.java

@@ -420,7 +420,7 @@ protected void renderComparison(Expression lhs, ComparisonOperator operator, Exp
 						break;
 				}
 			}
-			renderComparisonEmulateDecode( lhs, operator, rhs );
+			renderComparisonEmulateDecode( lhs, operator, rhs, SqlAstNodeRenderingMode.NO_UNTYPED );
 		}
 	}
 

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/H2LegacyDialect.java

@@ -200,6 +200,12 @@ public boolean supportsStandardArrays() {
 		return getVersion().isSameOrAfter( 2 );
 	}
 
+	@Override
+	public boolean useArrayForMultiValuedParameters() {
+		// Performance is worse than the in-predicate version
+		return false;
+	}
+
 	@Override
 	protected String columnType(int sqlTypeCode) {
 		switch ( sqlTypeCode ) {

hibernate-core/hibernate-core.gradle

@@ -245,6 +245,9 @@ tasks.withType( Test.class ).each { test ->
     test.jvmArgs( ['--add-opens', 'java.base/java.security=ALL-UNNAMED'] )
     test.jvmArgs( ['--add-opens', 'java.base/java.lang=ALL-UNNAMED'] )
 
+    //Avoid Log4J2 classloader leaks:
+    test.jvmArgs( ['-Dlog4j2.disableJmx=true'] )
+
     test.beforeTest { descriptor ->
         //println "Starting test: " + descriptor
     }

hibernate-core/src/main/antlr/org/hibernate/grammars/hql/HqlParser.g4

@@ -152,6 +152,7 @@ queryExpression
 orderedQuery
 	: query queryOrder?										# QuerySpecExpression
 	| LEFT_PAREN queryExpression RIGHT_PAREN queryOrder?	# NestedQueryExpression
+	| queryOrder											# QueryOrderExpression
 	;
 
 /**
@@ -180,6 +181,7 @@ query
 // TODO: add with clause
 	: selectClause fromClause? whereClause? (groupByClause havingClause?)?
 	| fromClause whereClause? (groupByClause havingClause?)? selectClause?
+	| whereClause
 	;
 
 

hibernate-core/src/main/java/org/hibernate/InstantiationException.java

@@ -15,7 +15,7 @@ public class InstantiationException extends HibernateException {
 	private final Class<?> clazz;
 
 	/**
-	 * Constructs a {@code InstantiationException}.
+	 * Constructs an {@code InstantiationException}.
 	 *
 	 * @param message A message explaining the exception condition
 	 * @param clazz The Class we are attempting to instantiate

hibernate-core/src/main/java/org/hibernate/Session.java

@@ -183,13 +183,13 @@ public interface Session extends SharedSessionContract, EntityManager {
 	void setFlushMode(FlushModeType flushMode);
 
 	/**
-	 * Set the current {@link FlushMode flush mode} for this session.
+	 * Set the current {@linkplain FlushMode flush mode} for this session.
 	 * <p>
 	 * <em>Flushing</em> is the process of synchronizing the underlying persistent
 	 * store with persistable state held in memory. The current flush mode determines
 	 * when the session is automatically flushed.
 	 * <p>
-	 * The {@link FlushMode#AUTO default flush mode} is sometimes unnecessarily
+	 * The {@linkplain FlushMode#AUTO default flush mode} is sometimes unnecessarily
 	 * aggressive. For a logically "read only" session, it's reasonable to set the
 	 * session's flush mode to {@link FlushMode#MANUAL} at the start of the session
 	 * in order to avoid some unnecessary work.
@@ -201,22 +201,22 @@ public interface Session extends SharedSessionContract, EntityManager {
 	void setHibernateFlushMode(FlushMode flushMode);
 
 	/**
-	 * Get the current {@link FlushModeType JPA flush mode} for this session.
+	 * Get the current {@linkplain FlushModeType JPA flush mode} for this session.
 	 *
 	 * @return the {@link FlushModeType} currently in effect
 	 */
 	@Override
 	FlushModeType getFlushMode();
 
 	/**
-	 * Get the current {@link FlushMode flush mode} for this session.
+	 * Get the current {@linkplain FlushMode flush mode} for this session.
 	 *
 	 * @return the {@link FlushMode} currently in effect
 	 */
 	FlushMode getHibernateFlushMode();
 
 	/**
-	 * Set the current {@link CacheMode cache mode} for this session.
+	 * Set the current {@linkplain CacheMode cache mode} for this session.
 	 * <p>
 	 * The cache mode determines the manner in which this session can interact with
 	 * the second level cache.
@@ -226,7 +226,7 @@ public interface Session extends SharedSessionContract, EntityManager {
 	void setCacheMode(CacheMode cacheMode);
 
 	/**
-	 * Get the current {@link CacheMode cache mode} for this session.
+	 * Get the current {@linkplain CacheMode cache mode} for this session.
 	 *
 	 * @return the current cache mode
 	 */

hibernate-core/src/main/java/org/hibernate/SessionFactory.java

@@ -220,6 +220,8 @@ default void inSession(Consumer<Session> action) {
 
 	/**
 	 * Open a {@link StatelessSession} and use it to perform an action.
+	 *
+	 * @since 6.3
 	 */
 	default void inStatelessSession(Consumer<StatelessSession> action) {
 		try ( StatelessSession session = openStatelessSession() ) {
@@ -238,6 +240,8 @@ default void inTransaction(Consumer<Session> action) {
 	/**
 	 * Open a {@link StatelessSession} and use it to perform an action
 	 * within the bounds of a transaction.
+	 *
+	 * @since 6.3
 	 */
 	default void inStatelessTransaction(Consumer<StatelessSession> action) {
 		inStatelessSession( session -> manageTransaction( session, session.beginTransaction(), action ) );
@@ -254,6 +258,8 @@ default <R> R fromSession(Function<Session,R> action) {
 
 	/**
 	 * Open a {@link StatelessSession} and use it to obtain a value.
+	 *
+	 * @since 6.3
 	 */
 	default <R> R fromStatelessSession(Function<StatelessSession,R> action) {
 		try ( StatelessSession session = openStatelessSession() ) {
@@ -272,6 +278,8 @@ default <R> R fromTransaction(Function<Session,R> action) {
 	/**
 	 * Open a {@link StatelessSession} and use it to obtain a value
 	 * within the bounds of a transaction.
+	 *
+	 * @since 6.3
 	 */
 	default <R> R fromStatelessTransaction(Function<StatelessSession,R> action) {
 		return fromStatelessSession( session -> manageTransaction( session, session.beginTransaction(), action ) );

hibernate-core/src/main/java/org/hibernate/annotations/processing/Find.java

@@ -113,6 +113,10 @@
  *     {@linkplain jakarta.persistence.criteria.CriteriaBuilder criteria
  *     query}.
  * </ul>
+ * <p>
+ * As an exception, the method may have at most one parameter of
+ * type {@code EntityManager}, {@code Session},
+ * {@code StatelessSession}, or {@code Mutiny.Session}.
  *
  * @see HQL
  * @see SQL

hibernate-core/src/main/java/org/hibernate/annotations/processing/HQL.java

@@ -49,8 +49,9 @@
  * Alternatively, the type to which the annotated method belongs may
  * also declare an abstract method with no parameters which returns
  * one of the types {@link jakarta.persistence.EntityManager},
- * {@link org.hibernate.StatelessSession},
- * or {@link org.hibernate.Session}, for example:
+ * {@link org.hibernate.Session},
+ * {@link org.hibernate.StatelessSession}, or {@code Mutiny.Session},
+ * for example:
  * <pre>
  * EntityManager entityManager();
  * </pre>
@@ -74,7 +75,8 @@
  * <p>
  * This is reminiscent of traditional DAO-style repositories.
  * <p>
- * The return type of an annotated method must be:
+ * For a {@code select} query, the return type of an annotated method
+ * must be:
  * <ul>
  * <li>an entity type,
  * <li>{@link java.util.List},
@@ -84,6 +86,10 @@
  * <li>{@link jakarta.persistence.TypedQuery}.
  * </ul>
  * <p>
+ * For an {@code insert}, {@code update}, or {@code delete} query,
+ * the return type of the annotated method must be {@code int} or
+ * {@code void}.
+ * <p>
  * The method parameters must match the parameters of the HQL query,
  * either by name or by position:
  * <ul>
@@ -95,6 +101,8 @@
  * <p>
  * As an exception, the method may have:
  * <ul>
+ * <li>a parameter of type {@code EntityManager}, {@code Session},
+ *     {@code StatelessSession}, or {@code Mutiny.Session},
  * <li>a parameter with type {@code Page}, and/or
  * <li>a parameter with type {@code Order<? super E>},
  *     {@code List<Order<? super E>>}, or {@code Order<? super E>...}

hibernate-core/src/main/java/org/hibernate/annotations/processing/SQL.java

@@ -49,8 +49,9 @@
  * Alternatively, the type to which the annotated method belongs may
  * also declare an abstract method with no parameters which returns
  * one of the types {@link jakarta.persistence.EntityManager},
- * {@link org.hibernate.StatelessSession},
- * or {@link org.hibernate.Session}, for example:
+ * {@link org.hibernate.Session},
+ * {@link org.hibernate.StatelessSession}, or {@code Mutiny.Session},
+ * for example:
  * <pre>
  * EntityManager entityManager();
  * </pre>
@@ -91,6 +92,10 @@
  * <li>a named query parameter of form {@code :name} is matched to
  *     the method parameter {@code name}.
  * </ul>
+ * <p>
+ * As an exception, the method may have at most one parameter of
+ * type {@code EntityManager}, {@code Session},
+ * {@code StatelessSession}, or {@code Mutiny.Session}.
  *
  * @see HQL
  * @see Find