Add version to delete sql for optimistic locking

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>

Author: quaff

spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/jdbc/JdbcJobExecutionDao.java

@@ -77,6 +77,7 @@
  * @author Dimitrios Liapis
  * @author Philippe Marschall
  * @author Jinwoo Bae
+ * @author Yanming Zhou
  */
 public class JdbcJobExecutionDao extends AbstractJdbcBatchMetadataDao implements JobExecutionDao, InitializingBean {
 
@@ -149,7 +150,7 @@ SELECT COUNT(*)
 
 	private static final String DELETE_JOB_EXECUTION = """
 			DELETE FROM %PREFIX%JOB_EXECUTION
-			WHERE JOB_EXECUTION_ID = ?
+			WHERE JOB_EXECUTION_ID = ? AND VERSION = ?
 			""";
 
 	private static final String DELETE_JOB_EXECUTION_PARAMETERS = """
@@ -398,7 +399,13 @@ public void synchronizeStatus(JobExecution jobExecution) {
 	 */
 	@Override
 	public void deleteJobExecution(JobExecution jobExecution) {
-		getJdbcTemplate().update(getQuery(DELETE_JOB_EXECUTION), jobExecution.getId());
+		int count = getJdbcTemplate().update(getQuery(DELETE_JOB_EXECUTION), jobExecution.getId(),
+				jobExecution.getVersion());
+
+		if (count == 0) {
+			throw new OptimisticLockingFailureException("Attempt to delete job execution id=" + jobExecution.getId()
+					+ " with wrong version (" + jobExecution.getVersion() + ")");
+		}
 	}
 
 	/**

spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/jdbc/JdbcJobInstanceDao.java

@@ -33,6 +33,7 @@
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.EmptyResultDataAccessException;
+import org.springframework.dao.OptimisticLockingFailureException;
 import org.springframework.jdbc.core.ResultSetExtractor;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.jdbc.support.incrementer.DataFieldMaxValueIncrementer;
@@ -55,6 +56,7 @@
  * @author Will Schipp
  * @author Mahmoud Ben Hassine
  * @author Parikshit Dutta
+ * @author Yanming Zhou
  */
 public class JdbcJobInstanceDao extends AbstractJdbcBatchMetadataDao implements JobInstanceDao, InitializingBean {
 
@@ -120,7 +122,7 @@ SELECT COUNT(*)
 
 	private static final String DELETE_JOB_INSTANCE = """
 			DELETE FROM %PREFIX%JOB_INSTANCE
-			WHERE JOB_INSTANCE_ID = ?
+			WHERE JOB_INSTANCE_ID = ? AND VERSION = ?
 			""";
 
 	private DataFieldMaxValueIncrementer jobInstanceIncrementer;
@@ -281,7 +283,13 @@ public long getJobInstanceCount(@Nullable String jobName) throws NoSuchJobExcept
 	 */
 	@Override
 	public void deleteJobInstance(JobInstance jobInstance) {
-		getJdbcTemplate().update(getQuery(DELETE_JOB_INSTANCE), jobInstance.getId());
+		int count = getJdbcTemplate().update(getQuery(DELETE_JOB_INSTANCE), jobInstance.getId(),
+				jobInstance.getVersion());
+
+		if (count == 0) {
+			throw new OptimisticLockingFailureException("Attempt to delete job instance id=" + jobInstance.getId()
+					+ " with wrong version (" + jobInstance.getVersion() + ")");
+		}
 	}
 
 	/**

spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/jdbc/JdbcStepExecutionDao.java

@@ -68,6 +68,7 @@
  * @author Mahmoud Ben Hassine
  * @author Baris Cubukcuoglu
  * @author Minsoo Kim
+ * @author Yanming Zhou
  * @see StepExecutionDao
  */
 public class JdbcStepExecutionDao extends AbstractJdbcBatchMetadataDao implements StepExecutionDao, InitializingBean {
@@ -116,7 +117,7 @@ SELECT COUNT(*)
 
 	private static final String DELETE_STEP_EXECUTION = """
 			DELETE FROM %PREFIX%STEP_EXECUTION
-			WHERE STEP_EXECUTION_ID = ?
+			WHERE STEP_EXECUTION_ID = ? and VERSION = ?
 			""";
 
 	private static final Comparator<StepExecution> BY_CREATE_TIME_DESC_ID_DESC = Comparator
@@ -380,7 +381,13 @@ public long countStepExecutions(JobInstance jobInstance, String stepName) {
 	 */
 	@Override
 	public void deleteStepExecution(StepExecution stepExecution) {
-		getJdbcTemplate().update(getQuery(DELETE_STEP_EXECUTION), stepExecution.getId());
+		int count = getJdbcTemplate().update(getQuery(DELETE_STEP_EXECUTION), stepExecution.getId(),
+				stepExecution.getVersion());
+
+		if (count == 0) {
+			throw new OptimisticLockingFailureException("Attempt to delete step execution id=" + stepExecution.getId()
+					+ " with wrong version (" + stepExecution.getVersion() + ")");
+		}
 	}
 
 	private static class StepExecutionRowMapper implements RowMapper<StepExecution> {

spring-batch-test/src/main/java/org/springframework/batch/test/JobRepositoryTestUtils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,6 +30,7 @@
 import org.springframework.batch.core.repository.JobInstanceAlreadyCompleteException;
 import org.springframework.batch.core.repository.JobRepository;
 import org.springframework.batch.core.repository.JobRestartException;
+import org.springframework.dao.OptimisticLockingFailureException;
 import org.springframework.lang.Nullable;
 
 /**
@@ -39,6 +40,7 @@
  *
  * @author Dave Syer
  * @author Mahmoud Ben Hassine
+ * @author Yanming Zhou
  */
 public class JobRepositoryTestUtils {
 
@@ -136,7 +138,12 @@ public void removeJobExecutions(Collection<JobExecution> jobExecutions) {
 			removeJobExecution(jobExecution);
 		}
 		for (JobExecution jobExecution : jobExecutions) {
-			this.jobRepository.deleteJobInstance(jobExecution.getJobInstance());
+			try {
+				this.jobRepository.deleteJobInstance(jobExecution.getJobInstance());
+			}
+			catch (OptimisticLockingFailureException ignore) {
+				// same job instance may be already deleted
+			}
 		}
 	}