refactor: use TableRouteCache instead

GreptimeTeam · May 13, 2024 · b15ad13 · b15ad13
1 parent f212ef1
commit b15ad13
Show file tree

Hide file tree

Showing 13 changed files with 86 additions and 396 deletions.
diff --git a/src/cache/src/lib.rs b/src/cache/src/lib.rs
@@ -19,9 +19,8 @@ use std::time::Duration;
 
 use catalog::kvbackend::new_table_cache;
 use common_meta::cache::{
-    new_composite_table_route_cache, new_table_flownode_set_cache, new_table_info_cache,
-    new_table_name_cache, new_table_route_cache, CacheRegistry, CacheRegistryBuilder,
-    LayeredCacheRegistryBuilder,
+    new_table_flownode_set_cache, new_table_info_cache, new_table_name_cache,
+    new_table_route_cache, CacheRegistry, CacheRegistryBuilder, LayeredCacheRegistryBuilder,
 };
 use common_meta::kv_backend::KvBackendRef;
 use moka::future::CacheBuilder;
@@ -38,7 +37,6 @@ pub const TABLE_NAME_CACHE_NAME: &str = "table_name_cache";
 pub const TABLE_CACHE_NAME: &str = "table_cache";
 pub const TABLE_FLOWNODE_SET_CACHE_NAME: &str = "table_flownode_set_cache";
 pub const TABLE_ROUTE_CACHE_NAME: &str = "table_route_cache";
-pub const COMPOSITE_TABLE_ROUTE_CACHE: &str = "composite_table_route_cache";
 
 pub fn build_fundamental_cache_registry(kv_backend: KvBackendRef) -> CacheRegistry {
     // Builds table info cache
@@ -103,9 +101,6 @@ pub fn with_default_composite_cache_registry(
     let table_name_cache = builder.get().context(error::CacheRequiredSnafu {
         name: TABLE_NAME_CACHE_NAME,
     })?;
-    let table_route_cache = builder.get().context(error::CacheRequiredSnafu {
-        name: TABLE_ROUTE_CACHE_NAME,
-    })?;
 
     // Builds table cache
     let cache = CacheBuilder::new(DEFAULT_CACHE_MAX_CAPACITY)
@@ -119,20 +114,8 @@ pub fn with_default_composite_cache_registry(
         table_name_cache,
     ));
 
-    // Builds composite table route cache
-    let cache = CacheBuilder::new(DEFAULT_CACHE_MAX_CAPACITY)
-        .time_to_live(DEFAULT_CACHE_TTL)
-        .time_to_idle(DEFAULT_CACHE_TTI)
-        .build();
-    let composite_table_route_cache = Arc::new(new_composite_table_route_cache(
-        COMPOSITE_TABLE_ROUTE_CACHE.to_string(),
-        cache,
-        table_route_cache,
-    ));
-
     let registry = CacheRegistryBuilder::default()
         .add_cache(table_cache)
-        .add_cache(composite_table_route_cache)
         .build();
 
     Ok(builder.add_cache_registry(registry))

diff --git a/src/catalog/src/kvbackend/manager.rs b/src/catalog/src/kvbackend/manager.rs
@@ -22,7 +22,7 @@ use common_catalog::consts::{
 };
 use common_config::Mode;
 use common_error::ext::BoxedError;
-use common_meta::cache::CompositeTableRouteCacheRef;
+use common_meta::cache::TableRouteCacheRef;
 use common_meta::key::catalog_name::CatalogNameKey;
 use common_meta::key::schema_name::SchemaNameKey;
 use common_meta::key::table_info::TableInfoValue;
@@ -72,14 +72,14 @@ impl KvBackendCatalogManager {
         meta_client: Option<Arc<MetaClient>>,
         backend: KvBackendRef,
         table_cache: TableCacheRef,
-        composite_table_route_cache: CompositeTableRouteCacheRef,
+        table_route_cache: TableRouteCacheRef,
     ) -> Arc<Self> {
         Arc::new_cyclic(|me| Self {
             mode,
             meta_client,
             partition_manager: Arc::new(PartitionRuleManager::new(
                 backend.clone(),
-                composite_table_route_cache,
+                table_route_cache,
             )),
             table_metadata_manager: Arc::new(TableMetadataManager::new(backend)),
             system_catalog: SystemCatalog {

diff --git a/src/cmd/src/frontend.rs b/src/cmd/src/frontend.rs
@@ -17,8 +17,8 @@ use std::time::Duration;
 
 use async_trait::async_trait;
 use cache::{
-    build_fundamental_cache_registry, with_default_composite_cache_registry,
-    COMPOSITE_TABLE_ROUTE_CACHE, TABLE_CACHE_NAME,
+    build_fundamental_cache_registry, with_default_composite_cache_registry, TABLE_CACHE_NAME,
+    TABLE_ROUTE_CACHE_NAME,
 };
 use catalog::kvbackend::{CachedMetaKvBackendBuilder, KvBackendCatalogManager, MetaKvBackend};
 use clap::Parser;
@@ -268,18 +268,18 @@ impl StartCommand {
             .context(error::CacheRequiredSnafu {
                 name: TABLE_CACHE_NAME,
             })?;
-        let composite_table_route_cache =
+        let table_route_cache =
             layered_cache_registry
                 .get()
                 .context(error::CacheRequiredSnafu {
-                    name: COMPOSITE_TABLE_ROUTE_CACHE,
+                    name: TABLE_ROUTE_CACHE_NAME,
                 })?;
         let catalog_manager = KvBackendCatalogManager::new(
             opts.mode,
             Some(meta_client.clone()),
             cached_meta_backend.clone(),
             table_cache,
-            composite_table_route_cache,
+            table_route_cache,
         )
         .await;
 

diff --git a/src/cmd/src/standalone.rs b/src/cmd/src/standalone.rs
@@ -17,8 +17,8 @@ use std::{fs, path};
 
 use async_trait::async_trait;
 use cache::{
-    build_fundamental_cache_registry, with_default_composite_cache_registry,
-    COMPOSITE_TABLE_ROUTE_CACHE, TABLE_CACHE_NAME,
+    build_fundamental_cache_registry, with_default_composite_cache_registry, TABLE_CACHE_NAME,
+    TABLE_ROUTE_CACHE_NAME,
 };
 use catalog::kvbackend::KvBackendCatalogManager;
 use clap::Parser;
@@ -399,16 +399,15 @@ impl StartCommand {
         let table_cache = layered_cache_registry.get().context(CacheRequiredSnafu {
             name: TABLE_CACHE_NAME,
         })?;
-        let composite_table_route_cache =
-            layered_cache_registry.get().context(CacheRequiredSnafu {
-                name: COMPOSITE_TABLE_ROUTE_CACHE,
-            })?;
+        let table_route_cache = layered_cache_registry.get().context(CacheRequiredSnafu {
+            name: TABLE_ROUTE_CACHE_NAME,
+        })?;
         let catalog_manager = KvBackendCatalogManager::new(
             dn_opts.mode,
             None,
             kv_backend.clone(),
             table_cache,
-            composite_table_route_cache,
+            table_route_cache,
         )
         .await;
 

diff --git a/src/common/meta/src/cache.rs b/src/common/meta/src/cache.rs
@@ -24,8 +24,7 @@ pub use registry::{
     LayeredCacheRegistryBuilder, LayeredCacheRegistryRef,
 };
 pub use table::{
-    new_composite_table_route_cache, new_table_info_cache, new_table_name_cache,
-    new_table_route_cache, CompositeTableRoute, CompositeTableRouteCache,
-    CompositeTableRouteCacheRef, TableInfoCache, TableInfoCacheRef, TableNameCache,
-    TableNameCacheRef, TableRouteCache, TableRouteCacheRef,
+    new_table_info_cache, new_table_name_cache, new_table_route_cache, TableInfoCache,
+    TableInfoCacheRef, TableNameCache, TableNameCacheRef, TableRoute, TableRouteCache,
+    TableRouteCacheRef,
 };
diff --git a/src/common/meta/src/cache/table.rs b/src/common/meta/src/cache/table.rs
@@ -12,14 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-mod composite_table_route;
 mod table_info;
 mod table_name;
 mod table_route;
-pub use composite_table_route::{
-    new_composite_table_route_cache, CompositeTableRoute, CompositeTableRouteCache,
-    CompositeTableRouteCacheRef,
-};
 pub use table_info::{new_table_info_cache, TableInfoCache, TableInfoCacheRef};
 pub use table_name::{new_table_name_cache, TableNameCache, TableNameCacheRef};
 pub use table_route::{new_table_route_cache, TableRoute, TableRouteCache, TableRouteCacheRef};