Skip to content

Commit da65229

Browse files
jayshrivastavajayshrivastava
committed
wip
1 parent 71cb888 commit da65229

File tree

2 files changed

+108
-30
lines changed

2 files changed

+108
-30
lines changed

‎src/execution_plans/stage.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -546,9 +546,9 @@ impl DisplayAs for StageExec {
546546
let mut extra_spacing = "".to_string();
547547
if i > 0 {
548548
// Add newline for each task
549-
writeln!(f)?;
549+
writeln!(f)?;
550550
// with_indent() in DisplayableExectutionPlan will not add indentation for tasks, so we add it manually.
551-
extra_spacing = " ".repeat(self.depth);
551+
extra_spacing = " ".repeat(self.depth);
552552
}
553553
writeln!(
554554
f,

‎src/test_utils/insta.rs‎

Lines changed: 106 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -23,48 +23,126 @@ pub fn settings() -> insta::Settings {
2323
"UUID",
2424
);
2525
settings.add_filter(r"\d+\.\.\d+", "<int>..<int>");
26-
26+
2727
// Metric filters - only replace known metric names to avoid false positives
2828
settings.add_filter(r"output_rows=\d+", "output_rows=<metric>");
29-
settings.add_filter(r"elapsed_compute=[\d.]+[a-zA-Zµnms]+", "elapsed_compute=<metric>");
29+
settings.add_filter(
30+
r"elapsed_compute=[\d.]+[a-zA-Zµnms]+",
31+
"elapsed_compute=<metric>",
32+
);
3033
settings.add_filter(r"spill_count=\d+", "spill_count=<metric>");
31-
settings.add_filter(r"spilled_bytes=[\d.]+\s*[KMGTPE]?B?", "spilled_bytes=<metric>");
34+
settings.add_filter(
35+
r"spilled_bytes=[\d.]+\s*[KMGTPE]?B?",
36+
"spilled_bytes=<metric>",
37+
);
3238
settings.add_filter(r"spilled_rows=\d+", "spilled_rows=<metric>");
33-
settings.add_filter(r"current_memory_usage=[\d.]+\s*[KMGTPE]?B?", "current_memory_usage=<metric>");
34-
settings.add_filter(r"start_timestamp=[\d.]+[a-zA-Zµnms]*", "start_timestamp=<metric>");
35-
settings.add_filter(r"end_timestamp=[\d.]+[a-zA-Zµnms]*", "end_timestamp=<metric>");
36-
39+
settings.add_filter(
40+
r"current_memory_usage=[\d.]+\s*[KMGTPE]?B?",
41+
"current_memory_usage=<metric>",
42+
);
43+
settings.add_filter(
44+
r"start_timestamp=[\d.]+[a-zA-Zµnms]*",
45+
"start_timestamp=<metric>",
46+
);
47+
settings.add_filter(
48+
r"end_timestamp=[\d.]+[a-zA-Zµnms]*",
49+
"end_timestamp=<metric>",
50+
);
51+
3752
// Common custom metric patterns
3853
settings.add_filter(r"fetch_time=[\d.]+[a-zA-Zµnms]+", "fetch_time=<metric>");
39-
settings.add_filter(r"repartition_time=[\d.]+[a-zA-Zµnms]+", "repartition_time=<metric>");
54+
settings.add_filter(
55+
r"repartition_time=[\d.]+[a-zA-Zµnms]+",
56+
"repartition_time=<metric>",
57+
);
4058
settings.add_filter(r"send_time=[\d.]+[a-zA-Zµnms]+", "send_time=<metric>");
4159
settings.add_filter(r"peak_mem_used=\d+", "peak_mem_used=<metric>");
4260
settings.add_filter(r"batches_splitted=\d+", "batches_splitted=<metric>");
4361
settings.add_filter(r"batches_split=\d+", "batches_split=<metric>");
4462
settings.add_filter(r"bytes_scanned=\d+", "bytes_scanned=<metric>");
4563
settings.add_filter(r"file_open_errors=\d+", "file_open_errors=<metric>");
4664
settings.add_filter(r"file_scan_errors=\d+", "file_scan_errors=<metric>");
47-
settings.add_filter(r"files_ranges_pruned_statistics=\d+", "files_ranges_pruned_statistics=<metric>");
48-
settings.add_filter(r"num_predicate_creation_errors=\d+", "num_predicate_creation_errors=<metric>");
49-
settings.add_filter(r"page_index_rows_matched=\d+", "page_index_rows_matched=<metric>");
50-
settings.add_filter(r"page_index_rows_pruned=\d+", "page_index_rows_pruned=<metric>");
51-
settings.add_filter(r"predicate_evaluation_errors=\d+", "predicate_evaluation_errors=<metric>");
52-
settings.add_filter(r"pushdown_rows_matched=\d+", "pushdown_rows_matched=<metric>");
65+
settings.add_filter(
66+
r"files_ranges_pruned_statistics=\d+",
67+
"files_ranges_pruned_statistics=<metric>",
68+
);
69+
settings.add_filter(
70+
r"num_predicate_creation_errors=\d+",
71+
"num_predicate_creation_errors=<metric>",
72+
);
73+
settings.add_filter(
74+
r"page_index_rows_matched=\d+",
75+
"page_index_rows_matched=<metric>",
76+
);
77+
settings.add_filter(
78+
r"page_index_rows_pruned=\d+",
79+
"page_index_rows_pruned=<metric>",
80+
);
81+
settings.add_filter(
82+
r"predicate_evaluation_errors=\d+",
83+
"predicate_evaluation_errors=<metric>",
84+
);
85+
settings.add_filter(
86+
r"pushdown_rows_matched=\d+",
87+
"pushdown_rows_matched=<metric>",
88+
);
5389
settings.add_filter(r"pushdown_rows_pruned=\d+", "pushdown_rows_pruned=<metric>");
54-
settings.add_filter(r"row_groups_matched_bloom_filter=\d+", "row_groups_matched_bloom_filter=<metric>");
55-
settings.add_filter(r"row_groups_matched_statistics=\d+", "row_groups_matched_statistics=<metric>");
56-
settings.add_filter(r"row_groups_pruned_bloom_filter=\d+", "row_groups_pruned_bloom_filter=<metric>");
57-
settings.add_filter(r"row_groups_pruned_statistics=\d+", "row_groups_pruned_statistics=<metric>");
58-
settings.add_filter(r"bloom_filter_eval_time=[\d.]+[a-zA-Zµnms]+", "bloom_filter_eval_time=<metric>");
59-
settings.add_filter(r"metadata_load_time=[\d.]+[a-zA-Zµnms]+", "metadata_load_time=<metric>");
60-
settings.add_filter(r"page_index_eval_time=[\d.]+[a-zA-Zµnms]+", "page_index_eval_time=<metric>");
61-
settings.add_filter(r"row_pushdown_eval_time=[\d.]+[a-zA-Zµnms]+", "row_pushdown_eval_time=<metric>");
62-
settings.add_filter(r"statistics_eval_time=[\d.]+[a-zA-Zµnms]+", "statistics_eval_time=<metric>");
63-
settings.add_filter(r"time_elapsed_opening=[\d.]+[a-zA-Zµnms]+", "time_elapsed_opening=<metric>");
64-
settings.add_filter(r"time_elapsed_processing=[\d.]+[a-zA-Zµnms]+", "time_elapsed_processing=<metric>");
65-
settings.add_filter(r"time_elapsed_scanning_total=[\d.]+[a-zA-Zµnms]+", "time_elapsed_scanning_total=<metric>");
66-
settings.add_filter(r"time_elapsed_scanning_until_data=[\d.]+[a-zA-Zµnms]+", "time_elapsed_scanning_until_data=<metric>");
67-
settings.add_filter(r"skipped_aggregation_rows=\d+", "skipped_aggregation_rows=<metric>");
90+
settings.add_filter(
91+
r"row_groups_matched_bloom_filter=\d+",
92+
"row_groups_matched_bloom_filter=<metric>",
93+
);
94+
settings.add_filter(
95+
r"row_groups_matched_statistics=\d+",
96+
"row_groups_matched_statistics=<metric>",
97+
);
98+
settings.add_filter(
99+
r"row_groups_pruned_bloom_filter=\d+",
100+
"row_groups_pruned_bloom_filter=<metric>",
101+
);
102+
settings.add_filter(
103+
r"row_groups_pruned_statistics=\d+",
104+
"row_groups_pruned_statistics=<metric>",
105+
);
106+
settings.add_filter(
107+
r"bloom_filter_eval_time=[\d.]+[a-zA-Zµnms]+",
108+
"bloom_filter_eval_time=<metric>",
109+
);
110+
settings.add_filter(
111+
r"metadata_load_time=[\d.]+[a-zA-Zµnms]+",
112+
"metadata_load_time=<metric>",
113+
);
114+
settings.add_filter(
115+
r"page_index_eval_time=[\d.]+[a-zA-Zµnms]+",
116+
"page_index_eval_time=<metric>",
117+
);
118+
settings.add_filter(
119+
r"row_pushdown_eval_time=[\d.]+[a-zA-Zµnms]+",
120+
"row_pushdown_eval_time=<metric>",
121+
);
122+
settings.add_filter(
123+
r"statistics_eval_time=[\d.]+[a-zA-Zµnms]+",
124+
"statistics_eval_time=<metric>",
125+
);
126+
settings.add_filter(
127+
r"time_elapsed_opening=[\d.]+[a-zA-Zµnms]+",
128+
"time_elapsed_opening=<metric>",
129+
);
130+
settings.add_filter(
131+
r"time_elapsed_processing=[\d.]+[a-zA-Zµnms]+",
132+
"time_elapsed_processing=<metric>",
133+
);
134+
settings.add_filter(
135+
r"time_elapsed_scanning_total=[\d.]+[a-zA-Zµnms]+",
136+
"time_elapsed_scanning_total=<metric>",
137+
);
138+
settings.add_filter(
139+
r"time_elapsed_scanning_until_data=[\d.]+[a-zA-Zµnms]+",
140+
"time_elapsed_scanning_until_data=<metric>",
141+
);
142+
settings.add_filter(
143+
r"skipped_aggregation_rows=\d+",
144+
"skipped_aggregation_rows=<metric>",
145+
);
68146
settings.add_filter(r"build_input_batches=\d+", "build_input_batches=<metric>");
69147
settings.add_filter(r"build_input_rows=\d+", "build_input_rows=<metric>");
70148
settings.add_filter(r"input_batches=\d+", "input_batches=<metric>");

0 commit comments

Comments
 (0)