Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature: impl get_table_by_id with kv-txn #5185

Merged
merged 1 commit into from
May 6, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
102 changes: 102 additions & 0 deletions common/meta/api/src/meta_api_test_suite.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1099,6 +1099,108 @@ impl MetaApiTestSuite {
Ok(())
}

pub async fn get_table_by_id<MT: MetaApi>(self, mt: &MT) -> anyhow::Result<()> {
let tenant = "tenant1";
let db_name = "db1";
let tbl_name = "tb2";

let schema = || {
Arc::new(DataSchema::new(vec![DataField::new(
"number",
u64::to_data_type(),
)]))
};

let options = || maplit::btreemap! {"opt‐1".into() => "val-1".into()};

let table_meta = |created_on| TableMeta {
schema: schema(),
engine: "JSON".to_string(),
options: options(),
created_on,
..TableMeta::default()
};

tracing::info!("--- prepare db");
{
let plan = CreateDatabaseReq {
if_not_exists: false,
name_ident: DatabaseNameIdent {
tenant: tenant.to_string(),
db_name: db_name.to_string(),
},
meta: DatabaseMeta {
engine: "".to_string(),
..DatabaseMeta::default()
},
};

let res = mt.create_database(plan).await?;
tracing::info!("create database res: {:?}", res);

assert_eq!(1, res.database_id, "first database id is 1");
}

tracing::info!("--- create and get table");
{
let created_on = Utc::now();

let req = CreateTableReq {
if_not_exists: false,
name_ident: TableNameIdent {
tenant: tenant.to_string(),
db_name: db_name.to_string(),
table_name: tbl_name.to_string(),
},
table_meta: table_meta(created_on),
};

let _tb_ident_2 = {
let res = mt.create_table(req.clone()).await?;
assert!(res.table_id >= 1, "table id >= 1");
let tb_id = res.table_id;

let got = mt.get_table((tenant, db_name, tbl_name).into()).await?;
let seq = got.ident.version;

let ident = TableIdent::new(tb_id, seq);

let want = TableInfo {
ident: ident.clone(),
desc: format!("'{}'.'{}'.'{}'", tenant, db_name, tbl_name),
name: tbl_name.into(),
meta: table_meta(created_on),
};
assert_eq!(want, got.as_ref().clone(), "get created table");
ident
};
}

tracing::info!("--- get_table_by_id ");
{
tracing::info!("--- get_table_by_id ");
{
let table = mt.get_table((tenant, "db1", "tb2").into()).await.unwrap();

let (table_id, table_meta) = mt.get_table_by_id(table.ident.table_id).await?;

assert_eq!(table_meta.options.get("opt‐1"), Some(&"val-1".into()));
assert_eq!(table_id.table_id, table.ident.table_id);
}

tracing::info!("--- get_table_by_id with not exists table_id");
{
let got = mt.get_table_by_id(1024).await;

let err = got.unwrap_err();
let err = ErrorCode::from(err);

assert_eq!(ErrorCode::UnknownTableId("").code(), err.code());
}
}
Ok(())
}

pub async fn table_list<MT: MetaApi>(&self, mt: &MT) -> anyhow::Result<()> {
let tenant = "tenant1";
let db_name = "db1";
Expand Down
20 changes: 18 additions & 2 deletions common/meta/grpc/src/meta_client_on_kv_impl.rs
Original file line number Diff line number Diff line change
Expand Up @@ -647,9 +647,25 @@ impl MetaApi for MetaClientOnKV {

async fn get_table_by_id(
&self,
_table_id: MetaId,
table_id: MetaId,
) -> Result<(TableIdent, Arc<TableMeta>), MetaError> {
todo!()
let tbid = TableId { table_id };

let (tb_meta_seq, table_meta): (_, Option<TableMeta>) =
self.get_struct_value(&tbid).await?;

tracing::debug!(ident = display(&tbid), "get_table_by_id");

if tb_meta_seq == 0 || table_meta.is_none() {
return Err(MetaError::AppError(AppError::UnknownTableId(
UnknownTableId::new(table_id, "get_table_by_id"),
)));
}

Ok((
TableIdent::new(table_id, tb_meta_seq),
Arc::new(table_meta.unwrap()),
))
}

async fn upsert_table_option(
Expand Down
12 changes: 12 additions & 0 deletions metasrv/tests/it/grpc/metasrv_grpc_meta_api_on_kv.rs
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,18 @@ async fn test_meta_api_on_kv_upsert_table_option() -> anyhow::Result<()> {
MetaApiTestSuite {}.table_upsert_option(&client).await
}

#[tokio::test(flavor = "multi_thread", worker_threads = 3)]
async fn test_meta_api_on_kv_get_table_by_id() -> anyhow::Result<()> {
let (_log_guards, ut_span) = init_meta_ut!();
let _ent = ut_span.enter();

let (_tc, addr) = start_metasrv().await?;

let client = MetaClientOnKV::try_create(addr.as_str(), "root", "xxx", None, None).await?;

MetaApiTestSuite {}.get_table_by_id(&client).await
}

// Under developing:
/*
#[tokio::test(flavor = "multi_thread", worker_threads = 3)]
Expand Down