Skip to content

Commit 8686ba1

Browse files
authored
refactor: simplify database setup using Util across multiple test scenarios (#18563)
- Consolidate Util usage in drop_table_without_tableid_to_name tests - Simplify concurrent_commit_table_meta database setup - Streamline table_drop_out_of_retention_time_history test setup - Eliminate code duplication across schema-api tests
1 parent ed341af commit 8686ba1

File tree

1 file changed

+11
-45
lines changed

1 file changed

+11
-45
lines changed

src/meta/api/src/schema_api_test_suite.rs

Lines changed: 11 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1410,22 +1410,13 @@ impl SchemaApiTestSuite {
14101410
mt: &MT,
14111411
) -> anyhow::Result<()> {
14121412
let tenant_name = "tenant1";
1413-
let tenant = Tenant::new_or_err(tenant_name, func_name!())?;
1414-
14151413
let db = "db";
14161414
let table_name = "tbl";
14171415

1418-
let create_db_req = CreateDatabaseReq {
1419-
create_option: CreateOption::Create,
1420-
name_ident: DatabaseNameIdent::new(&tenant, db),
1421-
meta: DatabaseMeta {
1422-
engine: "".to_string(),
1423-
..DatabaseMeta::default()
1424-
},
1425-
};
1426-
1427-
let res = mt.create_database(create_db_req.clone()).await?;
1428-
let db_id = res.db_id;
1416+
let mut util = Util::new(mt, tenant_name, db, table_name, "");
1417+
let tenant = util.tenant();
1418+
util.create_db().await?;
1419+
let db_id = util.db_id();
14291420

14301421
let schema = || {
14311422
Arc::new(TableSchema::new(vec![TableField::new(
@@ -4411,10 +4402,10 @@ impl SchemaApiTestSuite {
44114402
mt: &MT,
44124403
) -> anyhow::Result<()> {
44134404
let tenant_name = "tenant_table_drop_history";
4414-
let tenant = Tenant::new_or_err(tenant_name, func_name!())?;
4415-
44164405
let db_name = "table_table_drop_history_db1";
44174406
let tbl_name = "table_table_drop_history_tb1";
4407+
let mut util = Util::new(mt, tenant_name, db_name, tbl_name, "");
4408+
let tenant = util.tenant();
44184409
let tbl_name_ident = TableNameIdent {
44194410
tenant: tenant.clone(),
44204411
db_name: db_name.to_string(),
@@ -4428,25 +4419,9 @@ impl SchemaApiTestSuite {
44284419
)]))
44294420
};
44304421

4431-
let db_id;
4432-
44334422
info!("--- prepare db");
4434-
{
4435-
let plan = CreateDatabaseReq {
4436-
create_option: CreateOption::Create,
4437-
name_ident: DatabaseNameIdent::new(&tenant, db_name),
4438-
meta: DatabaseMeta {
4439-
engine: "".to_string(),
4440-
..DatabaseMeta::default()
4441-
},
4442-
};
4443-
4444-
let res = mt.create_database(plan).await?;
4445-
info!("create database res: {:?}", res);
4446-
4447-
assert_eq!(1, *res.db_id, "first database id is 1");
4448-
db_id = res.db_id;
4449-
}
4423+
util.create_db().await?;
4424+
let db_id = util.db_id();
44504425

44514426
let created_on = Utc::now();
44524427
let create_table_meta = TableMeta {
@@ -5719,21 +5694,12 @@ impl SchemaApiTestSuite {
57195694
) -> anyhow::Result<()> {
57205695
let db_name = "db";
57215696
let tenant_name = "concurrent_commit_table_meta";
5722-
let tenant = Tenant::new_or_err(tenant_name, func_name!())?;
57235697
let tbl_name = "tb";
57245698

5725-
let plan = CreateDatabaseReq {
5726-
create_option: CreateOption::Create,
5727-
name_ident: DatabaseNameIdent::new(&tenant, db_name),
5728-
meta: DatabaseMeta {
5729-
engine: "".to_string(),
5730-
..DatabaseMeta::default()
5731-
},
5732-
};
5733-
57345699
let mt = Arc::new(b.build().await);
5735-
let res = mt.create_database(plan).await?;
5736-
let db_id = res.db_id;
5700+
let mut util = Util::new(&*mt, tenant_name, db_name, tbl_name, "");
5701+
util.create_db().await?;
5702+
let db_id = util.db_id();
57375703

57385704
let schema = || {
57395705
Arc::new(TableSchema::new(vec![TableField::new(

0 commit comments

Comments
 (0)