Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions core/src/main/java/com/scalar/db/common/CoreError.java
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -898,7 +898,7 @@ public enum CoreError implements ScalarDbError {
OBJECT_STORAGE_PRIMARY_KEY_CONTAINS_ILLEGAL_CHARACTER(
Category.USER_ERROR,
"0257",
"The value of the column %s in the primary key contains an illegal character.",
"The value of the column %s in the primary key contains an illegal character. Value: %s",
"",
""),
CONSENSUS_COMMIT_SPECIFYING_TRANSACTION_METADATA_COLUMNS_IN_PROJECTION_NOT_ALLOWED(
Expand Down Expand Up @@ -1244,7 +1244,11 @@ public enum CoreError implements ScalarDbError {
"",
""),
JDBC_MYSQL_GETTING_CONNECTION_METADATA_FAILED(
Category.INTERNAL_ERROR, "0063", "Getting the MySQL JDBC connection metadata failed", "", ""),
Category.INTERNAL_ERROR,
"0063",
"Getting the MySQL JDBC connection metadata failed. Details: %s",
"",
""),
OBJECT_STORAGE_ERROR_OCCURRED_IN_SELECTION(
Category.INTERNAL_ERROR, "0064", "An error occurred in the selection. Details: %s", "", ""),
OBJECT_STORAGE_ERROR_OCCURRED_IN_MUTATION(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,7 @@ public void handle(Delete delete) throws ExecutionException {
CoreError.NO_MUTATION_APPLIED.buildMessage(), Collections.singletonList(delete), 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(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,7 @@ public void handle(Put put) throws ExecutionException {
CoreError.NO_MUTATION_APPLIED.buildMessage(), Collections.singletonList(put), 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(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ private static RdbEngineStrategy createMysqlOrTidbEngine(JdbcConfig config) {
// We can't throw a checked exception here because it would break backward compatibility since
// the calling method is executed in constructor of JdbcAdmin or JdbcService
throw new RuntimeException(
CoreError.JDBC_MYSQL_GETTING_CONNECTION_METADATA_FAILED.buildMessage(e), e);
CoreError.JDBC_MYSQL_GETTING_CONNECTION_METADATA_FAILED.buildMessage(e.getMessage()), e);
}
}
}