Skip to content

Commit ede42b4

Browse files
drmingdrmerdrmingdrmer
authored
refactor: replace manual database setup with Util across multiple test cases (#18565)
- db_table_gc_out_of_retention_time - table_commit_table_meta orphan section - table_update_row_access_policy - table_update_mask_policy - table_history_filter_with_limit
1 parent 2496067 commit ede42b4

File tree

1 file changed

+25
-85
lines changed

1 file changed

+25
-85
lines changed

‎src/meta/api/src/schema_api_test_suite.rs‎

Lines changed: 25 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -2996,19 +2996,11 @@ impl SchemaApiTestSuite {
29962996

29972997
info!("--- prepare db");
29982998
{
2999-
let plan = CreateDatabaseReq {
3000-
create_option: CreateOption::Create,
3001-
name_ident: DatabaseNameIdent::new(&tenant, db_name),
3002-
meta: DatabaseMeta {
3003-
engine: "".to_string(),
3004-
..DatabaseMeta::default()
3005-
},
3006-
};
3007-
3008-
let res = mt.create_database(plan).await?;
3009-
info!("create database res: {:?}", res);
2999+
let mut util = Util::new(mt, tenant_name, db_name, "", "");
3000+
util.create_db().await?;
3001+
info!("create database res: {:?}", ());
30103002

3011-
assert_eq!(1, *res.db_id, "first database id is 1");
3003+
assert_eq!(1, *util.db_id(), "first database id is 1");
30123004
}
30133005

30143006
let created_on = Utc::now();
@@ -3356,19 +3348,11 @@ impl SchemaApiTestSuite {
33563348

33573349
info!("--- prepare db");
33583350
{
3359-
let plan = CreateDatabaseReq {
3360-
create_option: CreateOption::Create,
3361-
name_ident: DatabaseNameIdent::new(&tenant, db_name),
3362-
meta: DatabaseMeta {
3363-
engine: "".to_string(),
3364-
..DatabaseMeta::default()
3365-
},
3366-
};
3367-
3368-
let res = mt.create_database(plan).await?;
3369-
info!("create database res: {:?}", res);
3351+
let mut util = Util::new(mt, tenant_name, db_name, "", "");
3352+
util.create_db().await?;
3353+
info!("create database res: {:?}", ());
33703354

3371-
assert_eq!(1, *res.db_id, "first database id is 1");
3355+
assert_eq!(1, *util.db_id(), "first database id is 1");
33723356
}
33733357

33743358
let created_on = Utc::now();
@@ -4145,18 +4129,10 @@ impl SchemaApiTestSuite {
41454129
table_name: tb1_name.to_string(),
41464130
};
41474131

4148-
let plan = CreateDatabaseReq {
4149-
create_option: CreateOption::Create,
4150-
name_ident: DatabaseNameIdent::new(&tenant, db1_name),
4151-
meta: DatabaseMeta {
4152-
engine: "".to_string(),
4153-
..DatabaseMeta::default()
4154-
},
4155-
};
4156-
4157-
let res = mt.create_database(plan).await?;
4158-
info!("create database res: {:?}", res);
4159-
let db_id = res.db_id;
4132+
let mut util = Util::new(mt, tenant_name, db1_name, "", "");
4133+
util.create_db().await?;
4134+
info!("create database res: {:?}", ());
4135+
let db_id = util.db_id();
41604136

41614137
let created_on = Utc::now();
41624138
let schema = || {
@@ -4878,18 +4854,9 @@ impl SchemaApiTestSuite {
48784854
info!("--- create db1 tables");
48794855
{
48804856
let test_db_name = "db1";
4881-
let db_name = DatabaseNameIdent::new(&tenant, test_db_name);
4882-
let req = CreateDatabaseReq {
4883-
create_option: CreateOption::Create,
4884-
name_ident: db_name.clone(),
4885-
meta: DatabaseMeta {
4886-
engine: "".to_string(),
4887-
..DatabaseMeta::default()
4888-
},
4889-
};
4890-
4891-
let res = mt.create_database(req).await?;
4892-
let db_id = res.db_id;
4857+
let mut util = Util::new(mt, tenant_name, test_db_name, "", "");
4858+
util.create_db().await?;
4859+
let db_id = util.db_id();
48934860

48944861
let drop_ids =
48954862
create_dropped_table(mt, tenant_name, test_db_name, *db_id, DEFAULT_MGET_SIZE + 1)
@@ -4909,18 +4876,9 @@ impl SchemaApiTestSuite {
49094876
info!("--- create db2 tables");
49104877
{
49114878
let test_db_name = "db2";
4912-
let db_name = DatabaseNameIdent::new(&tenant, test_db_name);
4913-
let req = CreateDatabaseReq {
4914-
create_option: CreateOption::Create,
4915-
name_ident: db_name.clone(),
4916-
meta: DatabaseMeta {
4917-
engine: "".to_string(),
4918-
..DatabaseMeta::default()
4919-
},
4920-
};
4921-
4922-
let res = mt.create_database(req).await?;
4923-
let db_id = res.db_id;
4879+
let mut util = Util::new(mt, tenant_name, test_db_name, "", "");
4880+
util.create_db().await?;
4881+
let db_id = util.db_id();
49244882

49254883
let drop_ids =
49264884
create_dropped_table(mt, tenant_name, test_db_name, *db_id, DEFAULT_MGET_SIZE)
@@ -4938,18 +4896,9 @@ impl SchemaApiTestSuite {
49384896
info!("--- create db3 tables");
49394897
{
49404898
let test_db_name = "db3";
4941-
let db_name = DatabaseNameIdent::new(&tenant, test_db_name);
4942-
let req = CreateDatabaseReq {
4943-
create_option: CreateOption::Create,
4944-
name_ident: db_name.clone(),
4945-
meta: DatabaseMeta {
4946-
engine: "".to_string(),
4947-
..DatabaseMeta::default()
4948-
},
4949-
};
4950-
4951-
let res = mt.create_database(req).await?;
4952-
let db_id = res.db_id;
4899+
let mut util = Util::new(mt, tenant_name, test_db_name, "", "");
4900+
util.create_db().await?;
4901+
let db_id = util.db_id();
49534902

49544903
let drop_ids = create_dropped_table(mt, tenant_name, test_db_name, *db_id, 1).await?;
49554904
let case_drop_ids_vec = vec![&mut case1_drop_ids, &mut case5_drop_ids];
@@ -5564,19 +5513,10 @@ impl SchemaApiTestSuite {
55645513
// use a new tenant and db do test
55655514
let db_name = "orphan_db";
55665515
let tenant_name = "orphan_tenant";
5567-
let tenant = Tenant::new_or_err(tenant_name, func_name!())?;
5568-
5569-
let plan = CreateDatabaseReq {
5570-
create_option: CreateOption::Create,
5571-
name_ident: DatabaseNameIdent::new(&tenant, db_name),
5572-
meta: DatabaseMeta {
5573-
engine: "".to_string(),
5574-
..DatabaseMeta::default()
5575-
},
5576-
};
5577-
5578-
let res = mt.create_database(plan).await?;
5579-
let db_id = res.db_id;
5516+
let mut orphan_util = Util::new(mt, tenant_name, db_name, "", "");
5517+
orphan_util.create_db().await?;
5518+
let db_id = orphan_util.db_id();
5519+
let tenant = orphan_util.tenant();
55805520

55815521
let create_table_req = CreateTableReq {
55825522
create_option: CreateOption::CreateOrReplace,

0 commit comments

Comments
 (0)