Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could use the new replace syntax to guard the tests against changing global IDs. They're not static, so changes to the catalog can cause churn here. Specifically, we could replace t[\d]+ with a placeholder.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oooh right, good idea.

Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ SELECT mz_unsafe.mz_sleep(8)
query IT
SELECT id, global_id FROM mz_internal.mz_dataflow_global_ids ORDER BY id, global_id;
----
5 u2
5 u3
6 u2
6 u3

query TI
SELECT global_id, lir_id FROM mz_internal.mz_lir_mapping ORDER BY global_id, lir_id DESC;
Expand Down Expand Up @@ -119,17 +119,17 @@ SELECT mz_unsafe.mz_sleep(8)
query IT
SELECT id, global_id FROM mz_internal.mz_dataflow_global_ids ORDER BY id, global_id;
----
10 t52
11 t66


query TI
SELECT global_id, lir_id FROM mz_internal.mz_lir_mapping ORDER BY global_id, lir_id DESC;
----
t52 5
t52 4
t52 3
t52 2
t52 1
t66 5
t66 4
t66 3
t66 2
t66 1

## attribution queries

Expand All @@ -142,11 +142,11 @@ SELECT global_id, lir_id, parent_lir_id, REPEAT(' ', nesting * 2) || operator AS
GROUP BY global_id, lir_id, operator, parent_lir_id, nesting
ORDER BY global_id, lir_id DESC;
----
t52 5 NULL Differential␠Join␠%0␠»␠%1
t52 4 5 ␠␠Arrange␠(#0{y})
t52 3 4 ␠␠␠␠Read␠u4
t52 2 5 ␠␠Arrange␠(#0{x})
t52 1 2 ␠␠␠␠Read␠u4
t66 5 NULL Differential␠Join␠%0␠»␠%1
t66 4 5 ␠␠Arrange␠(#0{y})
t66 3 4 ␠␠␠␠Read␠u4
t66 2 5 ␠␠Arrange␠(#0{x})
t66 1 2 ␠␠␠␠Read␠u4

# omitting pg_size_pretty(sum(size)) as size
query TIIT
Expand All @@ -157,11 +157,11 @@ SELECT global_id, lir_id, parent_lir_id, REPEAT(' ', nesting * 2) || operator AS
GROUP BY global_id, lir_id, operator, parent_lir_id, nesting
ORDER BY global_id, lir_id DESC;
----
t52 5 NULL Differential␠Join␠%0␠»␠%1
t52 4 5 ␠␠Arrange␠(#0{y})
t52 3 4 ␠␠␠␠Read␠u4
t52 2 5 ␠␠Arrange␠(#0{x})
t52 1 2 ␠␠␠␠Read␠u4
t66 5 NULL Differential␠Join␠%0␠»␠%1
t66 4 5 ␠␠Arrange␠(#0{y})
t66 3 4 ␠␠␠␠Read␠u4
t66 2 5 ␠␠Arrange␠(#0{x})
t66 1 2 ␠␠␠␠Read␠u4

statement ok
DROP TABLE u CASCADE;
Expand Down Expand Up @@ -417,26 +417,26 @@ SELECT global_id, REPEAT(' ', nesting * 2) || operator AS operator
FROM mz_internal.mz_lir_mapping mlm
ORDER BY global_id, lir_id DESC;
----
t77 Returning␠Distinct␠GroupAggregate
t77 ␠␠Union
t77 ␠␠␠␠Differential␠Join␠%0␠»␠%1
t77 ␠␠␠␠␠␠Arrange␠(#0{messageid})
t77 ␠␠␠␠␠␠␠␠Stream␠l0
t77 ␠␠␠␠␠␠Arranged␠u15
t77 ␠␠␠␠Arranged␠u13
t77 With␠Recursive␠l0␠=␠Unarranged␠Raw␠Stream
t77 ␠␠Distinct␠GroupAggregate
t77 ␠␠␠␠Union
t77 ␠␠␠␠␠␠Differential␠Join␠%0␠»␠%1
t77 ␠␠␠␠␠␠␠␠Arrange␠(#0{messageid})
t77 ␠␠␠␠␠␠␠␠␠␠Read␠l0
t77 ␠␠␠␠␠␠␠␠Arrange␠(#1{parentcommentid})
t77 ␠␠␠␠␠␠␠␠␠␠Arranged␠u15
t77 ␠␠␠␠␠␠Differential␠Join␠%1␠»␠%0
t77 ␠␠␠␠␠␠␠␠Arranged␠u13
t77 ␠␠␠␠␠␠␠␠Arrange␠(#1{parentpostid})
t77 ␠␠␠␠␠␠␠␠␠␠Arranged␠u15
t77 ␠␠␠␠␠␠Arranged␠u13
t83 Returning␠Distinct␠GroupAggregate
t83 ␠␠Union
t83 ␠␠␠␠Differential␠Join␠%0␠»␠%1
t83 ␠␠␠␠␠␠Arrange␠(#0{messageid})
t83 ␠␠␠␠␠␠␠␠Stream␠l0
t83 ␠␠␠␠␠␠Arranged␠u15
t83 ␠␠␠␠Arranged␠u13
t83 With␠Recursive␠l0␠=␠Unarranged␠Raw␠Stream
t83 ␠␠Distinct␠GroupAggregate
t83 ␠␠␠␠Union
t83 ␠␠␠␠␠␠Differential␠Join␠%0␠»␠%1
t83 ␠␠␠␠␠␠␠␠Arrange␠(#0{messageid})
t83 ␠␠␠␠␠␠␠␠␠␠Read␠l0
t83 ␠␠␠␠␠␠␠␠Arrange␠(#1{parentcommentid})
t83 ␠␠␠␠␠␠␠␠␠␠Arranged␠u15
t83 ␠␠␠␠␠␠Differential␠Join␠%1␠»␠%0
t83 ␠␠␠␠␠␠␠␠Arranged␠u13
t83 ␠␠␠␠␠␠␠␠Arrange␠(#1{parentpostid})
t83 ␠␠␠␠␠␠␠␠␠␠Arranged␠u15
t83 ␠␠␠␠␠␠Arranged␠u13
u10 Arrange␠(#1{person1id})
u10 ␠␠Stream␠u9
u11 Arrange␠(#2{person2id})
Expand All @@ -458,7 +458,7 @@ u21 ␠␠Read␠l0
u21 ␠␠Stream␠l0
u21 With␠l0␠=␠Map/Filter/Project
u21 ␠␠Accumulable␠GroupAggregate
u21 ␠␠␠␠Delta␠Join␠[%0␠»␠%1␠»␠%2][%1␠»␠%0␠»␠%2][%2␠»␠%0␠»␠%1]
u21 ␠␠␠␠Delta␠Join␠[%0␠»␠%1␠»␠%2][%1␠»␠%0␠»␠%2][%2␠»␠%0␠»␠%1]
u21 ␠␠␠␠␠␠Arranged␠u9
u21 ␠␠␠␠␠␠Arranged␠u17
u21 ␠␠␠␠␠␠Arrange␠(empty␠key)␠(#1{parentmessageid})
Expand Down Expand Up @@ -490,7 +490,7 @@ u23 ␠␠␠␠␠␠Arrange␠(#1{dst})
u23 ␠␠␠␠␠␠␠␠Read␠l3
u23 l4␠=␠Non-monotonic␠TopK
u23 ␠␠Union
u23 ␠␠␠␠Delta␠Join␠[%0␠»␠%2␠»␠%1][%1␠»␠%0␠»␠%2][%2␠»␠%0␠»␠%1]
u23 ␠␠␠␠Delta␠Join␠[%0␠»␠%2␠»␠%1][%1␠»␠%0␠»␠%2][%2␠»␠%0␠»␠%1]
u23 ␠␠␠␠␠␠Arranged␠l1
u23 ␠␠␠␠␠␠Arranged␠l2
u23 ␠␠␠␠␠␠Arrange␠(empty␠key)␠(#1{dst})
Expand All @@ -501,7 +501,7 @@ u23 ␠␠␠␠␠␠␠␠Constant␠(1␠rows)
u23 ␠␠␠␠␠␠Arranged␠l0
u23 l3␠=␠Non-monotonic␠TopK
u23 ␠␠Union
u23 ␠␠␠␠Delta␠Join␠[%0␠»␠%2␠»␠%1][%1␠»␠%0␠»␠%2][%2␠»␠%0␠»␠%1]
u23 ␠␠␠␠Delta␠Join␠[%0␠»␠%2␠»␠%1][%1␠»␠%0␠»␠%2][%2␠»␠%0␠»␠%1]
u23 ␠␠␠␠␠␠Arranged␠l1
u23 ␠␠␠␠␠␠Arranged␠l2
u23 ␠␠␠␠␠␠Arrange␠(empty␠key)␠(#1{dst})
Expand Down Expand Up @@ -592,7 +592,7 @@ materialize.public.v2_idx_x u26 2
materialize.public.v2_idx_x u27 2
materialize.public.v_idx_x u28 5
materialize.public.v_idx_x u29 2
materialize.public.w t90 5
materialize.public.w t92 5

# explain analyze SQL generation

Expand Down Expand Up @@ -1210,7 +1210,7 @@ FROM
mz_introspection.mz_mappable_objects AS mo
LEFT JOIN object_memory_totals AS omt USING(global_id)
ORDER BY
total_memory DESC NULLS LAST,
omt.total_memory DESC NULLS LAST,
total_records DESC NULLS LAST,
mo.name DESC;
EOF
Expand Down Expand Up @@ -1274,7 +1274,7 @@ FROM
LEFT JOIN object_memory_totals AS omt USING(global_id)
LEFT JOIN object_cpu_totals AS oct USING(global_id)
ORDER BY
total_memory DESC NULLS LAST,
omt.total_memory DESC NULLS LAST,
total_records DESC NULLS LAST,
total_elapsed DESC NULLS LAST,
mo.name DESC;
Expand Down Expand Up @@ -1507,7 +1507,7 @@ ORDER BY
worker_id,
max_operator_memory_ratio DESC NULLS LAST,
max_operator_records_ratio DESC NULLS LAST,
worker_memory DESC NULLS LAST,
om.worker_memory DESC NULLS LAST,
worker_records DESC NULLS LAST,
mo.name DESC;
EOF
Expand Down
24 changes: 17 additions & 7 deletions test/sqllogictest/mzcompose.py
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,12 @@ def run_sqllogictest(

failed_files = []

def file_replicas(file: str) -> int:
# `singlereplica_*` files assert replica-targeted introspection
# results, so always run them with a single replica instead of
# skipping them when the workflow requests more.
return 1 if "singlereplica_" in file else args.replicas

def worker(container_name: str):
exception: Exception | None = None
while True:
Expand All @@ -385,9 +391,6 @@ def worker(container_name: str):
except Exception:
break # Queue is empty

if "singlereplica_" in file and args.replicas > 1:
continue

junit_report_path = (
None
if rewrite_results
Expand All @@ -398,7 +401,7 @@ def worker(container_name: str):
cmd = step.to_command(
container_name,
file,
args.replicas,
file_replicas(file),
args.replica_size,
junit_report_path,
c.metadata_store(),
Expand Down Expand Up @@ -455,9 +458,16 @@ def worker(container_name: str):
f.write(diff)
else:
print("Rewriting results did not result in a diff")
print(
f"Rewrite SLT files locally with: bin/sqllogictest --optimized -- --rewrite-results --replica-size={args.replica_size} --replicas={args.replicas} {' '.join([file for step, file in failed_files])}"
)
replica_counts = {file_replicas(file) for _, file in failed_files}
for replicas in sorted(replica_counts):
files = [
file
for _, file in failed_files
if file_replicas(file) == replicas
]
print(
f"Rewrite SLT files locally with: bin/sqllogictest --optimized -- --rewrite-results --replica-size={args.replica_size} --replicas={replicas} {' '.join(files)}"
)
print(f"Or apply directly: git apply <<'EOF'\n{diff}EOF")
if errors:
raise errors[0]
Expand Down
Loading