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 missing filters after join reordering #76619

Merged
merged 1 commit into from
Feb 15, 2022
Merged

release-21.2: opt: fix missing filters after join reordering #76619

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
195 changes: 95 additions & 100 deletions pkg/sql/opt/exec/execbuilder/testdata/join
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,120 +431,115 @@ vectorized: true
│ render relname: relname
│
└── • hash join (inner)
│ columns: (attrelid, attname, attnum, attrelid, attname, attnum, oid, conname, contype, condeferrable, condeferred, conrelid, confrelid, confupdtype, confdeltype, conkey, confkey, oid, relname, relnamespace, oid, nspname, generate_series, oid, relname, relnamespace, oid, nspname, objid, refobjid, oid, relname, relkind)
│ columns: (oid, nspname, oid, relname, relnamespace, attrelid, attname, attnum, attrelid, attname, attnum, objid, refobjid, oid, relname, relkind, oid, conname, contype, condeferrable, condeferred, conrelid, confrelid, confupdtype, confdeltype, conkey, confkey, oid, relname, relnamespace, oid, nspname, generate_series)
│ estimated row count: 110,908 (missing stats)
│ equality: (oid) = (objid)
│ equality: (oid) = (attrelid)
│
├── • hash join (inner)
│ │ columns: (attrelid, attname, attnum, attrelid, attname, attnum, oid, conname, contype, condeferrable, condeferred, conrelid, confrelid, confupdtype, confdeltype, conkey, confkey, oid, relname, relnamespace, oid, nspname, generate_series, oid, relname, relnamespace, oid, nspname)
│ │ estimated row count: 114,302 (missing stats)
│ │ equality: (relnamespace) = (oid)
│ │ columns: (oid, nspname, oid, relname, relnamespace)
│ │ estimated row count: 9,801 (missing stats)
│ │ equality: (oid) = (relnamespace)
│ │
│ ├── • hash join (inner)
│ │ │ columns: (attrelid, attname, attnum, attrelid, attname, attnum, oid, conname, contype, condeferrable, condeferred, conrelid, confrelid, confupdtype, confdeltype, conkey, confkey, oid, relname, relnamespace, oid, nspname, generate_series, oid, relname, relnamespace)
│ │ │ estimated row count: 11,557 (missing stats)
│ │ │ equality: (attrelid) = (oid)
│ │ │ pred: attnum = confkey[generate_series]
│ │ │
│ │ ├── • hash join (inner)
│ │ │ │ columns: (attrelid, attname, attnum, attrelid, attname, attnum, oid, conname, contype, condeferrable, condeferred, conrelid, confrelid, confupdtype, confdeltype, conkey, confkey, oid, relname, relnamespace, oid, nspname, generate_series)
│ │ │ │ estimated row count: 3,502 (missing stats)
│ │ │ │ equality: (attrelid) = (confrelid)
│ │ │ │
│ │ │ ├── • virtual table
│ │ │ │ columns: (attrelid, attname, attnum)
│ │ │ │ estimated row count: 1,000 (missing stats)
│ │ │ │ table: pg_attribute@primary
│ │ │ │
│ │ │ └── • cross join (inner)
│ │ │ │ columns: (attrelid, attname, attnum, oid, conname, contype, condeferrable, condeferred, conrelid, confrelid, confupdtype, confdeltype, conkey, confkey, oid, relname, relnamespace, oid, nspname, generate_series)
│ │ │ │ estimated row count: 354 (missing stats)
│ │ │ │ pred: attnum = conkey[generate_series]
│ │ │ │
│ │ │ ├── • hash join (inner)
│ │ │ │ │ columns: (attrelid, attname, attnum, oid, conname, contype, condeferrable, condeferred, conrelid, confrelid, confupdtype, confdeltype, conkey, confkey, oid, relname, relnamespace, oid, nspname)
│ │ │ │ │ estimated row count: 107 (missing stats)
│ │ │ │ │ equality: (relnamespace) = (oid)
│ │ │ │ │
│ │ │ │ ├── • merge join (inner)
│ │ │ │ │ │ columns: (attrelid, attname, attnum, oid, conname, contype, condeferrable, condeferred, conrelid, confrelid, confupdtype, confdeltype, conkey, confkey, oid, relname, relnamespace)
│ │ │ │ │ │ estimated row count: 105 (missing stats)
│ │ │ │ │ │ equality: (attrelid) = (oid)
│ │ │ │ │ │ merge ordering: +"(attrelid=oid)"
│ │ │ │ │ │
│ │ │ │ │ ├── • virtual table
│ │ │ │ │ │ columns: (attrelid, attname, attnum)
│ │ │ │ │ │ ordering: +attrelid
│ │ │ │ │ │ estimated row count: 1,000 (missing stats)
│ │ │ │ │ │ table: pg_attribute@pg_attribute_attrelid_idx
│ │ │ │ │ │
│ │ │ │ │ └── • virtual table lookup join (inner)
│ │ │ │ │ │ columns: (oid, conname, contype, condeferrable, condeferred, conrelid, confrelid, confupdtype, confdeltype, conkey, confkey, oid, relname, relnamespace)
│ │ │ │ │ │ ordering: +conrelid
│ │ │ │ │ │ estimated row count: 10 (missing stats)
│ │ │ │ │ │ table: pg_class@pg_class_oid_idx
│ │ │ │ │ │ equality: (conrelid) = (oid)
│ │ │ │ │ │ pred: relname = 'orders'
│ │ │ │ │ │
│ │ │ │ │ └── • filter
│ │ │ │ │ │ columns: (oid, conname, contype, condeferrable, condeferred, conrelid, confrelid, confupdtype, confdeltype, conkey, confkey)
│ │ │ │ │ │ ordering: +conrelid
│ │ │ │ │ │ estimated row count: 10 (missing stats)
│ │ │ │ │ │ filter: contype = 'f'
│ │ │ │ │ │
│ │ │ │ │ └── • virtual table
│ │ │ │ │ columns: (oid, conname, contype, condeferrable, condeferred, conrelid, confrelid, confupdtype, confdeltype, conkey, confkey)
│ │ │ │ │ ordering: +conrelid
│ │ │ │ │ estimated row count: 1,000 (missing stats)
│ │ │ │ │ table: pg_constraint@pg_constraint_conrelid_idx
│ │ │ │ │
│ │ │ │ └── • filter
│ │ │ │ │ columns: (oid, nspname)
│ │ │ │ │ estimated row count: 10 (missing stats)
│ │ │ │ │ filter: nspname = 'public'
│ │ │ │ │
│ │ │ │ └── • virtual table
│ │ │ │ columns: (oid, nspname)
│ │ │ │ estimated row count: 1,000 (missing stats)
│ │ │ │ table: pg_namespace@primary
│ │ │ │
│ │ │ └── • project set
│ │ │ │ columns: (generate_series)
│ │ │ │ estimated row count: 10
│ │ │ │ render 0: generate_series(1, 32)
│ │ │ │
│ │ │ └── • emptyrow
│ │ │ columns: ()
│ │ │
│ │ └── • virtual table
│ │ columns: (oid, relname, relnamespace)
│ │ estimated row count: 1,000 (missing stats)
│ │ table: pg_class@primary
│ ├── • virtual table
│ │ columns: (oid, nspname)
│ │ estimated row count: 1,000 (missing stats)
│ │ table: pg_namespace@primary
│ │
│ └── • virtual table
│ columns: (oid, nspname)
│ columns: (oid, relname, relnamespace)
│ estimated row count: 1,000 (missing stats)
│ table: pg_namespace@primary
│ table: pg_class@primary
│
└── • hash join (inner)
│ columns: (objid, refobjid, oid, relname, relkind)
│ estimated row count: 99 (missing stats)
│ equality: (refobjid) = (oid)
│ columns: (attrelid, attname, attnum, attrelid, attname, attnum, objid, refobjid, oid, relname, relkind, oid, conname, contype, condeferrable, condeferred, conrelid, confrelid, confupdtype, confdeltype, conkey, confkey, oid, relname, relnamespace, oid, nspname, generate_series)
│ estimated row count: 1,779 (missing stats)
│ equality: (attrelid) = (oid)
│ pred: attnum = conkey[generate_series]
│
├── • virtual table
│ columns: (objid, refobjid)
│ columns: (attrelid, attname, attnum)
│ estimated row count: 1,000 (missing stats)
│ table: pg_depend@primary
│ table: pg_attribute@primary
│
└── • filter
│ columns: (oid, relname, relkind)
│ estimated row count: 10 (missing stats)
│ filter: relkind = 'i'
└── • cross join (inner)
│ columns: (attrelid, attname, attnum, objid, refobjid, oid, relname, relkind, oid, conname, contype, condeferrable, condeferred, conrelid, confrelid, confupdtype, confdeltype, conkey, confkey, oid, relname, relnamespace, oid, nspname, generate_series)
│ estimated row count: 539 (missing stats)
│ pred: attnum = confkey[generate_series]
│
└── • virtual table
columns: (oid, relname, relkind)
estimated row count: 1,000 (missing stats)
table: pg_class@primary
├── • hash join (inner)
│ │ columns: (attrelid, attname, attnum, objid, refobjid, oid, relname, relkind, oid, conname, contype, condeferrable, condeferred, conrelid, confrelid, confupdtype, confdeltype, conkey, confkey, oid, relname, relnamespace, oid, nspname)
│ │ estimated row count: 163 (missing stats)
│ │ equality: (attrelid) = (confrelid)
│ │
│ ├── • virtual table
│ │ columns: (attrelid, attname, attnum)
│ │ estimated row count: 1,000 (missing stats)
│ │ table: pg_attribute@primary
│ │
│ └── • hash join (inner)
│ │ columns: (objid, refobjid, oid, relname, relkind, oid, conname, contype, condeferrable, condeferred, conrelid, confrelid, confupdtype, confdeltype, conkey, confkey, oid, relname, relnamespace, oid, nspname)
│ │ estimated row count: 17 (missing stats)
│ │ equality: (objid) = (oid)
│ │
│ ├── • hash join (inner)
│ │ │ columns: (objid, refobjid, oid, relname, relkind)
│ │ │ estimated row count: 99 (missing stats)
│ │ │ equality: (refobjid) = (oid)
│ │ │
│ │ ├── • virtual table
│ │ │ columns: (objid, refobjid)
│ │ │ estimated row count: 1,000 (missing stats)
│ │ │ table: pg_depend@primary
│ │ │
│ │ └── • filter
│ │ │ columns: (oid, relname, relkind)
│ │ │ estimated row count: 10 (missing stats)
│ │ │ filter: relkind = 'i'
│ │ │
│ │ └── • virtual table
│ │ columns: (oid, relname, relkind)
│ │ estimated row count: 1,000 (missing stats)
│ │ table: pg_class@primary
│ │
│ └── • hash join (inner)
│ │ columns: (oid, conname, contype, condeferrable, condeferred, conrelid, confrelid, confupdtype, confdeltype, conkey, confkey, oid, relname, relnamespace, oid, nspname)
│ │ estimated row count: 11 (missing stats)
│ │ equality: (relnamespace) = (oid)
│ │
│ ├── • virtual table lookup join (inner)
│ │ │ columns: (oid, conname, contype, condeferrable, condeferred, conrelid, confrelid, confupdtype, confdeltype, conkey, confkey, oid, relname, relnamespace)
│ │ │ estimated row count: 10 (missing stats)
│ │ │ table: pg_class@pg_class_oid_idx
│ │ │ equality: (conrelid) = (oid)
│ │ │ pred: relname = 'orders'
│ │ │
│ │ └── • filter
│ │ │ columns: (oid, conname, contype, condeferrable, condeferred, conrelid, confrelid, confupdtype, confdeltype, conkey, confkey)
│ │ │ estimated row count: 10 (missing stats)
│ │ │ filter: contype = 'f'
│ │ │
│ │ └── • virtual table
│ │ columns: (oid, conname, contype, condeferrable, condeferred, conrelid, confrelid, confupdtype, confdeltype, conkey, confkey)
│ │ estimated row count: 1,000 (missing stats)
│ │ table: pg_constraint@primary
│ │
│ └── • filter
│ │ columns: (oid, nspname)
│ │ estimated row count: 10 (missing stats)
│ │ filter: nspname = 'public'
│ │
│ └── • virtual table
│ columns: (oid, nspname)
│ estimated row count: 1,000 (missing stats)
│ table: pg_namespace@primary
│
└── • project set
│ columns: (generate_series)
│ estimated row count: 10
│ render 0: generate_series(1, 32)
│
└── • emptyrow
columns: ()

# Ensure that left joins on non-null foreign keys turn into inner joins
statement ok
Expand Down
28 changes: 0 additions & 28 deletions pkg/sql/opt/xform/join_order_builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1328,24 +1328,6 @@ func commute(op opt.Operator) bool {
// ON x = a
//
func assoc(edgeA, edgeB *edge) bool {
if edgeB.ses.intersects(edgeA.op.leftVertexes) || edgeA.ses.intersects(edgeB.op.rightVertexes) {
// Ensure that application of the associative property would not lead to
// 'orphaned' predicates, where one or more referenced relations are not in
// the resulting join's inputs. Take as an example this reordering that
// results from applying the associative property:
//
// SELECT * FROM (SELECT * FROM xy INNER JOIN ab ON y = a)
// INNER JOIN uv
// ON x = u
// =>
// SELECT * FROM xy
// INNER JOIN (SELECT * FROM ab INNER JOIN uv ON x = u)
// ON y = a
//
// Note that the x = u predicate references the xy relation, which is not
// in that join's inputs. Therefore, this transformation is invalid.
return false
}
return checkProperty(assocTable, edgeA, edgeB)
}

Expand All @@ -1368,11 +1350,6 @@ func assoc(edgeA, edgeB *edge) bool {
// INNER JOIN ab ON x = a
//
func leftAsscom(edgeA, edgeB *edge) bool {
if edgeB.ses.intersects(edgeA.op.rightVertexes) || edgeA.ses.intersects(edgeB.op.rightVertexes) {
// Ensure that application of the left-asscom property would not lead to
// 'orphaned' predicates. See the assoc() comment for why this is necessary.
return false
}
return checkProperty(leftAsscomTable, edgeA, edgeB)
}

Expand All @@ -1397,11 +1374,6 @@ func leftAsscom(edgeA, edgeB *edge) bool {
// ON x = a
//
func rightAsscom(edgeA, edgeB *edge) bool {
if edgeB.ses.intersects(edgeA.op.leftVertexes) || edgeA.ses.intersects(edgeB.op.leftVertexes) {
// Ensure that application of the right-asscom property would not lead to
// 'orphaned' predicates. See the assoc() comment for why this is necessary.
return false
}
return checkProperty(rightAsscomTable, edgeA, edgeB)
}

Expand Down
16 changes: 16 additions & 0 deletions pkg/sql/opt/xform/join_order_builder_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,6 +381,22 @@ func TestJoinOrderBuilder_CalcTES(t *testing.T) {
expectedTES: "ABC",
expectedRules: "",
},
{ // 20
// SELECT * FROM (
// SELECT * FROM (
// SELECT * FROM A
// INNER JOIN B ON A.u = B.u
// ) INNER JOIN C ON B.v = C.v
// ) INNER JOIN D ON A.w = D.w
rootEdge: testEdge{joinOp: opt.InnerJoinOp, left: "ABC", right: "D", ses: "AD", notNull: "AD"},
leftChildEdges: []testEdge{
{joinOp: opt.InnerJoinOp, left: "AB", right: "C", ses: "BC", notNull: "BC"},
{joinOp: opt.InnerJoinOp, left: "A", right: "B", ses: "AB", notNull: "AB"},
},
rightChildEdges: []testEdge{},
expectedTES: "AD",
expectedRules: "",
},
}

for i, tc := range testCases {
Expand Down
Loading