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

fix(queue-msg): fix flattening optimization passes #2058

Merged
merged 1 commit into from
Jun 7, 2024
Merged

fix(queue-msg): fix flattening optimization passes #2058

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
100 changes: 88 additions & 12 deletions lib/queue-msg/src/optimize/passes.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,15 @@ impl<T: QueueMessageTypes> PurePass<T> for FlattenSeq {
fn go<T: QueueMessageTypes>(msg: QueueMsg<T>) -> Vec<QueueMsg<T>> {
match msg {
QueueMsg::Sequence(new_seq) => new_seq.into_iter().flat_map(go).collect(),
QueueMsg::Concurrent(c) => vec![conc(c.into_iter().flat_map(go))],
QueueMsg::Concurrent(c) => vec![conc(c.into_iter().flat_map(|msg| {
let mut msgs = go(msg);

match msgs.len() {
0 => None,
1 => Some(msgs.pop().unwrap()),
_ => Some(seq(msgs)),
}
}))],
QueueMsg::Aggregate {
queue,
data,
Expand Down Expand Up @@ -253,18 +261,16 @@ impl<T: QueueMessageTypes> PurePass<T> for FlattenConc {
fn go<T: QueueMessageTypes>(msg: QueueMsg<T>) -> Vec<QueueMsg<T>> {
match msg {
QueueMsg::Concurrent(new_conc) => new_conc.into_iter().flat_map(go).collect(),
// wrap in conc again
// seq(conc(a.., conc(b..)), c..) == seq(conc(a.., b..), c..)
// seq(conc(a.., conc(b..)), c..) != seq(a.., b.., c..)
QueueMsg::Sequence(s) => vec![seq(s.into_iter().map(|msg| {
QueueMsg::Sequence(s) => vec![seq(s.into_iter().flat_map(|msg| {
let mut msgs = go(msg);

match msgs.len() {
// return the original empty sequence
0 => seq([]),
// seq(a) == a
1 => msgs.pop().unwrap(),
_ => conc(msgs),
0 => None,
1 => Some(msgs.pop().unwrap()),
// wrap in conc again
// seq(conc(a.., conc(b..)), c..) == seq(conc(a.., b..), c..)
// seq(conc(a.., conc(b..)), c..) != seq(a.., b.., c..)
_ => Some(conc(msgs)),
}
}))],
QueueMsg::Aggregate {
Expand Down Expand Up @@ -298,8 +304,10 @@ impl<T: QueueMessageTypes> PurePass<T> for FlattenConc {
mod tests {
use super::*;
use crate::{
data, effect, fetch, noop,
test_utils::{DataA, DataB, DataC, FetchA, PrintAbc, SimpleMessage},
aggregate, data, defer_relative, effect, event, fetch, noop,
test_utils::{
AggregatePrintAbc, DataA, DataB, DataC, FetchA, PrintAbc, SimpleEvent, SimpleMessage,
},
};

#[test]
Expand Down Expand Up @@ -349,4 +357,72 @@ mod tests {
assert_eq!(optimized.ready, expected_output);
assert_eq!(optimized.optimize_further, []);
}

#[test]
fn seq_conc_conc() {
let msgs = vec![seq::<SimpleMessage>([
conc([
aggregate([], [], AggregatePrintAbc {}),
aggregate([], [], AggregatePrintAbc {}),
]),
conc([
aggregate([], [], AggregatePrintAbc {}),
aggregate([], [], AggregatePrintAbc {}),
]),
conc([
repeat(None, seq([event(SimpleEvent {}), defer_relative(10)])),
repeat(None, seq([event(SimpleEvent {}), defer_relative(10)])),
// this seq is the only message that should be flattened
seq([
effect(PrintAbc {
a: DataA {},
b: DataB {},
c: DataC {},
}),
seq([
aggregate([], [], AggregatePrintAbc {}),
aggregate([], [], AggregatePrintAbc {}),
aggregate([], [], AggregatePrintAbc {}),
]),
]),
]),
])];

let expected_output = vec![(
vec![0],
seq::<SimpleMessage>([
conc([
aggregate([], [], AggregatePrintAbc {}),
aggregate([], [], AggregatePrintAbc {}),
]),
conc([
aggregate([], [], AggregatePrintAbc {}),
aggregate([], [], AggregatePrintAbc {}),
]),
conc([
repeat(None, seq([event(SimpleEvent {}), defer_relative(10)])),
repeat(None, seq([event(SimpleEvent {}), defer_relative(10)])),
seq([
effect(PrintAbc {
a: DataA {},
b: DataB {},
c: DataC {},
}),
aggregate([], [], AggregatePrintAbc {}),
aggregate([], [], AggregatePrintAbc {}),
aggregate([], [], AggregatePrintAbc {}),
]),
]),
]),
)];

let optimized = Normalize::default().run_pass_pure(msgs.clone());

assert_eq!(optimized.optimize_further, expected_output);
assert_eq!(optimized.ready, []);

let optimized = NormalizeFinal::default().run_pass_pure(msgs);
assert_eq!(optimized.ready, expected_output);
assert_eq!(optimized.optimize_further, []);
}
}
Loading