[hibernate-commits] Hibernate SVN: r19531 - in core/branches/Branch_3_5/core/src: test/java/org/hibernate and 1 other directories.

Author: steve.ebersole(a)jboss.com Date: 2010-05-17 11:40:29 -0400 (Mon, 17 May 2010) New Revision: 19531 Added: core/branches/Branch_3_5/core/src/test/java/org/hibernate/TestingDatabaseInfo.java core/branches/Branch_3_5/core/src/test/java/org/hibernate/id/SequenceHiLoGeneratorNoIncrementTest.java Modified: core/branches/Branch_3_5/core/src/main/java/org/hibernate/id/SequenceHiLoGenerator.java core/branches/Branch_3_5/core/src/test/java/org/hibernate/id/SequenceHiLoGeneratorTest.java Log: HHH-5230 - Regresion! @SequenceGenerator with allocationSize=1 fails Other allocationSizes appear to be decremented by 1 Modified: core/branches/Branch_3_5/core/src/main/java/org/hibernate/id/SequenceHiLoGenerator.java =================================================================== --- core/branches/Branch_3_5/core/src/main/java/org/hibernate/id/SequenceHiLoGenerator.java 2010-05-17 15:39:55 UTC (rev 19530) +++ core/branches/Branch_3_5/core/src/main/java/org/hibernate/id/SequenceHiLoGenerator.java 2010-05-17 15:40:29 UTC (rev 19531) @@ -61,10 +61,12 @@ maxLo = PropertiesHelper.getInt( MAX_LO, params, 9 ); - hiloOptimizer = new OptimizerFactory.LegacyHiLoAlgorithmOptimizer( - getIdentifierType().getReturnedClass(), - maxLo - ); + if ( maxLo >= 1 ) { + hiloOptimizer = new OptimizerFactory.LegacyHiLoAlgorithmOptimizer( + getIdentifierType().getReturnedClass(), + maxLo + ); + } } public synchronized Serializable generate(final SessionImplementor session, Object obj) { Added: core/branches/Branch_3_5/core/src/test/java/org/hibernate/TestingDatabaseInfo.java =================================================================== --- core/branches/Branch_3_5/core/src/test/java/org/hibernate/TestingDatabaseInfo.java (rev 0) +++ core/branches/Branch_3_5/core/src/test/java/org/hibernate/TestingDatabaseInfo.java 2010-05-17 15:40:29 UTC (rev 19531) @@ -0,0 +1,52 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2010, Red Hat Inc. or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Inc. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ +package org.hibernate; + +import org.hibernate.cfg.Configuration; +import org.hibernate.cfg.Environment; +import org.hibernate.dialect.Dialect; +import org.hibernate.dialect.HSQLDialect; + +/** + * TODO : javadoc + * + * @author Steve Ebersole + */ +public class TestingDatabaseInfo { + public static volatile String DRIVER = "org.hsqldb.jdbcDriver"; + public static volatile String URL = "jdbc:hsqldb:."; + public static volatile String USER = "sa"; + public static volatile String PASS = ""; + + public static final Dialect DIALECT = new HSQLDialect(); + + public static Configuration buildBaseConfiguration() { + return new Configuration() + .setProperty( Environment.DRIVER, DRIVER ) + .setProperty( Environment.URL, URL ) + .setProperty( Environment.USER, USER ) + .setProperty( Environment.PASS, PASS ) + .setProperty( Environment.DIALECT, DIALECT.getClass().getName() ); + } +} Added: core/branches/Branch_3_5/core/src/test/java/org/hibernate/id/SequenceHiLoGeneratorNoIncrementTest.java =================================================================== --- core/branches/Branch_3_5/core/src/test/java/org/hibernate/id/SequenceHiLoGeneratorNoIncrementTest.java (rev 0) +++ core/branches/Branch_3_5/core/src/test/java/org/hibernate/id/SequenceHiLoGeneratorNoIncrementTest.java 2010-05-17 15:40:29 UTC (rev 19531) @@ -0,0 +1,141 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2010, Red Hat Inc. or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Inc. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ +package org.hibernate.id; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.Properties; + +import junit.framework.TestCase; + +import org.hibernate.Hibernate; +import org.hibernate.Session; +import org.hibernate.cfg.Configuration; +import org.hibernate.cfg.Environment; +import org.hibernate.cfg.NamingStrategy; +import org.hibernate.cfg.ObjectNameNormalizer; +import org.hibernate.dialect.Dialect; +import org.hibernate.dialect.H2Dialect; +import org.hibernate.engine.SessionFactoryImplementor; +import org.hibernate.impl.SessionImpl; +import org.hibernate.jdbc.Work; +import org.hibernate.mapping.SimpleAuxiliaryDatabaseObject; +import org.hibernate.TestingDatabaseInfo; + +/** + * I went back to 3.3 source and grabbed the code/logic as it existed back then and crafted this + * unit test so that we can make sure the value keep being generated in the expected manner + * + * @author Steve Ebersole + */ +public class SequenceHiLoGeneratorNoIncrementTest extends TestCase { + private static final String TEST_SEQUENCE = "test_sequence"; + + private Configuration cfg; + private SessionFactoryImplementor sessionFactory; + private SequenceHiLoGenerator generator; + + protected void setUp() throws Exception { + super.setUp(); + + Properties properties = new Properties(); + properties.setProperty( SequenceGenerator.SEQUENCE, TEST_SEQUENCE ); + properties.setProperty( SequenceHiLoGenerator.MAX_LO, "0" ); // JPA allocationSize of 1 + properties.setProperty( SequenceGenerator.PARAMETERS, "start with 1" ); // hsqldb sequences start with 0 by default :? + properties.put( + PersistentIdentifierGenerator.IDENTIFIER_NORMALIZER, + new ObjectNameNormalizer() { + protected boolean isUseQuotedIdentifiersGlobally() { + return false; + } + + protected NamingStrategy getNamingStrategy() { + return cfg.getNamingStrategy(); + } + } + ); + + Dialect dialect = new H2Dialect(); + + generator = new SequenceHiLoGenerator(); + generator.configure( Hibernate.LONG, properties, dialect ); + + cfg = TestingDatabaseInfo.buildBaseConfiguration() + .setProperty( Environment.HBM2DDL_AUTO, "create-drop" ); + cfg.addAuxiliaryDatabaseObject( + new SimpleAuxiliaryDatabaseObject( + generator.sqlCreateStrings( dialect )[0], + generator.sqlDropStrings( dialect )[0] + ) + ); + + sessionFactory = (SessionFactoryImplementor) cfg.buildSessionFactory(); + } + + protected void tearDown() throws Exception { + if ( sessionFactory != null ) { + sessionFactory.close(); + } + + super.tearDown(); + } + + public void testHiLoAlgorithm() { + SessionImpl session = (SessionImpl) sessionFactory.openSession(); + session.beginTransaction(); + + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + // initially sequence should be uninitialized +// we have to assume here since in this branch we are testing with hsqldb which does not allow access to the +// current sequence value and the optimizer does not yet know the value. On trunk (3.6), against H2, we physically +// check the sequence value in the database + + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + // historically the hilo generators skipped the initial block of values; + // so the first generated id value is maxlo + 1, here be 4 + Long generatedValue = (Long) generator.generate( session, null ); + assertEquals( 1L, generatedValue.longValue() ); + + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + generatedValue = (Long) generator.generate( session, null ); + assertEquals( 2L, generatedValue.longValue() ); + + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + generatedValue = (Long) generator.generate( session, null ); + assertEquals( 3L, generatedValue.longValue() ); + + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + generatedValue = (Long) generator.generate( session, null ); + assertEquals( 4L, generatedValue.longValue() ); + + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + generatedValue = (Long) generator.generate( session, null ); + assertEquals( 5L, generatedValue.longValue() ); + + session.getTransaction().commit(); + session.close(); + } +} \ No newline at end of file Modified: core/branches/Branch_3_5/core/src/test/java/org/hibernate/id/SequenceHiLoGeneratorTest.java =================================================================== --- core/branches/Branch_3_5/core/src/test/java/org/hibernate/id/SequenceHiLoGeneratorTest.java 2010-05-17 15:39:55 UTC (rev 19530) +++ core/branches/Branch_3_5/core/src/test/java/org/hibernate/id/SequenceHiLoGeneratorTest.java 2010-05-17 15:40:29 UTC (rev 19531) @@ -28,6 +28,7 @@ import junit.framework.TestCase; import org.hibernate.Hibernate; +import org.hibernate.TestingDatabaseInfo; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.cfg.NamingStrategy; @@ -77,10 +78,7 @@ //noinspection deprecation generator.configure( Hibernate.LONG, properties, dialect ); - cfg = new Configuration() - .setProperty( Environment.DRIVER, "org.hsqldb.jdbcDriver" ) - .setProperty( Environment.URL, "jdbc:hsqldb:." ) - .setProperty( Environment.USER, "sa" ) + cfg = TestingDatabaseInfo.buildBaseConfiguration() .setProperty( Environment.HBM2DDL_AUTO, "create-drop" ); cfg.addAuxiliaryDatabaseObject( new SimpleAuxiliaryDatabaseObject(