reformat source code

according to code styles, 'AccessModifierOffset' should be -2.

src/sql/resolver/dcl/ob_alter_user_primary_zone_resolver.h

@@ -20,7 +20,7 @@
 namespace oceanbase {
 namespace sql {
 class ObAlterUserPrimaryZoneResolver : public ObDCLResolver {
-  public:
+public:
   explicit ObAlterUserPrimaryZoneResolver(ObResolverParams& params);
   virtual ~ObAlterUserPrimaryZoneResolver();
   virtual int resolve(const ParseNode& parse_tree);

src/sql/resolver/dcl/ob_alter_user_primary_zone_stmt.h

@@ -18,7 +18,7 @@
 namespace oceanbase {
 namespace sql {
 class ObAlterUserPrimaryZoneStmt : public ObDDLStmt {
-  public:
+public:
   ObAlterUserPrimaryZoneStmt();
   explicit ObAlterUserPrimaryZoneStmt(common::ObIAllocator* name_pool);
   virtual ~ObAlterUserPrimaryZoneStmt();
@@ -44,11 +44,11 @@ class ObAlterUserPrimaryZoneStmt : public ObDDLStmt {
   }
   TO_STRING_KV(K_(stmt_type), K_(arg));
 
-  public:
+public:
   // data members
   obrpc::ObAlterDatabaseArg arg_;
 
-  private:
+private:
   DISALLOW_COPY_AND_ASSIGN(ObAlterUserPrimaryZoneStmt);
 };
 }  // end namespace sql

src/sql/resolver/dcl/ob_alter_user_profile_resolver.h

@@ -20,12 +20,12 @@
 namespace oceanbase {
 namespace sql {
 class ObAlterUserProfileResolver : public ObDCLResolver {
-  public:
+public:
   explicit ObAlterUserProfileResolver(ObResolverParams& params);
   virtual ~ObAlterUserProfileResolver();
   virtual int resolve(const ParseNode& parse_tree);
 
-  private:
+private:
   int resolve_set_role(const ParseNode& parse_tree);
   int resolve_default_role(const ParseNode& parse_tree);
   int resolve_default_role_clause(const ParseNode* parse_tree, obrpc::ObAlterUserProfileArg& arg,

src/sql/resolver/dcl/ob_alter_user_profile_stmt.h

@@ -17,7 +17,7 @@
 namespace oceanbase {
 namespace sql {
 class ObAlterUserProfileStmt : public ObDDLStmt {
-  public:
+public:
   ObAlterUserProfileStmt();
   explicit ObAlterUserProfileStmt(common::ObIAllocator* name_pool);
   virtual ~ObAlterUserProfileStmt();
@@ -37,12 +37,12 @@ class ObAlterUserProfileStmt : public ObDDLStmt {
     return set_role_flag_;
   }
 
-  private:
+private:
   // data members
   obrpc::ObAlterUserProfileArg arg_;
   int set_role_flag_;
 
-  private:
+private:
   DISALLOW_COPY_AND_ASSIGN(ObAlterUserProfileStmt);
 };
 }  // end namespace sql

src/sql/resolver/dcl/ob_create_role_resolver.h

@@ -17,13 +17,13 @@
 namespace oceanbase {
 namespace sql {
 class ObCreateRoleResolver : public ObDCLResolver {
-  public:
+public:
   explicit ObCreateRoleResolver(ObResolverParams& params);
   virtual ~ObCreateRoleResolver();
 
   virtual int resolve(const ParseNode& parse_tree);
 
-  private:
+private:
   // disallow copy
   DISALLOW_COPY_AND_ASSIGN(ObCreateRoleResolver);
 };

src/sql/resolver/dcl/ob_create_role_stmt.h

@@ -20,7 +20,7 @@
 namespace oceanbase {
 namespace sql {
 class ObCreateRoleStmt : public ObDDLStmt {
-  public:
+public:
   explicit ObCreateRoleStmt(common::ObIAllocator* name_pool);
   ObCreateRoleStmt();
   virtual ~ObCreateRoleStmt();
@@ -59,14 +59,14 @@ class ObCreateRoleStmt : public ObDDLStmt {
   }
   DECLARE_VIRTUAL_TO_STRING;
 
-  private:
+private:
   // data members
   uint64_t tenant_id_;
   common::ObString role_name_;
   common::ObString password_;
   obrpc::ObCreateRoleArg create_role_arg_;
 
-  private:
+private:
   DISALLOW_COPY_AND_ASSIGN(ObCreateRoleStmt);
 };
 }  // end namespace sql

src/sql/resolver/dcl/ob_create_user_resolver.h

@@ -17,13 +17,13 @@
 namespace oceanbase {
 namespace sql {
 class ObCreateUserResolver : public ObDCLResolver {
-  public:
+public:
   explicit ObCreateUserResolver(ObResolverParams& params);
   virtual ~ObCreateUserResolver();
 
   virtual int resolve(const ParseNode& parse_tree);
 
-  private:
+private:
   // disallow copy
   DISALLOW_COPY_AND_ASSIGN(ObCreateUserResolver);
 };

src/sql/resolver/dcl/ob_create_user_stmt.h

@@ -20,7 +20,7 @@
 namespace oceanbase {
 namespace sql {
 class ObCreateUserStmt : public ObDDLStmt {
-  public:
+public:
   explicit ObCreateUserStmt(common::ObIAllocator* name_pool);
   ObCreateUserStmt();
   virtual ~ObCreateUserStmt();
@@ -76,7 +76,7 @@ class ObCreateUserStmt : public ObDDLStmt {
   }
   DECLARE_VIRTUAL_TO_STRING;
 
-  private:
+private:
   // data members
   uint64_t tenant_id_;
   common::ObStrings users_;  // (user1, host1, pass1, need_enc1;
@@ -87,7 +87,7 @@ class ObCreateUserStmt : public ObDDLStmt {
   uint64_t profile_id_;  // only used in oracle mode
   obrpc::ObCreateUserArg create_user_arg_;
 
-  private:
+private:
   DISALLOW_COPY_AND_ASSIGN(ObCreateUserStmt);
 };
 }  // end namespace sql

src/sql/resolver/dcl/ob_dcl_resolver.h

@@ -17,13 +17,13 @@
 namespace oceanbase {
 namespace sql {
 class ObDCLResolver : public ObStmtResolver {
-  public:
+public:
   explicit ObDCLResolver(ObResolverParams& params) : ObStmtResolver(params)
   {}
   virtual ~ObDCLResolver()
   {}
 
-  protected:
+protected:
   int check_and_convert_name(common::ObString& db, common::ObString& table);
   int check_password_strength(common::ObString& password, common::ObString& user_name);
   int check_number_count(common::ObString& password, const int64_t& number_count);
@@ -36,7 +36,7 @@ class ObDCLResolver : public ObStmtResolver {
   enum ObPasswordPolicy { LOW = 0, MEDIUM };
   static const char password_mask_ = '*';
 
-  private:
+private:
   DISALLOW_COPY_AND_ASSIGN(ObDCLResolver);
 };
 }  // namespace sql

src/sql/resolver/dcl/ob_dcl_stmt.h

@@ -18,7 +18,7 @@
 namespace oceanbase {
 namespace sql {
 class ObDCLStmt : public ObStmt, public ObICmd {
-  public:
+public:
   ObDCLStmt(common::ObIAllocator* name_pool, stmt::StmtType type) : ObStmt(name_pool, type)
   {}
   explicit ObDCLStmt(stmt::StmtType type) : ObStmt(type)
@@ -34,7 +34,7 @@ class ObDCLStmt : public ObStmt, public ObICmd {
     return true;
   }
 
-  private:
+private:
   DISALLOW_COPY_AND_ASSIGN(ObDCLStmt);
 };
 }  // namespace sql

src/sql/resolver/dcl/ob_drop_role_resolver.h

@@ -18,13 +18,13 @@
 namespace oceanbase {
 namespace sql {
 class ObDropRoleResolver : public ObDCLResolver {
-  public:
+public:
   explicit ObDropRoleResolver(ObResolverParams& params);
   virtual ~ObDropRoleResolver();
 
   virtual int resolve(const ParseNode& parse_tree);
 
-  private:
+private:
   // disallow copy
   DISALLOW_COPY_AND_ASSIGN(ObDropRoleResolver);
 };

src/sql/resolver/dcl/ob_drop_role_stmt.h

@@ -20,7 +20,7 @@
 namespace oceanbase {
 namespace sql {
 class ObDropRoleStmt : public ObDDLStmt {
-  public:
+public:
   explicit ObDropRoleStmt(common::ObIAllocator* name_pool);
   ObDropRoleStmt();
   virtual ~ObDropRoleStmt();
@@ -51,13 +51,13 @@ class ObDropRoleStmt : public ObDDLStmt {
   }
   DECLARE_VIRTUAL_TO_STRING;
 
-  private:
+private:
   // data members
   uint64_t tenant_id_;
   common::ObString role_name_;
   obrpc::ObDropUserArg drop_role_arg_;
 
-  private:
+private:
   DISALLOW_COPY_AND_ASSIGN(ObDropRoleStmt);
 };
 }  // end namespace sql

src/sql/resolver/dcl/ob_drop_user_resolver.h

@@ -17,13 +17,13 @@
 namespace oceanbase {
 namespace sql {
 class ObDropUserResolver : public ObDCLResolver {
-  public:
+public:
   explicit ObDropUserResolver(ObResolverParams& params);
   virtual ~ObDropUserResolver();
 
   virtual int resolve(const ParseNode& parse_tree);
 
-  private:
+private:
   // disallow copy
   DISALLOW_COPY_AND_ASSIGN(ObDropUserResolver);
 };

src/sql/resolver/dcl/ob_drop_user_stmt.h

@@ -19,7 +19,7 @@
 namespace oceanbase {
 namespace sql {
 class ObDropUserStmt : public ObDDLStmt {
-  public:
+public:
   explicit ObDropUserStmt(common::ObIAllocator* name_pool);
   ObDropUserStmt();
   virtual ~ObDropUserStmt();
@@ -46,12 +46,12 @@ class ObDropUserStmt : public ObDDLStmt {
   }
   DECLARE_VIRTUAL_TO_STRING;
 
-  private:
+private:
   // data members
   common::ObStrings users_;  // user1,host1; usr2,host2;...
   uint64_t tenant_id_;
   obrpc::ObDropUserArg drop_user_arg_;  // for returning exec_tenant_id_
-  private:
+private:
   DISALLOW_COPY_AND_ASSIGN(ObDropUserStmt);
 };
 }  // end namespace sql

src/sql/resolver/dcl/ob_grant_resolver.h

@@ -19,7 +19,7 @@
 namespace oceanbase {
 namespace sql {
 class ObGrantResolver : public ObDCLResolver {
-  public:
+public:
   explicit ObGrantResolver(ObResolverParams& params);
   virtual ~ObGrantResolver();
 
@@ -60,7 +60,7 @@ class ObGrantResolver : public ObDCLResolver {
       ObIArray<ObString>& user_name_array, const ObGrantStmt* grant_stmt, const ObString& user_name,
       const ObString& host_name);
 
-  private:
+private:
   int build_table_priv_arary_for_all(
       ObGrantStmt* grant_stmt, share::ObRawObjPrivArray& table_priv_array, bool is_owner);
   int check_obj_priv_valid(ObGrantStmt* grant_stmt, share::ObRawObjPriv ora_obj_priv);
@@ -74,7 +74,7 @@ class ObGrantResolver : public ObDCLResolver {
   int check_duplicated_privs_with_info_ora(const ParseNode* privs_node, bool& duplicated_privs, bool& priv_has_execute);
   static int trans_ora_sys_priv_to_obj(ParseNode* priv_type_node);
 
-  private:
+private:
   // disallow copy
   DISALLOW_COPY_AND_ASSIGN(ObGrantResolver);
 };

src/sql/resolver/dcl/ob_grant_stmt.h

@@ -23,7 +23,7 @@ namespace oceanbase {
 namespace sql {
 
 class ObGrantStmt : public ObDDLStmt {
-  public:
+public:
   explicit ObGrantStmt(common::ObIAllocator* name_pool);
   ObGrantStmt();
   virtual ~ObGrantStmt();
@@ -176,7 +176,7 @@ class ObGrantStmt : public ObDDLStmt {
   }
   DECLARE_VIRTUAL_TO_STRING;
 
-  private:
+private:
   // data members
   ObPrivSet priv_set_;
   share::schema::ObPrivLevel grant_level_;
@@ -201,7 +201,7 @@ class ObGrantStmt : public ObDDLStmt {
   ObSEArray<uint64_t, 4> ref_col_ids_;
   ObSelectStmt* ref_query_;  // when grant, check table,view privs.
 
-  private:
+private:
   DISALLOW_COPY_AND_ASSIGN(ObGrantStmt);
 };
 }  // end namespace sql

src/sql/resolver/dcl/ob_lock_user_resolver.h

@@ -17,12 +17,12 @@
 namespace oceanbase {
 namespace sql {
 class ObLockUserResolver : public ObDCLResolver {
-  public:
+public:
   explicit ObLockUserResolver(ObResolverParams& params);
   virtual ~ObLockUserResolver();
   virtual int resolve(const ParseNode& parse_tree);
 
-  private:
+private:
   // disallow copy
   DISALLOW_COPY_AND_ASSIGN(ObLockUserResolver);
 };

src/sql/resolver/dcl/ob_lock_user_stmt.h

@@ -17,7 +17,7 @@
 namespace oceanbase {
 namespace sql {
 class ObLockUserStmt : public ObDDLStmt {
-  public:
+public:
   ObLockUserStmt();
   explicit ObLockUserStmt(common::ObIAllocator* name_pool);
   virtual ~ObLockUserStmt();
@@ -53,13 +53,13 @@ class ObLockUserStmt : public ObDDLStmt {
     return true;
   }
 
-  private:
+private:
   // data members
   uint64_t tenant_id_;
   common::ObStrings user_;  // user1,host1; usr2,host2;...
   bool locked_;
   obrpc::ObLockUserArg lock_user_arg_;  // for returning exec_tenant_id_
-  private:
+private:
   DISALLOW_COPY_AND_ASSIGN(ObLockUserStmt);
 };
 }  // end namespace sql

src/sql/resolver/dcl/ob_rename_user_resolver.h

@@ -17,13 +17,13 @@
 namespace oceanbase {
 namespace sql {
 class ObRenameUserResolver : public ObDCLResolver {
-  public:
+public:
   explicit ObRenameUserResolver(ObResolverParams& params);
   virtual ~ObRenameUserResolver();
 
   virtual int resolve(const ParseNode& parse_tree);
 
-  private:
+private:
   // disallow copy
   DISALLOW_COPY_AND_ASSIGN(ObRenameUserResolver);
 };

src/sql/resolver/dcl/ob_rename_user_stmt.h

@@ -17,7 +17,7 @@
 namespace oceanbase {
 namespace sql {
 class ObRenameUserStmt : public ObDDLStmt {
-  public:
+public:
   explicit ObRenameUserStmt(common::ObIAllocator* name_pool);
   ObRenameUserStmt();
   virtual ~ObRenameUserStmt();
@@ -42,14 +42,14 @@ class ObRenameUserStmt : public ObDDLStmt {
   }
   DECLARE_VIRTUAL_TO_STRING;
 
-  private:
+private:
   // data members
   common::ObStrings rename_infos_;  // (from1_user, from1_host, to1_user, to1_host), (from2_user, from2_host, to2_user,
                                     // to2_host)
   uint64_t tenant_id_;
   obrpc::ObRenameUserArg rename_user_arg_;
 
-  private:
+private:
   DISALLOW_COPY_AND_ASSIGN(ObRenameUserStmt);
 };
 }  // end namespace sql

src/sql/resolver/dcl/ob_revoke_resolver.h

@@ -18,7 +18,7 @@
 namespace oceanbase {
 namespace sql {
 class ObRevokeResolver : public ObDCLResolver {
-  private:
+private:
   int resolve_revoke_role_inner(const ParseNode* revoke_role, ObRevokeStmt* revoke_stmt);
   int resolve_revoke_sysprivs_inner(const ParseNode* revoke_role, ObRevokeStmt* revoke_stmt);
   int resolve_mysql(const ParseNode& parse_tree);
@@ -27,13 +27,13 @@ class ObRevokeResolver : public ObDCLResolver {
       share::ObRawObjPrivArray& obj_priv_array, bool& revoke_all_ora);
   static int trans_ora_sys_priv_to_obj(ParseNode* priv_type_node);
 
-  public:
+public:
   explicit ObRevokeResolver(ObResolverParams& params);
   virtual ~ObRevokeResolver();
 
   virtual int resolve(const ParseNode& parse_tree);
 
-  private:
+private:
   // disallow copy
   DISALLOW_COPY_AND_ASSIGN(ObRevokeResolver);
 };

src/sql/resolver/dcl/ob_revoke_stmt.h

@@ -21,7 +21,7 @@ namespace oceanbase {
 namespace sql {
 
 class ObRevokeStmt : public ObDDLStmt {
-  public:
+public:
   explicit ObRevokeStmt(common::ObIAllocator* name_pool);
   ObRevokeStmt();
   virtual ~ObRevokeStmt();
@@ -123,7 +123,7 @@ class ObRevokeStmt : public ObDDLStmt {
   }
   DECLARE_VIRTUAL_TO_STRING;
 
-  private:
+private:
   // data members
   ObPrivSet priv_set_;
   share::schema::ObPrivLevel grant_level_;
@@ -146,7 +146,7 @@ class ObRevokeStmt : public ObDDLStmt {
   uint64_t grantor_id_;
   bool revoke_all_ora_;
 
-  private:
+private:
   DISALLOW_COPY_AND_ASSIGN(ObRevokeStmt);
 };
 }  // end namespace sql

src/sql/resolver/dcl/ob_set_password_resolver.h

@@ -17,7 +17,7 @@
 namespace oceanbase {
 namespace sql {
 class ObSetPasswordResolver : public ObDCLResolver {
-  public:
+public:
   explicit ObSetPasswordResolver(ObResolverParams& params);
   virtual ~ObSetPasswordResolver();
 
@@ -27,11 +27,11 @@ class ObSetPasswordResolver : public ObDCLResolver {
 
   static bool is_valid_mysql41_passwd(const common::ObString& str);
 
-  private:
+private:
   int resolve_oracle_password_strength(
       common::ObString& user_name, common::ObString& hostname, common::ObString& password);
 
-  private:
+private:
   // disallow copy
   DISALLOW_COPY_AND_ASSIGN(ObSetPasswordResolver);
 };

src/sql/resolver/dcl/ob_set_password_stmt.h

@@ -17,7 +17,7 @@
 namespace oceanbase {
 namespace sql {
 class ObSetPasswordStmt : public ObDDLStmt {
-  public:
+public:
   explicit ObSetPasswordStmt(common::ObIAllocator* name_pool);
   ObSetPasswordStmt();
   virtual ~ObSetPasswordStmt();
@@ -63,7 +63,7 @@ class ObSetPasswordStmt : public ObDDLStmt {
   }
   DECLARE_VIRTUAL_TO_STRING;
 
-  private:
+private:
   // data members
   common::ObStrings user_pwd_;  // username1, hostname1, passwd1;
                                 // username2, hostname2, passwd2...
@@ -73,7 +73,7 @@ class ObSetPasswordStmt : public ObDDLStmt {
   bool for_current_user_;
   obrpc::ObSetPasswdArg set_password_arg_;
 
-  private:
+private:
   DISALLOW_COPY_AND_ASSIGN(ObSetPasswordStmt);
 };
 }  // end namespace sql