diff --git a/src/sql/parser/ob_parser.h b/src/sql/parser/ob_parser.h index 666fd739c9..bed327b6b2 100644 --- a/src/sql/parser/ob_parser.h +++ b/src/sql/parser/ob_parser.h @@ -77,7 +77,7 @@ public: // situation we will try find ';' delimiter to parser part of string in case of save memory, // but this maybe parser error and throw error info. However, we will still try parser remain // string when parse part of string failed, if we throw parse part error info, maybe will let - // someone misunderstand have bug, So, we introduce this mark to decide to throw parser erorr. + // someone misunderstand have bug, So, we introduce this mark to decide to throw parser error. // eg: select '123;' from dual; select '123' from dual; int parse_sql(const common::ObString &stmt, ParseResult &parse_result, diff --git a/src/sql/parser/parse_malloc.cpp b/src/sql/parser/parse_malloc.cpp index bb817a188f..ba334d0a88 100644 --- a/src/sql/parser/parse_malloc.cpp +++ b/src/sql/parser/parse_malloc.cpp @@ -33,7 +33,7 @@ void *malloc_parentheses_info(const size_t nbyte, void *malloc_pool) return ptr; } -// get memory from the thread obStringBuf, and not release untill thread quits +// get memory from the thread obStringBuf, and not release until thread quits void *parse_malloc(const size_t nbyte, void *malloc_pool) { void *ptr = NULL; diff --git a/src/sql/parser/sql_parser_base.h b/src/sql/parser/sql_parser_base.h index 62881775b4..afb101c801 100644 --- a/src/sql/parser/sql_parser_base.h +++ b/src/sql/parser/sql_parser_base.h @@ -240,7 +240,7 @@ do { setup_token_pos_info(node, word_start - 1, word_end - word_start + 1); \ } while (0) -//oralce下生成非保留关键字结点请使用该宏,区别于mysql的是做了大写的转换 +//oracle下生成非保留关键字结点请使用该宏,区别于mysql的是做了大写的转换 #define get_oracle_non_reserved_node(node, malloc_pool, expr_start, expr_end) \ do { \ malloc_terminal_node(node, malloc_pool, T_IDENT); \ diff --git a/src/sql/rewrite/ob_query_range.cpp b/src/sql/rewrite/ob_query_range.cpp index 4d05fad9ad..3ec825799b 100644 --- a/src/sql/rewrite/ob_query_range.cpp +++ b/src/sql/rewrite/ob_query_range.cpp @@ -4545,7 +4545,7 @@ int ObQueryRange::do_row_gt_and(ObKeyPart *l_gt, ObKeyPart *r_gt, ObKeyPart *&r // AND single key part (itself) and items in item_next_ list -// Each item in item_next_ list must be unkown item untill physical plan open +// Each item in item_next_ list must be unkown item until physical plan open // // E.g. // (A1 and ?1 and ?2 and ... and ?m) and (A2 and ?I and ?II and ... and ?n) diff --git a/src/sql/rewrite/ob_query_range.h b/src/sql/rewrite/ob_query_range.h index edc9e4a79f..c6a160aee7 100644 --- a/src/sql/rewrite/ob_query_range.h +++ b/src/sql/rewrite/ob_query_range.h @@ -406,7 +406,7 @@ public: const common::ObDataTypeCastParams &dtc_params); // get_tablet_ranges gets range of a index. - // This function can not be used untill physical plan is opened. + // This function can not be used until physical plan is opened. virtual int get_tablet_ranges(ObQueryRangeArray &ranges, bool &all_single_value_ranges, diff --git a/src/storage/ls/ob_ls_tablet_service.cpp b/src/storage/ls/ob_ls_tablet_service.cpp index d84036a1f5..02765eb4fe 100755 --- a/src/storage/ls/ob_ls_tablet_service.cpp +++ b/src/storage/ls/ob_ls_tablet_service.cpp @@ -6180,7 +6180,7 @@ int ObLSTabletService::check_need_rollback_in_transfer_for_4377_(const transacti // read from origin tablet, if there's inconsistent, it should throw 4377 error // CASE 2.2: transfer_scn_ is valid, the transfer_scn_ is backfilled, it means that // tablet has started to transfer out. If it's the first transfer, we should - // throw 4377 erorr, otherwise we should compare the transfer_scn_ with the tx_scn, + // throw 4377 error, otherwise we should compare the transfer_scn_ with the tx_scn, // and decide to rollback the transaction or throw 4377 error. // However, we can not be sure about whether this transfer out is the first transfer or not. // So we consider all the transfer out status as not the first transfer here, to avoid