Skip to content

Commit

Permalink
opt: do not build Constraints in GenerateInvertedIndexScans
Browse files Browse the repository at this point in the history 
InvertedConstraints can be built for inverted index scans in all cases
that Constraints could be built. Therefore there is no longer a need to
build Constraints in GenerateInvertedIndexScans. This commit removes the
code related to this.

Release note: None
  • Loading branch information
@mgartner
mgartner committed Jan 26, 2021
1 parent fda07f8 commit 0a19637
Showing 1 changed file with 29 additions and 51 deletions.
80 changes: 29 additions & 51 deletions pkg/sql/opt/xform/select_funcs.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,6 @@ func (c *CustomFuncs) GenerateConstrainedScans(
append(optionalFilters, partitionFilters...),
scanPrivate.Table,
index.Ordinal(),
false, /* isInverted */
)
if !ok {
return
Expand All @@ -309,7 +308,6 @@ func (c *CustomFuncs) GenerateConstrainedScans(
append(optionalFilters, inBetweenFilters...),
scanPrivate.Table,
index.Ordinal(),
false, /* isInverted */
)
if !ok {
panic(errors.AssertionFailedf("in-between filters didn't yield a constraint"))
Expand Down Expand Up @@ -732,50 +730,35 @@ func (c *CustomFuncs) GenerateInvertedIndexScans(
var iter scanIndexIter
iter.Init(c.e.mem, &c.im, scanPrivate, filters, rejectNonInvertedIndexes)
iter.ForEach(func(index cat.Index, filters memo.FiltersExpr, indexCols opt.ColSet, isCovering bool) {
var spanExpr *invertedexpr.SpanExpression
var pfState *invertedexpr.PreFiltererStateForInvertedFilterer
var spansToRead invertedexpr.InvertedSpans
var constraint *constraint.Constraint
var filterOk, constraintOk bool

// Check whether the filter can constrain the index.
// TODO(rytaft): Unify these two cases so both return a spanExpr.
spanExpr, constraint, remainingFilters, pfState, filterOk := invertedidx.TryFilterInvertedIndex(
spanExpr, constraint, remainingFilters, pfState, ok := invertedidx.TryFilterInvertedIndex(
c.e.evalCtx, c.e.f, filters, optionalFilters, scanPrivate.Table, index, tabMeta.ComputedCols,
)
if filterOk {
spansToRead = spanExpr.SpansToRead
// Override the filters with remainingFilters. If the index is a
// multi-column inverted index, the non-inverted prefix columns are
// constrained by the constraint. It may be possible to reduce the
// filters if the constraint fully describes some of
// sub-expressions. The remainingFilters are the filters that are
// not fully expressed by the constraint.
//
// Consider the example:
//
// CREATE TABLE t (a INT, b INT, g GEOMETRY, INVERTED INDEX (b, g))
//
// SELECT * FROM t WHERE a = 1 AND b = 2 AND ST_Intersects(.., g)
//
// The constraint would constrain b to [/2 - /2], guaranteeing that
// the inverted index scan would only produce rows where (b = 2).
// Reapplying the (b = 2) filter after the scan would be
// unnecessary, so the remainingFilters in this case would be
// (a = 1 AND ST_Intersects(.., g)).
filters = remainingFilters
} else {
constraint, filters, constraintOk = c.tryConstrainIndex(
filters,
nil, /* optionalFilters */
scanPrivate.Table,
index.Ordinal(),
true, /* isInverted */
)
if !constraintOk {
return
}
if !ok {
// A span expression to constrain the inverted index could not be
// generated.
return
}
spansToRead := spanExpr.SpansToRead
// Override the filters with remainingFilters. If the index is a
// multi-column inverted index, the non-inverted prefix columns are
// constrained by the constraint. In this case, it may be possible to
// reduce the filters if the constraint fully describes some of
// sub-expressions. The remainingFilters are the filters that are not
// fully expressed by the constraint.
//
// Consider the example:
//
// CREATE TABLE t (a INT, b INT, g GEOMETRY, INVERTED INDEX (b, g))
//
// SELECT * FROM t WHERE a = 1 AND b = 2 AND ST_Intersects(.., g)
//
// The constraint would constrain b to [/2 - /2], guaranteeing that
// the inverted index scan would only produce rows where (b = 2).
// Reapplying the (b = 2) filter after the scan would be
// unnecessary, so the remainingFilters in this case would be
// (a = 1 AND ST_Intersects(.., g)).
filters = remainingFilters

// Construct new ScanOpDef with the new index and constraint.
newScanPrivate := *scanPrivate
Expand All @@ -787,8 +770,7 @@ func (c *CustomFuncs) GenerateInvertedIndexScans(
// produce duplicate primary keys or requires at least one UNION or
// INTERSECTION. In this case, we must scan both the primary key columns
// and the inverted key column.
needInvertedFilter := spanExpr != nil &&
(!spanExpr.Unique || spanExpr.Operator != invertedexpr.None)
needInvertedFilter := !spanExpr.Unique || spanExpr.Operator != invertedexpr.None
pkCols := sb.primaryKeyCols()
newScanPrivate.Cols = pkCols.Copy()
var invertedCol opt.ColumnID
Expand Down Expand Up @@ -826,19 +808,15 @@ func (c *CustomFuncs) GenerateInvertedIndexScans(
// filter remaining after extracting the constraint. If no constraint can be
// derived, then tryConstrainIndex returns ok = false.
func (c *CustomFuncs) tryConstrainIndex(
requiredFilters, optionalFilters memo.FiltersExpr,
tabID opt.TableID,
indexOrd int,
isInverted bool,
requiredFilters, optionalFilters memo.FiltersExpr, tabID opt.TableID, indexOrd int,
) (constraint *constraint.Constraint, remainingFilters memo.FiltersExpr, ok bool) {
// Start with fast check to rule out indexes that cannot be constrained.
if !isInverted &&
!c.canMaybeConstrainNonInvertedIndex(requiredFilters, tabID, indexOrd) &&
if !c.canMaybeConstrainNonInvertedIndex(requiredFilters, tabID, indexOrd) &&
!c.canMaybeConstrainNonInvertedIndex(optionalFilters, tabID, indexOrd) {
return nil, nil, false
}

ic := c.initIdxConstraintForIndex(requiredFilters, optionalFilters, tabID, indexOrd, isInverted)
ic := c.initIdxConstraintForIndex(requiredFilters, optionalFilters, tabID, indexOrd, false /* isInverted */)
constraint = ic.Constraint()
if constraint.IsUnconstrained() {
return nil, nil, false
Expand Down

0 comments on commit 0a19637

Please sign in to comment.