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

refactor(hydro_deploy): simplify persist_pullup code #1455

Merged
merged 2 commits into from
Sep 23, 2024
Merged

refactor(hydro_deploy): simplify persist_pullup code #1455

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
40891ba
refactor(hydro_deploy): simplify `persist_pullup` code
MingweiSamuel Sep 17, 2024
8755151
Merge branch 'main' into persist-pullup
MingweiSamuel Sep 23, 2024
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
239 changes: 76 additions & 163 deletions hydroflow_plus/src/persist_pullup.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,200 +1,113 @@
use std::cell::RefCell;
use std::collections::HashSet;
use std::ops::Deref;

use crate::ir::*;

fn persist_pullup_node<'a>(
node: &mut HfPlusNode<'a>,
persist_pulled_tees: &mut HashSet<*const RefCell<HfPlusNode<'a>>>,
) {
match node {
HfPlusNode::Unpersist(box HfPlusNode::Persist(_)) => {
if let HfPlusNode::Unpersist(box HfPlusNode::Persist(box behind_persist)) =
std::mem::replace(node, HfPlusNode::Placeholder)
{
*node = behind_persist;
} else {
unreachable!()
}
}
*node = match std::mem::replace(node, HfPlusNode::Placeholder) {
HfPlusNode::Unpersist(box HfPlusNode::Persist(box behind_persist)) => behind_persist,

HfPlusNode::Delta(box HfPlusNode::Persist(_)) => {
if let HfPlusNode::Delta(box HfPlusNode::Persist(box behind_persist)) =
std::mem::replace(node, HfPlusNode::Placeholder)
{
*node = behind_persist;
} else {
unreachable!()
}
}
HfPlusNode::Delta(box HfPlusNode::Persist(box behind_persist)) => behind_persist,

HfPlusNode::Tee { inner } => {
if persist_pulled_tees.contains(&(inner.as_ref() as *const RefCell<HfPlusNode<'a>>)) {
*node = HfPlusNode::Persist(Box::new(HfPlusNode::Tee {
HfPlusNode::Persist(Box::new(HfPlusNode::Tee {
inner: inner.clone(),
}));
} else {
let inner_borrow = inner.borrow();
if let HfPlusNode::Persist(_) = inner_borrow.deref() {
drop(inner_borrow);
MingweiSamuel marked this conversation as resolved.
Show resolved Hide resolved
persist_pulled_tees.insert(inner.as_ref() as *const RefCell<HfPlusNode<'a>>);
if let HfPlusNode::Persist(box behind_persist) =
inner.replace(HfPlusNode::Placeholder)
{
*inner.borrow_mut() = behind_persist;
} else {
unreachable!()
}

*node = HfPlusNode::Persist(Box::new(HfPlusNode::Tee {
inner: inner.clone(),
}));
}))
} else if matches!(*inner.borrow(), HfPlusNode::Persist(_)) {
persist_pulled_tees.insert(inner.as_ref() as *const RefCell<HfPlusNode<'a>>);
if let HfPlusNode::Persist(box behind_persist) =
inner.replace(HfPlusNode::Placeholder)
{
*inner.borrow_mut() = behind_persist;
} else {
unreachable!()
}
}
}

HfPlusNode::Map {
f: _,
input: box HfPlusNode::Persist(_),
} => {
if let HfPlusNode::Map {
f,
input: box HfPlusNode::Persist(behind_persist),
} = std::mem::replace(node, HfPlusNode::Placeholder)
{
*node = HfPlusNode::Persist(Box::new(HfPlusNode::Map {
f,
input: behind_persist,
}));
HfPlusNode::Persist(Box::new(HfPlusNode::Tee {
inner: inner.clone(),
}))
} else {
unreachable!()
HfPlusNode::Tee { inner }
}
}

HfPlusNode::Map {
f,
input: box HfPlusNode::Persist(behind_persist),
} => HfPlusNode::Persist(Box::new(HfPlusNode::Map {
f,
input: behind_persist,
})),

HfPlusNode::FlatMap {
f: _,
input: box HfPlusNode::Persist(_),
} => {
if let HfPlusNode::FlatMap {
f,
input: box HfPlusNode::Persist(behind_persist),
} = std::mem::replace(node, HfPlusNode::Placeholder)
{
*node = HfPlusNode::Persist(Box::new(HfPlusNode::FlatMap {
f,
input: behind_persist,
}));
} else {
unreachable!()
}
}
f,
input: box HfPlusNode::Persist(behind_persist),
} => HfPlusNode::Persist(Box::new(HfPlusNode::FlatMap {
f,
input: behind_persist,
})),

HfPlusNode::Filter {
f: _,
input: box HfPlusNode::Persist(_),
} => {
if let HfPlusNode::Filter {
f,
input: box HfPlusNode::Persist(behind_persist),
} = std::mem::replace(node, HfPlusNode::Placeholder)
{
*node = HfPlusNode::Persist(Box::new(HfPlusNode::Filter {
f,
input: behind_persist,
}));
} else {
unreachable!()
}
}
f,
input: box HfPlusNode::Persist(behind_persist),
} => HfPlusNode::Persist(Box::new(HfPlusNode::Filter {
f,
input: behind_persist,
})),

HfPlusNode::Network {
input: box HfPlusNode::Persist(_),
from_location,
from_key,
to_location,
to_key,
serialize_pipeline,
instantiate_fn,
deserialize_pipeline,
input: box HfPlusNode::Persist(behind_persist),
..
} => {
if let HfPlusNode::Network {
from_location,
from_key,
to_location,
to_key,
serialize_pipeline,
instantiate_fn,
deserialize_pipeline,
input: box HfPlusNode::Persist(behind_persist),
} = std::mem::replace(node, HfPlusNode::Placeholder)
{
*node = HfPlusNode::Persist(Box::new(HfPlusNode::Network {
from_location,
from_key,
to_location,
to_key,
serialize_pipeline,
instantiate_fn,
deserialize_pipeline,
input: behind_persist,
}));
} else {
unreachable!()
}
}

HfPlusNode::Union(box HfPlusNode::Persist(_), box HfPlusNode::Persist(_)) => {
if let HfPlusNode::Union(
box HfPlusNode::Persist(left),
box HfPlusNode::Persist(right),
) = std::mem::replace(node, HfPlusNode::Placeholder)
{
*node = HfPlusNode::Persist(Box::new(HfPlusNode::Union(left, right)));
} else {
unreachable!()
}
} => HfPlusNode::Persist(Box::new(HfPlusNode::Network {
from_location,
from_key,
to_location,
to_key,
serialize_pipeline,
instantiate_fn,
deserialize_pipeline,
input: behind_persist,
})),

HfPlusNode::Union(box HfPlusNode::Persist(left), box HfPlusNode::Persist(right)) => {
HfPlusNode::Persist(Box::new(HfPlusNode::Union(left, right)))
}

HfPlusNode::CrossProduct(box HfPlusNode::Persist(_), box HfPlusNode::Persist(_)) => {
if let HfPlusNode::CrossProduct(
box HfPlusNode::Persist(left),
box HfPlusNode::Persist(right),
) = std::mem::replace(node, HfPlusNode::Placeholder)
{
*node = HfPlusNode::Persist(Box::new(HfPlusNode::Delta(Box::new(
HfPlusNode::CrossProduct(
Box::new(HfPlusNode::Persist(left)),
Box::new(HfPlusNode::Persist(right)),
),
))));
} else {
unreachable!()
}
HfPlusNode::CrossProduct(box HfPlusNode::Persist(left), box HfPlusNode::Persist(right)) => {
HfPlusNode::Persist(Box::new(HfPlusNode::Delta(Box::new(
HfPlusNode::CrossProduct(
Box::new(HfPlusNode::Persist(left)),
Box::new(HfPlusNode::Persist(right)),
),
))))
}

HfPlusNode::Join(box HfPlusNode::Persist(_), box HfPlusNode::Persist(_)) => {
if let HfPlusNode::Join(box HfPlusNode::Persist(left), box HfPlusNode::Persist(right)) =
std::mem::replace(node, HfPlusNode::Placeholder)
{
*node =
HfPlusNode::Persist(Box::new(HfPlusNode::Delta(Box::new(HfPlusNode::Join(
Box::new(HfPlusNode::Persist(left)),
Box::new(HfPlusNode::Persist(right)),
)))));
} else {
unreachable!()
}
HfPlusNode::Join(box HfPlusNode::Persist(left), box HfPlusNode::Persist(right)) => {
HfPlusNode::Persist(Box::new(HfPlusNode::Delta(Box::new(HfPlusNode::Join(
Box::new(HfPlusNode::Persist(left)),
Box::new(HfPlusNode::Persist(right)),
)))))
}

HfPlusNode::Unique(box HfPlusNode::Persist(_)) => {
if let HfPlusNode::Unique(box HfPlusNode::Persist(inner)) =
std::mem::replace(node, HfPlusNode::Placeholder)
{
*node = HfPlusNode::Persist(Box::new(HfPlusNode::Delta(Box::new(
HfPlusNode::Unique(Box::new(HfPlusNode::Persist(inner))),
))));
} else {
unreachable!()
}
HfPlusNode::Unique(box HfPlusNode::Persist(inner)) => {
HfPlusNode::Persist(Box::new(HfPlusNode::Delta(Box::new(HfPlusNode::Unique(
Box::new(HfPlusNode::Persist(inner)),
)))))
}

_ => {}
}
node => node,
};
}

pub fn persist_pullup(ir: Vec<HfPlusLeaf>) -> Vec<HfPlusLeaf> {
Expand Down
Loading