reformat source code
according to code styles, 'AccessModifierOffset' should be -2.
This commit is contained in:
@ -91,7 +91,7 @@ struct ObHiddenColumnItem {
|
||||
};
|
||||
|
||||
class ObSQLUtils {
|
||||
public:
|
||||
public:
|
||||
const static int64_t WITHOUT_FUNC_REGEXP = 1;
|
||||
const static int64_t WITHOUT_FUNC_ADDR_TO_PARTITION_ID = 2;
|
||||
const static int64_t OB_MYSQL50_TABLE_NAME_PREFIX_LENGTH = 9;
|
||||
@ -332,7 +332,7 @@ class ObSQLUtils {
|
||||
static int print_identifier(char* buf, const int64_t buf_len, int64_t& pos,
|
||||
common::ObCollationType connection_collation, const common::ObString& identifier_name);
|
||||
|
||||
private:
|
||||
private:
|
||||
static int check_ident_name(const common::ObCollationType cs_type, common::ObString& name,
|
||||
const bool check_for_path_char, const int64_t max_ident_len);
|
||||
static bool check_mysql50_prefix(common::ObString& db_name);
|
||||
@ -379,7 +379,7 @@ struct ObAcsIndexInfo {
|
||||
};
|
||||
|
||||
class RelExprCheckerBase {
|
||||
public:
|
||||
public:
|
||||
const static int32_t FIELD_LIST_SCOPE;
|
||||
const static int32_t WHERE_SCOPE;
|
||||
const static int32_t GROUP_SCOPE;
|
||||
@ -401,7 +401,7 @@ class RelExprCheckerBase {
|
||||
const static int32_t JOIN_CONDITION_SCOPE;
|
||||
const static int32_t EXTRA_OUTPUT_SCOPE;
|
||||
|
||||
public:
|
||||
public:
|
||||
RelExprCheckerBase() : duplicated_checker_(), ignore_scope_(0)
|
||||
{}
|
||||
RelExprCheckerBase(int32_t ignore_scope) : duplicated_checker_(), ignore_scope_(ignore_scope)
|
||||
@ -418,14 +418,14 @@ class RelExprCheckerBase {
|
||||
virtual int add_expr(ObRawExpr*& expr) = 0;
|
||||
int add_exprs(common::ObIArray<ObRawExpr*>& exprs);
|
||||
|
||||
protected:
|
||||
protected:
|
||||
static const int64_t CHECKER_BUCKET_NUM = 1000;
|
||||
common::hash::ObHashSet<uint64_t, common::hash::NoPthreadDefendMode> duplicated_checker_;
|
||||
int32_t ignore_scope_;
|
||||
};
|
||||
|
||||
class RelExprChecker : public RelExprCheckerBase {
|
||||
public:
|
||||
public:
|
||||
RelExprChecker(common::ObIArray<ObRawExpr*>& rel_array) : RelExprCheckerBase(), rel_array_(rel_array)
|
||||
{}
|
||||
|
||||
@ -436,25 +436,25 @@ class RelExprChecker : public RelExprCheckerBase {
|
||||
{}
|
||||
int add_expr(ObRawExpr*& expr);
|
||||
|
||||
private:
|
||||
private:
|
||||
common::ObIArray<ObRawExpr*>& rel_array_;
|
||||
};
|
||||
|
||||
class FastRelExprChecker : public RelExprCheckerBase {
|
||||
public:
|
||||
public:
|
||||
FastRelExprChecker(common::ObIArray<ObRawExpr*>& rel_array);
|
||||
FastRelExprChecker(common::ObIArray<ObRawExpr*>& rel_array, int32_t ignore_scope);
|
||||
virtual ~FastRelExprChecker();
|
||||
int add_expr(ObRawExpr*& expr);
|
||||
int dedup();
|
||||
|
||||
private:
|
||||
private:
|
||||
common::ObIArray<ObRawExpr*>& rel_array_;
|
||||
int64_t init_size_;
|
||||
};
|
||||
|
||||
class RelExprPointerChecker : public RelExprCheckerBase {
|
||||
public:
|
||||
public:
|
||||
RelExprPointerChecker(common::ObIArray<ObRawExprPointer>& rel_array)
|
||||
: RelExprCheckerBase(), rel_array_(rel_array), expr_id_map_()
|
||||
{}
|
||||
@ -464,14 +464,15 @@ class RelExprPointerChecker : public RelExprCheckerBase {
|
||||
virtual ~RelExprPointerChecker()
|
||||
{}
|
||||
virtual int init(int64_t bucket_num = CHECKER_BUCKET_NUM) override;
|
||||
int add_expr(ObRawExpr *&expr) override;
|
||||
int add_expr(ObRawExpr*& expr) override;
|
||||
|
||||
private:
|
||||
common::ObIArray<ObRawExprPointer> &rel_array_;
|
||||
common::ObIArray<ObRawExprPointer>& rel_array_;
|
||||
common::hash::ObHashMap<uint64_t, uint64_t, common::hash::NoPthreadDefendMode> expr_id_map_;
|
||||
};
|
||||
|
||||
class AllExprPointerCollector : public RelExprCheckerBase {
|
||||
public:
|
||||
public:
|
||||
AllExprPointerCollector(common::ObIArray<ObRawExpr**>& rel_array) : RelExprCheckerBase(), rel_array_(rel_array)
|
||||
{}
|
||||
AllExprPointerCollector(common::ObIArray<ObRawExpr**>& rel_array, int32_t ignore_scope)
|
||||
@ -481,7 +482,7 @@ class AllExprPointerCollector : public RelExprCheckerBase {
|
||||
{}
|
||||
int add_expr(ObRawExpr*& expr);
|
||||
|
||||
private:
|
||||
private:
|
||||
common::ObIArray<ObRawExpr**>& rel_array_;
|
||||
};
|
||||
|
||||
@ -509,7 +510,7 @@ struct ObSqlTraits {
|
||||
|
||||
template <typename ValueType>
|
||||
class ObValueChecker {
|
||||
public:
|
||||
public:
|
||||
ObValueChecker() = delete;
|
||||
|
||||
constexpr ObValueChecker(ValueType min_value, ValueType max_value, int err_ret_code)
|
||||
@ -528,7 +529,7 @@ class ObValueChecker {
|
||||
|
||||
TO_STRING_KV(K_(min_value), K_(max_value), K_(err_ret_code));
|
||||
|
||||
private:
|
||||
private:
|
||||
ValueType min_value_;
|
||||
ValueType max_value_;
|
||||
int err_ret_code_;
|
||||
@ -536,7 +537,7 @@ class ObValueChecker {
|
||||
|
||||
template <typename ValueType>
|
||||
class ObPointerChecker {
|
||||
public:
|
||||
public:
|
||||
ObPointerChecker() = delete;
|
||||
|
||||
constexpr ObPointerChecker(int err_ret_code) : err_ret_code_(err_ret_code)
|
||||
@ -549,7 +550,7 @@ class ObPointerChecker {
|
||||
|
||||
TO_STRING_KV(K_(err_ret_code));
|
||||
|
||||
private:
|
||||
private:
|
||||
int err_ret_code_;
|
||||
};
|
||||
|
||||
@ -559,7 +560,7 @@ class ObEnumBitSet {
|
||||
static_assert(std::is_enum<T>::value, "typename must be a enum type");
|
||||
static_assert(static_cast<int>(T::MAX_VALUE) < MAX_ENUM_VALUE, "Please add MAX_VALUE in enum class");
|
||||
|
||||
public:
|
||||
public:
|
||||
inline ObEnumBitSet() : flag_(0)
|
||||
{}
|
||||
inline ObEnumBitSet(T value)
|
||||
@ -602,7 +603,7 @@ class ObEnumBitSet {
|
||||
}
|
||||
TO_STRING_KV(K_(flag));
|
||||
|
||||
private:
|
||||
private:
|
||||
inline uint64_t bit2flag(int bit) const
|
||||
{
|
||||
uint64_t v = 1;
|
||||
@ -617,7 +618,7 @@ OB_SERIALIZE_MEMBER_TEMP(template <typename T>, ObEnumBitSet<T>, flag_);
|
||||
struct ObImplicitCursorInfo {
|
||||
OB_UNIS_VERSION(1);
|
||||
|
||||
public:
|
||||
public:
|
||||
ObImplicitCursorInfo()
|
||||
: stmt_id_(common::OB_INVALID_INDEX),
|
||||
affected_rows_(0),
|
||||
@ -641,7 +642,7 @@ struct ObImplicitCursorInfo {
|
||||
struct ObParamPosIdx {
|
||||
OB_UNIS_VERSION_V(1);
|
||||
|
||||
public:
|
||||
public:
|
||||
ObParamPosIdx() : pos_(0), idx_(0)
|
||||
{}
|
||||
ObParamPosIdx(int32_t pos, int32_t idx) : pos_(pos), idx_(idx)
|
||||
@ -654,7 +655,7 @@ struct ObParamPosIdx {
|
||||
};
|
||||
|
||||
class ObVirtualTableResultConverter {
|
||||
public:
|
||||
public:
|
||||
ObVirtualTableResultConverter()
|
||||
: key_alloc_(nullptr),
|
||||
key_cast_ctx_(),
|
||||
@ -698,7 +699,7 @@ class ObVirtualTableResultConverter {
|
||||
ObEvalCtx& eval_ctx, const common::ObIArray<ObExpr*>& src_exprs, const common::ObIArray<ObExpr*>& dst_exprs);
|
||||
int convert_column(ObObj& obj, uint64_t column_id, uint64_t idx);
|
||||
|
||||
private:
|
||||
private:
|
||||
int process_tenant_id(const ObIArray<bool>* extract_tenant_ids, const int64_t nth_col, ObIAllocator& allocator,
|
||||
bool decode, ObObj& obj);
|
||||
int convert_key(const ObRowkey& src, ObRowkey& dst, bool is_start_key, int64_t pos);
|
||||
@ -707,7 +708,7 @@ class ObVirtualTableResultConverter {
|
||||
int init_output_row(int64_t cell_cnt);
|
||||
int get_need_convert_key_ranges_pos(ObNewRange& key_range, int64_t& pos);
|
||||
|
||||
public:
|
||||
public:
|
||||
// the memory that allocated must be reset by caller
|
||||
ObIAllocator* key_alloc_;
|
||||
ObCastCtx key_cast_ctx_;
|
||||
@ -735,17 +736,17 @@ class ObVirtualTableResultConverter {
|
||||
};
|
||||
|
||||
class ObLinkStmtParam {
|
||||
public:
|
||||
public:
|
||||
static int write(char* buf, int64_t buf_len, int64_t& pos, int64_t param_idx);
|
||||
static int read_next(const char* buf, int64_t buf_len, int64_t& pos, int64_t& param_idx);
|
||||
static int64_t get_param_len();
|
||||
|
||||
private:
|
||||
private:
|
||||
static const int64_t PARAM_LEN;
|
||||
};
|
||||
|
||||
class ObSqlFatalErrExtraInfoGuard : public common::ObFatalErrExtraInfoGuard {
|
||||
public:
|
||||
public:
|
||||
ObSqlFatalErrExtraInfoGuard()
|
||||
{
|
||||
reset();
|
||||
@ -776,7 +777,7 @@ class ObSqlFatalErrExtraInfoGuard : public common::ObFatalErrExtraInfoGuard {
|
||||
}
|
||||
DECLARE_TO_STRING;
|
||||
|
||||
private:
|
||||
private:
|
||||
uint64_t tenant_id_;
|
||||
common::ObString cur_sql_;
|
||||
const ObPhysicalPlan* plan_;
|
||||
|
||||
Reference in New Issue
Block a user