Skip to content

Commit 97d3400

Browse files
author
Isha Nema
committed
Fix tests for new Column API
1 parent f589270 commit 97d3400

File tree

8 files changed

+23
-22
lines changed

8 files changed

+23
-22
lines changed

‎datafusion/expr/src/expr_schema.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1083,7 +1083,7 @@ mod tests {
10831083
let outer_ref = out_ref_col_with_metadata(
10841084
DataType::Int32,
10851085
meta.to_hashmap(),
1086-
Column::from_name("foo"),
1086+
"foo",
10871087
);
10881088
assert_eq!(meta, outer_ref.metadata(&schema).unwrap());
10891089
}

‎datafusion/expr/src/logical_plan/plan.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4972,7 +4972,7 @@ mod tests {
49724972
let col = schema.field_names()[0].clone();
49734973

49744974
let filter = Filter::try_new(
4975-
Expr::Column(col.into()).eq(Expr::Literal(ScalarValue::Int32(Some(1)), None)),
4975+
Expr::Column(Column::from_qualified_name(col)).eq(Expr::Literal(ScalarValue::Int32(Some(1)), None)),
49764976
scan,
49774977
)
49784978
.unwrap();
@@ -5002,7 +5002,7 @@ mod tests {
50025002
let col = schema.field_names()[0].clone();
50035003

50045004
let filter =
5005-
Filter::try_new(Expr::Column(col.into()).eq(lit(1i32)), scan).unwrap();
5005+
Filter::try_new(Expr::Column(Column::from_qualified_name(col)).eq(lit(1i32)), scan).unwrap();
50065006
assert!(filter.is_scalar());
50075007
}
50085008

‎datafusion/optimizer/src/common_subexpr_eliminate.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1167,7 +1167,7 @@ mod test {
11671167
let table_scan_1 = test_table_scan_with_name("test1").unwrap();
11681168
let table_scan_2 = test_table_scan_with_name("test2").unwrap();
11691169
let join = LogicalPlanBuilder::from(table_scan_1)
1170-
.join(table_scan_2, JoinType::Inner, (vec!["a"], vec!["a"]), None)
1170+
.join(table_scan_2, JoinType::Inner, (vec![Column::from_qualified_name("a")], vec![Column::from_qualified_name("a")]), None)
11711171
.unwrap()
11721172
.build()
11731173
.unwrap();

‎datafusion/optimizer/src/eliminate_cross_join.rs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -447,6 +447,7 @@ mod tests {
447447
use crate::optimizer::OptimizerContext;
448448
use crate::test::*;
449449

450+
use datafusion_common::Column;
450451
use datafusion_expr::{
451452
Operator::{And, Or},
452453
binary_expr, col, lit,
@@ -652,10 +653,10 @@ mod tests {
652653
.join(
653654
t3,
654655
JoinType::Inner,
655-
(vec!["t1.a"], vec!["t3.a"]),
656+
(vec![Column::from_qualified_name("t1.a")], vec![Column::from_qualified_name("t3.a")]),
656657
Some(col("t1.a").gt(lit(20u32))),
657658
)?
658-
.join(t2, JoinType::Inner, (vec!["t1.a"], vec!["t2.a"]), None)?
659+
.join(t2, JoinType::Inner, (vec![Column::from_qualified_name("t1.a")], vec![Column::from_qualified_name("t2.a")]), None)?
659660
.filter(col("t1.a").gt(lit(15u32)))?
660661
.build()?;
661662

‎datafusion/optimizer/src/filter_null_join_keys.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ mod tests {
308308
.join(
309309
t2,
310310
JoinType::Inner,
311-
(vec!["optional_id"], vec!["t2.optional_id"]),
311+
(vec![Column::from_qualified_name("optional_id")], vec![Column::from_qualified_name("t2.optional_id")]),
312312
None,
313313
)?
314314
.build()?;

‎datafusion/optimizer/src/optimize_projections/mod.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1734,9 +1734,9 @@ mod tests {
17341734
let plan = table_scan(Some("m4"), &schema, None)?
17351735
.aggregate(
17361736
Vec::<Expr>::new(),
1737-
vec![max(col(Column::new_unqualified("tag.one"))).alias("tag.one")],
1737+
vec![max(Expr::Column(Column::new_unqualified("tag.one"))).alias("tag.one")],
17381738
)?
1739-
.project([col(Column::new_unqualified("tag.one"))])?
1739+
.project([Expr::Column(Column::new_unqualified("tag.one"))])?
17401740
.build()?;
17411741

17421742
assert_optimized_plan_equal!(
@@ -1842,7 +1842,7 @@ mod tests {
18421842
let table2_scan = scan_empty(Some("test2"), &schema, None)?.build()?;
18431843

18441844
let plan = LogicalPlanBuilder::from(table_scan)
1845-
.join(table2_scan, JoinType::Left, (vec!["a"], vec!["c1"]), None)?
1845+
.join(table2_scan, JoinType::Left, (vec![Column::from_qualified_name("a")], vec![Column::from_qualified_name("c1")]), None)?
18461846
.project(vec![col("a"), col("b"), col("c1")])?
18471847
.build()?;
18481848

@@ -1894,7 +1894,7 @@ mod tests {
18941894
let table2_scan = scan_empty(Some("test2"), &schema, None)?.build()?;
18951895

18961896
let plan = LogicalPlanBuilder::from(table_scan)
1897-
.join(table2_scan, JoinType::Left, (vec!["a"], vec!["c1"]), None)?
1897+
.join(table2_scan, JoinType::Left, (vec![Column::from_qualified_name("a")], vec![Column::from_qualified_name("c1")]), None)?
18981898
// projecting joined column `a` should push the right side column `c1` projection as
18991899
// well into test2 table even though `c1` is not referenced in projection.
19001900
.project(vec![col("a"), col("b")])?
@@ -1949,7 +1949,7 @@ mod tests {
19491949
let table2_scan = scan_empty(Some("test2"), &schema, None)?.build()?;
19501950

19511951
let plan = LogicalPlanBuilder::from(table_scan)
1952-
.join_using(table2_scan, JoinType::Left, vec!["a".into()])?
1952+
.join_using(table2_scan, JoinType::Left, vec![Column::from_qualified_name("a")])?
19531953
.project(vec![col("a"), col("b")])?
19541954
.build()?;
19551955

‎datafusion/optimizer/src/push_down_limit.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ mod test {
279279
use crate::test::*;
280280

281281
use crate::OptimizerContext;
282-
use datafusion_common::DFSchemaRef;
282+
use datafusion_common::{Column, DFSchemaRef};
283283
use datafusion_expr::{
284284
Expr, Extension, UserDefinedLogicalNodeCore, col, exists,
285285
logical_plan::builder::LogicalPlanBuilder,
@@ -837,7 +837,7 @@ mod test {
837837
.join(
838838
LogicalPlanBuilder::from(table_scan_2).build()?,
839839
JoinType::Inner,
840-
(vec!["a"], vec!["a"]),
840+
(vec![Column::from_qualified_name("a")], vec![Column::from_qualified_name("a")]),
841841
None,
842842
)?
843843
.limit(10, Some(1000))?
@@ -864,7 +864,7 @@ mod test {
864864
.join(
865865
LogicalPlanBuilder::from(table_scan_2).build()?,
866866
JoinType::Inner,
867-
(vec!["a"], vec!["a"]),
867+
(vec![Column::from_qualified_name("a")], vec![Column::from_qualified_name("a")]),
868868
None,
869869
)?
870870
.limit(10, Some(1000))?
@@ -955,7 +955,7 @@ mod test {
955955
.join(
956956
LogicalPlanBuilder::from(table_scan_2).build()?,
957957
JoinType::Left,
958-
(vec!["a"], vec!["a"]),
958+
(vec![Column::from_qualified_name("a")], vec![Column::from_qualified_name("a")]),
959959
None,
960960
)?
961961
.limit(10, Some(1000))?
@@ -983,7 +983,7 @@ mod test {
983983
.join(
984984
LogicalPlanBuilder::from(table_scan_2).build()?,
985985
JoinType::Right,
986-
(vec!["a"], vec!["a"]),
986+
(vec![Column::from_qualified_name("a")], vec![Column::from_qualified_name("a")]),
987987
None,
988988
)?
989989
.limit(0, Some(1000))?
@@ -1011,7 +1011,7 @@ mod test {
10111011
.join(
10121012
LogicalPlanBuilder::from(table_scan_2).build()?,
10131013
JoinType::Right,
1014-
(vec!["a"], vec!["a"]),
1014+
(vec![Column::from_qualified_name("a")], vec![Column::from_qualified_name("a")]),
10151015
None,
10161016
)?
10171017
.limit(10, Some(1000))?

‎datafusion/sql/tests/cases/plan_to_sql.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1773,7 +1773,7 @@ fn test_join_with_table_scan_filters() -> Result<()> {
17731773
.join(
17741774
right_plan.clone(),
17751775
datafusion_expr::JoinType::Inner,
1776-
(vec!["left.id"], vec!["right_table.id"]),
1776+
(vec![Column::from_qualified_name("left.id")], vec![Column::from_qualified_name("right_table.id")]),
17771777
Some(col("left.id").gt(lit(5))),
17781778
)?
17791779
.build()?;
@@ -1788,7 +1788,7 @@ fn test_join_with_table_scan_filters() -> Result<()> {
17881788
.join(
17891789
right_plan,
17901790
datafusion_expr::JoinType::Inner,
1791-
(vec!["left.id"], vec!["right_table.id"]),
1791+
(vec![Column::from_qualified_name("left.id")], vec![Column::from_qualified_name("right_table.id")]),
17921792
None,
17931793
)?
17941794
.build()?;
@@ -1812,7 +1812,7 @@ fn test_join_with_table_scan_filters() -> Result<()> {
18121812
.join(
18131813
right_plan_with_filter,
18141814
datafusion_expr::JoinType::Inner,
1815-
(vec!["left.id"], vec!["right_table.id"]),
1815+
(vec![Column::from_qualified_name("left.id")], vec![Column::from_qualified_name("right_table.id")]),
18161816
Some(col("left.id").gt(lit(5))),
18171817
)?
18181818
.filter(col("left.name").eq(lit("after_join_filter_val")))?
@@ -1843,7 +1843,7 @@ fn test_join_with_table_scan_filters() -> Result<()> {
18431843
.join(
18441844
right_plan_with_duplicated_filter,
18451845
datafusion_expr::JoinType::Inner,
1846-
(vec!["left.id"], vec!["right_table.id"]),
1846+
(vec![Column::from_qualified_name("left.id")], vec![Column::from_qualified_name("right_table.id")]),
18471847
Some(col("left.id").gt(lit(5))),
18481848
)?
18491849
.build()?;

0 commit comments

Comments
 (0)