Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

expression: fix errors in Apply when the type of c ... (#19331) #19692

Merged
merged 12 commits into from
Sep 3, 2020
Merged

expression: fix errors in Apply when the type of c ... (#19331) #19692

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
53b188f
cherry pick #19331 to release-4.0
qw4990 Sep 2, 2020
ba2ca4e
Merge remote-tracking branch 'upstream/release-4.0' into release-4.0-…
qw4990 Sep 2, 2020
9923392
resolve conflicts
qw4990 Sep 2, 2020
99eddb7
resolve conflicts
qw4990 Sep 2, 2020
7513177
Merge branch 'release-4.0' into release-4.0-853e0b49290c
ti-srebot Sep 2, 2020
7baae51
Merge branch 'release-4.0' into release-4.0-853e0b49290c
ti-srebot Sep 2, 2020
b76b068
Merge branch 'release-4.0' into release-4.0-853e0b49290c
ti-srebot Sep 2, 2020
c2f767c
Merge remote-tracking branch 'upstream/release-4.0' into release-4.0-…
qw4990 Sep 2, 2020
cb84fac
Merge branch 'release-4.0' into release-4.0-853e0b49290c
ti-srebot Sep 3, 2020
018bdd6
Merge branch 'release-4.0' into release-4.0-853e0b49290c
qw4990 Sep 3, 2020
a06ca2f
Merge branch 'release-4.0' into release-4.0-853e0b49290c
qw4990 Sep 3, 2020
a6981ff
Merge branch 'release-4.0' into release-4.0-853e0b49290c
zz-jason Sep 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion expression/expression.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1100,7 +1100,9 @@ func canExprPushDown(expr Expression, pc PbConverter, storeType kv.StoreType) bo
return false
}
switch x := expr.(type) {
case *Constant, *CorrelatedColumn:
case *CorrelatedColumn:
return pc.conOrCorColToPBExpr(expr) != nil && pc.columnToPBExpr(&x.Column) != nil
case *Constant:
return pc.conOrCorColToPBExpr(expr) != nil
case *Column:
return pc.columnToPBExpr(x) != nil
Expand Down
13 changes: 13 additions & 0 deletions expression/integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6787,6 +6787,19 @@ func (s *testIntegrationSerialSuite) TestIssue19045(c *C) {
tk.MustQuery(`select ( SELECT t1.a FROM t1, t2 WHERE t1.b = t2.a AND t2.b = '03' AND t1.c = a.a) invode from t a ;`).Check(testkit.Rows("a011", "a011"))
}

func (s *testIntegrationSerialSuite) TestIssue19315(c *C) {
tk := testkit.NewTestKit(c, s.store)
tk.MustExec("use test")
tk.MustExec("drop table if exists t")
tk.MustExec("drop table if exists t1")
tk.MustExec("CREATE TABLE `t` (`a` bit(10) DEFAULT NULL,`b` int(11) DEFAULT NULL) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin")
tk.MustExec("INSERT INTO `t` VALUES (_binary '\\0',1),(_binary '\\0',2),(_binary '\\0',5),(_binary '\\0',4),(_binary '\\0',2),(_binary '\\0 ',4)")
tk.MustExec("CREATE TABLE `t1` (`a` int(11) DEFAULT NULL, `b` int(11) DEFAULT NULL) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin")
tk.MustExec("INSERT INTO `t1` VALUES (1,1),(1,5),(2,3),(2,4),(3,3)")
err := tk.QueryToErr("select * from t where t.b > (select min(t1.b) from t1 where t1.a > t.a)")
c.Assert(err, IsNil)
}

func (s *testIntegrationSuite) TestIssue19504(c *C) {
tk := testkit.NewTestKit(c, s.store)
tk.MustExec("use test")
Expand Down