From d2315cf23d8c231432b260e9b458cb12912d2570 Mon Sep 17 00:00:00 2001 From: Mukhiddin Yusupov Date: Fri, 16 Aug 2024 19:20:11 +0500 Subject: [PATCH] MSEARCH-794: fix status setting query --- .../service/reindex/jdbc/ReindexStatusRepository.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/folio/search/service/reindex/jdbc/ReindexStatusRepository.java b/src/main/java/org/folio/search/service/reindex/jdbc/ReindexStatusRepository.java index c2a6a2442..e466a8a7e 100644 --- a/src/main/java/org/folio/search/service/reindex/jdbc/ReindexStatusRepository.java +++ b/src/main/java/org/folio/search/service/reindex/jdbc/ReindexStatusRepository.java @@ -3,6 +3,7 @@ import static org.folio.search.model.reindex.ReindexStatusEntity.END_TIME_MERGE_COLUMN; import static org.folio.search.model.reindex.ReindexStatusEntity.END_TIME_UPLOAD_COLUMN; import static org.folio.search.model.reindex.ReindexStatusEntity.START_TIME_MERGE_COLUMN; +import static org.folio.search.model.reindex.ReindexStatusEntity.STATUS_COLUMN; import static org.folio.search.model.reindex.ReindexStatusEntity.TOTAL_MERGE_RANGES_COLUMN; import static org.folio.search.service.reindex.ReindexConstants.REINDEX_STATUS_TABLE; import static org.folio.search.utils.JdbcUtils.getFullTableName; @@ -37,7 +38,7 @@ public class ReindexStatusRepository { private static final String UPDATE_FOR_ENTITIES_SQL = """ UPDATE %s SET %s - WHERE entity_type in ?; + WHERE entity_type in (?); """; private final FolioExecutionContext context; @@ -67,9 +68,10 @@ public void setReindexUploadFailed(ReindexEntityType entityType) { public void setReindexMergeFailed(List entityTypes) { var inTypes = entityTypes.stream() .map(ReindexEntityType::name) - .collect(Collectors.joining(",", "(", ")")); + .collect(Collectors.joining("," )); var fullTableName = getFullTableName(context, REINDEX_STATUS_TABLE); - var sql = UPDATE_FOR_ENTITIES_SQL.formatted(fullTableName, "%s = ?".formatted(END_TIME_MERGE_COLUMN)); + var sql = UPDATE_FOR_ENTITIES_SQL.formatted( + fullTableName, "%s = ?, %s = ?".formatted(STATUS_COLUMN, END_TIME_MERGE_COLUMN)); jdbcTemplate.update(sql, ReindexStatus.MERGE_FAILED.name(), Timestamp.from(Instant.now()), inTypes); }