From edf49eea36ef8ae2460842c874b26fc135763e78 Mon Sep 17 00:00:00 2001 From: Toshihiro Suzuki Date: Mon, 17 Nov 2025 00:35:06 +0000 Subject: [PATCH 1/2] Empty commit [skip ci] From 9a8e792ef3dbe88a4b73baac413f42cbd81b18e3 Mon Sep 17 00:00:00 2001 From: Toshihiro Suzuki Date: Mon, 17 Nov 2025 09:34:41 +0900 Subject: [PATCH 2/2] Fix CoreError message parameter mismatches (#3164) --- .../main/java/com/scalar/db/storage/dynamo/BatchHandler.java | 3 +-- .../com/scalar/db/storage/dynamo/DeleteStatementHandler.java | 3 +-- .../java/com/scalar/db/storage/dynamo/PutStatementHandler.java | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/core/src/main/java/com/scalar/db/storage/dynamo/BatchHandler.java b/core/src/main/java/com/scalar/db/storage/dynamo/BatchHandler.java index 9ea87e1b5a..eb6a347c4f 100644 --- a/core/src/main/java/com/scalar/db/storage/dynamo/BatchHandler.java +++ b/core/src/main/java/com/scalar/db/storage/dynamo/BatchHandler.java @@ -96,8 +96,7 @@ public void handle(List mutations) throws ExecutionException // If all the reasons of the cancellation are "TransactionConflict", throw // RetriableExecutionException throw new RetriableExecutionException( - CoreError.DYNAMO_TRANSACTION_CONFLICT_OCCURRED_IN_MUTATION.buildMessage( - e.getMessage(), e), + CoreError.DYNAMO_TRANSACTION_CONFLICT_OCCURRED_IN_MUTATION.buildMessage(e.getMessage()), e); } diff --git a/core/src/main/java/com/scalar/db/storage/dynamo/DeleteStatementHandler.java b/core/src/main/java/com/scalar/db/storage/dynamo/DeleteStatementHandler.java index 2a18ecbbc8..1b76514a63 100644 --- a/core/src/main/java/com/scalar/db/storage/dynamo/DeleteStatementHandler.java +++ b/core/src/main/java/com/scalar/db/storage/dynamo/DeleteStatementHandler.java @@ -53,8 +53,7 @@ public void handle(Delete delete) throws ExecutionException { throw new NoMutationException(CoreError.NO_MUTATION_APPLIED.buildMessage(), e); } catch (TransactionConflictException e) { throw new RetriableExecutionException( - CoreError.DYNAMO_TRANSACTION_CONFLICT_OCCURRED_IN_MUTATION.buildMessage( - e.getMessage(), e), + CoreError.DYNAMO_TRANSACTION_CONFLICT_OCCURRED_IN_MUTATION.buildMessage(e.getMessage()), e); } catch (DynamoDbException e) { throw new ExecutionException( diff --git a/core/src/main/java/com/scalar/db/storage/dynamo/PutStatementHandler.java b/core/src/main/java/com/scalar/db/storage/dynamo/PutStatementHandler.java index 19910819f7..fac625be63 100644 --- a/core/src/main/java/com/scalar/db/storage/dynamo/PutStatementHandler.java +++ b/core/src/main/java/com/scalar/db/storage/dynamo/PutStatementHandler.java @@ -54,8 +54,7 @@ public void handle(Put put) throws ExecutionException { throw new NoMutationException(CoreError.NO_MUTATION_APPLIED.buildMessage(), e); } catch (TransactionConflictException e) { throw new RetriableExecutionException( - CoreError.DYNAMO_TRANSACTION_CONFLICT_OCCURRED_IN_MUTATION.buildMessage( - e.getMessage(), e), + CoreError.DYNAMO_TRANSACTION_CONFLICT_OCCURRED_IN_MUTATION.buildMessage(e.getMessage()), e); } catch (DynamoDbException e) { throw new ExecutionException(