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

fix typo

Browse Source
This commit is contained in:
hnwyllmm
2022-12-30 04:41:47 +00:00
committed by ob-robot
parent 9f7a4d321b
commit 1235ea51e6
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/sql/ob_sql_utils.cpp
View File

@ -985,7 +985,7 @@ int64_t ObSQLUtils::get_usec()
return time_val.tv_sec*1000000 + time_val.tv_usec; return time_val.tv_sec*1000000 + time_val.tv_usec;
} }
int ObSQLUtils::check_and_convert_db_name(const ObCollationType cs_type, const bool perserve_lettercase, int ObSQLUtils::check_and_convert_db_name(const ObCollationType cs_type, const bool preserve_lettercase,
ObString &name) ObString &name)
{ {
/*如果database name的字节数大于384则报错OB_WRONG_DB_NAME; /*如果database name的字节数大于384则报错OB_WRONG_DB_NAME;
@ -1011,7 +1011,7 @@ int ObSQLUtils::check_and_convert_db_name(const ObCollationType cs_type, const b
} }
ObString last_name(name_len, name_str); ObString last_name(name_len, name_str);
if (!perserve_lettercase) { if (!preserve_lettercase) {
ObCharset::casedn(CS_TYPE_UTF8MB4_BIN, last_name); ObCharset::casedn(CS_TYPE_UTF8MB4_BIN, last_name);
} }
if (OB_ERR_WRONG_IDENT_NAME == (ret = check_ident_name(cs_type, last_name, check_for_path_chars, if (OB_ERR_WRONG_IDENT_NAME == (ret = check_ident_name(cs_type, last_name, check_for_path_chars,
@ -1056,7 +1056,7 @@ int ObSQLUtils::cvt_db_name_to_org(share::schema::ObSchemaGetterGuard &schema_gu
} }
int ObSQLUtils::check_and_convert_table_name(const ObCollationType cs_type, int ObSQLUtils::check_and_convert_table_name(const ObCollationType cs_type,
const bool perserve_lettercase, const bool preserve_lettercase,
ObString &name, ObString &name,
const stmt::StmtType stmt_type, const stmt::StmtType stmt_type,
const bool is_index_table) const bool is_index_table)
@ -1090,7 +1090,7 @@ int ObSQLUtils::check_and_convert_table_name(const ObCollationType cs_type,
} else { } else {
char origin_name[OB_MAX_USER_TABLE_NAME_LENGTH_ORACLE * OB_MAX_CHAR_LEN + 1] = {'\0'}; char origin_name[OB_MAX_USER_TABLE_NAME_LENGTH_ORACLE * OB_MAX_CHAR_LEN + 1] = {'\0'};
MEMCPY(origin_name, name_str, name_len); MEMCPY(origin_name, name_str, name_len);
if (!perserve_lettercase) { if (!preserve_lettercase) {
ObCharset::casedn(CS_TYPE_UTF8MB4_GENERAL_CI, name); ObCharset::casedn(CS_TYPE_UTF8MB4_GENERAL_CI, name);
} }
bool check_for_path_chars = false; bool check_for_path_chars = false;
@ -1124,9 +1124,9 @@ int ObSQLUtils::check_and_convert_table_name(const ObCollationType cs_type,
int ObSQLUtils::check_and_convert_context_namespace(const common::ObCollationType cs_type, int ObSQLUtils::check_and_convert_context_namespace(const common::ObCollationType cs_type,
common::ObString &name) common::ObString &name)
{ {
bool perserve_lettercase = true; bool preserve_lettercase = true;
stmt::StmtType type = stmt::T_CREATE_CONTEXT; stmt::StmtType type = stmt::T_CREATE_CONTEXT;
return check_and_convert_table_name(cs_type, perserve_lettercase, name, type); return check_and_convert_table_name(cs_type, preserve_lettercase, name, type);
} }
int ObSQLUtils::check_index_name(const ObCollationType cs_type, ObString &name) int ObSQLUtils::check_index_name(const ObCollationType cs_type, ObString &name)

8
src/sql/ob_sql_utils.h
View File

@ -141,7 +141,7 @@ public:
* and a partition func. * and a partition func.
* *
* The range array is assumed to only contain single_value ranges and * The range array is assumed to only contain single_value ranges and
* the partiton_ids will contain all the resulted partition ids without * the partition_ids will contain all the resulted partition ids without
* duplicates. * duplicates.
*/ */
static int calc_partition_ids(const common::ObIArray<common::ObNewRange*> &ranges, static int calc_partition_ids(const common::ObIArray<common::ObNewRange*> &ranges,
@ -293,13 +293,13 @@ public:
ObObj &result); ObObj &result);
static void destruct_default_expr_context(ObExprCtx &expr_ctx); static void destruct_default_expr_context(ObExprCtx &expr_ctx);
static int64_t get_usec(); static int64_t get_usec();
static int check_and_convert_db_name(const common::ObCollationType cs_type, const bool perserver_lettercase, static int check_and_convert_db_name(const common::ObCollationType cs_type, const bool preserve_lettercase,
common::ObString &name); common::ObString &name);
static int cvt_db_name_to_org(share::schema::ObSchemaGetterGuard &schema_guard, static int cvt_db_name_to_org(share::schema::ObSchemaGetterGuard &schema_guard,
const ObSQLSessionInfo *session, const ObSQLSessionInfo *session,
common::ObString &name); common::ObString &name);
static int check_and_convert_table_name(const common::ObCollationType cs_type, static int check_and_convert_table_name(const common::ObCollationType cs_type,
const bool perserve_lettercase, const bool preserve_lettercase,
common::ObString &name, common::ObString &name,
const stmt::StmtType stmt_type = stmt::T_NONE, const stmt::StmtType stmt_type = stmt::T_NONE,
const bool is_index_table = false); const bool is_index_table = false);
@ -561,7 +561,7 @@ public:
* So, timestamp between servers can be vary large. * So, timestamp between servers can be vary large.
* A sql executed across servers needs to be corrected * A sql executed across servers needs to be corrected
* according to the THIS_WORKER.get_ntp_offset(), * according to the THIS_WORKER.get_ntp_offset(),
* That is the time correctly set by the processer of the RPC * That is the time correctly set by the processor of the RPC
------------------------*/ ------------------------*/
static void adjust_time_by_ntp_offset(int64_t &dst_timeout_ts); static void adjust_time_by_ntp_offset(int64_t &dst_timeout_ts);
private: private: