HHH-18621 remove hibernate.jdbc.batch_versioned_data

gavinking · gavinking · commit 5958f3df3c7f · 2025-02-08T15:27:42.000+01:00
since it has had no effect for some time

and the "tests" for it weren't really testing anything :-/
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/OracleLegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/OracleLegacyDialect.java
@@ -20,8 +20,21 @@
 import org.hibernate.QueryTimeoutException;
 import org.hibernate.boot.model.FunctionContributions;
 import org.hibernate.boot.model.TypeContributions;
-import org.hibernate.cfg.Environment;
-import org.hibernate.dialect.*;
+import org.hibernate.dialect.BooleanDecoder;
+import org.hibernate.dialect.DatabaseVersion;
+import org.hibernate.dialect.Dialect;
+import org.hibernate.dialect.DmlTargetColumnQualifierSupport;
+import org.hibernate.dialect.OracleBooleanJdbcType;
+import org.hibernate.dialect.OracleJdbcHelper;
+import org.hibernate.dialect.OracleJsonArrayJdbcTypeConstructor;
+import org.hibernate.dialect.OracleJsonJdbcType;
+import org.hibernate.dialect.OracleReflectionStructJdbcType;
+import org.hibernate.dialect.OracleTypes;
+import org.hibernate.dialect.OracleUserDefinedTypeExporter;
+import org.hibernate.dialect.OracleXmlJdbcType;
+import org.hibernate.dialect.Replacer;
+import org.hibernate.dialect.RowLockStrategy;
+import org.hibernate.dialect.TimeZoneSupport;
 import org.hibernate.dialect.aggregate.AggregateSupport;
 import org.hibernate.dialect.aggregate.OracleAggregateSupport;
 import org.hibernate.dialect.function.CommonFunctionFactory;
@@ -788,13 +801,6 @@ public TimeZoneSupport getTimeZoneSupport() {
 		return getVersion().isSameOrAfter( 9 ) ? TimeZoneSupport.NATIVE : TimeZoneSupport.NONE;
 	}
 
-	@Override
-	protected void initDefaultProperties() {
-		super.initDefaultProperties();
-		String newerVersion = Boolean.toString( getVersion().isSameOrAfter( 12 ) );
-		getDefaultProperties().setProperty( Environment.BATCH_VERSIONED_DATA, newerVersion );
-	}
-
 	@Override
 	public int getDefaultStatementBatchSize() {
 		return 15;
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/SessionFactoryBuilder.java b/hibernate-core/src/main/java/org/hibernate/boot/SessionFactoryBuilder.java
@@ -564,19 +564,6 @@ public interface SessionFactoryBuilder {
 	 */
 	SessionFactoryBuilder applyJdbcBatchSize(int size);
 
-	/**
-	 * This setting controls whether versioned entities will be included in JDBC batching.  The reason
-	 * being that some JDBC drivers have a problems returning "accurate" update counts from batch statements.
-	 * This is setting is {@code false} by default.
-	 *
-	 * @param enabled The batch size to use.
-	 *
-	 * @return {@code this}, for method chaining
-	 *
-	 * @see org.hibernate.cfg.AvailableSettings#BATCH_VERSIONED_DATA
-	 */
-	SessionFactoryBuilder applyJdbcBatchingForVersionedEntities(boolean enabled);
-
 	/**
 	 * Should scrollable results be supported in queries?  We ask the JDBC driver whether it
 	 * supports scrollable result sets as the default for this setting, but some drivers do not
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryBuilderImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryBuilderImpl.java
@@ -318,12 +318,6 @@ public SessionFactoryBuilder applyJdbcBatchSize(int size) {
 		return this;
 	}
 
-	@Override
-	public SessionFactoryBuilder applyJdbcBatchingForVersionedEntities(boolean enabled) {
-		this.optionsBuilder.enableJdbcBatchingForVersionedEntities( enabled );
-		return this;
-	}
-
 	@Override
 	public SessionFactoryBuilder applyScrollableResultsSupport(boolean enabled) {
 		this.optionsBuilder.enableScrollableResultSupport( enabled );
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryOptionsBuilder.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryOptionsBuilder.java
@@ -222,7 +222,6 @@ public class SessionFactoryOptionsBuilder implements SessionFactoryOptions {
 	// JDBC Handling
 	private boolean getGeneratedKeysEnabled;
 	private int jdbcBatchSize;
-	private boolean jdbcBatchVersionedData;
 	private Integer jdbcFetchSize;
 	private boolean scrollableResultSetsEnabled;
 	private boolean commentsEnabled;
@@ -465,8 +464,6 @@ public SessionFactoryOptionsBuilder(StandardServiceRegistry serviceRegistry, Boo
 		jdbcBatchSize = disallowBatchUpdates( dialect, meta ) ? 0
 				: getInt( STATEMENT_BATCH_SIZE, settings, 1 );
 
-		jdbcBatchVersionedData = getBoolean( BATCH_VERSIONED_DATA, settings, true );
-
 		scrollableResultSetsEnabled =
 				getBoolean( USE_SCROLLABLE_RESULTSET, settings, meta.supportsScrollableResults() );
 		getGeneratedKeysEnabled =
@@ -1054,11 +1051,6 @@ public int getJdbcBatchSize() {
 		return jdbcBatchSize;
 	}
 
-	@Override
-	public boolean isJdbcBatchVersionedData() {
-		return jdbcBatchVersionedData;
-	}
-
 	@Override
 	public boolean isScrollableResultSetsEnabled() {
 		return scrollableResultSetsEnabled;
@@ -1469,10 +1461,6 @@ public void applyJdbcBatchSize(int size) {
 		this.jdbcBatchSize = size;
 	}
 
-	public void enableJdbcBatchingForVersionedEntities(boolean enabled) {
-		this.jdbcBatchVersionedData = enabled;
-	}
-
 	public void enableScrollableResultSupport(boolean enabled) {
 		this.scrollableResultSetsEnabled = enabled;
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingSessionFactoryBuilder.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingSessionFactoryBuilder.java
@@ -286,12 +286,6 @@ public T applyJdbcBatchSize(int size) {
 		return getThis();
 	}
 
-	@Override
-	public T applyJdbcBatchingForVersionedEntities(boolean enabled) {
-		delegate.applyJdbcBatchingForVersionedEntities( enabled );
-		return getThis();
-	}
-
 	@Override
 	public T applyScrollableResultsSupport(boolean enabled) {
 		delegate.applyScrollableResultsSupport( enabled );
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingSessionFactoryOptions.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingSessionFactoryOptions.java
@@ -304,11 +304,6 @@ public int getJdbcBatchSize() {
 		return delegate.getJdbcBatchSize();
 	}
 
-	@Override
-	public boolean isJdbcBatchVersionedData() {
-		return delegate.isJdbcBatchVersionedData();
-	}
-
 	@Override
 	public boolean isScrollableResultSetsEnabled() {
 		return delegate.isScrollableResultSetsEnabled();
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/SessionFactoryOptions.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/SessionFactoryOptions.java
@@ -297,11 +297,6 @@ default boolean isAllowRefreshDetachedEntity() {
 	 */
 	int getJdbcBatchSize();
 
-	/**
-	 * @see org.hibernate.cfg.BatchSettings#BATCH_VERSIONED_DATA
-	 */
-	boolean isJdbcBatchVersionedData();
-
 	/**
 	 * @see org.hibernate.cfg.JdbcSettings#USE_SCROLLABLE_RESULTSET
 	 */
diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/BatchSettings.java b/hibernate-core/src/main/java/org/hibernate/cfg/BatchSettings.java
@@ -53,16 +53,6 @@ public interface BatchSettings {
 	 */
 	String ORDER_INSERTS = "hibernate.order_inserts";
 
-	/**
-	 * When enabled, specifies that {@linkplain jakarta.persistence.Version versioned}
-	 * data should be included in batching.
-	 *
-	 * @see org.hibernate.boot.SessionFactoryBuilder#applyJdbcBatchingForVersionedEntities(boolean)
-	 *
-	 * @settingDefault Generally {@code true}, though can vary based on Dialect
-	 */
-	String BATCH_VERSIONED_DATA = "hibernate.jdbc.batch_versioned_data";
-
 	/**
 	 * @deprecated Use {@link #BUILDER} instead
 	 */
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/OracleDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/OracleDialect.java
@@ -104,7 +104,6 @@
 import static org.hibernate.LockOptions.NO_WAIT;
 import static org.hibernate.LockOptions.SKIP_LOCKED;
 import static org.hibernate.LockOptions.WAIT_FOREVER;
-import static org.hibernate.cfg.AvailableSettings.BATCH_VERSIONED_DATA;
 import static org.hibernate.dialect.OracleJdbcHelper.getArrayJdbcTypeConstructor;
 import static org.hibernate.dialect.OracleJdbcHelper.getNestedTableJdbcTypeConstructor;
 import static org.hibernate.exception.spi.TemplatedViolatedConstraintNameExtractor.extractUsingTemplate;
@@ -834,12 +833,6 @@ public TimeZoneSupport getTimeZoneSupport() {
 		return TimeZoneSupport.NATIVE;
 	}
 
-	@Override
-	protected void initDefaultProperties() {
-		super.initDefaultProperties();
-		getDefaultProperties().setProperty( BATCH_VERSIONED_DATA, "true" );
-	}
-
 	@Override
 	public int getDefaultStatementBatchSize() {
 		return 15;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CollectionCacheEmbeddedIdKeyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CollectionCacheEmbeddedIdKeyTest.java
@@ -50,7 +50,6 @@
 @ServiceRegistry( settings = {
 		@Setting( name = AvailableSettings.USE_SECOND_LEVEL_CACHE, value = "true" ),
 		@Setting( name = AvailableSettings.DEFAULT_BATCH_FETCH_SIZE, value = "30" ),
-		@Setting( name = AvailableSettings.BATCH_VERSIONED_DATA, value = "true" ),
 } )
 @Jira( "https://hibernate.atlassian.net/browse/HHH-16845" )
 public class CollectionCacheEmbeddedIdKeyTest {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/caching/CachingWithBatchAndFetchModeSelectTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/caching/CachingWithBatchAndFetchModeSelectTest.java
@@ -34,7 +34,6 @@
 		},
 		integrationSettings = {
 				@Setting(name = AvailableSettings.USE_SECOND_LEVEL_CACHE, value = "true"),
-				@Setting(name = AvailableSettings.BATCH_VERSIONED_DATA, value = "true")
 		}
 
 )
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/BatchVersionedDataConfigTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/BatchVersionedDataConfigTest.java
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/OracleDialectsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/OracleDialectsTest.java
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/AbstractEntityWithManyToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/AbstractEntityWithManyToManyTest.java
@@ -8,7 +8,6 @@
 
 import org.hibernate.LockMode;
 import org.hibernate.StaleObjectStateException;
-import org.hibernate.StaleStateException;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.engine.spi.SessionImplementor;
 import org.hibernate.metamodel.MappingMetamodel;
@@ -919,12 +918,7 @@ public void testManyToManyCollectionOptimisticLockingWithUpdate(SessionFactorySc
 					catch (PersistenceException ex) {
 						s.getTransaction().rollback();
 						assertTrue( isContractVersioned );
-						if ( !scope.getSessionFactory().getSessionFactoryOptions().isJdbcBatchVersionedData() ) {
-							assertTyping( StaleObjectStateException.class, ex.getCause() );
-						}
-						else {
-							assertTyping( StaleStateException.class, ex.getCause() );
-						}
+						assertTyping( StaleObjectStateException.class, ex.getCause() );
 					}
 				}
 		);
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/AbstractEntityWithOneToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/AbstractEntityWithOneToManyTest.java
@@ -10,7 +10,6 @@
 
 import org.hibernate.QueryException;
 import org.hibernate.StaleObjectStateException;
-import org.hibernate.StaleStateException;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.engine.spi.SessionImplementor;
 import org.hibernate.metamodel.MappingMetamodel;
@@ -1171,12 +1170,7 @@ public void testOneToManyCollectionOptimisticLockingWithUpdate(SessionFactorySco
 					catch (PersistenceException ex) {
 						s.getTransaction().rollback();
 						assertTrue( isContractVersioned );
-						if ( !sessionFactory.getSessionFactoryOptions().isJdbcBatchVersionedData() ) {
-							assertTyping( StaleObjectStateException.class, ex.getCause() );
-						}
-						else {
-							assertTyping( StaleStateException.class, ex.getCause() );
-						}
+						assertTyping( StaleObjectStateException.class, ex.getCause() );
 					}
 				}
 		);
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/exception/ExceptionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/exception/ExceptionTest.java
