fix review commend

databendlabs · Apr 17, 2024 · 1a64a7f · 1a64a7f
1 parent a95bfd4
commit 1a64a7f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 20 deletions.
diff --git a/src/meta/api/src/schema_api_impl.rs b/src/meta/api/src/schema_api_impl.rs
@@ -3638,8 +3638,7 @@ impl<KV: kvapi::KVApi<Error = MetaError> + ?Sized> SchemaApi for KV {
     #[minitrace::trace]
     async fn list_locks(&self, req: ListLocksReq) -> Result<Vec<LockInfo>, KVAppError> {
         let mut reply = vec![];
-        let prefixes = req.gen_prefixes();
-        for prefix in &prefixes {
+        for prefix in &req.prefixes {
             let mut stream = self.list_kv(prefix).await?;
             while let Some(list) = stream.try_next().await? {
                 let k = list.key;

diff --git a/src/meta/app/src/schema/lock.rs b/src/meta/app/src/schema/lock.rs
@@ -130,32 +130,26 @@ pub struct LockInfo {
 
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct ListLocksReq {
-    pub tenant: Tenant,
-    pub table_ids: Vec<u64>,
+    pub prefixes: Vec<String>,
 }
 
 impl ListLocksReq {
-    pub fn create(tenant: impl ToTenant, table_ids: Vec<u64>) -> Self {
+    pub fn create(tenant: &Tenant) -> Self {
+        let lock = TableLockKey::new(tenant, 0, 0);
+        let prefix = DirName::new_with_level(lock, 2).dir_name_with_slash();
         Self {
-            tenant: tenant.to_tenant(),
-            table_ids,
+            prefixes: vec![prefix],
         }
     }
 
-    pub fn gen_prefixes(&self) -> Vec<String> {
+    pub fn create_with_table_ids(tenant: &Tenant, table_ids: Vec<u64>) -> Self {
         let mut prefixes = Vec::new();
-        if self.table_ids.is_empty() {
-            let lock = TableLockKey::new(self.tenant.clone(), 0, 0);
-            let prefix = DirName::new_with_level(lock, 2).dir_name_with_slash();
+        for table_id in table_ids {
+            let lock = TableLockKey::new(tenant, table_id, 0);
+            let prefix = DirName::new(lock).dir_name_with_slash();
             prefixes.push(prefix);
-        } else {
-            for table_id in &self.table_ids {
-                let lock = TableLockKey::new(self.tenant.clone(), *table_id, 0);
-                let prefix = DirName::new(lock).dir_name_with_slash();
-                prefixes.push(prefix);
-            }
         }
-        prefixes
+        Self { prefixes }
     }
 }
 
@@ -203,7 +197,7 @@ impl TableLockKey {
     pub fn new(tenant: impl ToTenant, table_id: u64, revision: u64) -> Self {
         Self {
             tenant: tenant.to_tenant(),
-            table_id: table_id.into(),
+            table_id,
             revision,
         }
     }

diff --git a/src/query/storages/system/src/locks_table.rs b/src/query/storages/system/src/locks_table.rs
@@ -91,7 +91,11 @@ impl AsyncSystemTable for LocksTable {
                 }
             }
 
-            let req = ListLocksReq::create(&tenant, table_ids);
+            let req = if table_ids.is_empty() {
+                ListLocksReq::create(&tenant)
+            } else {
+                ListLocksReq::create_with_table_ids(&tenant, table_ids)
+            };
             let lock_infos = ctl.list_locks(req).await?;
             for info in lock_infos {
                 lock_table_id.push(info.table_id);