Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

refactor: Call TestDbBuilder.build again instead of making a new builder

pull/24376/head
Carol (Nichols || Goulding) 2021-10-22 14:32:32 -04:00
parent e838a22f92
commit 0c3ace5573
1 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
server/src/db.rs
View File

@ -3225,16 +3225,15 @@ mod tests {
// ==================== do: create DB ==================== // ==================== do: create DB ====================
// Create a DB given a server id, an object store and a db name // Create a DB given a server id, an object store and a db name
let test_db = TestDb::builder() let test_db_builder = TestDb::builder()
.lifecycle_rules(LifecycleRules { .lifecycle_rules(LifecycleRules {
late_arrive_window_seconds: NonZeroU32::try_from(1).unwrap(), late_arrive_window_seconds: NonZeroU32::try_from(1).unwrap(),
..Default::default() ..Default::default()
}) })
.object_store(Arc::clone(&object_store)) .object_store(Arc::clone(&object_store))
.server_id(server_id) .server_id(server_id)
.db_name(db_name) .db_name(db_name);
.build() let test_db = test_db_builder.build().await;
.await;
let db = test_db.db; let db = test_db.db;
// ==================== check: empty catalog created ==================== // ==================== check: empty catalog created ====================
@ -3288,12 +3287,7 @@ mod tests {
// ==================== do: re-load DB ==================== // ==================== do: re-load DB ====================
// Re-create database with same store, serverID, and DB name // Re-create database with same store, serverID, and DB name
drop(db); drop(db);
let test_db = TestDb::builder() let test_db = test_db_builder.build().await;
.object_store(Arc::clone(&object_store))
.server_id(server_id)
.db_name(db_name)
.build()
.await;
let db = Arc::new(test_db.db); let db = Arc::new(test_db.db);
// ==================== check: DB state ==================== // ==================== check: DB state ====================
@ -3424,7 +3418,7 @@ mod tests {
// ==================== do: create DB ==================== // ==================== do: create DB ====================
// Create a DB given a server id, an object store and a db name // Create a DB given a server id, an object store and a db name
let test_db = TestDb::builder() let test_db_builder = TestDb::builder()
.object_store(Arc::clone(&object_store)) .object_store(Arc::clone(&object_store))
.server_id(server_id) .server_id(server_id)
.db_name(db_name) .db_name(db_name)
@ -3432,9 +3426,8 @@ mod tests {
catalog_transactions_until_checkpoint: NonZeroU64::try_from(2).unwrap(), catalog_transactions_until_checkpoint: NonZeroU64::try_from(2).unwrap(),
late_arrive_window_seconds: NonZeroU32::try_from(1).unwrap(), late_arrive_window_seconds: NonZeroU32::try_from(1).unwrap(),
..Default::default() ..Default::default()
}) });
.build() let test_db = test_db_builder.build().await;
.await;
let db = Arc::new(test_db.db); let db = Arc::new(test_db.db);
// ==================== do: write data to parquet ==================== // ==================== do: write data to parquet ====================
@ -3469,12 +3462,7 @@ mod tests {
// ==================== do: re-load DB ==================== // ==================== do: re-load DB ====================
// Re-create database with same store, serverID, and DB name // Re-create database with same store, serverID, and DB name
let test_db = TestDb::builder() let test_db = test_db_builder.build().await;
.object_store(Arc::clone(&object_store))
.server_id(server_id)
.db_name(db_name)
.build()
.await;
let db = Arc::new(test_db.db); let db = Arc::new(test_db.db);
// ==================== check: DB state ==================== // ==================== check: DB state ====================