From c1b8981f61873a4b4466184e59901566177ce7e9 Mon Sep 17 00:00:00 2001 From: elijah <30852919+e1ijah1@users.noreply.github.com> Date: Fri, 9 Dec 2022 12:59:16 +0800 Subject: [PATCH] refactor(mito): change the table path to `schema/table_id` (#728) refactor: change the table path to `schema/table_id` --- src/mito/src/engine.rs | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/src/mito/src/engine.rs b/src/mito/src/engine.rs index 845493d745..48d3344821 100644 --- a/src/mito/src/engine.rs +++ b/src/mito/src/engine.rs @@ -58,8 +58,8 @@ fn region_id(table_id: TableId, n: u32) -> RegionId { } #[inline] -fn table_dir(schema_name: &str, table_name: &str, table_id: TableId) -> String { - format!("{}/{}_{}/", schema_name, table_name, table_id) +fn table_dir(schema_name: &str, table_id: TableId) -> String { + format!("{}/{}/", schema_name, table_id) } /// [TableEngine] implementation. @@ -341,7 +341,7 @@ impl MitoEngineInner { } } - let table_dir = table_dir(schema_name, table_name, table_id); + let table_dir = table_dir(schema_name, table_id); let opts = CreateOptions { parent_dir: table_dir.clone(), }; @@ -422,7 +422,7 @@ impl MitoEngineInner { let table_id = request.table_id; let engine_ctx = StorageEngineContext::default(); - let table_dir = table_dir(schema_name, table_name, table_id); + let table_dir = table_dir(schema_name, table_id); let opts = OpenOptions { parent_dir: table_dir.to_string(), }; @@ -666,14 +666,8 @@ mod tests { #[test] fn test_table_dir() { - assert_eq!( - "public/test_table_1024/", - table_dir("public", "test_table", 1024) - ); - assert_eq!( - "prometheus/demo_1024/", - table_dir("prometheus", "demo", 1024) - ); + assert_eq!("public/1024/", table_dir("public", 1024)); + assert_eq!("prometheus/1024/", table_dir("prometheus", 1024)); } #[test]