refactor: TIdent add a flag to indicate if the tenant should be encoded into key

src/meta/app/src/background/job_ident.rs

@@ -31,6 +31,7 @@ mod kvapi_impl {
     impl TenantResource for Resource {
         const PREFIX: &'static str = "__fd_background_job";
         const TYPE: &'static str = "BackgroundJobIdent";
+        const HAS_TENANT: bool = true;
         type ValueType = BackgroundJobId;
     }
 

src/meta/app/src/background/task_ident.rs

@@ -30,6 +30,7 @@ mod kvapi_impl {
     impl TenantResource for Resource {
         const PREFIX: &'static str = "__fd_background_task_by_name";
         const TYPE: &'static str = "BackgroundTaskIdent";
+        const HAS_TENANT: bool = true;
         type ValueType = BackgroundTaskInfo;
     }
 

src/meta/app/src/data_mask/data_mask_name_ident.rs

@@ -29,6 +29,8 @@ mod kvapi_impl {
     pub struct Resource;
     impl TenantResource for Resource {
         const PREFIX: &'static str = "__fd_datamask";
+        const TYPE: &'static str = "DataMaskNameIdent";
+        const HAS_TENANT: bool = true;
         type ValueType = DatamaskId;
     }
 

src/meta/app/src/data_mask/mask_policy_table_id_list_ident.rs

@@ -13,8 +13,10 @@
 // limitations under the License.
 
 use crate::tenant_key::ident::TIdent;
+use crate::tenant_key::raw::TIdentRaw;
 
 pub type MaskPolicyTableIdListIdent = TIdent<Resource>;
+pub type MaskPolicyTableIdListIdentRaw = TIdentRaw<Resource>;
 
 pub use kvapi_impl::Resource;
 
@@ -28,6 +30,8 @@ mod kvapi_impl {
     pub struct Resource;
     impl TenantResource for Resource {
         const PREFIX: &'static str = "__fd_datamask_id_list";
+        const TYPE: &'static str = "MaskPolicyTableIdListIdent";
+        const HAS_TENANT: bool = true;
         type ValueType = MaskpolicyTableIdList;
     }
 

src/meta/app/src/principal/connection_ident.rs

@@ -32,6 +32,8 @@ mod kvapi_impl {
     pub struct Resource;
     impl TenantResource for Resource {
         const PREFIX: &'static str = "__fd_connection";
+        const TYPE: &'static str = "ConnectionIdent";
+        const HAS_TENANT: bool = true;
         type ValueType = UserDefinedConnection;
     }
 

src/meta/app/src/principal/network_policy_ident.rs

@@ -32,6 +32,8 @@ mod kvapi_impl {
     pub struct Resource;
     impl TenantResource for Resource {
         const PREFIX: &'static str = "__fd_network_policies";
+        const TYPE: &'static str = "NetworkPolicyIdent";
+        const HAS_TENANT: bool = true;
         type ValueType = NetworkPolicy;
     }
 

src/meta/app/src/principal/password_policy_ident.rs

@@ -33,6 +33,8 @@ mod kvapi_impl {
 
     impl TenantResource for Resource {
         const PREFIX: &'static str = "__fd_password_policies";
+        const TYPE: &'static str = "PasswordPolicyIdent";
+        const HAS_TENANT: bool = true;
         type ValueType = PasswordPolicy;
     }
 

src/meta/app/src/principal/role_ident.rs

@@ -22,13 +22,13 @@ pub type RoleIdentRaw = TIdentRaw<Resource>;
 
 pub use kvapi_impl::Resource;
 
-impl TIdent<Resource> {
+impl RoleIdent {
     pub fn role_name(&self) -> &str {
         self.name()
     }
 }
 
-impl TIdentRaw<Resource> {
+impl RoleIdentRaw {
     pub fn role_name(&self) -> &str {
         self.name()
     }
@@ -45,6 +45,7 @@ mod kvapi_impl {
     impl TenantResource for Resource {
         const PREFIX: &'static str = "__fd_roles";
         const TYPE: &'static str = "RoleIdent";
+        const HAS_TENANT: bool = true;
         type ValueType = RoleInfo;
     }
 

src/meta/app/src/principal/udf_ident.rs

@@ -22,13 +22,13 @@ pub type UdfIdentRaw = TIdentRaw<Resource>;
 
 pub use kvapi_impl::Resource;
 
-impl TIdent<Resource> {
+impl UdfIdent {
     pub fn udf_name(&self) -> &str {
         self.name()
     }
 }
 
-impl TIdentRaw<Resource> {
+impl UdfIdentRaw {
     pub fn udf_name(&self) -> &str {
         self.name()
     }
@@ -45,6 +45,7 @@ mod kvapi_impl {
     impl TenantResource for Resource {
         const PREFIX: &'static str = "__fd_udfs";
         const TYPE: &'static str = "UdfIdent";
+        const HAS_TENANT: bool = true;
         type ValueType = UserDefinedFunction;
     }
 

src/meta/app/src/principal/user_defined_file_format_ident.rs

@@ -32,6 +32,8 @@ mod kvapi_impl {
     pub struct Resource;
     impl TenantResource for Resource {
         const PREFIX: &'static str = "__fd_file_formats";
+        const TYPE: &'static str = "UserDefinedFileFormatIdent";
+        const HAS_TENANT: bool = true;
         type ValueType = UserDefinedFileFormat;
     }
 

src/meta/app/src/principal/user_setting_ident.rs

@@ -29,6 +29,8 @@ mod kvapi_impl {
     pub struct Resource;
     impl TenantResource for Resource {
         const PREFIX: &'static str = "__fd_settings";
+        const TYPE: &'static str = "SettingIdent";
+        const HAS_TENANT: bool = true;
         type ValueType = UserSetting;
     }
 

src/meta/app/src/principal/user_stage_ident.rs

@@ -29,6 +29,8 @@ mod kvapi_impl {
     pub struct Resource;
     impl TenantResource for Resource {
         const PREFIX: &'static str = "__fd_stages";
+        const TYPE: &'static str = "StageIdent";
+        const HAS_TENANT: bool = true;
         type ValueType = StageInfo;
     }
 

src/meta/app/src/schema/catalog_name_ident.rs

@@ -35,6 +35,7 @@ mod kvapi_impl {
     impl TenantResource for Resource {
         const PREFIX: &'static str = "__fd_catalog";
         const TYPE: &'static str = "CatalogNameIdent";
+        const HAS_TENANT: bool = true;
         type ValueType = CatalogId;
     }
 

src/meta/app/src/schema/database_id_history_ident.rs

@@ -47,6 +47,7 @@ mod kvapi_impl {
     impl TenantResource for Resource {
         const PREFIX: &'static str = "__fd_db_id_list";
         const TYPE: &'static str = "DatabaseIdHistoryIdent";
+        const HAS_TENANT: bool = true;
         type ValueType = DbIdList;
     }
 

src/meta/app/src/schema/database_name_ident.rs

@@ -44,6 +44,7 @@ mod kvapi_impl {
     impl TenantResource for Resource {
         const PREFIX: &'static str = "__fd_database";
         const TYPE: &'static str = "DatabaseNameIdent";
+        const HAS_TENANT: bool = true;
         type ValueType = DatabaseId;
     }
 

src/meta/app/src/schema/index_name_ident.rs

@@ -47,6 +47,7 @@ mod kvapi_impl {
     impl TenantResource for Resource {
         const PREFIX: &'static str = "__fd_index";
         const TYPE: &'static str = "IndexNameIdent";
+        const HAS_TENANT: bool = true;
         type ValueType = IndexId;
     }
 

src/meta/app/src/schema/sequence.rs

@@ -102,6 +102,7 @@ mod kvapi_impl {
     pub struct Resource;
     impl TenantResource for Resource {
         const PREFIX: &'static str = "__fd_sequence";
+        const HAS_TENANT: bool = true;
         type ValueType = SequenceMeta;
     }
 

src/meta/app/src/schema/table_lock_ident.rs

@@ -70,6 +70,7 @@ mod kvapi_impl {
     impl TenantResource for Resource {
         const PREFIX: &'static str = "__fd_table_lock";
         const TYPE: &'static str = "TableLockIdent";
+        const HAS_TENANT: bool = true;
         type ValueType = LockMeta;
     }
 

src/meta/app/src/schema/virtual_column_ident.rs

@@ -45,6 +45,7 @@ mod kvapi_impl {
     impl TenantResource for Resource {
         const PREFIX: &'static str = "__fd_virtual_column";
         const TYPE: &'static str = "VirtualColumnIdent";
+        const HAS_TENANT: bool = true;
         type ValueType = VirtualColumnMeta;
     }
 

src/meta/app/src/share/share_consumer_ident.rs

@@ -46,6 +46,7 @@ mod kvapi_impl {
     impl TenantResource for Resource {
         const PREFIX: &'static str = "__fd_share_account_id";
         const TYPE: &'static str = "ShareConsumerIdent";
+        const HAS_TENANT: bool = true;
         type ValueType = ShareAccountMeta;
     }
 

src/meta/app/src/share/share_end_point_ident.rs

@@ -45,6 +45,7 @@ mod kvapi_impl {
     impl TenantResource for Resource {
         const PREFIX: &'static str = "__fd_share_endpoint";
         const TYPE: &'static str = "ShareEndpointIdent";
+        const HAS_TENANT: bool = true;
         type ValueType = ShareEndpointId;
     }
 

src/meta/app/src/share/share_name_ident.rs

@@ -46,6 +46,7 @@ mod kvapi_impl {
     impl TenantResource for Resource {
         const PREFIX: &'static str = "__fd_share";
         const TYPE: &'static str = "ShareNameIdent";
+        const HAS_TENANT: bool = true;
         type ValueType = ShareId;
     }
 

src/meta/app/src/tenant/tenant_quota_ident.rs

@@ -44,6 +44,7 @@ mod kvapi_impl {
     impl TenantResource for Resource {
         const PREFIX: &'static str = "__fd_quotas";
         const TYPE: &'static str = "TenantQuotaIdent";
+        const HAS_TENANT: bool = true;
         type ValueType = TenantQuota;
     }
 

src/meta/app/src/tenant_key/ident.rs

@@ -219,6 +219,7 @@ mod tests {
 
         impl TenantResource for Foo {
             const PREFIX: &'static str = "foo";
+            const HAS_TENANT: bool = true;
             type ValueType = Infallible;
         }
 
@@ -237,6 +238,7 @@ mod tests {
 
         impl TenantResource for Foo {
             const PREFIX: &'static str = "foo";
+            const HAS_TENANT: bool = true;
             type ValueType = Infallible;
         }
 

src/meta/app/src/tenant_key/resource.rs

@@ -35,6 +35,16 @@ pub trait TenantResource {
     /// ```
     const TYPE: &'static str = "";
 
+    /// Whether to encode tenant into the key, when encoding a key without key-space.
+    ///
+    /// There are two kinds of key before introducing key space:
+    /// 1. The key with tenant, such as `CatalogNameIdent(tenant, name)`.
+    /// 2. The key without tenant, such as `TableId(table_id:u64)`.
+    ///
+    /// Meta-service keys are implemented with [`TIdent`].
+    /// [`TenantResource`] should be able to distinguish the two kinds of keys.
+    const HAS_TENANT: bool;
+
     /// The type of the value for the key [`TIdent<R: TenantResource>`](TIdent).
     type ValueType: kvapi::Value;
 }