Skip to content

Migrate containers from Vec<(Tuple)> to columnar containers #54

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

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Migrate containers from Vec<(Tuple)> to columnar containers #54

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion src/relation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ impl<Tuple: Ord> Relation<Tuple> {
/// see [`Variable::from_leapjoin`](crate::Variable::from_leapjoin)
pub fn from_leapjoin<'leap, SourceTuple: Ord, Val: Ord + 'leap>(
source: &Relation<SourceTuple>,
leapers: impl Leapers<'leap, SourceTuple, Val>,
leapers: impl Leapers<SourceTuple, &'leap Val>,
logic: impl FnMut(&SourceTuple, &Val) -> Tuple,
) -> Self {
treefrog::leapjoin(&source.elements, leapers, logic)
Expand Down
58 changes: 29 additions & 29 deletions src/treefrog.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use super::Relation;
/// Performs treefrog leapjoin using a list of leapers.
pub(crate) fn leapjoin<'leap, Tuple: Ord, Val: Ord + 'leap, Result: Ord>(
source: &[Tuple],
mut leapers: impl Leapers<'leap, Tuple, Val>,
mut leapers: impl Leapers<Tuple, &'leap Val>,
mut logic: impl FnMut(&Tuple, &Val) -> Result,
) -> Relation<Result> {
let mut result = Vec::new(); // temp output storage.
Expand Down Expand Up @@ -45,23 +45,23 @@ pub(crate) fn leapjoin<'leap, Tuple: Ord, Val: Ord + 'leap, Result: Ord>(
}

/// Implemented for a tuple of leapers
pub trait Leapers<'leap, Tuple, Val> {
pub trait Leapers<Tuple, Val> {
/// Internal method:
fn for_each_count(&mut self, tuple: &Tuple, op: impl FnMut(usize, usize));

/// Internal method:
fn propose(&mut self, tuple: &Tuple, min_index: usize, values: &mut Vec<&'leap Val>);
fn propose(&mut self, tuple: &Tuple, min_index: usize, values: &mut Vec<Val>);

/// Internal method:
fn intersect(&mut self, tuple: &Tuple, min_index: usize, values: &mut Vec<&'leap Val>);
fn intersect(&mut self, tuple: &Tuple, min_index: usize, values: &mut Vec<Val>);
}

macro_rules! tuple_leapers {
($($Ty:ident)*) => {
#[allow(unused_assignments, non_snake_case)]
impl<'leap, Tuple, Val, $($Ty),*> Leapers<'leap, Tuple, Val> for ($($Ty,)*)
impl<Tuple, Val, $($Ty),*> Leapers<Tuple, Val> for ($($Ty,)*)
where
$($Ty: Leaper<'leap, Tuple, Val>,)*
$($Ty: Leaper<Tuple, Val>,)*
{
fn for_each_count(&mut self, tuple: &Tuple, mut op: impl FnMut(usize, usize)) {
let ($($Ty,)*) = self;
Expand All @@ -73,7 +73,7 @@ macro_rules! tuple_leapers {
)*
}

fn propose(&mut self, tuple: &Tuple, min_index: usize, values: &mut Vec<&'leap Val>) {
fn propose(&mut self, tuple: &Tuple, min_index: usize, values: &mut Vec<Val>) {
let ($($Ty,)*) = self;
let mut index = 0;
$(
Expand All @@ -85,7 +85,7 @@ macro_rules! tuple_leapers {
panic!("no match found for min_index={}", min_index);
}

fn intersect(&mut self, tuple: &Tuple, min_index: usize, values: &mut Vec<&'leap Val>) {
fn intersect(&mut self, tuple: &Tuple, min_index: usize, values: &mut Vec<Val>) {
let ($($Ty,)*) = self;
let mut index = 0;
$(
Expand All @@ -107,13 +107,13 @@ tuple_leapers!(A B C D E F);
tuple_leapers!(A B C D E F G);

/// Methods to support treefrog leapjoin.
pub trait Leaper<'leap, Tuple, Val> {
pub trait Leaper<Tuple, Val> {
/// Estimates the number of proposed values.
fn count(&mut self, prefix: &Tuple) -> usize;
/// Populates `values` with proposed values.
fn propose(&mut self, prefix: &Tuple, values: &mut Vec<&'leap Val>);
fn propose(&mut self, prefix: &Tuple, values: &mut Vec<Val>);
/// Restricts `values` to proposed values.
fn intersect(&mut self, prefix: &Tuple, values: &mut Vec<&'leap Val>);
fn intersect(&mut self, prefix: &Tuple, values: &mut Vec<Val>);
}

pub(crate) mod filters {
Expand All @@ -131,7 +131,7 @@ pub(crate) mod filters {
predicate: Func,
}

impl<'leap, Tuple, Func> PrefixFilter<Tuple, Func>
impl<Tuple, Func> PrefixFilter<Tuple, Func>
where
Func: Fn(&Tuple) -> bool,
{
Expand All @@ -144,7 +144,7 @@ pub(crate) mod filters {
}
}

impl<'leap, Tuple, Val, Func> Leaper<'leap, Tuple, Val> for PrefixFilter<Tuple, Func>
impl<Tuple, Val, Func> Leaper<Tuple, Val> for PrefixFilter<Tuple, Func>
where
Func: Fn(&Tuple) -> bool,
{
Expand All @@ -157,21 +157,21 @@ pub(crate) mod filters {
}
}
/// Populates `values` with proposed values.
fn propose(&mut self, _prefix: &Tuple, _values: &mut Vec<&'leap Val>) {
fn propose(&mut self, _prefix: &Tuple, _values: &mut Vec<Val>) {
panic!("PrefixFilter::propose(): variable apparently unbound");
}
/// Restricts `values` to proposed values.
fn intersect(&mut self, _prefix: &Tuple, _values: &mut Vec<&'leap Val>) {
fn intersect(&mut self, _prefix: &Tuple, _values: &mut Vec<Val>) {
// We can only be here if we returned max_value() above.
}
}

impl<'leap, Tuple, Func> Leapers<'leap, Tuple, ()> for PrefixFilter<Tuple, Func>
impl<'leap, Tuple, Func> Leapers<Tuple, &'leap ()> for PrefixFilter<Tuple, Func>
where
Func: Fn(&Tuple) -> bool,
{
fn for_each_count(&mut self, tuple: &Tuple, mut op: impl FnMut(usize, usize)) {
if <Self as Leaper<'_, Tuple, ()>>::count(self, tuple) == 0 {
if <Self as Leaper<Tuple, &()>>::count(self, tuple) == 0 {
op(0, 0)
} else {
// we will "propose" the `()` value if the predicate applies
Expand Down Expand Up @@ -202,7 +202,7 @@ pub(crate) mod filters {
}
}

impl<'leap, Tuple> Leaper<'leap, Tuple, ()> for Passthrough<Tuple> {
impl<'leap, Tuple> Leaper<Tuple, &'leap ()> for Passthrough<Tuple> {
/// Estimates the number of proposed values.
fn count(&mut self, _prefix: &Tuple) -> usize {
1
Expand Down Expand Up @@ -250,7 +250,7 @@ pub(crate) mod filters {
predicate: Func,
}

impl<'leap, Tuple, Val, Func> ValueFilter<Tuple, Val, Func>
impl<Tuple, Val, Func> ValueFilter<Tuple, Val, Func>
where
Func: Fn(&Tuple, &Val) -> bool,
{
Expand All @@ -263,7 +263,7 @@ pub(crate) mod filters {
}
}

impl<'leap, Tuple, Val, Func> Leaper<'leap, Tuple, Val> for ValueFilter<Tuple, Val, Func>
impl<'leap, Tuple, Val, Func> Leaper<Tuple, &'leap Val> for ValueFilter<Tuple, Val, Func>
where
Func: Fn(&Tuple, &Val) -> bool,
{
Expand Down Expand Up @@ -401,7 +401,7 @@ pub(crate) mod extend_with {
}
}

impl<'leap, Key, Val, Tuple, Func> Leaper<'leap, Tuple, Val>
impl<'leap, Key, Val, Tuple, Func> Leaper<Tuple, &'leap Val>
for ExtendWith<'leap, Key, Val, Tuple, Func>
where
Key: Ord + 'leap,
Expand Down Expand Up @@ -435,7 +435,7 @@ pub(crate) mod extend_with {
}
}

impl<'leap, Key, Val, Tuple, Func> Leapers<'leap, Tuple, Val>
impl<'leap, Key, Val, Tuple, Func> Leapers<Tuple, &'leap Val>
for ExtendWith<'leap, Key, Val, Tuple, Func>
where
Key: Ord + 'leap,
Expand Down Expand Up @@ -496,7 +496,7 @@ pub(crate) mod extend_anti {
}
}

impl<'leap, Key: Ord, Val: Ord + 'leap, Tuple: Ord, Func> Leaper<'leap, Tuple, Val>
impl<'leap, Key: Ord, Val: Ord + 'leap, Tuple: Ord, Func> Leaper<Tuple, &'leap Val>
for ExtendAnti<'leap, Key, Val, Tuple, Func>
where
Key: Ord + 'leap,
Expand Down Expand Up @@ -575,7 +575,7 @@ pub(crate) mod filter_with {
}
}

impl<'leap, Key, Val, Val2, Tuple, Func> Leaper<'leap, Tuple, Val2>
impl<'leap, Key, Val, Val2, Tuple, Func> Leaper<Tuple, &'leap Val2>
for FilterWith<'leap, Key, Val, Tuple, Func>
where
Key: Ord + 'leap,
Expand Down Expand Up @@ -604,7 +604,7 @@ pub(crate) mod filter_with {
}
}

impl<'leap, Key, Val, Tuple, Func> Leapers<'leap, Tuple, ()>
impl<'leap, Key, Val, Tuple, Func> Leapers<Tuple, &'leap ()>
for FilterWith<'leap, Key, Val, Tuple, Func>
where
Key: Ord + 'leap,
Expand All @@ -613,7 +613,7 @@ pub(crate) mod filter_with {
Func: Fn(&Tuple) -> (Key, Val),
{
fn for_each_count(&mut self, tuple: &Tuple, mut op: impl FnMut(usize, usize)) {
if <Self as Leaper<Tuple, ()>>::count(self, tuple) == 0 {
if <Self as Leaper<Tuple, &()>>::count(self, tuple) == 0 {
op(0, 0)
} else {
op(0, 1)
Expand Down Expand Up @@ -668,7 +668,7 @@ pub(crate) mod filter_anti {
}
}

impl<'leap, Key: Ord, Val: Ord + 'leap, Val2, Tuple: Ord, Func> Leaper<'leap, Tuple, Val2>
impl<'leap, Key: Ord, Val: Ord + 'leap, Val2, Tuple: Ord, Func> Leaper<Tuple, &'leap Val2>
for FilterAnti<'leap, Key, Val, Tuple, Func>
where
Key: Ord + 'leap,
Expand Down Expand Up @@ -697,7 +697,7 @@ pub(crate) mod filter_anti {
}
}

impl<'leap, Key, Val, Tuple, Func> Leapers<'leap, Tuple, ()>
impl<'leap, Key, Val, Tuple, Func> Leapers<Tuple, &'leap ()>
for FilterAnti<'leap, Key, Val, Tuple, Func>
where
Key: Ord + 'leap,
Expand All @@ -706,7 +706,7 @@ pub(crate) mod filter_anti {
Func: Fn(&Tuple) -> (Key, Val),
{
fn for_each_count(&mut self, tuple: &Tuple, mut op: impl FnMut(usize, usize)) {
if <Self as Leaper<Tuple, ()>>::count(self, tuple) == 0 {
if <Self as Leaper<Tuple, &()>>::count(self, tuple) == 0 {
op(0, 0)
} else {
op(0, 1)
Expand Down
2 changes: 1 addition & 1 deletion src/variable.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ impl<Tuple: Ord> Variable<Tuple> {
pub fn from_leapjoin<'leap, SourceTuple: Ord, Val: Ord + 'leap>(
&self,
source: &Variable<SourceTuple>,
leapers: impl Leapers<'leap, SourceTuple, Val>,
leapers: impl Leapers<SourceTuple, &'leap Val>,
logic: impl FnMut(&SourceTuple, &Val) -> Tuple,
) {
self.insert(treefrog::leapjoin(&source.recent.borrow(), leapers, logic));
Expand Down
Loading