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

opt: Hoist Exists operator and try to decorrelate #24969

Merged
merged 2 commits into from
Apr 24, 2018
Merged

opt: Hoist Exists operator and try to decorrelate #24969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3c4d9e
opt: Add OuterCols to relational properties
andy-kimball Apr 21, 2018
d3c6e99
opt: Hoist Exists operator and try to decorrelate
andy-kimball Apr 22, 2018
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: 4 additions & 0 deletions pkg/sql/opt/memo/expr_view.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,6 +333,10 @@ func (ev ExprView) formatRelational(tp treeprinter.Node, flags ExprFmtFlags) {
}
}

if !flags.HasFlags(ExprFmtHideOuterCols) && !logProps.Relational.OuterCols.Empty() {
tp.Childf("outer: %s", logProps.Relational.OuterCols.String())
}

if !flags.HasFlags(ExprFmtHideStats) {
ev.formatStats(tp, &logProps.Relational.Stats)
}
Expand Down
2 changes: 0 additions & 2 deletions pkg/sql/opt/memo/logical_props.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,6 @@ type RelationalProps struct {
// SELECT expression binds the b.x and b.y references, so they are not
// part of the outer column set. The outer SELECT binds the a.x column, and
// so its outer column set is empty.
//
// TODO(andyk): populate this when we have subquery support
OuterCols opt.ColSet

// Stats is the set of statistics that apply to this relational expression.
Expand Down
92 changes: 81 additions & 11 deletions pkg/sql/opt/memo/logical_props_factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ func (f logicalPropsFactory) constructRelationalProps(ev ExprView) LogicalProps
return f.constructLimitProps(ev)

case opt.OffsetOp:
return f.passThroughRelationalProps(ev, 0 /* childIdx */)
return f.constructOffsetProps(ev)

case opt.Max1RowOp:
return f.constructMax1RowProps(ev)
Expand Down Expand Up @@ -117,10 +117,19 @@ func (f logicalPropsFactory) constructSelectProps(ev ExprView) LogicalProps {
props := LogicalProps{Relational: &RelationalProps{}}

inputProps := ev.childGroup(0).logical.Relational
filterProps := ev.childGroup(1).logical.Scalar

// Inherit input properties as starting point.
*props.Relational = *inputProps

// Any outer columns from the filter that are not bound by the input columns
// are outer columns for the Select expression, in addition to any outer
// columns inherited from the input expression.
if !filterProps.OuterCols.SubsetOf(inputProps.OutputCols) {
props.Relational.OuterCols = filterProps.OuterCols.Difference(inputProps.OutputCols)
props.Relational.OuterCols.UnionWith(inputProps.OuterCols)
}

props.Relational.Stats.initSelect(f.evalCtx, ev.Child(1), &inputProps.Stats)

return props
Expand All @@ -130,6 +139,7 @@ func (f logicalPropsFactory) constructProjectProps(ev ExprView) LogicalProps {
props := LogicalProps{Relational: &RelationalProps{}}

inputProps := ev.childGroup(0).logical.Relational
projectionProps := ev.childGroup(1).logical.Scalar

// Use output columns from projection list.
props.Relational.OutputCols = opt.ColListToSet(ev.Child(1).Private().(opt.ColList))
Expand All @@ -139,8 +149,13 @@ func (f logicalPropsFactory) constructProjectProps(ev ExprView) LogicalProps {
props.Relational.NotNullCols = inputProps.NotNullCols
filterNullCols(props.Relational)

// Inherit outer columns from input.
props.Relational.OuterCols = inputProps.OuterCols
// Any outer columns from the projection list that are not bound by the input
// columns are outer columns from the Project expression, in addition to any
// outer columns inherited from the input expression.
if !projectionProps.OuterCols.SubsetOf(inputProps.OutputCols) {
props.Relational.OuterCols = projectionProps.OuterCols.Difference(inputProps.OutputCols)
}
props.Relational.OuterCols.UnionWith(inputProps.OuterCols)

// Inherit weak keys that are composed entirely of output columns.
props.Relational.WeakKeys = inputProps.WeakKeys
Expand All @@ -156,6 +171,7 @@ func (f logicalPropsFactory) constructJoinProps(ev ExprView) LogicalProps {

leftProps := ev.childGroup(0).logical.Relational
rightProps := ev.childGroup(1).logical.Relational
onProps := ev.childGroup(2).logical.Scalar

// Output columns are union of columns from left and right inputs, except
// in case of semi and anti joins, which only project the left columns.
Expand Down Expand Up @@ -186,6 +202,24 @@ func (f logicalPropsFactory) constructJoinProps(ev ExprView) LogicalProps {
props.Relational.NotNullCols.UnionWith(leftProps.NotNullCols)
}

// Any outer columns from the filter that are not bound by the input columns
// are outer columns for the Join expression, in addition to any outer columns
// inherited from the input expressions.
inputCols := leftProps.OutputCols.Union(rightProps.OutputCols)
if !onProps.OuterCols.SubsetOf(inputCols) {
props.Relational.OuterCols = onProps.OuterCols.Difference(inputCols)
}
if ev.IsJoinApply() {
// Outer columns of right side of apply join can be bound by output
// columns of left side of apply join.
if !rightProps.OuterCols.SubsetOf(leftProps.OutputCols) {
props.Relational.OuterCols.UnionWith(rightProps.OuterCols.Difference(leftProps.OutputCols))
}
} else {
props.Relational.OuterCols.UnionWith(rightProps.OuterCols)
}
props.Relational.OuterCols.UnionWith(leftProps.OuterCols)

// TODO(andyk): Need to derive weak keys for joins, for example when weak
// keys on both sides are equivalent cols.

Expand All @@ -200,6 +234,7 @@ func (f logicalPropsFactory) constructGroupByProps(ev ExprView) LogicalProps {
props := LogicalProps{Relational: &RelationalProps{}}

inputProps := ev.childGroup(0).logical.Relational
aggProps := ev.childGroup(1).logical.Scalar

// Output columns are the union of grouping columns with columns from the
// aggregate projection list.
Expand All @@ -212,6 +247,11 @@ func (f logicalPropsFactory) constructGroupByProps(ev ExprView) LogicalProps {
props.Relational.NotNullCols = inputProps.NotNullCols.Copy()
props.Relational.NotNullCols.IntersectionWith(groupingColSet)

// Any outer columns from aggregation expressions that are not bound by the
// input columns are outer columns.
props.Relational.OuterCols = aggProps.OuterCols.Difference(inputProps.OutputCols)
props.Relational.OuterCols.UnionWith(inputProps.OuterCols)

// Scalar group by has no grouping columns and always a single row.
if groupingColSet.Empty() {
// Any combination of columns is a weak key when there is one row.
Expand Down Expand Up @@ -263,6 +303,9 @@ func (f logicalPropsFactory) constructSetProps(ev ExprView) LogicalProps {
}
}

// Outer columns from either side are outer columns for set operation.
props.Relational.OuterCols = leftProps.OuterCols.Union(rightProps.OuterCols)

props.Relational.Stats.initSetOp(ev.Operator(), &leftProps.Stats, &rightProps.Stats, &colMap)

return props
Expand All @@ -274,6 +317,11 @@ func (f logicalPropsFactory) constructValuesProps(ev ExprView) LogicalProps {
// Use output columns that are attached to the values op.
props.Relational.OutputCols = opt.ColListToSet(ev.Private().(opt.ColList))

// Union outer columns from all row expressions.
for i := 0; i < ev.ChildCount(); i++ {
props.Relational.OuterCols.UnionWith(ev.childGroup(i).logical.Scalar.OuterCols)
}

props.Relational.Stats.initValues(ev, &props.Relational.OutputCols)

return props
Expand All @@ -284,34 +332,49 @@ func (f logicalPropsFactory) constructLimitProps(ev ExprView) LogicalProps {

inputProps := ev.Child(0).Logical().Relational
limit := ev.Child(1)
limitProps := limit.Logical().Scalar

// Start with pass-through props from input.
*props.Relational = *inputProps

// Inherit outer columns from limit expression.
if !limitProps.OuterCols.Empty() {
props.Relational.OuterCols = limitProps.OuterCols.Union(inputProps.OuterCols)
}

props.Relational.Stats.initLimit(limit, &inputProps.Stats)

return props
}

func (f logicalPropsFactory) constructMax1RowProps(ev ExprView) LogicalProps {
func (f logicalPropsFactory) constructOffsetProps(ev ExprView) LogicalProps {
props := LogicalProps{Relational: &RelationalProps{}}

inputProps := ev.Child(0).Logical().Relational
offsetProps := ev.Child(1).Logical().Scalar

// Start with pass-through props from input.
*props.Relational = *inputProps

props.Relational.Stats.initMax1Row(&inputProps.Stats)
// Inherit outer columns from offset expression.
if !offsetProps.OuterCols.Empty() {
props.Relational.OuterCols = offsetProps.OuterCols.Union(inputProps.OuterCols)
}

return props
}

// passThroughRelationalProps returns the relational properties of the given
// child group.
func (f logicalPropsFactory) passThroughRelationalProps(ev ExprView, childIdx int) LogicalProps {
// Properties are immutable after construction, so just inherit relational
// props pointer from child.
return LogicalProps{Relational: ev.childGroup(childIdx).logical.Relational}
func (f logicalPropsFactory) constructMax1RowProps(ev ExprView) LogicalProps {
props := LogicalProps{Relational: &RelationalProps{}}

inputProps := ev.Child(0).Logical().Relational

// Start with pass-through props from input.
*props.Relational = *inputProps

props.Relational.Stats.initMax1Row(&inputProps.Stats)

return props
}

func (f logicalPropsFactory) constructScalarProps(ev ExprView) LogicalProps {
Expand All @@ -322,6 +385,13 @@ func (f logicalPropsFactory) constructScalarProps(ev ExprView) LogicalProps {
// Variable introduces outer column.
props.Scalar.OuterCols.Add(int(ev.Private().(opt.ColumnID)))
return props

case opt.SubqueryOp:
inputProps := ev.childGroup(0).logical.Relational
projectionProps := ev.childGroup(1).logical.Scalar
props.Scalar.OuterCols = projectionProps.OuterCols.Difference(inputProps.OutputCols)
props.Scalar.OuterCols.UnionWith(inputProps.OuterCols)
return props
}

// By default, union outer cols from all children, both relational and scalar.
Expand Down
16 changes: 16 additions & 0 deletions pkg/sql/opt/memo/logical_props_factory_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (
"github.com/cockroachdb/cockroach/pkg/sql/opt/norm"
"github.com/cockroachdb/cockroach/pkg/sql/opt/testutils"
"github.com/cockroachdb/cockroach/pkg/sql/sem/tree"
"github.com/cockroachdb/cockroach/pkg/sql/sem/types"
)

func TestLogicalPropsFactory(t *testing.T) {
Expand Down Expand Up @@ -69,6 +70,21 @@ func TestLogicalJoinProps(t *testing.T) {
joinFunc(opt.SemiJoinApplyOp, "a.x:1(int!null) a.y:2(int)")
joinFunc(opt.AntiJoinOp, "a.x:1(int!null) a.y:2(int)")
joinFunc(opt.AntiJoinApplyOp, "a.x:1(int!null) a.y:2(int)")

// Ensure that OuterCols that refer to outer relation of apply join do not
// become OuterCols of the join (i.e. that they are bound).
// (ApplyInnerJoin (Scan a) (Values (Tuple (Variable a.x))))
leftGroup := f.ConstructScan(f.InternScanOpDef(constructScanOpDef(f.Metadata(), a)))
varGroup := f.ConstructVariable(f.InternColumnID(f.Metadata().TableColumn(a, 0)))
tupleGroup := f.ConstructTuple(f.InternList([]memo.GroupID{varGroup}))
rows := f.InternList([]memo.GroupID{tupleGroup})
cols := f.InternColList(opt.ColList{f.Metadata().AddColumn("column1", types.Int)})
valuesGroup := f.ConstructValues(rows, cols)
joinGroup := f.ConstructInnerJoinApply(leftGroup, valuesGroup, f.ConstructTrue())

if !f.Memo().GroupProperties(joinGroup).Relational.OuterCols.Empty() {
t.Fatalf("expected outer columns to be empty on apply join group")
}
}

func constructScanOpDef(md *opt.Metadata, tabID opt.TableID) *memo.ScanOpDef {
Expand Down
Loading