HHH-9990 - Enabled batched updates for versioned data by default

dreab8 · dreab8 · commit 4da260b3be6f · 2015-08-05T11:27:18.000+01:00
diff --git a/databases/derby/resources/hibernate.properties b/databases/derby/resources/hibernate.properties
@@ -21,9 +21,6 @@ hibernate.max_fetch_depth 5
 hibernate.cache.region_prefix hibernate.test
 hibernate.cache.region.factory_class org.hibernate.testing.cache.CachingRegionFactory
 
-# NOTE: hibernate.jdbc.batch_versioned_data should be set to false when testing with Oracle
-hibernate.jdbc.batch_versioned_data true
-
 javax.persistence.validation.mode=NONE
 hibernate.service.allow_crawling=false
 hibernate.session.events.log=true
diff --git a/databases/mariadb/resources/hibernate.properties b/databases/mariadb/resources/hibernate.properties
@@ -21,9 +21,6 @@ hibernate.max_fetch_depth 5
 hibernate.cache.region_prefix hibernate.test
 hibernate.cache.region.factory_class org.hibernate.testing.cache.CachingRegionFactory
 
-# NOTE: hibernate.jdbc.batch_versioned_data should be set to false when testing with Oracle
-hibernate.jdbc.batch_versioned_data true
-
 javax.persistence.validation.mode=NONE
 hibernate.service.allow_crawling=false
 hibernate.session.events.log=true
diff --git a/databases/pgsql/resources/hibernate.properties b/databases/pgsql/resources/hibernate.properties
@@ -21,9 +21,6 @@ hibernate.max_fetch_depth 5
 hibernate.cache.region_prefix hibernate.test
 hibernate.cache.region.factory_class org.hibernate.testing.cache.CachingRegionFactory
 
-# NOTE: hibernate.jdbc.batch_versioned_data should be set to false when testing with Oracle
-hibernate.jdbc.batch_versioned_data true
-
 javax.persistence.validation.mode=NONE
 hibernate.service.allow_crawling=false
 hibernate.session.events.log=true
diff --git a/hibernate-c3p0/src/test/resources/hibernate.properties b/hibernate-c3p0/src/test/resources/hibernate.properties
@@ -24,6 +24,3 @@ hibernate.max_fetch_depth 5
 
 hibernate.cache.region_prefix hibernate.test
 hibernate.cache.region.factory_class org.hibernate.testing.cache.CachingRegionFactory
-
-# NOTE: hibernate.jdbc.batch_versioned_data should be set to false when testing with Oracle
-hibernate.jdbc.batch_versioned_data true
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
@@ -540,9 +540,9 @@ public SessionFactoryOptionsStateStandardImpl(StandardServiceRegistry serviceReg
 
 			final Map configurationSettings = new HashMap();
 			//noinspection unchecked
-			configurationSettings.putAll( cfgService.getSettings() );
-			//noinspection unchecked
 			configurationSettings.putAll( jdbcServices.getJdbcEnvironment().getDialect().getDefaultProperties() );
+			//noinspection unchecked
+			configurationSettings.putAll( cfgService.getSettings() );
 			cfgService = new ConfigurationServiceImpl( configurationSettings );
 			( (ConfigurationServiceImpl) cfgService ).injectServices( (ServiceRegistryImplementor) serviceRegistry );
 
@@ -666,7 +666,7 @@ public SessionFactoryOptionsStateStandardImpl(StandardServiceRegistry serviceReg
 				this.jdbcBatchSize = 0;
 			}
 
-			this.jdbcBatchVersionedData = ConfigurationHelper.getBoolean( BATCH_VERSIONED_DATA, configurationSettings, false );
+			this.jdbcBatchVersionedData = ConfigurationHelper.getBoolean( BATCH_VERSIONED_DATA, configurationSettings, true );
 			this.scrollableResultSetsEnabled = ConfigurationHelper.getBoolean(
 					USE_SCROLLABLE_RESULTSET,
 					configurationSettings,
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/Oracle12cDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/Oracle12cDialect.java
@@ -18,6 +18,7 @@
 public class Oracle12cDialect extends Oracle10gDialect {
 	public Oracle12cDialect() {
 		super();
+		getDefaultProperties().setProperty( Environment.BATCH_VERSIONED_DATA, "true" );
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/Oracle8iDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/Oracle8iDialect.java
@@ -254,6 +254,7 @@ protected void registerDefaultProperties() {
 		// be returned (via its RETURNING clause).  No other driver seems to
 		// support this overloaded version.
 		getDefaultProperties().setProperty( Environment.USE_GET_GENERATED_KEYS, "false" );
+		getDefaultProperties().setProperty( Environment.BATCH_VERSIONED_DATA, "false" );
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/Oracle9Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/Oracle9Dialect.java
@@ -81,6 +81,7 @@ public Oracle9Dialect() {
 		getDefaultProperties().setProperty( Environment.USE_GET_GENERATED_KEYS, "false" );
 		getDefaultProperties().setProperty( Environment.USE_STREAMS_FOR_BINARY, "true" );
 		getDefaultProperties().setProperty( Environment.STATEMENT_BATCH_SIZE, DEFAULT_BATCH_SIZE );
+		getDefaultProperties().setProperty( Environment.BATCH_VERSIONED_DATA, "false" );
 
 		registerFunction( "abs", new StandardSQLFunction( "abs" ) );
 		registerFunction( "sign", new StandardSQLFunction( "sign", StandardBasicTypes.INTEGER ) );
diff --git a/hibernate-core/src/test/resources/hibernate.properties b/hibernate-core/src/test/resources/hibernate.properties
@@ -21,9 +21,6 @@ hibernate.max_fetch_depth 5
 hibernate.cache.region_prefix hibernate.test
 hibernate.cache.region.factory_class org.hibernate.testing.cache.CachingRegionFactory
 
-# NOTE: hibernate.jdbc.batch_versioned_data should be set to false when testing with Oracle
-hibernate.jdbc.batch_versioned_data true
-
 javax.persistence.validation.mode=NONE
 hibernate.service.allow_crawling=false
 hibernate.session.events.log=true
diff --git a/hibernate-ehcache/src/test/resources/hibernate.properties b/hibernate-ehcache/src/test/resources/hibernate.properties
@@ -13,6 +13,4 @@ hibernate.connection.pool_size 5
 
 hibernate.cache.region_prefix hibernate.test
 
-# NOTE: hibernate.jdbc.batch_versioned_data should be set to false when testing with Oracle
-hibernate.jdbc.batch_versioned_data true
 hibernate.service.allow_crawling=false
diff --git a/hibernate-entitymanager/src/test/resources/hibernate.properties b/hibernate-entitymanager/src/test/resources/hibernate.properties
@@ -21,6 +21,4 @@ hibernate.cache.region.factory_class org.hibernate.testing.cache.CachingRegionFa
 
 hibernate.jdbc.batch_size 0
 
-# NOTE: hibernate.jdbc.batch_versioned_data should be set to false when testing with Oracle
-hibernate.jdbc.batch_versioned_data true
 hibernate.service.allow_crawling=false
diff --git a/hibernate-envers/src/test/resources/hibernate.properties b/hibernate-envers/src/test/resources/hibernate.properties
@@ -18,6 +18,4 @@ hibernate.max_fetch_depth 5
 hibernate.cache.region_prefix hibernate.test
 hibernate.cache.region.factory_class org.hibernate.testing.cache.CachingRegionFactory
 
-# NOTE: hibernate.jdbc.batch_versioned_data should be set to false when testing with Oracle
-hibernate.jdbc.batch_versioned_data true
 hibernate.service.allow_crawling=false
diff --git a/hibernate-infinispan/src/test/resources/hibernate.properties b/hibernate-infinispan/src/test/resources/hibernate.properties
@@ -18,6 +18,4 @@ hibernate.max_fetch_depth 5
 
 hibernate.generate_statistics true
 
-# NOTE: hibernate.jdbc.batch_versioned_data should be set to false when testing with Oracle
-hibernate.jdbc.batch_versioned_data true
 hibernate.service.allow_crawling=false
diff --git a/hibernate-java8/src/test/resources/hibernate.properties b/hibernate-java8/src/test/resources/hibernate.properties
@@ -20,9 +20,6 @@ hibernate.max_fetch_depth 5
 hibernate.cache.region_prefix hibernate.test
 hibernate.cache.region.factory_class org.hibernate.testing.cache.CachingRegionFactory
 
-# NOTE: hibernate.jdbc.batch_versioned_data should be set to false when testing with Oracle
-hibernate.jdbc.batch_versioned_data true
-
 javax.persistence.validation.mode=NONE
 hibernate.service.allow_crawling=false
 hibernate.session.events.log=true
diff --git a/hibernate-proxool/src/test/resources/hibernate.properties b/hibernate-proxool/src/test/resources/hibernate.properties
@@ -20,6 +20,3 @@ hibernate.max_fetch_depth 5
 
 hibernate.cache.region_prefix hibernate.test
 hibernate.cache.region.factory_class org.hibernate.testing.cache.CachingRegionFactory
-
-# NOTE: hibernate.jdbc.batch_versioned_data should be set to false when testing with Oracle
-hibernate.jdbc.batch_versioned_data true

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`	`public class Oracle12cDialect extends Oracle10gDialect {`
`19`	`19`	`public Oracle12cDialect() {`
`20`	`20`	`super();`
	`21`	`+ getDefaultProperties().setProperty( Environment.BATCH_VERSIONED_DATA, "true" );`
`21`	`22`	`}`
`22`	`23`
`23`	`24`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -254,6 +254,7 @@ protected void registerDefaultProperties() {`
`254`	`254`	`// be returned (via its RETURNING clause). No other driver seems to`
`255`	`255`	`// support this overloaded version.`
`256`	`256`	`getDefaultProperties().setProperty( Environment.USE_GET_GENERATED_KEYS, "false" );`
	`257`	`+ getDefaultProperties().setProperty( Environment.BATCH_VERSIONED_DATA, "false" );`
`257`	`258`	`}`
`258`	`259`
`259`	`260`	`@Override`