reset the optimizer after truncating tables or resynchronizing sequences

Author: gavinking

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

@@ -119,6 +119,12 @@ else if ( ! generationState.upperLimit.gt( generationState.value ) ) {
 	private GenerationState noTenantState;
 	private Map<String,GenerationState> tenantSpecificState;
 
+	@Override
+	public void reset() {
+		noTenantState = null;
+		tenantSpecificState = null;
+	}
+
 	private GenerationState locateGenerationState(String tenantId) {
 		if ( tenantId == null ) {
 			if ( noTenantState == null ) {

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

@@ -80,6 +80,12 @@ public Serializable generate(AccessCallback callback) {
 	private GenerationState noTenantState;
 	private Map<String,GenerationState> tenantSpecificState;
 
+	@Override
+	public void reset() {
+		noTenantState = null;
+		tenantSpecificState = null;
+	}
+
 	private GenerationState locateGenerationState(String tenantIdentifier) {
 		if ( tenantIdentifier == null ) {
 			if ( noTenantState == null ) {

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

@@ -31,7 +31,7 @@ public NoopOptimizer(Class<?> returnClass, int incrementSize) {
 
 	@Override
 	public Serializable generate(AccessCallback callback) {
-		// IMPL NOTE : this method is called concurrently and is
+		// IMPL NOTE: this method is called concurrently and is
 		// not synchronized. It is very important to work on the
 		// local variable: the field lastSourceValue is not
 		// reliable as it might be mutated by multiple threads.
@@ -59,4 +59,9 @@ public boolean applyIncrementSizeToSourceValues() {
 	public Expression createLowValueExpression(Expression databaseValue, SessionFactoryImplementor sessionFactory) {
 		return databaseValue;
 	}
+
+	@Override
+	public void reset() {
+		lastSourceValue = null;
+	}
 }

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

@@ -11,14 +11,15 @@
 import java.io.Serializable;
 
 /**
- * Performs optimization on an optimizable identifier generator.  Typically
+ * Performs optimization on an optimizable identifier generator. Typically.
  * this optimization takes the form of trying to ensure we do not have to
  * hit the database on each and every request to get an identifier value.
  * <p>
- * Optimizers work on constructor injection.  They should provide
- * a constructor with the following arguments <ol>
- * <li>java.lang.Class - The return type for the generated values</li>
- * <li>int - The increment size</li>
+ * Optimizers work on constructor injection. They should provide a
+ * constructor accepting the following arguments:
+ * <ol>
+ * <li>{@code java.lang.Class} - The return type for the generated values</li>
+ * <li>{@code int} - The increment size</li>
  * </ol>
  *
  * @author Steve Ebersole
@@ -35,6 +36,13 @@ public interface Optimizer {
 	 */
 	Serializable generate(AccessCallback callback);
 
+	/**
+	 * Reset the optimizer before restarting the underlying database sequence.
+	 *
+	 * @since 7.2
+	 */
+	void reset();
+
 	/**
 	 * A common means to access the last value obtained from the underlying
 	 * source.  This is intended for testing purposes, since accessing the

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

@@ -78,6 +78,12 @@ public Serializable generate(AccessCallback callback) {
 	private GenerationState noTenantState;
 	private Map<String,GenerationState> tenantSpecificState;
 
+	@Override
+	public void reset() {
+		noTenantState = null;
+		tenantSpecificState = null;
+	}
+
 	private GenerationState locateGenerationState(String tenantIdentifier) {
 		if ( tenantIdentifier == null ) {
 			if ( noTenantState == null ) {

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

@@ -64,6 +64,12 @@ private GenerationState locateGenerationState(String tenantIdentifier) {
 		}
 	}
 
+	@Override
+	public void reset() {
+		singleTenantState.remove();
+		multiTenantStates.remove();
+	}
+
 	// for Hibernate testsuite use only
 	private GenerationState noTenantGenerationState() {
 		final var noTenantState = locateGenerationState( null );

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

@@ -56,7 +56,6 @@ public PooledOptimizer(Class<?> returnClass, int incrementSize) {
 		OPTIMIZER_MESSAGE_LOGGER.creatingPooledOptimizer( incrementSize, returnClass.getName() );
 	}
 
-
 	@Override
 	public Serializable generate(AccessCallback callback) {
 		lock.lock();
@@ -99,6 +98,12 @@ else if ( generationState.value.gt( generationState.hiValue ) ) {
 	private GenerationState noTenantState;
 	private Map<String,GenerationState> tenantSpecificState;
 
+	@Override
+	public void reset() {
+		noTenantState = null;
+		tenantSpecificState = null;
+	}
+
 	private GenerationState locateGenerationState(String tenantIdentifier) {
 		if ( tenantIdentifier == null ) {
 			if ( noTenantState == null ) {

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

@@ -179,10 +179,12 @@ public void registerExtraExportables(Table table, Optimizer optimizer) {
 			final long max = getMaxPrimaryKey( isolator, primaryKeyColumnName, tableName );
 			final long current = getNextSequenceValue( isolator, sequenceName);
 			final long startWith = Math.max( max + adjustment, current );
+			optimizer.reset();
 			return new InitCommand( sqlContext.getDialect().getSequenceSupport()
 					.getRestartSequenceString( sequenceName, startWith ) );
 		} );
 		table.addResetCommand( sqlContext -> {
+			optimizer.reset();
 			final String sequenceName = sqlContext.format( physicalSequenceName );
 			return new InitCommand( sqlContext.getDialect().getSequenceSupport()
 					.getRestartSequenceString( sequenceName, initialValue ) );

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

@@ -445,7 +445,7 @@ protected OptimizerDescriptor determineOptimizationStrategy(Properties params, i
 	 * selected optimizer. This is the hook to achieve that.
 	 *
 	 * @param optimizationStrategy The optimizer strategy (name)
-	 * @param incrementSize The {@link #determineIncrementSize determined increment size}
+	 * @param incrementSize The {@linkplain #determineIncrementSize determined increment size}
 	 * @return The adjusted increment size.
 	 */
 	protected int determineAdjustedIncrementSize(OptimizerDescriptor optimizationStrategy, int incrementSize) {

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

@@ -716,6 +716,7 @@ private InitCommand generateResyncCommand(SqlStringGenerationContext context, Dd
 				getCurrentTableValue( isolator, sequenceTableName, valueColumnName,
 						segmentColumnName, segmentValue );
 		if ( max + adjustment > current ) {
+			optimizer.reset();
 			final String update =
 					"update " + sequenceTableName
 					+ " set " + valueColumnName + " = " + (max + adjustment)
@@ -728,6 +729,7 @@ private InitCommand generateResyncCommand(SqlStringGenerationContext context, Dd
 	}
 
 	private InitCommand generateResetCommand(SqlStringGenerationContext context) {
+		optimizer.reset();
 		final String update =
 				"update " + context.format( physicalTableName )
 				+ " set " + valueColumnName + " = " + initialValue