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

occupy error code and eval_sod_relate placeholder

Browse Source
This commit is contained in:
wu-xingying
2024-05-13 09:41:43 +00:00
committed by ob-robot
parent 03d93b896f
commit 14a830c971
5 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
deps/oblib/src/lib/container/ob_mask_set2.h vendored
View File

@ -168,7 +168,7 @@ private:
const ObIArray<T> *array_;
ObBitSet<> bitset_;
};
} // common
} // oceanbase
} // common
} // oceanbase
#endif // OCEANBASE_COMMON_OB_MASK_SET_

15
src/share/ob_errno.cpp
View File

File diff suppressed because one or more lines are too long

1
src/share/ob_errno.def
View File

@ -2069,6 +2069,7 @@ DEFINE_ORACLE_ERROR(OB_ERR_OPERATOR_NOT_EXIST, -7298, -1, "42000", "operator bin
DEFINE_ORACLE_ERROR(OB_INVALID_MASK, -7299, -1, "42000", "operator binding does not exist", 20000, "operator binding does not exist");
DEFINE_ORACLE_ERROR(OB_GEO_IN_DIFFERENT_COORDINATE, -7300, -1, "42000", "geometry objects are in different coordinate systems", 13295, "geometry objects are in different coordinate systems");
DEFINE_ORACLE_ERROR(OB_ERR_DOMAIN_COLUMN_DUPLICATE, -7301, -1, "42000", "cannot create multiple domain indexes on a column list using same", 29879, "cannot create multiple domain indexes on a column list using same");
DEFINE_ORACLE_ERROR(OB_ERR_PARSING_SPATIAL_PARAM, -7302, -1, "42000", "internal error while parsing spatial parameters", 13205, "internal error while parsing spatial parameters");
// 余留位置
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// GIS错误码值域 [-7201, -7400)

5
src/share/ob_errno.h
View File

@ -1469,6 +1469,7 @@ constexpr int OB_ERR_OPERATOR_NOT_EXIST = -7298;
constexpr int OB_INVALID_MASK = -7299;
constexpr int OB_GEO_IN_DIFFERENT_COORDINATE = -7300;
constexpr int OB_ERR_DOMAIN_COLUMN_DUPLICATE = -7301;
constexpr int OB_ERR_PARSING_SPATIAL_PARAM = -7302;
constexpr int OB_ERR_INVALID_XML_DATATYPE = -7402;
constexpr int OB_ERR_XML_MISSING_COMMA = -7403;
constexpr int OB_ERR_INVALID_XPATH_EXPRESSION = -7404;
@ -3684,6 +3685,7 @@ constexpr int OB_ERR_INVALID_DATE_MSG_FMT_V2 = -4219;
#define OB_INVALID_MASK__USER_ERROR_MSG "operator binding does not exist"
#define OB_GEO_IN_DIFFERENT_COORDINATE__USER_ERROR_MSG "geometry objects are in different coordinate systems"
#define OB_ERR_DOMAIN_COLUMN_DUPLICATE__USER_ERROR_MSG "cannot create multiple domain indexes on a column list using same"
#define OB_ERR_PARSING_SPATIAL_PARAM__USER_ERROR_MSG "internal error while parsing spatial parameters"
#define OB_ERR_INVALID_XML_DATATYPE__USER_ERROR_MSG "inconsistent datatypes: expected %s got %s"
#define OB_ERR_XML_MISSING_COMMA__USER_ERROR_MSG "missing comma"
#define OB_ERR_INVALID_XPATH_EXPRESSION__USER_ERROR_MSG "XPATH syntax error: ''"
@ -5948,6 +5950,7 @@ constexpr int OB_ERR_INVALID_DATE_MSG_FMT_V2 = -4219;
#define OB_INVALID_MASK__ORA_USER_ERROR_MSG "ORA-20000: operator binding does not exist"
#define OB_GEO_IN_DIFFERENT_COORDINATE__ORA_USER_ERROR_MSG "ORA-13295: geometry objects are in different coordinate systems"
#define OB_ERR_DOMAIN_COLUMN_DUPLICATE__ORA_USER_ERROR_MSG "ORA-29879: cannot create multiple domain indexes on a column list using same"
#define OB_ERR_PARSING_SPATIAL_PARAM__ORA_USER_ERROR_MSG "ORA-13205: internal error while parsing spatial parameters"
#define OB_ERR_INVALID_XML_DATATYPE__ORA_USER_ERROR_MSG "ORA-00932: inconsistent datatypes: expected %s got %s"
#define OB_ERR_XML_MISSING_COMMA__ORA_USER_ERROR_MSG "ORA-00917: missing comma"
#define OB_ERR_INVALID_XPATH_EXPRESSION__ORA_USER_ERROR_MSG "ORA-31013: invalid xpath expression"
@ -6417,7 +6420,7 @@ constexpr int OB_ERR_INVALID_DATE_MSG_FMT_V2 = -4219;
#define OB_ERR_DATA_TOO_LONG_MSG_FMT_V2__ORA_USER_ERROR_MSG "ORA-12899: value too large for column %.*s (actual: %ld, maximum: %ld)"
#define OB_ERR_INVALID_DATE_MSG_FMT_V2__ORA_USER_ERROR_MSG "ORA-01861: Incorrect datetime value for column '%.*s' at row %ld"
extern int g_all_ob_errnos[2260];
extern int g_all_ob_errnos[2261];
const char *ob_error_name(const int oberr);
const char* ob_error_cause(const int oberr);

1
src/sql/engine/expr/ob_expr_eval_functions.cpp
View File

@ -1192,6 +1192,7 @@ static ObExpr::EvalFunc g_expr_eval_functions[] = {
NULL, // ObExprRbAndNull2empty::eval_rb_and_null2empty, /* 713 */
NULL, // ObExprRbOrNull2empty::eval_rb_or_null2empty, /* 714 */
NULL, // ObExprRbAndnotNull2empty::eval_rb_andnot_null2empty, /* 715 */
NULL, //ObExprSdoRelate::eval_sdo_relate /* 716 */
};
static ObExpr::EvalBatchFunc g_expr_eval_batch_functions[] = {