put tenant at first

databendlabs · Jan 11, 2025 · 6263d87 · 6263d87
1 parent 37ab967
commit 6263d87
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/src/meta/api/src/schema_api.rs b/src/meta/api/src/schema_api.rs
@@ -167,8 +167,8 @@ pub trait SchemaApi: Send + Sync {
 
     async fn get_marked_deleted_indexes(
         &self,
-        table_id: Option<u64>,
         tenant: &Tenant,
+        table_id: Option<u64>,
     ) -> Result<GetMarkedDeletedIndexesReply, MetaError>;
 
     async fn update_index(

diff --git a/src/meta/api/src/schema_api_impl.rs b/src/meta/api/src/schema_api_impl.rs
@@ -851,8 +851,8 @@ impl<KV: kvapi::KVApi<Error = MetaError> + ?Sized> SchemaApi for KV {
     #[fastrace::trace]
     async fn get_marked_deleted_indexes(
         &self,
-        table_id: Option<u64>,
         tenant: &Tenant,
+        table_id: Option<u64>,
     ) -> Result<GetMarkedDeletedIndexesReply, MetaError> {
         let dir = match table_id {
             Some(table_id) => {

diff --git a/src/meta/api/src/schema_api_test_suite.rs b/src/meta/api/src/schema_api_test_suite.rs
@@ -6285,11 +6285,11 @@ impl SchemaApiTestSuite {
         {
             info!("--- get marked deleted indexes");
             let res = mt
-                .get_marked_deleted_indexes(Some(table_id), &tenant)
+                .get_marked_deleted_indexes(&tenant, Some(table_id))
                 .await?;
             assert_eq!(res.table_indexes.len(), 0);
 
-            let res = mt.get_marked_deleted_indexes(None, &tenant).await?;
+            let res = mt.get_marked_deleted_indexes(&tenant, None).await?;
             assert_eq!(res.table_indexes.len(), 0);
         }
 
@@ -6303,9 +6303,9 @@ impl SchemaApiTestSuite {
         {
             info!("--- get marked deleted indexes after drop one");
             let results = vec![
-                mt.get_marked_deleted_indexes(Some(table_id), &tenant)
+                mt.get_marked_deleted_indexes(&tenant, Some(table_id))
                     .await?,
-                mt.get_marked_deleted_indexes(None, &tenant).await?,
+                mt.get_marked_deleted_indexes(&tenant, None).await?,
             ];
             for res in results {
                 assert_eq!(res.table_indexes.len(), 1);
@@ -6360,9 +6360,9 @@ impl SchemaApiTestSuite {
         {
             info!("--- get marked deleted indexes after drop all");
             let results = vec![
-                mt.get_marked_deleted_indexes(Some(table_id), &tenant)
+                mt.get_marked_deleted_indexes(&tenant, Some(table_id))
                     .await?,
-                mt.get_marked_deleted_indexes(None, &tenant).await?,
+                mt.get_marked_deleted_indexes(&tenant, None).await?,
             ];
             for res in results {
                 assert_eq!(res.table_indexes.len(), 1);
@@ -6385,9 +6385,9 @@ impl SchemaApiTestSuite {
             mt.remove_marked_deleted_index_ids(&tenant, table_id, &[index_id])
                 .await?;
             let results = vec![
-                mt.get_marked_deleted_indexes(Some(table_id), &tenant)
+                mt.get_marked_deleted_indexes(&tenant, Some(table_id))
                     .await?,
-                mt.get_marked_deleted_indexes(None, &tenant).await?,
+                mt.get_marked_deleted_indexes(&tenant, None).await?,
             ];
             for res in results {
                 assert_eq!(res.table_indexes.len(), 1);
@@ -6406,10 +6406,10 @@ impl SchemaApiTestSuite {
             mt.remove_marked_deleted_index_ids(&tenant, table_id, &[index_id_2])
                 .await?;
             let res = mt
-                .get_marked_deleted_indexes(Some(table_id), &tenant)
+                .get_marked_deleted_indexes(&tenant, Some(table_id))
                 .await?;
             assert_eq!(res.table_indexes.len(), 0);
-            let res = mt.get_marked_deleted_indexes(None, &tenant).await?;
+            let res = mt.get_marked_deleted_indexes(&tenant, None).await?;
             assert_eq!(res.table_indexes.len(), 0);
         }
 

diff --git a/src/query/service/src/catalogs/default/mutable_catalog.rs b/src/query/service/src/catalogs/default/mutable_catalog.rs
@@ -358,7 +358,7 @@ impl Catalog for MutableCatalog {
         let res = self
             .ctx
             .meta
-            .get_marked_deleted_indexes(table_id, tenant)
+            .get_marked_deleted_indexes(tenant, table_id)
             .await?;
         Ok(res)
     }