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

release-21.2: opt: fix hoist of ANY comparison with tuples #99156

Closed
wants to merge 1 commit into from
Closed

release-21.2: opt: fix hoist of ANY comparison with tuples #99156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 29 additions & 0 deletions pkg/sql/logictest/testdata/logic_test/subquery_correlated
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1297,3 +1297,32 @@ WHERE key IN (
3 2
4 1
4 3

# Regression test for #98691.
statement ok
CREATE TABLE t98691 (
a INT,
b INT
)

statement ok
INSERT INTO t98691 VALUES (1, 10)

query B
SELECT (NULL, NULL) = ANY (
SELECT a, b FROM t98691 WHERE a > i
) FROM (VALUES (0), (0)) v(i)
----
NULL
NULL

statement ok
INSERT INTO t98691 VALUES (NULL, NULL)

query B
SELECT (2, 20) = ANY (
SELECT a, b FROM t98691 WHERE a > i OR a IS NULL
) FROM (VALUES (0), (0)) v(i)
----
NULL
NULL
18 changes: 16 additions & 2 deletions pkg/sql/opt/norm/decorrelate_funcs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -999,6 +999,20 @@ func (r *subqueryHoister) constructGroupByAny(
aggVar := r.f.ConstructVariable(aggColID)
caseColID := r.f.Metadata().AddColumn("case", types.Bool)

var scalarNotNull opt.ScalarExpr
if scalar.DataType().Family() == types.TupleFamily {
scalarNotNull = r.f.ConstructIsTupleNotNull(scalar)
} else {
scalarNotNull = r.f.ConstructIsNot(scalar, memo.NullSingleton)
}

var inputNotNull opt.ScalarExpr
if inputVar.DataType().Family() == types.TupleFamily {
inputNotNull = r.f.ConstructIsTupleNotNull(inputVar)
} else {
inputNotNull = r.f.ConstructIsNot(inputVar, memo.NullSingleton)
}

return r.f.ConstructProject(
r.f.ConstructScalarGroupBy(
r.f.ConstructProject(
Expand All @@ -1012,7 +1026,7 @@ func (r *subqueryHoister) constructGroupByAny(
)},
),
memo.ProjectionsExpr{r.f.ConstructProjectionsItem(
r.f.ConstructIsNot(inputVar, memo.NullSingleton),
inputNotNull,
notNullColID,
)},
opt.ColSet{},
Expand All @@ -1032,7 +1046,7 @@ func (r *subqueryHoister) constructGroupByAny(
r.f.ConstructWhen(
r.f.ConstructAnd(
aggVar,
r.f.ConstructIsNot(scalar, memo.NullSingleton),
scalarNotNull,
),
r.f.ConstructTrue(),
),
Expand Down
133 changes: 73 additions & 60 deletions pkg/sql/opt/norm/testdata/rules/combo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1241,6 +1241,74 @@ HoistProjectSubquery
- └── 5
+ └── case:15 [as=r:12, outer=(15)]
================================================================================
FoldNonNullIsNotNull
Cost: 2201.75
================================================================================
project
├── columns: r:12
├── inner-join-apply
│ ├── columns: x:1!null case:15
│ ├── key: (1)
│ ├── fd: (1)-->(15)
│ ├── scan xy
│ │ ├── columns: x:1!null
│ │ └── key: (1)
│ ├── project
│ │ ├── columns: case:15
│ │ ├── outer: (1)
│ │ ├── cardinality: [1 - 1]
│ │ ├── key: ()
│ │ ├── fd: ()-->(15)
│ │ ├── scalar-group-by
│ │ │ ├── columns: bool_or:14
│ │ │ ├── outer: (1)
│ │ │ ├── cardinality: [1 - 1]
│ │ │ ├── key: ()
│ │ │ ├── fd: ()-->(14)
│ │ │ ├── project
│ │ │ │ ├── columns: notnull:13!null
│ │ │ │ ├── outer: (1)
│ │ │ │ ├── cardinality: [0 - 1]
│ │ │ │ ├── key: ()
│ │ │ │ ├── fd: ()-->(13)
│ │ │ │ ├── select
│ │ │ │ │ ├── columns: i:6
│ │ │ │ │ ├── outer: (1)
│ │ │ │ │ ├── cardinality: [0 - 1]
│ │ │ │ │ ├── key: ()
│ │ │ │ │ ├── fd: ()-->(6)
│ │ │ │ │ ├── project
│ │ │ │ │ │ ├── columns: i:6
│ │ │ │ │ │ ├── outer: (1)
│ │ │ │ │ │ ├── cardinality: [0 - 1]
│ │ │ │ │ │ ├── key: ()
│ │ │ │ │ │ ├── fd: ()-->(6)
│ │ │ │ │ │ └── select
│ │ │ │ │ │ ├── columns: k:5!null i:6
│ │ │ │ │ │ ├── outer: (1)
│ │ │ │ │ │ ├── cardinality: [0 - 1]
│ │ │ │ │ │ ├── key: ()
│ │ │ │ │ │ ├── fd: ()-->(5,6)
│ │ │ │ │ │ ├── scan a
│ │ │ │ │ │ │ ├── columns: k:5!null i:6
│ │ │ │ │ │ │ ├── key: (5)
│ │ │ │ │ │ │ └── fd: (5)-->(6)
│ │ │ │ │ │ └── filters
│ │ │ │ │ │ └── k:5 = x:1 [outer=(1,5), constraints=(/1: (/NULL - ]; /5: (/NULL - ]), fd=(1)==(5), (5)==(1)]
│ │ │ │ │ └── filters
│ │ │ │ │ └── (5 = i:6) IS NOT false [outer=(6)]
│ │ │ │ └── projections
│ │ │ │ └── i:6 IS NOT NULL [as=notnull:13, outer=(6)]
│ │ │ └── aggregations
│ │ │ └── bool-or [as=bool_or:14, outer=(13)]
│ │ │ └── notnull:13
│ │ └── projections
- │ │ └── CASE WHEN bool_or:14 AND (5 IS NOT NULL) THEN true WHEN bool_or:14 IS NULL THEN false ELSE CAST(NULL AS BOOL) END [as=case:15, outer=(14)]
+ │ │ └── CASE WHEN bool_or:14 AND true THEN true WHEN bool_or:14 IS NULL THEN false ELSE CAST(NULL AS BOOL) END [as=case:15, outer=(14)]
│ └── filters (true)
└── projections
└── case:15 [as=r:12, outer=(15)]
================================================================================
CommuteVar
Cost: 2201.75
================================================================================
Expand Down Expand Up @@ -1304,7 +1372,7 @@ CommuteVar
│ │ │ └── bool-or [as=bool_or:14, outer=(13)]
│ │ │ └── notnull:13
│ │ └── projections
│ │ └── CASE WHEN bool_or:14 AND (5 IS NOT NULL) THEN true WHEN bool_or:14 IS NULL THEN false ELSE CAST(NULL AS BOOL) END [as=case:15, outer=(14)]
│ │ └── CASE WHEN bool_or:14 AND true THEN true WHEN bool_or:14 IS NULL THEN false ELSE CAST(NULL AS BOOL) END [as=case:15, outer=(14)]
│ └── filters (true)
└── projections
└── case:15 [as=r:12, outer=(15)]
Expand Down Expand Up @@ -1384,7 +1452,7 @@ PushSelectIntoProject
│ │ │ └── bool-or [as=bool_or:14, outer=(13)]
│ │ │ └── notnull:13
│ │ └── projections
│ │ └── CASE WHEN bool_or:14 AND (5 IS NOT NULL) THEN true WHEN bool_or:14 IS NULL THEN false ELSE CAST(NULL AS BOOL) END [as=case:15, outer=(14)]
│ │ └── CASE WHEN bool_or:14 AND true THEN true WHEN bool_or:14 IS NULL THEN false ELSE CAST(NULL AS BOOL) END [as=case:15, outer=(14)]
│ └── filters (true)
└── projections
└── case:15 [as=r:12, outer=(15)]
Expand Down Expand Up @@ -1462,7 +1530,7 @@ MergeSelects
│ │ │ └── bool-or [as=bool_or:14, outer=(13)]
│ │ │ └── notnull:13
│ │ └── projections
│ │ └── CASE WHEN bool_or:14 AND (5 IS NOT NULL) THEN true WHEN bool_or:14 IS NULL THEN false ELSE CAST(NULL AS BOOL) END [as=case:15, outer=(14)]
│ │ └── CASE WHEN bool_or:14 AND true THEN true WHEN bool_or:14 IS NULL THEN false ELSE CAST(NULL AS BOOL) END [as=case:15, outer=(14)]
│ └── filters (true)
└── projections
└── case:15 [as=r:12, outer=(15)]
Expand Down Expand Up @@ -1543,7 +1611,7 @@ EliminateSelect
│ │ │ └── bool-or [as=bool_or:14, outer=(13)]
│ │ │ └── notnull:13
│ │ └── projections
│ │ └── CASE WHEN bool_or:14 AND (5 IS NOT NULL) THEN true WHEN bool_or:14 IS NULL THEN false ELSE CAST(NULL AS BOOL) END [as=case:15, outer=(14)]
│ │ └── CASE WHEN bool_or:14 AND true THEN true WHEN bool_or:14 IS NULL THEN false ELSE CAST(NULL AS BOOL) END [as=case:15, outer=(14)]
│ └── filters (true)
└── projections
└── case:15 [as=r:12, outer=(15)]
Expand Down Expand Up @@ -1613,62 +1681,7 @@ MergeProjects
│ │ │ └── bool-or [as=bool_or:14, outer=(13)]
│ │ │ └── notnull:13
│ │ └── projections
│ │ └── CASE WHEN bool_or:14 AND (5 IS NOT NULL) THEN true WHEN bool_or:14 IS NULL THEN false ELSE CAST(NULL AS BOOL) END [as=case:15, outer=(14)]
│ └── filters (true)
└── projections
└── case:15 [as=r:12, outer=(15)]
================================================================================
FoldNonNullIsNotNull
Cost: 2201.73
================================================================================
project
├── columns: r:12
├── inner-join-apply
│ ├── columns: x:1!null case:15
│ ├── key: (1)
│ ├── fd: (1)-->(15)
│ ├── scan xy
│ │ ├── columns: x:1!null
│ │ └── key: (1)
│ ├── project
│ │ ├── columns: case:15
│ │ ├── outer: (1)
│ │ ├── cardinality: [1 - 1]
│ │ ├── key: ()
│ │ ├── fd: ()-->(15)
│ │ ├── scalar-group-by
│ │ │ ├── columns: bool_or:14
│ │ │ ├── outer: (1)
│ │ │ ├── cardinality: [1 - 1]
│ │ │ ├── key: ()
│ │ │ ├── fd: ()-->(14)
│ │ │ ├── project
│ │ │ │ ├── columns: notnull:13!null
│ │ │ │ ├── outer: (1)
│ │ │ │ ├── cardinality: [0 - 1]
│ │ │ │ ├── key: ()
│ │ │ │ ├── fd: ()-->(13)
│ │ │ │ ├── select
│ │ │ │ │ ├── columns: k:5!null i:6
│ │ │ │ │ ├── outer: (1)
│ │ │ │ │ ├── cardinality: [0 - 1]
│ │ │ │ │ ├── key: ()
│ │ │ │ │ ├── fd: ()-->(5,6)
│ │ │ │ │ ├── scan a
│ │ │ │ │ │ ├── columns: k:5!null i:6
│ │ │ │ │ │ ├── key: (5)
│ │ │ │ │ │ └── fd: (5)-->(6)
│ │ │ │ │ └── filters
│ │ │ │ │ ├── k:5 = x:1 [outer=(1,5), constraints=(/1: (/NULL - ]; /5: (/NULL - ]), fd=(1)==(5), (5)==(1)]
│ │ │ │ │ └── (i:6 = 5) IS NOT false [outer=(6)]
│ │ │ │ └── projections
│ │ │ │ └── i:6 IS NOT NULL [as=notnull:13, outer=(6)]
│ │ │ └── aggregations
│ │ │ └── bool-or [as=bool_or:14, outer=(13)]
│ │ │ └── notnull:13
│ │ └── projections
- │ │ └── CASE WHEN bool_or:14 AND (5 IS NOT NULL) THEN true WHEN bool_or:14 IS NULL THEN false ELSE CAST(NULL AS BOOL) END [as=case:15, outer=(14)]
+ │ │ └── CASE WHEN bool_or:14 AND true THEN true WHEN bool_or:14 IS NULL THEN false ELSE CAST(NULL AS BOOL) END [as=case:15, outer=(14)]
│ │ └── CASE WHEN bool_or:14 AND true THEN true WHEN bool_or:14 IS NULL THEN false ELSE CAST(NULL AS BOOL) END [as=case:15, outer=(14)]
│ └── filters (true)
└── projections
└── case:15 [as=r:12, outer=(15)]
Expand Down
Loading