Backport to branch(3.16) : Fix CoreError message parameter mismatches (#3170)

Co-authored-by: Toshihiro Suzuki <[email protected]>

Author: feeblefakie

core/src/main/java/com/scalar/db/common/CoreError.java

@@ -434,7 +434,7 @@ public enum CoreError implements ScalarDbError {
   CONSENSUS_COMMIT_CONDITION_NOT_ALLOWED_TO_TARGET_TRANSACTION_METADATA_COLUMNS(
       Category.USER_ERROR,
       "0100",
-      "The condition is not allowed to target transaction metadata columns. Column: %s",
+      "The condition is not allowed to target transaction metadata columns. Table: %s; Column: %s",
       "",
       ""),
   CONSENSUS_COMMIT_COLUMN_RESERVED_AS_TRANSACTION_METADATA(
@@ -974,7 +974,7 @@ public enum CoreError implements ScalarDbError {
   CONSENSUS_COMMIT_RECOVERING_RECORDS_FAILED(
       Category.INTERNAL_ERROR, "0057", "Recovering records failed. Details: %s", "", ""),
   CONSENSUS_COMMIT_COMMITTING_RECORDS_FAILED(
-      Category.INTERNAL_ERROR, "0058", "Committing records failed", "", ""),
+      Category.INTERNAL_ERROR, "0058", "Committing records failed. Details: %s", "", ""),
 
   //
   // Errors for the unknown transaction status error category

core/src/main/java/com/scalar/db/storage/dynamo/BatchHandler.java

@@ -96,8 +96,7 @@ public void handle(List<? extends Mutation> 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);
       }
 

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(

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(

core/src/main/java/com/scalar/db/transaction/consensuscommit/CommitHandler.java

@@ -293,7 +293,7 @@ void onePhaseCommitRecords(TransactionContext context)
           context.transactionId);
     } catch (ExecutionException e) {
       throw new UnknownTransactionStatusException(
-          CoreError.CONSENSUS_COMMIT_COMMITTING_RECORDS_FAILED.buildMessage(),
+          CoreError.CONSENSUS_COMMIT_COMMITTING_RECORDS_FAILED.buildMessage(e.getMessage()),
           e,
           context.transactionId);
     }