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.

Sign up for GitHub

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

Jump to bottom

Revert "Backport 0.57.9 reverts" #20202

Closed
wants to merge 10 commits into from
Closed

Revert "Backport 0.57.9 reverts" #20202

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5032396
Revert "Merge pull request #20124 from umanwizard/backport_57.9_reverts"
antiguru Jul 12, 2023
4c217ec
Revert "Backport 0.57.9 reverts"
antiguru Jun 28, 2023
7cefacf
Track trace usage in Materialize through a custom wrapper type
antiguru Jul 11, 2023
7b19127
Arrangement size logging: allow compaction to the empty frontier (#20…
antiguru Jun 28, 2023
ebcc499
Add arrangement size logging feature flag
antiguru Jul 14, 2023
57f0173
Update documentation
antiguru Jul 14, 2023
f4a80c2
Add safety argument to MzArranged::inner calls
antiguru Jul 14, 2023
03e7e13
Fix testdrive
antiguru Jul 14, 2023
5dc6505
Enable arrangement size logging in tests
antiguru Jul 18, 2023
5db53dd
Address review comments
antiguru Jul 18, 2023
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
11 changes: 5 additions & 6 deletions src/compute/src/extensions/arrange.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,11 @@ where
let mut trace = arranged.trace.clone();
let operator = trace.operator().global_id;

// We don't want to block compaction.
let empty = Antichain::new();
trace.set_logical_compaction(empty.borrow());
trace.set_physical_compaction(empty.borrow());
teskje marked this conversation as resolved.
Show resolved Hide resolved

let (mut old_size, mut old_capacity, mut old_allocations) = (0isize, 0isize, 0isize);

arranged
Expand All @@ -225,12 +230,6 @@ where
output.session(&time).give_container(&mut buffer);
}

// We don't want to block compaction.
let mut upper = Antichain::new();
trace.read_upper(&mut upper);
trace.set_logical_compaction(upper.borrow());
trace.set_physical_compaction(upper.borrow());

let (size, capacity, allocations) = logic(&trace);

let size = size.try_into().expect("must fit");
Expand Down