Skip to content

Commit e37ff60

Browse files
ClSlaidClSlaid
committed
ci: revert tables_table golden file
Signed-off-by: ClSlaid <cailue@bupt.edu.cn>
1 parent cebc57d commit e37ff60

File tree

2 files changed

+61
-42
lines changed

2 files changed

+61
-42
lines changed

‎src/query/service/tests/it/storages/system.rs

Lines changed: 61 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -314,13 +314,69 @@ async fn test_settings_table() -> Result<()> {
314314

315315
#[tokio::test]
316316
async fn test_tables_table() -> Result<()> {
317-
let mut mint = Mint::new("tests/it/storages/testdata");
318-
let file = &mut mint.new_goldenfile("tables_table.txt").unwrap();
319-
320317
let (_guard, ctx) = crate::tests::create_query_context().await?;
321-
322318
let table = TablesTableWithoutHistory::create(1);
323-
run_table_tests(file, ctx, table).await?;
319+
let source_plan = table.read_plan(ctx.clone(), None).await?;
320+
321+
let stream = table.read_data_block_stream(ctx, &source_plan).await?;
322+
let result = stream.try_collect::<Vec<_>>().await?;
323+
let block = &result[0];
324+
assert_eq!(block.num_columns(), 11);
325+
326+
// check column "dropped_on"
327+
for x in &result {
328+
for row in 0..x.num_rows() {
329+
// index of column dropped_on is 6
330+
let column = x.column(6);
331+
let str = column.get_checked(row)?.to_string();
332+
// All of them should be NULL
333+
assert_eq!("NULL", str)
334+
}
335+
}
336+
337+
// hard to tweak the regex assertion just remove the column "dropped_on" :)
338+
let mut without_dropped = Vec::new();
339+
for x in result {
340+
without_dropped.push(x.remove_column("dropped_on")?)
341+
}
342+
343+
let expected = vec![
344+
r"\+---------\+--------------------\+---------------------\+--------------------\+------------\+-------------------------------\+----------\+-----------\+----------------------\+------------\+",
345+
r"\| catalog \| database \| name \| engine \| cluster_by \| created_on \| num_rows \| data_size \| data_compressed_size \| index_size \|",
346+
r"\+---------\+--------------------\+---------------------\+--------------------\+------------\+-------------------------------\+----------\+-----------\+----------------------\+------------\+",
347+
r"\| default \| information_schema \| columns \| VIEW \| \| \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d{3} [\+-]\d{4} \| NULL \| NULL \| NULL \| NULL \|",
348+
r"\| default \| information_schema \| keywords \| VIEW \| \| \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d{3} [\+-]\d{4} \| NULL \| NULL \| NULL \| NULL \|",
349+
r"\| default \| information_schema \| schemata \| VIEW \| \| \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d{3} [\+-]\d{4} \| NULL \| NULL \| NULL \| NULL \|",
350+
r"\| default \| information_schema \| tables \| VIEW \| \| \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d{3} [\+-]\d{4} \| NULL \| NULL \| NULL \| NULL \|",
351+
r"\| default \| information_schema \| views \| VIEW \| \| \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d{3} [\+-]\d{4} \| NULL \| NULL \| NULL \| NULL \|",
352+
r"\| default \| system \| catalogs \| SystemCatalogs \| \| \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d{3} [\+-]\d{4} \| NULL \| NULL \| NULL \| NULL \|",
353+
r"\| default \| system \| clustering_history \| SystemLogTable \| \| \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d{3} [\+-]\d{4} \| NULL \| NULL \| NULL \| NULL \|",
354+
r"\| default \| system \| clusters \| SystemClusters \| \| \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d{3} [\+-]\d{4} \| NULL \| NULL \| NULL \| NULL \|",
355+
r"\| default \| system \| columns \| SystemColumns \| \| \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d{3} [\+-]\d{4} \| NULL \| NULL \| NULL \| NULL \|",
356+
r"\| default \| system \| configs \| SystemConfigs \| \| \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d{3} [\+-]\d{4} \| NULL \| NULL \| NULL \| NULL \|",
357+
r"\| default \| system \| malloc_stats \| SystemMetrics \| \| \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d{3} [\+-]\d{4} \| NULL \| NULL \| NULL \| NULL \|",
358+
r"\| default \| system \| malloc_stats_totals \| SystemMetrics \| \| \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d{3} [\+-]\d{4} \| NULL \| NULL \| NULL \| NULL \|",
359+
r"\| default \| system \| contributors \| SystemContributors \| \| \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d{3} [\+-]\d{4} \| NULL \| NULL \| NULL \| NULL \|",
360+
r"\| default \| system \| credits \| SystemCredits \| \| \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d{3} [\+-]\d{4} \| NULL \| NULL \| NULL \| NULL \|",
361+
r"\| default \| system \| databases \| SystemDatabases \| \| \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d{3} [\+-]\d{4} \| NULL \| NULL \| NULL \| NULL \|",
362+
r"\| default \| system \| engines \| SystemEngines \| \| \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d{3} [\+-]\d{4} \| NULL \| NULL \| NULL \| NULL \|",
363+
r"\| default \| system \| functions \| SystemFunctions \| \| \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d{3} [\+-]\d{4} \| NULL \| NULL \| NULL \| NULL \|",
364+
r"\| default \| system \| metrics \| SystemMetrics \| \| \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d{3} [\+-]\d{4} \| NULL \| NULL \| NULL \| NULL \|",
365+
r"\| default \| system \| one \| SystemOne \| \| \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d{3} [\+-]\d{4} \| NULL \| NULL \| NULL \| NULL \|",
366+
r"\| default \| system \| processes \| SystemProcesses \| \| \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d{3} [\+-]\d{4} \| NULL \| NULL \| NULL \| NULL \|",
367+
r"\| default \| system \| query_log \| SystemLogTable \| \| \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d{3} [\+-]\d{4} \| NULL \| NULL \| NULL \| NULL \|",
368+
r"\| default \| system \| roles \| SystemRoles \| \| \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d{3} [\+-]\d{4} \| NULL \| NULL \| NULL \| NULL \|",
369+
r"\| default \| system \| settings \| SystemSettings \| \| \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d{3} [\+-]\d{4} \| NULL \| NULL \| NULL \| NULL \|",
370+
r"\| default \| system \| stages \| SystemStages \| \| \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d{3} [\+-]\d{4} \| NULL \| NULL \| NULL \| NULL \|",
371+
r"\| default \| system \| tables \| SystemTables \| \| \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d{3} [\+-]\d{4} \| NULL \| NULL \| NULL \| NULL \|",
372+
r"\| default \| system \| tables_with_history \| SystemTables \| \| \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d{3} [\+-]\d{4} \| NULL \| NULL \| NULL \| NULL \|",
373+
r"\| default \| system \| tracing \| SystemTracing \| \| \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d{3} [\+-]\d{4} \| NULL \| NULL \| NULL \| NULL \|",
374+
r"\| default \| system \| users \| SystemUsers \| \| \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d{3} [\+-]\d{4} \| NULL \| NULL \| NULL \| NULL \|",
375+
r"\+---------\+--------------------\+---------------------\+--------------------\+------------\+-------------------------------\+----------\+-----------\+----------------------\+------------\+",
376+
];
377+
common_datablocks::assert_blocks_sorted_eq_with_regex(expected, without_dropped.as_slice());
378+
// may need a method to work with regex
379+
// run_table_tests(file, ctx, table).await?;
324380
Ok(())
325381
}
326382

‎src/query/service/tests/it/storages/testdata/tables_table.txt

Lines changed: 0 additions & 37 deletions
This file was deleted.

0 commit comments

Comments
 (0)