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

chore: fix merge that causes test failures

pull/24376/head
Nga Tran 2021-04-28 16:38:29 -04:00
parent 2a2760bd18
commit 0ea8861a65
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
server/src/query_tests/scenarios.rs
View File

@ -68,7 +68,7 @@ impl DbSetup for NoData {
.id(), .id(),
0 0
); );
assert_eq!(count_mutable_buffer_chunks(&db), 2); // 2 chunks open and closed assert_eq!(count_mutable_buffer_chunks(&db), 1); //
assert_eq!(count_read_buffer_chunks(&db), 0); // nothing yet assert_eq!(count_read_buffer_chunks(&db), 0); // nothing yet
assert_eq!(count_object_store_chunks(&db), 0); // nothing yet assert_eq!(count_object_store_chunks(&db), 0); // nothing yet
@ -76,14 +76,14 @@ impl DbSetup for NoData {
db.load_chunk_to_read_buffer(partition_key, table_name, 0) db.load_chunk_to_read_buffer(partition_key, table_name, 0)
.await .await
.unwrap(); .unwrap();
assert_eq!(count_mutable_buffer_chunks(&db), 1); // open chunk only assert_eq!(count_mutable_buffer_chunks(&db), 0); // open chunk only
assert_eq!(count_read_buffer_chunks(&db), 1); // close chunk only assert_eq!(count_read_buffer_chunks(&db), 1); // close chunk only
assert_eq!(count_object_store_chunks(&db), 0); // nothing yet assert_eq!(count_object_store_chunks(&db), 0); // nothing yet
// drop chunk 0 // drop chunk 0
db.drop_chunk(partition_key, table_name, 0).unwrap(); db.drop_chunk(partition_key, table_name, 0).unwrap();
assert_eq!(count_mutable_buffer_chunks(&db), 1); // open chunk only assert_eq!(count_mutable_buffer_chunks(&db), 0); // open chunk only
assert_eq!(count_read_buffer_chunks(&db), 0); // nothing after dropping chunk 0 assert_eq!(count_read_buffer_chunks(&db), 0); // nothing after dropping chunk 0
assert_eq!(count_object_store_chunks(&db), 0); // still nothing assert_eq!(count_object_store_chunks(&db), 0); // still nothing
@ -106,7 +106,7 @@ impl DbSetup for NoData {
.id(), .id(),
0 0
); );
assert_eq!(count_mutable_buffer_chunks(&db), 2); // 2 chunks open and closed assert_eq!(count_mutable_buffer_chunks(&db), 1); // 1 open chunk
assert_eq!(count_read_buffer_chunks(&db), 0); // nothing yet assert_eq!(count_read_buffer_chunks(&db), 0); // nothing yet
assert_eq!(count_object_store_chunks(&db), 0); // nothing yet assert_eq!(count_object_store_chunks(&db), 0); // nothing yet
@ -114,7 +114,7 @@ impl DbSetup for NoData {
db.load_chunk_to_read_buffer(partition_key, table_name, 0) db.load_chunk_to_read_buffer(partition_key, table_name, 0)
.await .await
.unwrap(); .unwrap();
assert_eq!(count_mutable_buffer_chunks(&db), 1); // open chunk only assert_eq!(count_mutable_buffer_chunks(&db), 0); // open chunk only
assert_eq!(count_read_buffer_chunks(&db), 1); // close chunk only assert_eq!(count_read_buffer_chunks(&db), 1); // close chunk only
assert_eq!(count_object_store_chunks(&db), 0); // nothing yet assert_eq!(count_object_store_chunks(&db), 0); // nothing yet
@ -123,7 +123,7 @@ impl DbSetup for NoData {
.await .await
.unwrap(); .unwrap();
// it should be the same chunk! // it should be the same chunk!
assert_eq!(count_mutable_buffer_chunks(&db), 1); // open chunk only assert_eq!(count_mutable_buffer_chunks(&db), 0); // open chunk only
assert_eq!(count_read_buffer_chunks(&db), 1); // closed chunk only assert_eq!(count_read_buffer_chunks(&db), 1); // closed chunk only
assert_eq!(count_object_store_chunks(&db), 1); // close chunk only assert_eq!(count_object_store_chunks(&db), 1); // close chunk only
@ -522,7 +522,7 @@ pub async fn make_two_chunk_scenarios(
.await .await
.unwrap(); .unwrap();
} }
write_lp(&db, data2); let table_names = write_lp(&db, data2);
for table_name in &table_names { for table_name in &table_names {
db.rollover_partition(partition_key, &table_name) db.rollover_partition(partition_key, &table_name)
.await .await