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

add placeholder for fts index

Browse Source
This commit is contained in:
obdev 2023-11-13 08:39:01 +00:00 committed by ob-robot
parent 3ee313de9c
commit d2700bedea
6 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
deps/oblib/src/lib/ob_errno.h vendored
View File

@ -360,6 +360,7 @@ constexpr int OB_ERR_SRS_EMPTY = -7285;
constexpr int OB_ERR_INVALID_OPTION_KEY = -7286;
constexpr int OB_ERR_INVALID_OPTION_VALUE = -7287;
constexpr int OB_ERR_INVALID_GEOMETRY_TYPE = -7288;
constexpr int OB_ERR_FTS_MUST_HAVE_TEXT_COL = -7289;
constexpr int OB_PACKET_CLUSTER_ID_NOT_MATCH = -8004;
constexpr int OB_TENANT_ID_NOT_MATCH = -8005;
constexpr int OB_URI_ERROR = -9001;

1
src/share/ob_ddl_common.h
View File

@ -56,6 +56,7 @@ enum ObDDLType
DDL_MODIFY_AUTO_INCREMENT = 4,
DDL_CREATE_INDEX = 5,
DDL_DROP_INDEX = 6,
DDL_CREATE_FTS_INDEX = 7,
///< @note Drop schema, and refuse concurrent trans.
DDL_DROP_SCHEMA_AVOID_CONCURRENT_TRANS = 500,
DDL_DROP_DATABASE = 501,

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

@ -1931,6 +1931,7 @@ DEFINE_ORACLE_ERROR_EXT_DEP(OB_ERR_SRS_EMPTY, -7285, ER_SRS_NOT_FOUND, "SR001",
DEFINE_ORACLE_ERROR_EXT_DEP(OB_ERR_INVALID_OPTION_KEY, -7286, ER_INVALID_OPTION_KEY, "22023", "Invalid option key in function.", "Invalid option key \'%.192s\' in function %.192s.", 600, "Invalid option key in function.", "Invalid option key \'%.192s\' in function %.192s.");
DEFINE_ORACLE_ERROR_EXT_DEP(OB_ERR_INVALID_OPTION_VALUE, -7287, ER_INVALID_OPTION_VALUE, "22023", "Invalid value for option in function.", "Invalid value \'%.192s\' for option \'%.192s\' in function \'%.192s\'.", 600, "Invalid value for option in function.", "Invalid value \'%.192s\' for option \'%.192s\' in function \'%.192s\'.");
DEFINE_ORACLE_ERROR_EXT_DEP(OB_ERR_INVALID_GEOMETRY_TYPE, -7288, ER_UNEXPECTED_GEOMETRY_TYPE, "22S01", "Unknown WKB type.", "Unknown WKB type(%d)! Full WKB type number was (%d).", 600, "Unknown WKB type.", "Unknown WKB type(%d)! Full WKB type number was (%d).");
DEFINE_ORACLE_ERROR_EXT_DEP(OB_ERR_FTS_MUST_HAVE_TEXT_COL, -7289, ER_BAD_FT_COLUMN, "42000", "A FTS index may only contain a text type column.", "A FTS index may only contain a text type column.", 600, "A FTS index may only contain a text type column.", "A FTS index may only contain a text type column.");
DEFINE_ORACLE_ERROR_EXT(OB_ERR_INVALID_XML_DATATYPE, -7402, -1, "22000", "Invalid data type for the operation", "inconsistent datatypes: expected %s got %s", 932, "inconsistent datatypes", "inconsistent datatypes: expected %s got %s");
DEFINE_ORACLE_ERROR(OB_ERR_XML_MISSING_COMMA, -7403, -1, "42000", "missing comma", 917, "missing comma");
DEFINE_ORACLE_ERROR(OB_ERR_INVALID_XPATH_EXPRESSION, -7404, -1, "42000", "invalid xpath expression", 31013, "invalid xpath expression");

4
src/share/ob_errno.h
View File

@ -3556,6 +3556,7 @@ constexpr int OB_ERR_INVALID_DATE_MSG_FMT_V2 = -4219;
#define OB_ERR_INVALID_OPTION_KEY__USER_ERROR_MSG "Invalid option key \'%.192s\' in function %.192s."
#define OB_ERR_INVALID_OPTION_VALUE__USER_ERROR_MSG "Invalid value \'%.192s\' for option \'%.192s\' in function \'%.192s\'."
#define OB_ERR_INVALID_GEOMETRY_TYPE__USER_ERROR_MSG "Unknown WKB type(%d)! Full WKB type number was (%d)."
#define OB_ERR_FTS_MUST_HAVE_TEXT_COL__USER_ERROR_MSG "A FTS index may only contain a text type column."
#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 "invalid xpath expression"
@ -5703,6 +5704,7 @@ constexpr int OB_ERR_INVALID_DATE_MSG_FMT_V2 = -4219;
#define OB_ERR_INVALID_OPTION_KEY__ORA_USER_ERROR_MSG "ORA-00600: Invalid option key \'%.192s\' in function %.192s."
#define OB_ERR_INVALID_OPTION_VALUE__ORA_USER_ERROR_MSG "ORA-00600: Invalid value \'%.192s\' for option \'%.192s\' in function \'%.192s\'."
#define OB_ERR_INVALID_GEOMETRY_TYPE__ORA_USER_ERROR_MSG "ORA-00600: Unknown WKB type(%d)! Full WKB type number was (%d)."
#define OB_ERR_FTS_MUST_HAVE_TEXT_COL__ORA_USER_ERROR_MSG "ORA-00600: A FTS index may only contain a text type column."
#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"
@ -6101,7 +6103,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[2143];
extern int g_all_ob_errnos[2144];
const char *ob_error_name(const int oberr);
const char* ob_error_cause(const int oberr);

13
src/share/schema/ob_schema_struct.h
View File

@ -303,11 +303,22 @@ enum ObIndexType
INDEX_TYPE_SPATIAL_LOCAL = 10,
INDEX_TYPE_SPATIAL_GLOBAL = 11,
INDEX_TYPE_SPATIAL_GLOBAL_LOCAL_STORAGE = 12,
// new index types for fts
INDEX_TYPE_FTS_ROWKEY_DOC_LOCAL = 13,
INDEX_TYPE_FTS_DOC_ROWKEY_LOCAL = 14,
INDEX_TYPE_FTS_INDEX_LOCAL = 15,
INDEX_TYPE_FTS_DOC_WORD_LOCAL = 16,
INDEX_TYPE_FTS_DOC_ROWKEY_GLOBAL = 17,
INDEX_TYPE_FTS_INDEX_GLOBAL = 18,
INDEX_TYPE_FTS_DOC_WORD_GLOBAL = 19,
INDEX_TYPE_FTS_DOC_ROWKEY_GLOBAL_LOCAL_STORAGE = 20,
INDEX_TYPE_FTS_INDEX_GLOBAL_LOCAL_STORAGE = 21,
INDEX_TYPE_FTS_DOC_WORD_GLOBAL_LOCAL_STORAGE = 22,
/*
* Attention!!! when add new index type,
* need update func ObSimpleTableSchemaV2::should_not_validate_data_index_ckm()
*/
INDEX_TYPE_MAX = 13,
INDEX_TYPE_MAX = 23,
};
// using type for index