fix(query): RoleInfo from_pb should not err (#15496)

Author: TCeason

src/meta/proto-conv/src/role_from_to_protobuf_impl.rs

@@ -15,6 +15,8 @@
 //! This mod is the key point about compatibility.
 //! Everytime update anything in this file, update the `VER` and let the tests pass.
 
+use std::collections::HashSet;
+
 use databend_common_meta_app as mt;
 use databend_common_protos::pb;
 
@@ -35,11 +37,12 @@ impl FromToProto for mt::principal::RoleInfo {
 
         Ok(mt::principal::RoleInfo {
             name: p.name.clone(),
-            grants: mt::principal::UserGrantSet::from_pb(p.grants.ok_or_else(|| {
-                Incompatible {
-                    reason: "RoleInfo.grants cannot be None".to_string(),
-                }
-            })?)?,
+            grants: if let Some(grants) = p.grants {
+                mt::principal::UserGrantSet::from_pb(grants)
+                    .unwrap_or_else(|_| mt::principal::UserGrantSet::new(vec![], HashSet::new()))
+            } else {
+                mt::principal::UserGrantSet::new(vec![], HashSet::new())
+            },
         })
     }
 

src/meta/proto-conv/src/util.rs

@@ -119,6 +119,7 @@ const META_CHANGE_LOG: &[(u64, &str)] = &[
     (87, "2024-04-17: Add: UserOption::disabled"),
     (88, "2024-04-17: Add: SequenceMeta"),
     (89, "2024-04-19: Add: geometry_output_format settings"),
+    (90, "2024-05-13: Refactor: After reader_check_msg success, RoleInfo::from_pb should not return err"),
     // Dear developer:
     //      If you're gonna add a new metadata version, you'll have to add a test for it.
     //      You could just copy an existing test file(e.g., `../tests/it/v024_table_meta.rs`)

src/meta/proto-conv/tests/it/main.rs

@@ -92,3 +92,4 @@ mod v086_table_index;
 mod v087_user_option_disabled;
 mod v088_sequence_meta;
 mod v089_geometry_output_format;
+mod v090_role_info;

src/meta/proto-conv/tests/it/v090_role_info.rs

@@ -0,0 +1,47 @@
+// Copyright 2023 Datafuse Labs.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use std::collections::HashSet;
+
+use databend_common_meta_app as mt;
+use databend_common_meta_app::principal::UserGrantSet;
+use minitrace::func_name;
+
+use crate::common;
+
+// These bytes are built when a new version in introduced,
+// and are kept for backward compatibility test.
+//
+// *************************************************************
+// * These messages should never be updated,                   *
+// * only be added when a new version is added,                *
+// * or be removed when an old version is no longer supported. *
+// *************************************************************
+//
+
+#[test]
+fn test_decode_v90_role() -> anyhow::Result<()> {
+    let role_info_v90 = vec![
+        10, 2, 114, 49, 18, 6, 160, 6, 90, 168, 6, 24, 160, 6, 90, 168, 6, 24,
+    ];
+
+    let want = || mt::principal::RoleInfo {
+        name: "r1".to_string(),
+        grants: UserGrantSet::new(vec![], HashSet::new()),
+    };
+    common::test_pb_from_to(func_name!(), want())?;
+    common::test_load_old(func_name!(), role_info_v90.as_slice(), 90, want())?;
+
+    Ok(())
+}