Makes hash join into for loop join optimization more aggressive

lib/src/sparql/plan_builder.rs

@@ -1361,15 +1361,15 @@ impl<'a> PlanBuilder<'a> {
     }
 
     fn new_join(&self, mut left: PlanNode, mut right: PlanNode) -> PlanNode {
-        if self.with_optimizations
-            && Self::is_fit_for_for_loop_join(&left)
-            && Self::is_fit_for_for_loop_join(&right)
-            && Self::has_some_common_variables(&left, &right)
-        {
         // We first use VALUES to filter the following patterns evaluation
         if matches!(right, PlanNode::StaticBindings { .. }) {
             swap(&mut left, &mut right);
         }
+
+        if self.with_optimizations
+            && Self::is_fit_for_for_loop_join(&right)
+            && Self::has_some_common_variables(&left, &right)
+        {
             PlanNode::ForLoopJoin {
                 left: Rc::new(left),
                 right: Rc::new(right),
@@ -1399,9 +1399,8 @@ impl<'a> PlanBuilder<'a> {
         match node {
             PlanNode::StaticBindings { .. }
             | PlanNode::QuadPattern { .. }
-            | PlanNode::PathPattern { .. }
+            | PlanNode::PathPattern { .. } => true,
-            | PlanNode::ForLoopJoin { .. } => true,
+            PlanNode::ForLoopJoin { left, right } | PlanNode::HashJoin { left, right } => {
-            PlanNode::HashJoin { left, right } => {
                 Self::is_fit_for_for_loop_join(left) && Self::is_fit_for_for_loop_join(right)
             }
             PlanNode::Filter { child, .. } | PlanNode::Extend { child, .. } => {