Skip to content

Commit f189d9a

Browse files
DandandanDandandan
committed
Update tests 2
1 parent 095042f commit f189d9a

File tree

2 files changed

+28
-58
lines changed

2 files changed

+28
-58
lines changed

‎datafusion/optimizer/src/push_down_filter.rs‎

Lines changed: 27 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1026,8 +1026,7 @@ mod tests {
10261026
.build()?;
10271027
let expected =
10281028
"Aggregate: groupBy=[[test.b + test.a]], aggr=[[SUM(test.a), test.b]]\
1029-
\n Filter: test.b + test.a > Int64(10)\
1030-
\n TableScan: test";
1029+
\n TableScan: test, full_filters=[test.b + test.a > Int64(10)]";
10311030
assert_optimized_plan_eq(&plan, expected)
10321031
}
10331032

@@ -1197,8 +1196,7 @@ mod tests {
11971196
// Push filter below NoopPlan
11981197
let expected = "\
11991198
NoopPlan\
1200-
\n Filter: test.a = Int64(1)\
1201-
\n TableScan: test";
1199+
\n TableScan: test, full_filters=[test.a = Int64(1)]";
12021200
assert_optimized_plan_eq(&plan, expected)?;
12031201

12041202
let custom_plan = LogicalPlan::Extension(Extension {
@@ -1231,10 +1229,8 @@ mod tests {
12311229
// Push filter below NoopPlan for each child branch
12321230
let expected = "\
12331231
NoopPlan\
1234-
\n Filter: test.a = Int64(1)\
1235-
\n TableScan: test\
1236-
\n Filter: test.a = Int64(1)\
1237-
\n TableScan: test";
1232+
\n TableScan: test, full_filters=[test.a = Int64(1)]\
1233+
\n TableScan: test, full_filters=[test.a = Int64(1)]";
12381234
assert_optimized_plan_eq(&plan, expected)?;
12391235

12401236
let custom_plan = LogicalPlan::Extension(Extension {
@@ -1251,10 +1247,8 @@ mod tests {
12511247
let expected = "\
12521248
Filter: test.c = Int64(2)\
12531249
\n NoopPlan\
1254-
\n Filter: test.a = Int64(1)\
1255-
\n TableScan: test\
1256-
\n Filter: test.a = Int64(1)\
1257-
\n TableScan: test";
1250+
\n TableScan: test, full_filters=[test.a = Int64(1)]\
1251+
\n TableScan: test, full_filters=[test.a = Int64(1)]";
12581252
assert_optimized_plan_eq(&plan, expected)
12591253
}
12601254

@@ -1322,8 +1316,7 @@ mod tests {
13221316
Filter: SUM(test.c) > Int64(10) AND SUM(test.c) < Int64(20)\
13231317
\n Aggregate: groupBy=[[b]], aggr=[[SUM(test.c)]]\
13241318
\n Projection: test.a AS b, test.c\
1325-
\n Filter: test.a > Int64(10)\
1326-
\n TableScan: test";
1319+
\n TableScan: test, full_filters=[test.a > Int64(10)]";
13271320
assert_optimized_plan_eq(&plan, expected)
13281321
}
13291322

@@ -1411,11 +1404,9 @@ mod tests {
14111404
let expected = "Projection: test.a, test1.d\
14121405
\n CrossJoin:\
14131406
\n Projection: test.a, test.b, test.c\
1414-
\n Filter: test.a = Int32(1)\
1415-
\n TableScan: test\
1407+
\n TableScan: test, full_filters=[test.a = Int32(1)]\
14161408
\n Projection: test1.d, test1.e, test1.f\
1417-
\n Filter: test1.d > Int32(2)\
1418-
\n TableScan: test1";
1409+
\n TableScan: test1, full_filters=[test1.d > Int32(2)]";
14191410

14201411
assert_optimized_plan_eq(&plan, expected)
14211412
}
@@ -1440,11 +1431,9 @@ mod tests {
14401431
let expected = "Projection: test.a, test1.a\
14411432
\n CrossJoin:\
14421433
\n Projection: test.a, test.b, test.c\
1443-
\n Filter: test.a = Int32(1)\
1444-
\n TableScan: test\
1434+
\n TableScan: test, full_filters=[test.a = Int32(1)]\
14451435
\n Projection: test1.a, test1.b, test1.c\
1446-
\n Filter: test1.a > Int32(2)\
1447-
\n TableScan: test1";
1436+
\n TableScan: test1, full_filters=[test1.a > Int32(2)]";
14481437
assert_optimized_plan_eq(&plan, expected)
14491438
}
14501439

@@ -2014,8 +2003,7 @@ mod tests {
20142003
\n Projection: test.a, test.b, test.c\
20152004
\n TableScan: test\
20162005
\n Projection: test2.a, test2.b, test2.c\
2017-
\n Filter: test2.c > UInt32(4)\
2018-
\n TableScan: test2";
2006+
\n TableScan: test2, full_filters=[test2.c > UInt32(4)]";
20192007
assert_optimized_plan_eq(&plan, expected)
20202008
}
20212009

@@ -2056,8 +2044,7 @@ mod tests {
20562044
let expected = "\
20572045
Right Join: test.a = test2.a Filter: test.b < test2.b AND test2.c > UInt32(4)\
20582046
\n Projection: test.a, test.b, test.c\
2059-
\n Filter: test.a > UInt32(1)\
2060-
\n TableScan: test\
2047+
\n TableScan: test, full_filters=[test.a > UInt32(1)]\
20612048
\n Projection: test2.a, test2.b, test2.c\
20622049
\n TableScan: test2";
20632050
assert_optimized_plan_eq(&plan, expected)
@@ -2283,8 +2270,7 @@ Projection: a, b
22832270
// rewrite filter col b to test.a
22842271
let expected = "\
22852272
Projection: test.a AS b, test.c\
2286-
\n Filter: test.a > Int64(10) AND test.c > Int64(10)\
2287-
\n TableScan: test\
2273+
\n TableScan: test, full_filters=[test.a > Int64(10), test.c > Int64(10)]\
22882274
";
22892275

22902276
assert_optimized_plan_eq(&plan, expected)
@@ -2316,8 +2302,7 @@ Projection: a, b
23162302
let expected = "\
23172303
Projection: b, test.c\
23182304
\n Projection: test.a AS b, test.c\
2319-
\n Filter: test.a > Int64(10) AND test.c > Int64(10)\
2320-
\n TableScan: test\
2305+
\n TableScan: test, full_filters=[test.a > Int64(10), test.c > Int64(10)]\
23212306
";
23222307

23232308
assert_optimized_plan_eq(&plan, expected)
@@ -2343,9 +2328,7 @@ Projection: a, b
23432328
// rewrite filter col b to test.a, col d to test.c
23442329
let expected = "\
23452330
Projection: test.a AS b, test.c AS d\
2346-
\n Filter: test.a > Int64(10) AND test.c > Int64(10)\
2347-
\n TableScan: test\
2348-
";
2331+
\n TableScan: test, full_filters=[test.a > Int64(10), test.c > Int64(10)]";
23492332

23502333
assert_optimized_plan_eq(&plan, expected)
23512334
}
@@ -2414,9 +2397,7 @@ Projection: a, b
24142397
// rewrite filter col b to test.a
24152398
let expected = "\
24162399
Projection: test.a AS b, test.c\
2417-
\n Filter: test.a IN ([UInt32(1), UInt32(2), UInt32(3), UInt32(4)])\
2418-
\n TableScan: test\
2419-
";
2400+
\n TableScan: test, full_filters=[test.a IN ([UInt32(1), UInt32(2), UInt32(3), UInt32(4)])]";
24202401

24212402
assert_optimized_plan_eq(&plan, expected)
24222403
}
@@ -2448,9 +2429,7 @@ Projection: a, b
24482429
let expected = "\
24492430
Projection: b, test.c\
24502431
\n Projection: test.a AS b, test.c\
2451-
\n Filter: test.a IN ([UInt32(1), UInt32(2), UInt32(3), UInt32(4)])\
2452-
\n TableScan: test\
2453-
";
2432+
\n TableScan: test, full_filters=[test.a IN ([UInt32(1), UInt32(2), UInt32(3), UInt32(4)])]";
24542433

24552434
assert_optimized_plan_eq(&plan, expected)
24562435
}
@@ -2484,11 +2463,10 @@ Projection: a, b
24842463
// rewrite filter col b to test.a
24852464
let expected_after = "\
24862465
Projection: test.a AS b, test.c\
2487-
\n Filter: test.a IN (<subquery>)\
2466+
\n TableScan: test, full_filters=[test.a IN (<subquery>)]\
24882467
\n Subquery:\
24892468
\n Projection: sq.c\
2490-
\n TableScan: sq\
2491-
\n TableScan: test";
2469+
\n TableScan: sq";
24922470
assert_optimized_plan_eq(&plan, expected_after)
24932471
}
24942472

@@ -2549,8 +2527,7 @@ Projection: a, b
25492527
Filter: test.a = d AND test.b > UInt32(1) OR test.b = e AND test.c < UInt32(10)\
25502528
\n CrossJoin:\
25512529
\n Projection: test.a, test.b, test.c\
2552-
\n Filter: test.b > UInt32(1) OR test.c < UInt32(10)\
2553-
\n TableScan: test\
2530+
\n TableScan: test, full_filters=[test.b > UInt32(1) OR test.c < UInt32(10)]\
25542531
\n Projection: test1.a AS d, test1.a AS e\
25552532
\n TableScan: test1";
25562533
assert_optimized_plan_eq_with_rewrite_predicate(&plan, expected)?;
@@ -2598,11 +2575,9 @@ Projection: a, b
25982575
// Both side will be pushed down.
25992576
let expected = "\
26002577
LeftSemi Join: test1.a = test2.a\
2601-
\n Filter: test1.b > UInt32(1)\
2602-
\n TableScan: test1\
2578+
\n TableScan: test1, full_filters=[test1.b > UInt32(1)]\
26032579
\n Projection: test2.a, test2.b\
2604-
\n Filter: test2.b > UInt32(2)\
2605-
\n TableScan: test2";
2580+
\n TableScan: test2, full_filters=[test2.b > UInt32(2)]";
26062581
assert_optimized_plan_eq(&plan, expected)
26072582
}
26082583

@@ -2641,11 +2616,9 @@ Projection: a, b
26412616
// Both side will be pushed down.
26422617
let expected = "\
26432618
RightSemi Join: test1.a = test2.a\
2644-
\n Filter: test1.b > UInt32(1)\
2645-
\n TableScan: test1\
2619+
\n TableScan: test1, full_filters=[test1.b > UInt32(1)]\
26462620
\n Projection: test2.a, test2.b\
2647-
\n Filter: test2.b > UInt32(2)\
2648-
\n TableScan: test2";
2621+
\n TableScan: test2, full_filters=[test2.b > UInt32(2)]";
26492622
assert_optimized_plan_eq(&plan, expected)
26502623
}
26512624

@@ -2691,8 +2664,7 @@ Projection: a, b
26912664
\n Projection: test1.a, test1.b\
26922665
\n TableScan: test1\
26932666
\n Projection: test2.a, test2.b\
2694-
\n Filter: test2.b > UInt32(2)\
2695-
\n TableScan: test2";
2667+
\n TableScan: test2, full_filters=[test2.b > UInt32(2)] ";
26962668
assert_optimized_plan_eq(&plan, expected)
26972669
}
26982670

@@ -2735,8 +2707,7 @@ Projection: a, b
27352707
// For right anti, filter of the left side can be pushed down.
27362708
let expected = "RightAnti Join: test1.a = test2.a Filter: test2.b > UInt32(2)\
27372709
\n Projection: test1.a, test1.b\
2738-
\n Filter: test1.b > UInt32(1)\
2739-
\n TableScan: test1\
2710+
\n TableScan: test1, full_filters=[test1.b > UInt32(1)]\
27402711
\n Projection: test2.a, test2.b\
27412712
\n TableScan: test2";
27422713
assert_optimized_plan_eq(&plan, expected)

‎datafusion/optimizer/src/simplify_expressions/simplify_exprs.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -833,8 +833,7 @@ mod tests {
833833

834834
// before simplify: t.g = power(t.f, 1.0)
835835
// after simplify: (t.g = t.f) as "t.g = power(t.f, 1.0)"
836-
let expected =
837-
"TableScan: test, unsupported_filters=[g = f AS g = power(f,Float64(1))]";
836+
let expected = "TableScan: test, full_filters=[g = f AS g = power(f,Float64(1))]";
838837
assert_optimized_plan_eq(&plan, expected)
839838
}
840839

0 commit comments

Comments
 (0)