feat: remote catalog (#315)

* chore: refactor dir for local catalog manager * refactor: CatalogProvider returns Result * refactor: SchemaProvider returns Result * feat: add kv operations to remote catalog * chore: refactor some code * feat: impl catalog initialization * feat: add register table and register system table function * refactor: add table_info method for Table trait * chore: add some tests * chore: add register schema test * chore: fix build issue after rebase onto develop * refactor: mock to separate file * build: failed to compile * fix: use a container struct to bridge KvBackend and Accessor trait * feat: upgrade opendal to 0.17 * test: add more tests * chore: add catalog name and schema name to table info * chore: add catalog name and schema name to table info * chore: rebase onto develop * refactor: common-catalog crate * chore: refactor dir for local catalog manager * refactor: CatalogProvider returns Result * refactor: SchemaProvider returns Result * feat: add kv operations to remote catalog * chore: refactor some code * feat: impl catalog initialization * feat: add register table and register system table function * refactor: add table_info method for Table trait * chore: add some tests * chore: add register schema test * chore: fix build issue after rebase onto develop * refactor: mock to separate file * build: failed to compile * fix: use a container struct to bridge KvBackend and Accessor trait * feat: upgrade opendal to 0.17 * test: add more tests * chore: add catalog name and schema name to table info * chore: add catalog name and schema name to table info * chore: rebase onto develop * refactor: common-catalog crate * refactor: remove remote catalog related files * fix: compilation * feat: add table version to TableKey * feat: add node id to TableValue * fix: some CR comments * chore: change async fn create_expr_to_request to sync * fix: add backtrace to errors * fix: code style * refactor: merge refactor/catalog-crate * feat: table key with version * feat: impl KvBackend for MetaClient * fix: integrate metaclient * fix: catalog use local table info as baseline * fix: sync metsrv * fix: wip * fix: update remote catalog on register and deregister * refactor: CatalogProvider * refactor: CatalogManager * fix: catalog key filtering * fix: pass some test * refactor: catalog iterating * fix: CatalogManager::table also requires both catalog_name and schema_name * chore: merge develop * chore: merge catalog crate * fix: adapt to recent meta-client api change * feat: databode lease * feat: remote catalog (#356) * chore: refactor dir for local catalog manager * refactor: CatalogProvider returns Result * refactor: SchemaProvider returns Result * feat: add kv operations to remote catalog * chore: refactor some code * feat: impl catalog initialization * feat: add register table and register system table function * refactor: add table_info method for Table trait * chore: add some tests * chore: add register schema test * chore: fix build issue after rebase onto develop * refactor: mock to separate file * build: failed to compile * fix: use a container struct to bridge KvBackend and Accessor trait * feat: upgrade opendal to 0.17 * test: add more tests * chore: add catalog name and schema name to table info * chore: add catalog name and schema name to table info * chore: rebase onto develop * refactor: common-catalog crate * chore: refactor dir for local catalog manager * refactor: CatalogProvider returns Result * refactor: SchemaProvider returns Result * feat: add kv operations to remote catalog * chore: refactor some code * feat: impl catalog initialization * feat: add register table and register system table function * refactor: add table_info method for Table trait * chore: add some tests * chore: add register schema test * chore: fix build issue after rebase onto develop * refactor: mock to separate file * build: failed to compile * fix: use a container struct to bridge KvBackend and Accessor trait * feat: upgrade opendal to 0.17 * test: add more tests * chore: add catalog name and schema name to table info * chore: add catalog name and schema name to table info * chore: rebase onto develop * refactor: common-catalog crate * refactor: remove remote catalog related files * fix: compilation * feat: add table version to TableKey * feat: add node id to TableValue * fix: some CR comments * chore: change async fn create_expr_to_request to sync * fix: add backtrace to errors * fix: code style * refactor: merge refactor/catalog-crate * feat: table key with version * feat: impl KvBackend for MetaClient * fix: integrate metaclient * fix: catalog use local table info as baseline * fix: sync metsrv * fix: wip * fix: update remote catalog on register and deregister * refactor: CatalogProvider * refactor: CatalogManager * fix: catalog key filtering * fix: pass some test * refactor: catalog iterating * fix: CatalogManager::table also requires both catalog_name and schema_name * chore: merge develop * chore: merge catalog crate * fix: adapt to recent meta-client api change * feat: datanode heartbeat (#355) * feat: add heartbeat task to instance * feat: add node_id datanode opts * fix: use real node id in heartbeat and meta client * feat: distribute table in frontend * test: distribute read demo * test: distribute read demo * test: distribute read demo * add write spliter * fix: node id changed to u64 * feat: datanode uses remote catalog implementation * dist insert integrate table * feat: specify region ids on creating table (#359) * fix: compiling issues * feat: datanode lease (#354) * Some glue code about dist_insert * fix: correctly wrap string value with quotes * feat: create route * feat: frontend catalog (#362) * feat: integrate catalog to frontend * feat: preserve partition rule on create * fix: print tables on start * chore: log in create route * test: distribute read demo * feat: support metasrv addr command line options * feat: optimize DataNodeInstance creation (#368) * chore: remove unnecessary changes * chore: revert changes to src/api * chore: revert changes to src/datanode/src/server.rs * chore: remove opendal backend * chore: optimize imports * chore: revert changes to instance and region ids * refactor: MetaKvBackend range * fix: remove some wrap * refactor: initiation of catalog * fix: next range request start key * fix: mock delete range * refactor: simplify range response handling Co-authored-by: jiachun <jiachun_fjc@163.com> Co-authored-by: luofucong <luofucong@greptime.com> Co-authored-by: fys <1113014250@qq.com> Co-authored-by: Jiachun Feng <jiachun_feng@proton.me>
2026-05-26 18:00:41 +00:00 · 2022-11-04 11:43:31 +08:00
parent cba611b9f5
commit db2b577628
12 changed files with 1336 additions and 30 deletions
--- a/src/common/catalog/src/error.rs
+++ b/src/common/catalog/src/error.rs
@@ -22,6 +22,9 @@ pub enum Error {
        backtrace: Backtrace,
        source: serde_json::error::Error,
    },
+
+    #[snafu(display("Failed to parse node id: {}", key))]
+    ParseNodeId { key: String, backtrace: Backtrace },
 }

 impl ErrorExt for Error {
@@ -30,6 +33,7 @@ impl ErrorExt for Error {
            Error::InvalidCatalog { .. }
            | Error::DeserializeCatalogEntryValue { .. }
            | Error::SerializeCatalogEntryValue { .. } => StatusCode::Unexpected,
+            Error::ParseNodeId { .. } => StatusCode::InvalidArguments,
        }
    }

--- a/src/common/catalog/src/helper.rs
+++ b/src/common/catalog/src/helper.rs
@@ -9,20 +9,18 @@ use table::metadata::{RawTableMeta, TableId, TableVersion};

 use crate::consts::{CATALOG_KEY_PREFIX, SCHEMA_KEY_PREFIX, TABLE_KEY_PREFIX};
 use crate::error::{
-    DeserializeCatalogEntryValueSnafu, Error, InvalidCatalogSnafu, SerializeCatalogEntryValueSnafu,
+    DeserializeCatalogEntryValueSnafu, Error, InvalidCatalogSnafu, ParseNodeIdSnafu,
+    SerializeCatalogEntryValueSnafu,
 };

 lazy_static! {
-    static ref CATALOG_KEY_PATTERN: Regex = Regex::new(&format!(
-        "^{}-([a-zA-Z_]+)-([a-zA-Z_]+)$",
-        CATALOG_KEY_PREFIX
-    ))
-    .unwrap();
+    static ref CATALOG_KEY_PATTERN: Regex =
+        Regex::new(&format!("^{}-([a-zA-Z_]+)-([0-9]+)$", CATALOG_KEY_PREFIX)).unwrap();
 }

 lazy_static! {
    static ref SCHEMA_KEY_PATTERN: Regex = Regex::new(&format!(
-        "^{}-([a-zA-Z_]+)-([a-zA-Z_]+)-([a-zA-Z_]+)$",
+        "^{}-([a-zA-Z_]+)-([a-zA-Z_]+)-([0-9]+)$",
        SCHEMA_KEY_PREFIX
    ))
    .unwrap();
@@ -30,7 +28,7 @@ lazy_static! {

 lazy_static! {
    static ref TABLE_KEY_PATTERN: Regex = Regex::new(&format!(
-        "^{}-([a-zA-Z_]+)-([a-zA-Z_]+)-([a-zA-Z_]+)-([0-9]+)-([a-zA-Z_]+)$",
+        "^{}-([a-zA-Z_]+)-([a-zA-Z_]+)-([a-zA-Z_]+)-([0-9]+)-([0-9]+)$",
        TABLE_KEY_PREFIX
    ))
    .unwrap();
@@ -58,7 +56,7 @@ pub struct TableKey {
    pub schema_name: String,
    pub table_name: String,
    pub version: TableVersion,
-    pub node_id: String,
+    pub node_id: u64,
 }

 impl Display for TableKey {
@@ -73,7 +71,7 @@ impl Display for TableKey {
        f.write_str("-")?;
        f.serialize_u64(self.version)?;
        f.write_str("-")?;
-        f.write_str(&self.node_id)
+        f.serialize_u64(self.node_id)
    }
 }

@@ -87,12 +85,15 @@ impl TableKey {

        let version =
            u64::from_str(&captures[4]).map_err(|_| InvalidCatalogSnafu { key }.build())?;
+        let node_id_str = captures[5].to_string();
+        let node_id = u64::from_str(&node_id_str)
+            .map_err(|_| ParseNodeIdSnafu { key: node_id_str }.build())?;
        Ok(Self {
            catalog_name: captures[1].to_string(),
            schema_name: captures[2].to_string(),
            table_name: captures[3].to_string(),
            version,
-            node_id: captures[5].to_string(),
+            node_id,
        })
    }
 }
@@ -100,7 +101,8 @@ impl TableKey {
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
 pub struct TableValue {
    pub id: TableId,
-    pub node_id: String,
+    pub node_id: u64,
+    pub regions_ids: Vec<u64>,
    pub meta: RawTableMeta,
 }

@@ -119,7 +121,7 @@ impl TableValue {

 pub struct CatalogKey {
    pub catalog_name: String,
-    pub node_id: String,
+    pub node_id: u64,
 }

 impl Display for CatalogKey {
@@ -128,7 +130,7 @@ impl Display for CatalogKey {
        f.write_str("-")?;
        f.write_str(&self.catalog_name)?;
        f.write_str("-")?;
-        f.write_str(&self.node_id)
+        f.serialize_u64(self.node_id)
    }
 }

@@ -139,9 +141,14 @@ impl CatalogKey {
            .captures(key)
            .context(InvalidCatalogSnafu { key })?;
        ensure!(captures.len() == 3, InvalidCatalogSnafu { key });
+
+        let node_id_str = captures[2].to_string();
+        let node_id = u64::from_str(&node_id_str)
+            .map_err(|_| ParseNodeIdSnafu { key: node_id_str }.build())?;
+
        Ok(Self {
            catalog_name: captures[1].to_string(),
-            node_id: captures[2].to_string(),
+            node_id,
        })
    }
 }
@@ -160,7 +167,7 @@ impl CatalogValue {
 pub struct SchemaKey {
    pub catalog_name: String,
    pub schema_name: String,
-    pub node_id: String,
+    pub node_id: u64,
 }

 impl Display for SchemaKey {
@@ -171,7 +178,7 @@ impl Display for SchemaKey {
        f.write_str("-")?;
        f.write_str(&self.schema_name)?;
        f.write_str("-")?;
-        f.write_str(&self.node_id)
+        f.serialize_u64(self.node_id)
    }
 }

@@ -183,10 +190,14 @@ impl SchemaKey {
            .context(InvalidCatalogSnafu { key })?;
        ensure!(captures.len() == 4, InvalidCatalogSnafu { key });

+        let node_id_str = captures[3].to_string();
+        let node_id = u64::from_str(&node_id_str)
+            .map_err(|_| ParseNodeIdSnafu { key: node_id_str }.build())?;
+
        Ok(Self {
            catalog_name: captures[1].to_string(),
            schema_name: captures[2].to_string(),
-            node_id: captures[3].to_string(),
+            node_id,
        })
    }
 }
@@ -211,31 +222,31 @@ mod tests {

    #[test]
    fn test_parse_catalog_key() {
-        let key = "__c-C-N";
+        let key = "__c-C-2";
        let catalog_key = CatalogKey::parse(key).unwrap();
        assert_eq!("C", catalog_key.catalog_name);
-        assert_eq!("N", catalog_key.node_id);
+        assert_eq!(2, catalog_key.node_id);
        assert_eq!(key, catalog_key.to_string());
    }

    #[test]
    fn test_parse_schema_key() {
-        let key = "__s-C-S-N";
+        let key = "__s-C-S-3";
        let schema_key = SchemaKey::parse(key).unwrap();
        assert_eq!("C", schema_key.catalog_name);
        assert_eq!("S", schema_key.schema_name);
-        assert_eq!("N", schema_key.node_id);
+        assert_eq!(3, schema_key.node_id);
        assert_eq!(key, schema_key.to_string());
    }

    #[test]
    fn test_parse_table_key() {
-        let key = "__t-C-S-T-42-N";
+        let key = "__t-C-S-T-42-1";
        let entry = TableKey::parse(key).unwrap();
        assert_eq!("C", entry.catalog_name);
        assert_eq!("S", entry.schema_name);
        assert_eq!("T", entry.table_name);
-        assert_eq!("N", entry.node_id);
+        assert_eq!(1, entry.node_id);
        assert_eq!(42, entry.version);
        assert_eq!(key, &entry.to_string());
    }
@@ -271,7 +282,8 @@ mod tests {

        let value = TableValue {
            id: 42,
-            node_id: "localhost".to_string(),
+            node_id: 32,
+            regions_ids: vec![1, 2, 3],
            meta,
        };
        let serialized = serde_json::to_string(&value).unwrap();