diff --git a/src/observer/table/ob_htable_utils.cpp b/src/observer/table/ob_htable_utils.cpp index ba3e216f06..ccff16809d 100644 --- a/src/observer/table/ob_htable_utils.cpp +++ b/src/observer/table/ob_htable_utils.cpp @@ -310,8 +310,8 @@ int ObHTableUtils::java_bytes_to_int64(const ObString &bytes, int64_t &val) { int ret = OB_SUCCESS; if (bytes.length() != sizeof(int64_t)) { - ret = OB_KV_HBASE_CONVERT_INT_ERROR; - LOG_USER_ERROR(OB_KV_HBASE_CONVERT_INT_ERROR, bytes.length()); + ret = OB_KV_HBASE_INCR_FIELD_IS_NOT_LONG; + LOG_USER_ERROR(OB_KV_HBASE_INCR_FIELD_IS_NOT_LONG, bytes.length()); LOG_WARN("length should be 8 bytes", K(ret), "len", bytes.length()); } else { // In Java, data is stored in big-endian format (also called network order). diff --git a/src/share/ob_errno.cpp b/src/share/ob_errno.cpp index 380641c12e..8033a2b476 100644 --- a/src/share/ob_errno.cpp +++ b/src/share/ob_errno.cpp @@ -26865,17 +26865,17 @@ static const _error _error_OB_KV_REDIS_PARSE_ERROR = { .oracle_str_error = "ORA-00600: internal error code, arguments: -10515, OBKV redis protocol parse error", .oracle_str_user_error = "ORA-00600: internal error code, arguments: -10515, Redis protocol parse errror, the input redis string is: '%.*s'" }; -static const _error _error_OB_KV_HBASE_CONVERT_INT_ERROR = { - .error_name = "OB_KV_HBASE_CONVERT_INT_ERROR", +static const _error _error_OB_KV_HBASE_INCR_FIELD_IS_NOT_LONG = { + .error_name = "OB_KV_HBASE_INCR_FIELD_IS_NOT_LONG", .error_cause = "Internal Error", .error_solution = "Contact OceanBase Support", .mysql_errno = -1, .sqlstate = "HY000", - .str_error = "cannot convert hbase cell value to int64", - .str_user_error = "cannot convert hbase cell value to int64, the cell value length is '%d'", + .str_error = "When invoking the Increment interface only HBase cells with a length of 8 can be converted to int64_t", + .str_user_error = "When invoking the Increment interface, only HBase cells with a length of 8 can be converted to int64_t. the current length of the HBase cell is '%d'.", .oracle_errno = 600, - .oracle_str_error = "ORA-00600: internal error code, arguments: -10516, cannot convert hbase cell value to int64", - .oracle_str_user_error = "ORA-00600: internal error code, arguments: -10516, cannot convert hbase cell value to int64, the cell value length is '%d'" + .oracle_str_error = "ORA-00600: internal error code, arguments: -10516, When invoking the Increment interface only HBase cells with a length of 8 can be converted to int64_t", + .oracle_str_user_error = "ORA-00600: internal error code, arguments: -10516, When invoking the Increment interface, only HBase cells with a length of 8 can be converted to int64_t. the current length of the HBase cell is '%d'." }; static const _error _error_OB_KV_ODP_TIMEOUT = { .error_name = "OB_KV_ODP_TIMEOUT", @@ -29433,7 +29433,7 @@ struct ObStrErrorInit _errors[-OB_KV_SCAN_RANGE_MISSING] = &_error_OB_KV_SCAN_RANGE_MISSING; _errors[-OB_KV_FILTER_PARSE_ERROR] = &_error_OB_KV_FILTER_PARSE_ERROR; _errors[-OB_KV_REDIS_PARSE_ERROR] = &_error_OB_KV_REDIS_PARSE_ERROR; - _errors[-OB_KV_HBASE_CONVERT_INT_ERROR] = &_error_OB_KV_HBASE_CONVERT_INT_ERROR; + _errors[-OB_KV_HBASE_INCR_FIELD_IS_NOT_LONG] = &_error_OB_KV_HBASE_INCR_FIELD_IS_NOT_LONG; _errors[-OB_KV_ODP_TIMEOUT] = &_error_OB_KV_ODP_TIMEOUT; _errors[-OB_ERR_VALUES_CLAUSE_NEED_HAVE_COLUMN] = &_error_OB_ERR_VALUES_CLAUSE_NEED_HAVE_COLUMN; _errors[-OB_ERR_VALUES_CLAUSE_CANNOT_USE_DEFAULT_VALUES] = &_error_OB_ERR_VALUES_CLAUSE_CANNOT_USE_DEFAULT_VALUES; diff --git a/src/share/ob_errno.def b/src/share/ob_errno.def index 07f9d3e89a..c7591eb033 100755 --- a/src/share/ob_errno.def +++ b/src/share/ob_errno.def @@ -2632,7 +2632,7 @@ DEFINE_ERROR_EXT(OB_KV_COLLATION_MISMATCH, -10512, -1, "HY000", "OBKV collation DEFINE_ERROR_EXT(OB_KV_SCAN_RANGE_MISSING, -10513, -1, "HY000", "OBKV scan range missing", "Scan range missing, input scan range cell count is '%ld', which should equal to rowkey count '%ld'"); DEFINE_ERROR_EXT(OB_KV_FILTER_PARSE_ERROR, -10514, -1, "HY000", "OBKV filter parse error", "Filter parse errror, the input filter string is: '%.*s'"); DEFINE_ERROR_EXT(OB_KV_REDIS_PARSE_ERROR, -10515, -1, "HY000", "OBKV redis protocol parse error", "Redis protocol parse errror, the input redis string is: '%.*s'"); -DEFINE_ERROR_EXT(OB_KV_HBASE_CONVERT_INT_ERROR, -10516, -1, "HY000", "cannot convert hbase cell value to int64", "cannot convert hbase cell value to int64, the cell value length is '%d'"); +DEFINE_ERROR_EXT(OB_KV_HBASE_INCR_FIELD_IS_NOT_LONG, -10516, -1, "HY000", "When invoking the Increment interface only HBase cells with a length of 8 can be converted to int64_t", "When invoking the Increment interface, only HBase cells with a length of 8 can be converted to int64_t. the current length of the HBase cell is '%d'."); DEFINE_ERROR(OB_KV_ODP_TIMEOUT, -10650, -1, "HY000", "ODP process timeout"); // 余留位置 diff --git a/src/share/ob_errno.h b/src/share/ob_errno.h index 3b313bb61a..d0939ef6ca 100644 --- a/src/share/ob_errno.h +++ b/src/share/ob_errno.h @@ -1861,7 +1861,7 @@ constexpr int OB_KV_COLLATION_MISMATCH = -10512; constexpr int OB_KV_SCAN_RANGE_MISSING = -10513; constexpr int OB_KV_FILTER_PARSE_ERROR = -10514; constexpr int OB_KV_REDIS_PARSE_ERROR = -10515; -constexpr int OB_KV_HBASE_CONVERT_INT_ERROR = -10516; +constexpr int OB_KV_HBASE_INCR_FIELD_IS_NOT_LONG = -10516; constexpr int OB_KV_ODP_TIMEOUT = -10650; constexpr int OB_ERR_VALUES_CLAUSE_NEED_HAVE_COLUMN = -11000; constexpr int OB_ERR_VALUES_CLAUSE_CANNOT_USE_DEFAULT_VALUES = -11001; @@ -4128,7 +4128,7 @@ constexpr int OB_ERR_INVALID_DATE_MSG_FMT_V2 = -4219; #define OB_KV_SCAN_RANGE_MISSING__USER_ERROR_MSG "Scan range missing, input scan range cell count is '%ld', which should equal to rowkey count '%ld'" #define OB_KV_FILTER_PARSE_ERROR__USER_ERROR_MSG "Filter parse errror, the input filter string is: '%.*s'" #define OB_KV_REDIS_PARSE_ERROR__USER_ERROR_MSG "Redis protocol parse errror, the input redis string is: '%.*s'" -#define OB_KV_HBASE_CONVERT_INT_ERROR__USER_ERROR_MSG "cannot convert hbase cell value to int64, the cell value length is '%d'" +#define OB_KV_HBASE_INCR_FIELD_IS_NOT_LONG__USER_ERROR_MSG "When invoking the Increment interface, only HBase cells with a length of 8 can be converted to int64_t. the current length of the HBase cell is '%d'." #define OB_KV_ODP_TIMEOUT__USER_ERROR_MSG "ODP process timeout" #define OB_ERR_VALUES_CLAUSE_NEED_HAVE_COLUMN__USER_ERROR_MSG "Each row of a VALUES clause must have at least one column, unless when used as source in an INSERT statement." #define OB_ERR_VALUES_CLAUSE_CANNOT_USE_DEFAULT_VALUES__USER_ERROR_MSG "A VALUES clause cannot use DEFAULT values, unless used as a source in an INSERT statement." @@ -6395,7 +6395,7 @@ constexpr int OB_ERR_INVALID_DATE_MSG_FMT_V2 = -4219; #define OB_KV_SCAN_RANGE_MISSING__ORA_USER_ERROR_MSG "ORA-00600: internal error code, arguments: -10513, Scan range missing, input scan range cell count is '%ld', which should equal to rowkey count '%ld'" #define OB_KV_FILTER_PARSE_ERROR__ORA_USER_ERROR_MSG "ORA-00600: internal error code, arguments: -10514, Filter parse errror, the input filter string is: '%.*s'" #define OB_KV_REDIS_PARSE_ERROR__ORA_USER_ERROR_MSG "ORA-00600: internal error code, arguments: -10515, Redis protocol parse errror, the input redis string is: '%.*s'" -#define OB_KV_HBASE_CONVERT_INT_ERROR__ORA_USER_ERROR_MSG "ORA-00600: internal error code, arguments: -10516, cannot convert hbase cell value to int64, the cell value length is '%d'" +#define OB_KV_HBASE_INCR_FIELD_IS_NOT_LONG__ORA_USER_ERROR_MSG "ORA-00600: internal error code, arguments: -10516, When invoking the Increment interface, only HBase cells with a length of 8 can be converted to int64_t. the current length of the HBase cell is '%d'." #define OB_KV_ODP_TIMEOUT__ORA_USER_ERROR_MSG "ORA-00600: internal error code, arguments: -10650, ODP process timeout" #define OB_ERR_VALUES_CLAUSE_NEED_HAVE_COLUMN__ORA_USER_ERROR_MSG "ORA-00600: internal error code, arguments: -11000, Each row of a VALUES clause must have at least one column, unless when used as source in an INSERT statement." #define OB_ERR_VALUES_CLAUSE_CANNOT_USE_DEFAULT_VALUES__ORA_USER_ERROR_MSG "ORA-00600: internal error code, arguments: -11001, A VALUES clause cannot use DEFAULT values, unless used as a source in an INSERT statement."