Takes care of VALUES when choosing joins

pull/171/head
Tpt 3 years ago
parent f602f66b87
commit 4673cd7979
  1. 25
      lib/src/sparql/plan_builder.rs

@ -8,6 +8,7 @@ use rand::random;
use spargebra::algebra::*; use spargebra::algebra::*;
use spargebra::term::*; use spargebra::term::*;
use std::collections::{BTreeSet, HashSet}; use std::collections::{BTreeSet, HashSet};
use std::mem::swap;
use std::rc::Rc; use std::rc::Rc;
pub struct PlanBuilder<'a> { pub struct PlanBuilder<'a> {
@ -1131,20 +1132,25 @@ impl<'a> PlanBuilder<'a> {
} }
} }
fn new_join(left: PlanNode, right: PlanNode) -> PlanNode { fn new_join(mut left: PlanNode, mut right: PlanNode) -> PlanNode {
if Self::is_fit_for_for_loop_join(&left) if Self::is_fit_for_for_loop_join(&left)
&& Self::is_fit_for_for_loop_join(&right) && Self::is_fit_for_for_loop_join(&right)
&& left && Self::has_some_common_variables(&left, &right)
.always_bound_variables()
.intersection(&right.always_bound_variables())
.next()
.is_some()
{ {
// We first use VALUES to filter the following patterns evaluation
if matches!(right, PlanNode::StaticBindings { .. }) {
swap(&mut left, &mut right);
}
PlanNode::ForLoopJoin { PlanNode::ForLoopJoin {
left: Box::new(left), left: Box::new(left),
right: Box::new(right), right: Box::new(right),
} }
} else { } else {
// Let's avoid materializing right if left is already materialized
// TODO: be smarter and reuse already existing materialization
if matches!(left, PlanNode::StaticBindings { .. }) {
swap(&mut left, &mut right);
}
PlanNode::HashJoin { PlanNode::HashJoin {
left: Box::new(left), left: Box::new(left),
right: Box::new(right), right: Box::new(right),
@ -1152,6 +1158,13 @@ impl<'a> PlanBuilder<'a> {
} }
} }
fn has_some_common_variables(left: &PlanNode, right: &PlanNode) -> bool {
left.always_bound_variables()
.intersection(&right.always_bound_variables())
.next()
.is_some()
}
fn is_fit_for_for_loop_join(node: &PlanNode) -> bool { fn is_fit_for_for_loop_join(node: &PlanNode) -> bool {
//TODO: think more about it //TODO: think more about it
match node { match node {

Loading…
Cancel
Save