HHH-14656 - SequenceStyleGenerator must set its LegacyHiLoAlgorithmOptimizer optimizer's incrementSize to (allocationSize - 1)

hibernate-core/src/main/java/org/hibernate/id/enhanced/SequenceStyleGenerator.java

@@ -431,10 +431,11 @@ protected String determineOptimizationStrategy(Properties params, int incrementS
 	@SuppressWarnings("WeakerAccess")
 	protected int determineAdjustedIncrementSize(String optimizationStrategy, int incrementSize) {
 		final int resolvedIncrementSize;
-		if ( Math.abs( incrementSize ) > 1 &&
-				StandardOptimizerDescriptor.NONE.getExternalName().equals( optimizationStrategy ) ) {
+
+		if ( StandardOptimizerDescriptor.NONE.getExternalName().equals( optimizationStrategy ) ) {
 			if ( incrementSize < -1 ) {
 				resolvedIncrementSize = -1;
+
 				LOG.honoringOptimizerSetting(
 						StandardOptimizerDescriptor.NONE.getExternalName(),
 						INCREMENT_PARAM,
@@ -443,8 +444,8 @@ protected int determineAdjustedIncrementSize(String optimizationStrategy, int in
 						resolvedIncrementSize
 				);
 			}
-			else {
-				// incrementSize > 1
+			else if ( incrementSize > 1 ) {
+
 				resolvedIncrementSize = 1;
 				LOG.honoringOptimizerSetting(
 						StandardOptimizerDescriptor.NONE.getExternalName(),
@@ -454,6 +455,12 @@ protected int determineAdjustedIncrementSize(String optimizationStrategy, int in
 						resolvedIncrementSize
 				);
 			}
+			else {
+				resolvedIncrementSize = incrementSize;
+			}
+		}
+		else if ( StandardOptimizerDescriptor.LEGACY_HILO.getExternalName().equals( optimizationStrategy ) ) {
+			resolvedIncrementSize = incrementSize - 1;
 		}
 		else {
 			resolvedIncrementSize = incrementSize;

hibernate-core/src/test/java/org/hibernate/id/SequenceStyleGeneratorBehavesLikeSequeceHiloGeneratorWitZeroIncrementSizeTest.java

@@ -58,7 +58,7 @@ public void setUp() throws Exception {
 		Properties properties = new Properties();
 		properties.setProperty( SequenceStyleGenerator.SEQUENCE_PARAM, TEST_SEQUENCE );
 		properties.setProperty( SequenceStyleGenerator.OPT_PARAM, "legacy-hilo" );
-		properties.setProperty( SequenceStyleGenerator.INCREMENT_PARAM, "0" ); // JPA allocationSize of 1
+		properties.setProperty( SequenceStyleGenerator.INCREMENT_PARAM, "1" ); // JPA allocationSize of 1
 		properties.put(
 				PersistentIdentifierGenerator.IDENTIFIER_NORMALIZER,
 				new ObjectNameNormalizer() {

hibernate-core/src/test/java/org/hibernate/id/enhanced/AbstractLegacyHiLoAlgorithmOptimizerIdTest.java

@@ -0,0 +1,111 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) {DATE}, 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.enhanced;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.SequenceGenerator;
+
+import org.hibernate.Session;
+import org.hibernate.Transaction;
+import org.hibernate.id.SequenceValueExtractor;
+import org.hibernate.internal.SessionImpl;
+
+import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+@TestForIssue(jiraKey = "HHH-14656")
+public abstract class AbstractLegacyHiLoAlgorithmOptimizerIdTest extends BaseCoreFunctionalTestCase {
+
+	@Test
+	public void testSequenceIdentifierGenerator() {
+		try (final Session s = openSession()) {
+			final SequenceValueExtractor sequenceValueExtractor = new SequenceValueExtractor(
+					getDialect(),
+					SequenceIdentifier.SEQUENCE_NAME
+			);
+
+			{
+				final Transaction tx = s.beginTransaction();
+
+				try {
+					for ( int i = 0; i < SequenceIdentifier.ALLOCATION_SIZE; i++ ) {
+						s.persist( new SequenceIdentifier() );
+					}
+
+					tx.commit();
+				}
+				catch (RuntimeException e) {
+					tx.rollback();
+				}
+
+				assertEquals( SequenceIdentifier.ALLOCATION_SIZE, countInsertedRows( s ) );
+				assertEquals( 1L, sequenceValueExtractor.extractSequenceValue( (SessionImpl) s ) );
+			}
+
+			{
+				final Transaction tx = s.beginTransaction();
+
+				try {
+					s.persist( new SequenceIdentifier() );
+					tx.commit();
+				}
+				catch (RuntimeException e) {
+					tx.rollback();
+				}
+
+				assertEquals( SequenceIdentifier.ALLOCATION_SIZE + 1, countInsertedRows( s ) );
+				assertEquals( 2L, sequenceValueExtractor.extractSequenceValue( (SessionImpl) s ) );
+			}
+		}
+	}
+
+	private int countInsertedRows(Session s) {
+		return ( (Number) s.createSQLQuery( "SELECT COUNT(*) FROM sequenceIdentifier" )
+				.uniqueResult() ).intValue();
+	}
+
+	@Override
+	@SuppressWarnings("rawtypes")
+	protected Class[] getAnnotatedClasses() {
+		return new Class[] { SequenceIdentifier.class };
+	}
+
+	@Entity(name = "sequenceIdentifier")
+	public static class SequenceIdentifier {
+		private static final int ALLOCATION_SIZE = 50;
+		private static final String SEQUENCE_NAME = "test_sequence";
+
+		@Id
+		@SequenceGenerator(name = "sampleGenerator", sequenceName = SEQUENCE_NAME, allocationSize = ALLOCATION_SIZE)
+		@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "sampleGenerator")
+		private long id;
+	}
+}
+

hibernate-core/src/test/java/org/hibernate/id/enhanced/SequenceGeneratorWithLegacyHiLoAlgorithmOptimizerIdTest.java

@@ -0,0 +1,39 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) {DATE}, 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.enhanced;
+
+import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.cfg.Configuration;
+
+import org.hibernate.testing.TestForIssue;
+
+@TestForIssue(jiraKey = "HHH-14656")
+public class SequenceGeneratorWithLegacyHiLoAlgorithmOptimizerIdTest
+		extends AbstractLegacyHiLoAlgorithmOptimizerIdTest {
+	@Override
+	protected void configure(Configuration configuration) {
+		configuration.getProperties().put( AvailableSettings.USE_NEW_ID_GENERATOR_MAPPINGS, "false" );
+	}
+}
+

hibernate-core/src/test/java/org/hibernate/id/enhanced/SequenceStyleGeneratorWithLegacyHiLoAlgorithmOptimizerIdTest.java

@@ -0,0 +1,46 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) {DATE}, 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.enhanced;
+
+import java.util.Properties;
+
+import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.cfg.Configuration;
+
+import org.hibernate.testing.TestForIssue;
+
+@TestForIssue(jiraKey = "HHH-14656")
+public class SequenceStyleGeneratorWithLegacyHiLoAlgorithmOptimizerIdTest
+		extends AbstractLegacyHiLoAlgorithmOptimizerIdTest {
+	@Override
+	protected void configure(Configuration configuration) {
+		final Properties properties = configuration.getProperties();
+		properties.put( AvailableSettings.USE_NEW_ID_GENERATOR_MAPPINGS, "true" );
+		properties.put(
+				AvailableSettings.PREFERRED_POOLED_OPTIMIZER,
+				StandardOptimizerDescriptor.LEGACY_HILO.getExternalName()
+		);
+	}
+}
+