refactor: move default_role to user option

Author: flaneur2020

common/meta/types/src/user_info.rs

@@ -40,8 +40,6 @@ pub struct UserInfo {
 
     pub quota: UserQuota,
 
-    pub default_role: Option<String>,
-
     pub option: UserOption,
 }
 
@@ -55,7 +53,6 @@ impl UserInfo {
         UserInfo {
             name: name.to_string(),
             hostname: hostname.to_string(),
-            default_role: None,
             auth_info,
             grants,
             quota,
@@ -97,17 +94,45 @@ impl TryFrom<Vec<u8>> for UserInfo {
 #[serde(default)]
 pub struct UserOption {
     flags: BitFlags<UserOptionFlag>,
+
+    default_role: Option<String>,
 }
 
 impl UserOption {
     pub fn new(flags: BitFlags<UserOptionFlag>) -> Self {
-        Self { flags }
+        Self {
+            flags,
+            default_role: None,
+        }
+    }
+
+    pub fn empty() -> Self {
+        Default::default()
+    }
+
+    pub fn with_flags(mut self, flags: BitFlags<UserOptionFlag>) -> Self {
+        self.flags = flags;
+        self
+    }
+
+    pub fn with_default_role(mut self, default_role: Option<String>) -> Self {
+        self.default_role = default_role;
+        self
+    }
+
+    pub fn with_set_flag(mut self, flag: UserOptionFlag) -> Self {
+        self.flags.insert(flag);
+        self
     }
 
     pub fn flags(&self) -> &BitFlags<UserOptionFlag> {
         &self.flags
     }
 
+    pub fn default_role(&self) -> &Option<String> {
+        &self.default_role
+    }
+
     pub fn set_all_flag(&mut self) {
         self.flags = BitFlags::all();
     }

common/proto-conv/src/user_from_to_protobuf_impl.rs

@@ -81,20 +81,22 @@ impl FromToProto<pb::UserOption> for mt::UserOption {
     where Self: Sized {
         check_ver(p.ver, p.min_compatible)?;
 
-        let flags = BitFlags::<mt::UserOptionFlag, u64>::from_bits(p.flags);
-        match flags {
-            Ok(flags) => Ok(mt::UserOption::new(flags)),
-            Err(e) => Err(Incompatible {
+        let flags =
+            BitFlags::<mt::UserOptionFlag, u64>::from_bits(p.flags).map_err(|e| Incompatible {
                 reason: format!("UserOptionFlag error: {}", e),
-            }),
-        }
+            })?;
+
+        Ok(mt::UserOption::default()
+            .with_flags(flags)
+            .with_default_role(p.default_role))
     }
 
     fn to_pb(&self) -> Result<pb::UserOption, Incompatible> {
         Ok(pb::UserOption {
             ver: VER,
             min_compatible: MIN_COMPATIBLE_VER,
             flags: self.flags().bits(),
+            default_role: self.default_role().clone(),
         })
     }
 }
@@ -246,7 +248,6 @@ impl FromToProto<pb::UserInfo> for mt::UserInfo {
         Ok(mt::UserInfo {
             name: p.name.clone(),
             hostname: p.hostname.clone(),
-            default_role: p.default_role.clone(),
             auth_info: mt::AuthInfo::from_pb(p.auth_info.ok_or_else(|| Incompatible {
                 reason: "UserInfo.auth_info cannot be None".to_string(),
             })?)?,
@@ -268,7 +269,6 @@ impl FromToProto<pb::UserInfo> for mt::UserInfo {
             min_compatible: MIN_COMPATIBLE_VER,
             name: self.name.clone(),
             hostname: self.hostname.clone(),
-            default_role: self.default_role.clone(),
             auth_info: Some(mt::AuthInfo::to_pb(&self.auth_info)?),
             grants: Some(mt::UserGrantSet::to_pb(&self.grants)?),
             quota: Some(mt::UserQuota::to_pb(&self.quota)?),

common/proto-conv/tests/it/user_proto_conv.rs

@@ -30,13 +30,13 @@ fn s(ss: impl ToString) -> String {
 }
 
 fn test_user_info() -> UserInfo {
-    let mut option = mt::UserOption::default();
-    option.set_option_flag(mt::UserOptionFlag::TenantSetting);
+    let option = mt::UserOption::default()
+        .with_set_flag(mt::UserOptionFlag::TenantSetting)
+        .with_default_role(Some("role1".to_string()));
 
     mt::UserInfo {
         name: "test_user".to_string(),
         hostname: "localhost".to_string(),
-        default_role: None,
         auth_info: mt::AuthInfo::Password {
             hash_value: [
                 116, 101, 115, 116, 95, 112, 97, 115, 115, 119, 111, 114, 100,

common/protos/proto/user.proto

@@ -96,6 +96,7 @@ message UserOption {
   uint64 min_compatible = 101;
 
   uint64 flags = 1;
+  optional string default_role = 2;
 }
 
 message UserInfo {
@@ -108,7 +109,6 @@ message UserInfo {
   UserGrantSet grants = 4;
   UserQuota quota = 5;
   UserOption option = 6;
-  optional string default_role = 7;
 }
 
 message UserIdentity {

query/src/interpreters/interpreter_user_create.rs

@@ -63,7 +63,6 @@ impl Interpreter for CreateUserInterpreter {
             grants: UserGrantSet::empty(),
             quota: UserQuota::no_limit(),
             option: plan.user_option,
-            default_role: None,
         };
         user_mgr
             .add_user(&tenant, user_info, plan.if_not_exists)