hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[master] fix tx-free-route retry error-code for oracle mode

Browse Source
This commit is contained in:
chinaxing
2023-02-08 20:13:57 +08:00
committed by ob-robot
parent 0e3d39c142
commit ebc852d9e9
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/share/ob_errno.cpp
View File

@ -18301,13 +18301,13 @@ static const _error _error_OB_TRANS_FREE_ROUTE_NOT_SUPPORTED = {
.error_name = "OB_TRANS_FREE_ROUTE_NOT_SUPPORTED", .error_name = "OB_TRANS_FREE_ROUTE_NOT_SUPPORTED",
.error_cause = "Internal Error", .error_cause = "Internal Error",
.error_solution = "Contact OceanBase Support", .error_solution = "Contact OceanBase Support",
.mysql_errno = -1, .mysql_errno = 6279,
.sqlstate = "HY000", .sqlstate = "HY000",
.str_error = "Query is not supported to be executed on txn temporary node", .str_error = "Query is not supported to be executed on txn temporary node",
.str_user_error = "Query is not supported to be executed on txn temporary node", .str_user_error = "Query is not supported to be executed on txn temporary node",
.oracle_errno = 600, .oracle_errno = 6279,
.oracle_str_error = "ORA-00600: internal error code, arguments: -6279, Query is not supported to be executed on txn temporary node", .oracle_str_error = "ORA-06279: Query is not supported to be executed on txn temporary node",
.oracle_str_user_error = "ORA-00600: internal error code, arguments: -6279, Query is not supported to be executed on txn temporary node" .oracle_str_user_error = "ORA-06279: Query is not supported to be executed on txn temporary node"
}; };
static const _error _error_OB_TRANS_LIVE_TOO_MUCH_TIME = { static const _error _error_OB_TRANS_LIVE_TOO_MUCH_TIME = {
.error_name = "OB_TRANS_LIVE_TOO_MUCH_TIME", .error_name = "OB_TRANS_LIVE_TOO_MUCH_TIME",

2
src/share/ob_errno.def
View File

@ -1670,7 +1670,7 @@ DEFINE_ERROR(OB_SCN_OUT_OF_BOUND, -6277, -1, "HY000", "scn is out of bounds of m
DEFINE_ORACLE_ERROR(OB_TRANS_IDLE_TIMEOUT, -6278, 6002, "25000", "Transaction idle timeout occurred, please rollback the transaction, set the variable ob_trx_idle_timeout to a larger value and then restart the transaction", 24761, "transaction rolled back: transaction idle timeout"); DEFINE_ORACLE_ERROR(OB_TRANS_IDLE_TIMEOUT, -6278, 6002, "25000", "Transaction idle timeout occurred, please rollback the transaction, set the variable ob_trx_idle_timeout to a larger value and then restart the transaction", 24761, "transaction rolled back: transaction idle timeout");
// for transaction free route // for transaction free route
DEFINE_ERROR(OB_TRANS_FREE_ROUTE_NOT_SUPPORTED, -6279, -1, "HY000", "Query is not supported to be executed on txn temporary node"); DEFINE_ORACLE_ERROR(OB_TRANS_FREE_ROUTE_NOT_SUPPORTED, -6279, 6279, "HY000", "Query is not supported to be executed on txn temporary node", 6279, "Query is not supported to be executed on txn temporary node");
DEFINE_ERROR(OB_TRANS_LIVE_TOO_MUCH_TIME, -6280, -1, "HY000", "Transaction cost too much without commit or rollback"); DEFINE_ERROR(OB_TRANS_LIVE_TOO_MUCH_TIME, -6280, -1, "HY000", "Transaction cost too much without commit or rollback");
DEFINE_ERROR(OB_TRANS_COMMIT_TOO_MUCH_TIME, -6281, -1, "HY000", "Transaction commit cost too much"); DEFINE_ERROR(OB_TRANS_COMMIT_TOO_MUCH_TIME, -6281, -1, "HY000", "Transaction commit cost too much");

2
src/share/ob_errno.h
View File

@ -5243,7 +5243,7 @@ constexpr int OB_ERR_INVALID_DATE_MSG_FMT_V2 = -4219;
#define OB_OBJ_UNLOCK_CONFLICT__ORA_USER_ERROR_MSG "ORA-00600: internal error code, arguments: -6276, there is an unlock operation doing, unlock conflict." #define OB_OBJ_UNLOCK_CONFLICT__ORA_USER_ERROR_MSG "ORA-00600: internal error code, arguments: -6276, there is an unlock operation doing, unlock conflict."
#define OB_SCN_OUT_OF_BOUND__ORA_USER_ERROR_MSG "ORA-00600: internal error code, arguments: -6277, scn is out of bounds of memtable" #define OB_SCN_OUT_OF_BOUND__ORA_USER_ERROR_MSG "ORA-00600: internal error code, arguments: -6277, scn is out of bounds of memtable"
#define OB_TRANS_IDLE_TIMEOUT__ORA_USER_ERROR_MSG "ORA-24761: transaction rolled back: transaction idle timeout" #define OB_TRANS_IDLE_TIMEOUT__ORA_USER_ERROR_MSG "ORA-24761: transaction rolled back: transaction idle timeout"
#define OB_TRANS_FREE_ROUTE_NOT_SUPPORTED__ORA_USER_ERROR_MSG "ORA-00600: internal error code, arguments: -6279, Query is not supported to be executed on txn temporary node" #define OB_TRANS_FREE_ROUTE_NOT_SUPPORTED__ORA_USER_ERROR_MSG "ORA-06279: Query is not supported to be executed on txn temporary node"
#define OB_TRANS_LIVE_TOO_MUCH_TIME__ORA_USER_ERROR_MSG "ORA-00600: internal error code, arguments: -6280, Transaction cost too much without commit or rollback" #define OB_TRANS_LIVE_TOO_MUCH_TIME__ORA_USER_ERROR_MSG "ORA-00600: internal error code, arguments: -6280, Transaction cost too much without commit or rollback"
#define OB_TRANS_COMMIT_TOO_MUCH_TIME__ORA_USER_ERROR_MSG "ORA-00600: internal error code, arguments: -6281, Transaction commit cost too much" #define OB_TRANS_COMMIT_TOO_MUCH_TIME__ORA_USER_ERROR_MSG "ORA-00600: internal error code, arguments: -6281, Transaction commit cost too much"
#define OB_LOG_ID_NOT_FOUND__ORA_USER_ERROR_MSG "ORA-00600: internal error code, arguments: -6301, log id not found" #define OB_LOG_ID_NOT_FOUND__ORA_USER_ERROR_MSG "ORA-00600: internal error code, arguments: -6301, log id not found"