From 2239dc734af5f28edfb6b3646fd4f15b188752e5 Mon Sep 17 00:00:00 2001
From: hyejinggu <118355536+hyejinggu@users.noreply.github.com>
Date: Sat, 5 Oct 2024 18:52:24 +0900
Subject: [PATCH] Fix column types in JdbcStepExecutionDao

Resolves #4648
---
 .../repository/dao/JdbcStepExecutionDao.java  | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcStepExecutionDao.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcStepExecutionDao.java
index c086ec3b01..037ad7706c 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcStepExecutionDao.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcStepExecutionDao.java
@@ -281,10 +281,9 @@ public void updateStepExecution(StepExecution stepExecution) {
 					stepExecution.getWriteSkipCount(), stepExecution.getRollbackCount(), lastUpdated,
 					stepExecution.getId(), stepExecution.getVersion() };
 			int count = getJdbcTemplate().update(getQuery(UPDATE_STEP_EXECUTION), parameters,
-					new int[] { Types.TIMESTAMP, Types.TIMESTAMP, Types.VARCHAR, Types.INTEGER, Types.INTEGER,
-							Types.INTEGER, Types.INTEGER, Types.VARCHAR, Types.VARCHAR, Types.INTEGER, Types.INTEGER,
-							Types.INTEGER, Types.INTEGER, Types.INTEGER, Types.TIMESTAMP, Types.BIGINT,
-							Types.INTEGER });
+					new int[] { Types.TIMESTAMP, Types.TIMESTAMP, Types.VARCHAR, Types.BIGINT, Types.BIGINT,
+							Types.BIGINT, Types.BIGINT, Types.VARCHAR, Types.VARCHAR, Types.INTEGER, Types.BIGINT,
+							Types.BIGINT, Types.BIGINT, Types.BIGINT, Types.TIMESTAMP, Types.BIGINT, Types.INTEGER });
 
 			// Avoid concurrent modifications...
 			if (count == 0) {
@@ -395,15 +394,15 @@ public StepExecution mapRow(ResultSet rs, int rowNum) throws SQLException {
 			stepExecution.setStartTime(rs.getTimestamp(3) == null ? null : rs.getTimestamp(3).toLocalDateTime());
 			stepExecution.setEndTime(rs.getTimestamp(4) == null ? null : rs.getTimestamp(4).toLocalDateTime());
 			stepExecution.setStatus(BatchStatus.valueOf(rs.getString(5)));
-			stepExecution.setCommitCount(rs.getInt(6));
-			stepExecution.setReadCount(rs.getInt(7));
-			stepExecution.setFilterCount(rs.getInt(8));
-			stepExecution.setWriteCount(rs.getInt(9));
+			stepExecution.setCommitCount(rs.getLong(6));
+			stepExecution.setReadCount(rs.getLong(7));
+			stepExecution.setFilterCount(rs.getLong(8));
+			stepExecution.setWriteCount(rs.getLong(9));
 			stepExecution.setExitStatus(new ExitStatus(rs.getString(10), rs.getString(11)));
-			stepExecution.setReadSkipCount(rs.getInt(12));
-			stepExecution.setWriteSkipCount(rs.getInt(13));
-			stepExecution.setProcessSkipCount(rs.getInt(14));
-			stepExecution.setRollbackCount(rs.getInt(15));
+			stepExecution.setReadSkipCount(rs.getLong(12));
+			stepExecution.setWriteSkipCount(rs.getLong(13));
+			stepExecution.setProcessSkipCount(rs.getLong(14));
+			stepExecution.setRollbackCount(rs.getLong(15));
 			stepExecution.setLastUpdated(rs.getTimestamp(16) == null ? null : rs.getTimestamp(16).toLocalDateTime());
 			stepExecution.setVersion(rs.getInt(17));
 			stepExecution.setCreateTime(rs.getTimestamp(18) == null ? null : rs.getTimestamp(18).toLocalDateTime());