Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: Nightly fixes (January 3) #30938

Merged
merged 1 commit into from
Jan 3, 2025
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
6 changes: 6 additions & 0 deletions misc/python/materialize/version_ancestor_overrides.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,12 @@ def get_ancestor_overrides_for_performance_regressions(

min_ancestor_mz_version_per_commit = dict()

if scenario_class_name == "FastPathOrderByLimit":
# PR#30872 (rust: Upgrade to 1.83.0) increases wallclock
min_ancestor_mz_version_per_commit[
"74ebdd68dd2e9ec860837d52866ab9db61a0a49e"
] = MzVersion.parse_mz("v0.129.0")

if scenario_class_name == "OptbenchTPCHQ01":
# PR#30806 ([optimizer] report per-transform metrics) increases wallclock
min_ancestor_mz_version_per_commit[
Expand Down
1 change: 1 addition & 0 deletions src/persist-client/src/internal/merge.rs
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@ mod tests {
use super::*;

#[mz_ore::test]
#[cfg_attr(miri, ignore)] // too slow
fn test_merge_tree() {
// Exhaustively test the merge tree for small sizes.
for max_len in 2..8 {
Expand Down
9 changes: 3 additions & 6 deletions test/testdrive/statistics-maintenance.td
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,12 @@ one:two
sink1 1 1 true true

> SELECT s.name,
SUM(u.updates_committed) > 0,
SUM(u.messages_received) >= 2
FROM mz_sources s
JOIN mz_internal.mz_source_statistics_raw u ON s.id = u.id
WHERE s.name IN ('upsert1')
GROUP BY s.id, s.name
upsert1 true true
upsert1 true

# Shut down the cluster
> ALTER CLUSTER cluster1 SET (REPLICATION FACTOR = 0)
Expand All @@ -75,13 +74,12 @@ upsert1 true true
sink1 1 1 true true

> SELECT s.name,
SUM(u.updates_committed) > 0,
SUM(u.messages_received) >= 2
FROM mz_sources s
JOIN mz_internal.mz_source_statistics_raw u ON s.id = u.id
WHERE s.name IN ('upsert1')
GROUP BY s.id, s.name
upsert1 true true
upsert1 true

# Ingest some more data, and ensure counters are maintained

Expand All @@ -99,10 +97,9 @@ two:three
sink1 2 2 true true

> SELECT s.name,
SUM(u.updates_committed) > 0,
SUM(u.messages_received) >= 4
FROM mz_sources s
JOIN mz_internal.mz_source_statistics_raw u ON s.id = u.id
WHERE s.name IN ('upsert1')
GROUP BY s.id, s.name
upsert1 true true
upsert1 true
Loading