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

fix fts issues

Browse Source
This commit is contained in:
zhenhan.gong@gmail.com
2024-04-28 12:27:03 +00:00
committed by ob-robot
parent 97f888cfba
commit fb848a9ce9
7 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/share/ob_errno.cpp
View File

File diff suppressed because one or more lines are too long

2
src/share/ob_errno.def
View File

@ -2296,6 +2296,8 @@ DEFINE_ERROR(OB_MARK_BLOCK_INFO_TIMEOUT, -9201, -1, "HY000", "Mark blocks timeou
DEFINE_ERROR(OB_NOT_READY_TO_EXTEND_FILE, -9202, -1, "HY000", "Auto extend param is not ready to start extending file");
////////////////////////////////////////////////////////////////
DEFINE_ERROR_EXT(OB_FUNCTION_NOT_DEFINED, -9203, ER_FUNCTION_NOT_DEFINED, "HY000", "Function not defined", "Function %.*s is not defined");
// 余留位置
////////////////////////////////////////////////////////////////
// Storage错误码值域 [-9000, -9500)

5
src/share/ob_errno.h
View File

@ -1575,6 +1575,7 @@ constexpr int OB_STORAGE_DEST_NOT_CONNECT = -9115;
constexpr int OB_ERR_RESIZE_FILE_TO_SMALLER = -9200;
constexpr int OB_MARK_BLOCK_INFO_TIMEOUT = -9201;
constexpr int OB_NOT_READY_TO_EXTEND_FILE = -9202;
constexpr int OB_FUNCTION_NOT_DEFINED = -9203;
constexpr int OB_ERR_DUPLICATE_HAVING_CLAUSE_IN_TABLE_EXPRESSION = -9501;
constexpr int OB_ERR_INOUT_PARAM_PLACEMENT_NOT_PROPERLY = -9502;
constexpr int OB_ERR_OBJECT_NOT_FOUND = -9503;
@ -3826,6 +3827,7 @@ constexpr int OB_ERR_INVALID_DATE_MSG_FMT_V2 = -4219;
#define OB_ERR_RESIZE_FILE_TO_SMALLER__USER_ERROR_MSG "Extend ssblock file to smaller is not allowed"
#define OB_MARK_BLOCK_INFO_TIMEOUT__USER_ERROR_MSG "Mark blocks timeout(5s) in auto extend process when alloc block fail"
#define OB_NOT_READY_TO_EXTEND_FILE__USER_ERROR_MSG "Auto extend param is not ready to start extending file"
#define OB_FUNCTION_NOT_DEFINED__USER_ERROR_MSG "Function %.*s is not defined"
#define OB_ERR_DUPLICATE_HAVING_CLAUSE_IN_TABLE_EXPRESSION__USER_ERROR_MSG "Duplicate having-clause in table expression"
#define OB_ERR_INOUT_PARAM_PLACEMENT_NOT_PROPERLY__USER_ERROR_MSG "OUT and IN/OUT modes cannot be used in this context"
#define OB_ERR_OBJECT_NOT_FOUND__USER_ERROR_MSG "object '%.*s' of type %.*s not found in schema '%.*s'"
@ -6079,6 +6081,7 @@ constexpr int OB_ERR_INVALID_DATE_MSG_FMT_V2 = -4219;
#define OB_ERR_RESIZE_FILE_TO_SMALLER__ORA_USER_ERROR_MSG "ORA-00600: internal error code, arguments: -9200, Extend ssblock file to smaller is not allowed"
#define OB_MARK_BLOCK_INFO_TIMEOUT__ORA_USER_ERROR_MSG "ORA-00600: internal error code, arguments: -9201, Mark blocks timeout(5s) in auto extend process when alloc block fail"
#define OB_NOT_READY_TO_EXTEND_FILE__ORA_USER_ERROR_MSG "ORA-00600: internal error code, arguments: -9202, Auto extend param is not ready to start extending file"
#define OB_FUNCTION_NOT_DEFINED__ORA_USER_ERROR_MSG "ORA-00600: internal error code, arguments: -9203, Function %.*s is not defined"
#define OB_ERR_DUPLICATE_HAVING_CLAUSE_IN_TABLE_EXPRESSION__ORA_USER_ERROR_MSG "PLS-00119: Duplicate having-clause in table expression"
#define OB_ERR_INOUT_PARAM_PLACEMENT_NOT_PROPERLY__ORA_USER_ERROR_MSG "PLS-00254: OUT and IN/OUT modes cannot be used in this context"
#define OB_ERR_OBJECT_NOT_FOUND__ORA_USER_ERROR_MSG "ORA-31603: object '%.*s' of type %.*s not found in schema '%.*s'"
@ -6387,7 +6390,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[2249];
extern int g_all_ob_errnos[2250];
const char *ob_error_name(const int oberr);
const char* ob_error_cause(const int oberr);

3
src/sql/das/ob_das_delete_op.cpp
View File

@ -74,8 +74,7 @@ int ObDASIndexDMLAdaptor<DAS_OP_TABLE_DELETE, ObDASDMLIterator>::write_rows(cons
LOG_WARN("delete rows to access service failed", K(ret));
}
} else if (!(ctdef.is_ignore_ ||
ctdef.table_param_.get_data_table().is_spatial_index() ||
ctdef.table_param_.get_data_table().is_multivalue_index_aux())
ctdef.table_param_.get_data_table().is_domain_index())
&& 0 == affected_rows) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("unexpected affected_rows after do delete", K(affected_rows), K(ret));

3
src/sql/das/ob_das_domain_utils.cpp
View File

@ -514,6 +514,9 @@ int ObDomainDMLIterator::get_next_domain_row(ObNewRow *&row)
int ret = OB_SUCCESS;
const ObChunkDatumStore::StoredRow *sr = nullptr;
bool got_row = false;
if (OB_FAIL(THIS_WORKER.check_status())) {
LOG_WARN("worker interrupt", K(ret));
}
while (OB_SUCC(ret) && !got_row) {
if (row_idx_ >= rows_.count()) {
rows_.reuse();

4
src/sql/das/ob_das_update_op.cpp
View File

@ -260,7 +260,9 @@ int ObDASIndexDMLAdaptor<DAS_OP_TABLE_UPDATE, ObDASUpdIterator>::write_rows(cons
if (OB_TRY_LOCK_ROW_CONFLICT != ret) {
LOG_WARN("update row to partition storage failed", K(ret));
}
} else if (!ctdef.is_ignore_ && 0 == affected_rows) {
} else if (!(ctdef.is_ignore_ ||
ctdef.table_param_.get_data_table().is_domain_index())
&& 0 == affected_rows) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("unexpected affected_rows after do update", K(affected_rows), K(ret));
}

5
src/storage/fts/ob_fts_plugin_mgr.cpp
View File

@ -173,6 +173,11 @@ int ObTenantFTPluginMgr::get_plugin_handler(
ret = OB_INVALID_ARGUMENT;
LOG_WARN("invalid arguments", K(ret), K(name));
} else if (OB_FAIL(handler_map_.get_refactored(name, plugin_handler))) {
if (OB_HASH_NOT_EXIST == ret) {
ret = OB_FUNCTION_NOT_DEFINED;
LOG_WARN("Function not defined", K(ret));
LOG_USER_ERROR(OB_FUNCTION_NOT_DEFINED, name.len(), name.str());
}
LOG_WARN("fail to get plugin handler", K(ret), K(name));
}
return ret;