rust/greptimedb
1
0
Fork 0
mirror of https://github.com/GreptimeTeam/greptimedb.git synced 2026-01-04 20:32:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: add catalog name to s3 path (#1011)

Browse Source
This commit is contained in:
Ning Sun
2023-02-15 16:30:09 +08:00
committed by GitHub
parent e17d564bf0
commit 40eec85cf7
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/mito/src/engine.rs
View File

@@ -64,8 +64,8 @@ fn region_id(table_id: TableId, n: u32) -> RegionId {
}
#[inline]
fn table_dir(schema_name: &str, table_id: TableId) -> String {
format!("{schema_name}/{table_id}/")
fn table_dir(catalog_name: &str, schema_name: &str, table_id: TableId) -> String {
format!("{catalog_name}/{schema_name}/{table_id}/")
}
/// [TableEngine] implementation.
@@ -336,7 +336,7 @@ impl<S: StorageEngine> MitoEngineInner<S> {
)?;
let table_id = request.id;
let table_dir = table_dir(schema_name, table_id);
let table_dir = table_dir(catalog_name, schema_name, table_id);
let mut regions = HashMap::with_capacity(request.region_numbers.len());
let _lock = self.table_mutex.lock().await;
@@ -446,7 +446,7 @@ impl<S: StorageEngine> MitoEngineInner<S> {
let table_id = request.table_id;
let engine_ctx = StorageEngineContext::default();
let table_dir = table_dir(schema_name, table_id);
let table_dir = table_dir(catalog_name, schema_name, table_id);
let opts = OpenOptions {
parent_dir: table_dir.to_string(),
};
@@ -747,8 +747,14 @@ mod tests {
#[test]
fn test_table_dir() {
assert_eq!("public/1024/", table_dir("public", 1024));
assert_eq!("prometheus/1024/", table_dir("prometheus", 1024));
assert_eq!(
"greptime/public/1024/",
table_dir("greptime", "public", 1024)
);
assert_eq!(
"0x4354a1/prometheus/1024/",
table_dir("0x4354a1", "prometheus", 1024)
);
}
#[test]