fix: fixed variant failed to successfully apply virtual column in bind join

Signed-off-by: Kould <[email protected]>

Author: KKould

src/query/sql/src/planner/binder/bind_context.rs

@@ -139,6 +139,17 @@ impl VirtualColumnContext {
             virtual_columns: Vec::new(),
         }
     }
+
+    pub(crate) fn merge(&mut self, other: &VirtualColumnContext) {
+        self.allow_pushdown = self.allow_pushdown || other.allow_pushdown;
+        self.table_indices.extend(other.table_indices.clone());
+        self.virtual_column_indices
+            .extend(other.virtual_column_indices.clone());
+        self.virtual_column_names
+            .extend(other.virtual_column_names.clone());
+        self.next_column_ids.extend(other.next_column_ids.clone());
+        self.virtual_columns.extend(other.virtual_columns.clone());
+    }
 }
 
 /// `BindContext` stores all the free variables in a query and tracks the context of binding procedure.

src/query/sql/src/planner/binder/bind_table_reference/bind_join.rs

@@ -98,6 +98,12 @@ impl Binder {
         let mut right_column_bindings = right_context.columns.clone();
 
         let mut bind_context = bind_context.replace();
+        bind_context
+            .virtual_column_context
+            .merge(&left_context.virtual_column_context);
+        bind_context
+            .virtual_column_context
+            .merge(&right_context.virtual_column_context);
 
         self.check_table_name_and_condition(
             &left_column_bindings,
@@ -762,7 +768,7 @@ impl<'a> JoinConditionResolver<'a> {
     }
 
     fn resolve_predicate(
-        &self,
+        &mut self,
         predicate: &Expr,
         left_join_conditions: &mut Vec<ScalarExpr>,
         right_join_conditions: &mut Vec<ScalarExpr>,
@@ -810,6 +816,7 @@ impl<'a> JoinConditionResolver<'a> {
                 non_equi_conditions.push(predicate);
             }
         }
+        *self.join_context = join_context;
         Ok(())
     }
 

tests/sqllogictests/suites/mode/standalone/ee/explain_virtual_column.test

@@ -133,9 +133,6 @@ TableScan
 ├── virtual columns: [v['a'][0], v['b']]
 └── estimated rows: 0.00
 
-statement ok
-drop table t1
-
 statement ok
 drop table if exists t2
 
@@ -256,6 +253,109 @@ Filter
     ├── virtual columns: [v['a'][0], v['b']]
     └── estimated rows: 1.00
 
+query T
+explain select t1.a, t1.v['b'] from t1 left outer join t2 on t1.v['b'] = t2.a where t1.v['a'][0] = 1;
+----
+HashJoin
+├── output columns: [t1.a (#0), t1.v['b'] (#4)]
+├── join type: RIGHT OUTER
+├── build keys: []
+├── probe keys: []
+├── keys is null equal: []
+├── filters: [TRY_CAST(v['b'] (#4) AS Int32 NULL) = t2.a (#2)]
+├── estimated rows: 0.00
+├── TableScan(Build)
+│   ├── table: default.test_virtual_db.t1
+│   ├── output columns: [a (#0), v['b'] (#4)]
+│   ├── read rows: 1
+│   ├── read size: < 1 KiB
+│   ├── partitions total: 1
+│   ├── partitions scanned: 1
+│   ├── pruning stats: [segments: <range pruning: 1 to 1>, blocks: <range pruning: 1 to 1>]
+│   ├── push downs: [filters: [is_true(TRY_CAST(v['a'][0] (#5) AS UInt8 NULL) = 1)], limit: NONE]
+│   ├── virtual columns: [v['a'][0], v['b']]
+│   └── estimated rows: 0.00
+└── TableScan(Probe)
+    ├── table: default.test_virtual_db.t2
+    ├── output columns: [a (#2)]
+    ├── read rows: 1
+    ├── read size: < 1 KiB
+    ├── partitions total: 1
+    ├── partitions scanned: 1
+    ├── pruning stats: [segments: <range pruning: 1 to 1>, blocks: <range pruning: 1 to 1>]
+    ├── push downs: [filters: [], limit: NONE]
+    └── estimated rows: 1.00
+
+query T
+explain select t1.a, t1.v['b'] from t1 left outer join t2 on t1.v['b'] = t2.a where t1.v['a'][0] = 1;
+----
+HashJoin
+├── output columns: [t1.a (#0), t1.v['b'] (#4)]
+├── join type: RIGHT OUTER
+├── build keys: []
+├── probe keys: []
+├── keys is null equal: []
+├── filters: [TRY_CAST(v['b'] (#4) AS Int32 NULL) = t2.a (#2)]
+├── estimated rows: 0.00
+├── TableScan(Build)
+│   ├── table: default.test_virtual_db.t1
+│   ├── output columns: [a (#0), v['b'] (#4)]
+│   ├── read rows: 1
+│   ├── read size: < 1 KiB
+│   ├── partitions total: 1
+│   ├── partitions scanned: 1
+│   ├── pruning stats: [segments: <range pruning: 1 to 1>, blocks: <range pruning: 1 to 1>]
+│   ├── push downs: [filters: [is_true(TRY_CAST(v['a'][0] (#5) AS UInt8 NULL) = 1)], limit: NONE]
+│   ├── virtual columns: [v['a'][0], v['b']]
+│   └── estimated rows: 0.00
+└── TableScan(Probe)
+    ├── table: default.test_virtual_db.t2
+    ├── output columns: [a (#2)]
+    ├── read rows: 1
+    ├── read size: < 1 KiB
+    ├── partitions total: 1
+    ├── partitions scanned: 1
+    ├── pruning stats: [segments: <range pruning: 1 to 1>, blocks: <range pruning: 1 to 1>]
+    ├── push downs: [filters: [], limit: NONE]
+    └── estimated rows: 1.00
+
+
+query T
+explain select * from t1 join t2 on t1.v['b'] = t2.a;
+----
+HashJoin
+├── output columns: [t1.a (#0), t1.v (#1), t2.a (#2), t2.v (#3)]
+├── join type: INNER
+├── build keys: [t2.a (#2)]
+├── probe keys: [CAST(v['b'] (#4) AS Int32 NULL)]
+├── keys is null equal: [false]
+├── filters: []
+├── estimated rows: 1.00
+├── TableScan(Build)
+│   ├── table: default.test_virtual_db.t2
+│   ├── output columns: [a (#2), v (#3)]
+│   ├── read rows: 1
+│   ├── read size: < 1 KiB
+│   ├── partitions total: 1
+│   ├── partitions scanned: 1
+│   ├── pruning stats: [segments: <range pruning: 1 to 1>, blocks: <range pruning: 1 to 1>]
+│   ├── push downs: [filters: [], limit: NONE]
+│   └── estimated rows: 1.00
+└── TableScan(Probe)
+    ├── table: default.test_virtual_db.t1
+    ├── output columns: [a (#0), v (#1), v['b'] (#4)]
+    ├── read rows: 1
+    ├── read size: < 1 KiB
+    ├── partitions total: 1
+    ├── partitions scanned: 1
+    ├── pruning stats: [segments: <range pruning: 1 to 1>, blocks: <range pruning: 1 to 1>]
+    ├── push downs: [filters: [], limit: NONE]
+    ├── virtual columns: [v['b']]
+    └── estimated rows: 1.00
+
+statement ok
+drop table t1
+
 statement ok
 drop table t2