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

modify error message about OB_ROWKEY_ORDER_ERROR

Browse Source
This commit is contained in:
medcll
2024-11-26 14:15:15 +00:00
committed by ob-robot
parent 2202128579
commit ec7e1bbcf8
4 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/share/ob_errno.cpp
View File

@ -1294,12 +1294,12 @@ static const _error _error_OB_ROWKEY_ORDER_ERROR = {
.mysql_errno = -1, .mysql_errno = -1,
.sqlstate = "HY000", .sqlstate = "HY000",
.str_error = "Rowkey order error", .str_error = "Rowkey order error",
.str_user_error = "Rowkey order error", .str_user_error = "%s",
.oracle_errno = 600, .oracle_errno = 600,
.oracle_str_error = "ORA-00600: internal error code, arguments: -4105, Rowkey order error", .oracle_str_error = "ORA-00600: internal error code, arguments: -4105, Rowkey order error",
.oracle_str_user_error = "ORA-00600: internal error code, arguments: -4105, Rowkey order error", .oracle_str_user_error = "ORA-00600: internal error code, arguments: -4105, %s",
.ob_str_error = "OBE-00600: internal error code, arguments: -4105, Rowkey order error", .ob_str_error = "OBE-00600: internal error code, arguments: -4105, Rowkey order error",
.ob_str_user_error = "OBE-00600: internal error code, arguments: -4105, Rowkey order error" .ob_str_user_error = "OBE-00600: internal error code, arguments: -4105, %s"
}; };
static const _error _error_OB_NOT_ENOUGH_STORE = { static const _error _error_OB_NOT_ENOUGH_STORE = {
.error_name = "OB_NOT_ENOUGH_STORE", .error_name = "OB_NOT_ENOUGH_STORE",

2
src/share/ob_errno.def
View File

@ -196,7 +196,7 @@ DEFINE_ORACLE_ERROR_DEP(OB_DEAD_LOCK, -4101, ER_LOCK_DEADLOCK, "HY000", "Deadloc
DEFINE_ERROR(OB_PARTIAL_LOG, -4102, -1, "HY000", "Incomplete log entry"); DEFINE_ERROR(OB_PARTIAL_LOG, -4102, -1, "HY000", "Incomplete log entry");
DEFINE_ERROR_DEP(OB_CHECKSUM_ERROR, -4103, -1, "42000", "Data checksum error"); DEFINE_ERROR_DEP(OB_CHECKSUM_ERROR, -4103, -1, "42000", "Data checksum error");
DEFINE_ERROR_DEP(OB_INIT_FAIL, -4104, -1, "HY000", "Initialize error"); DEFINE_ERROR_DEP(OB_INIT_FAIL, -4104, -1, "HY000", "Initialize error");
DEFINE_ERROR_DEP(OB_ROWKEY_ORDER_ERROR, -4105, -1, "HY000", "Rowkey order error"); DEFINE_ERROR_EXT_DEP(OB_ROWKEY_ORDER_ERROR, -4105, -1, "HY000", "Rowkey order error", "%s");
DEFINE_ERROR(OB_NOT_ENOUGH_STORE, -4106, -1, "HY000", "not enough commitlog store"); DEFINE_ERROR(OB_NOT_ENOUGH_STORE, -4106, -1, "HY000", "not enough commitlog store");
DEFINE_ERROR(OB_BLOCK_SWITCHED, -4107, -1, "HY000", "block switched when fill commitlog"); DEFINE_ERROR(OB_BLOCK_SWITCHED, -4107, -1, "HY000", "block switched when fill commitlog");
DEFINE_ERROR_DEP(OB_PHYSIC_CHECKSUM_ERROR, -4108, -1, "42000", "Physic data checksum error"); DEFINE_ERROR_DEP(OB_PHYSIC_CHECKSUM_ERROR, -4108, -1, "42000", "Physic data checksum error");

6
src/share/ob_errno.h
View File

@ -2052,7 +2052,7 @@ constexpr int OB_ERR_INVALID_DATE_MSG_FMT_V2 = -4219;
#define OB_PARTIAL_LOG__USER_ERROR_MSG "Incomplete log entry" #define OB_PARTIAL_LOG__USER_ERROR_MSG "Incomplete log entry"
#define OB_CHECKSUM_ERROR__USER_ERROR_MSG "Data checksum error" #define OB_CHECKSUM_ERROR__USER_ERROR_MSG "Data checksum error"
#define OB_INIT_FAIL__USER_ERROR_MSG "Initialize error" #define OB_INIT_FAIL__USER_ERROR_MSG "Initialize error"
#define OB_ROWKEY_ORDER_ERROR__USER_ERROR_MSG "Rowkey order error" #define OB_ROWKEY_ORDER_ERROR__USER_ERROR_MSG "%s"
#define OB_NOT_ENOUGH_STORE__USER_ERROR_MSG "not enough commitlog store" #define OB_NOT_ENOUGH_STORE__USER_ERROR_MSG "not enough commitlog store"
#define OB_BLOCK_SWITCHED__USER_ERROR_MSG "block switched when fill commitlog" #define OB_BLOCK_SWITCHED__USER_ERROR_MSG "block switched when fill commitlog"
#define OB_PHYSIC_CHECKSUM_ERROR__USER_ERROR_MSG "Physic data checksum error" #define OB_PHYSIC_CHECKSUM_ERROR__USER_ERROR_MSG "Physic data checksum error"
@ -4529,8 +4529,8 @@ constexpr int OB_ERR_INVALID_DATE_MSG_FMT_V2 = -4219;
#define OB_CHECKSUM_ERROR__OBE_USER_ERROR_MSG "OBE-00600: internal error code, arguments: -4103, Data checksum error" #define OB_CHECKSUM_ERROR__OBE_USER_ERROR_MSG "OBE-00600: internal error code, arguments: -4103, Data checksum error"
#define OB_INIT_FAIL__ORA_USER_ERROR_MSG "ORA-00600: internal error code, arguments: -4104, Initialize error" #define OB_INIT_FAIL__ORA_USER_ERROR_MSG "ORA-00600: internal error code, arguments: -4104, Initialize error"
#define OB_INIT_FAIL__OBE_USER_ERROR_MSG "OBE-00600: internal error code, arguments: -4104, Initialize error" #define OB_INIT_FAIL__OBE_USER_ERROR_MSG "OBE-00600: internal error code, arguments: -4104, Initialize error"
#define OB_ROWKEY_ORDER_ERROR__ORA_USER_ERROR_MSG "ORA-00600: internal error code, arguments: -4105, Rowkey order error" #define OB_ROWKEY_ORDER_ERROR__ORA_USER_ERROR_MSG "ORA-00600: internal error code, arguments: -4105, %s"
#define OB_ROWKEY_ORDER_ERROR__OBE_USER_ERROR_MSG "OBE-00600: internal error code, arguments: -4105, Rowkey order error" #define OB_ROWKEY_ORDER_ERROR__OBE_USER_ERROR_MSG "OBE-00600: internal error code, arguments: -4105, %s"
#define OB_NOT_ENOUGH_STORE__ORA_USER_ERROR_MSG "ORA-00600: internal error code, arguments: -4106, not enough commitlog store" #define OB_NOT_ENOUGH_STORE__ORA_USER_ERROR_MSG "ORA-00600: internal error code, arguments: -4106, not enough commitlog store"
#define OB_NOT_ENOUGH_STORE__OBE_USER_ERROR_MSG "OBE-00600: internal error code, arguments: -4106, not enough commitlog store" #define OB_NOT_ENOUGH_STORE__OBE_USER_ERROR_MSG "OBE-00600: internal error code, arguments: -4106, not enough commitlog store"
#define OB_BLOCK_SWITCHED__ORA_USER_ERROR_MSG "ORA-00600: internal error code, arguments: -4107, block switched when fill commitlog" #define OB_BLOCK_SWITCHED__ORA_USER_ERROR_MSG "ORA-00600: internal error code, arguments: -4107, block switched when fill commitlog"

6
src/sql/engine/cmd/ob_load_data_direct_impl.cpp
View File

@ -2309,6 +2309,12 @@ int ObLoadDataDirectImpl::execute(ObExecContext &ctx, ObLoadDataStmt &load_stmt)
} }
} }
if (OB_FAIL(ret)) {
if (!execute_param_.need_sort_ && OB_ROWKEY_ORDER_ERROR == ret) {
LOG_USER_ERROR(OB_ROWKEY_ORDER_ERROR, "The data to be imported is unordered, please set need_sort to true");
}
}
direct_loader_.destroy(); direct_loader_.destroy();
if (OB_NOT_NULL(session)) { if (OB_NOT_NULL(session)) {
session->reset_cur_phy_plan_to_null(); session->reset_cur_phy_plan_to_null();