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-22.1: opt: fix incorrect column indexing in index recommendations #84220

Merged
merged 1 commit into from
Jul 12, 2022
Merged

release-22.1: opt: fix incorrect column indexing in index recommendations #84220

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
119 changes: 99 additions & 20 deletions pkg/sql/opt/indexrec/testdata/index-candidates-recommendations
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1210,7 +1210,7 @@ project
├── immutable
├── cost: 807.393333
└── index-join t4
├── columns: t4.k:1 f:3 j:4
├── columns: k:1 f:3 j:4
├── immutable
├── cost: 806.262222
└── scan t4@_hyp_1
Expand Down Expand Up @@ -1239,7 +1239,7 @@ project
├── immutable
├── cost: 805.048889
└── index-join t4
├── columns: t4.k:1 f:3 j:4!null
├── columns: k:1 f:3 j:4!null
├── immutable
├── cost: 803.928889
└── scan t4@_hyp_1
Expand Down Expand Up @@ -1268,11 +1268,11 @@ project
├── immutable
├── cost: 816.998889
└── select
├── columns: t4.k:1 f:3 j:4
├── columns: k:1 f:3 j:4
├── immutable
├── cost: 813.645556
├── index-join t4
│ ├── columns: t4.k:1 f:3 j:4
│ ├── columns: k:1 f:3 j:4
│ ├── cost: 812.504444
│ └── inverted-filter
│ ├── columns: rowid:6!null
Expand All @@ -1284,7 +1284,7 @@ project
│ ├── cost: 134.706667
│ ├── key: (6)
│ └── scan t4@_hyp_1
│ ├── columns: rowid:6!null k:9!null
│ ├── columns: rowid:6!null j_inverted_key:9!null
│ ├── inverted constraint: /9/6
│ │ └── spans
│ │ ├── ["7\x00\x019", "7\x00\x019"]
Expand Down Expand Up @@ -1347,12 +1347,12 @@ project
├── cost: 22.1100001
├── fd: ()-->(1)
└── select
├── columns: t4.k:1!null f:3 j:4
├── columns: k:1!null f:3 j:4
├── immutable
├── cost: 22.0566667
├── fd: ()-->(1)
├── index-join t4
│ ├── columns: t4.k:1 f:3 j:4
│ ├── columns: k:1 f:3 j:4
│ ├── cost: 22.0155556
│ └── inverted-filter
│ ├── columns: rowid:6!null
Expand All @@ -1364,7 +1364,7 @@ project
│ ├── cost: 15.2177778
│ ├── key: (6)
│ └── scan t4@_hyp_3
│ ├── columns: rowid:6!null k:10!null
│ ├── columns: rowid:6!null j_inverted_key:10!null
│ ├── constraint: /1: [/1 - /1]
│ ├── inverted constraint: /10/6
│ │ └── spans
Expand Down Expand Up @@ -1404,7 +1404,7 @@ project
├── cost: 10.7379279
├── fd: ()-->(1)
└── inner-join (zigzag t4@_hyp_1 t4@_hyp_2)
├── columns: t4.k:1!null i:2!null f:3 j:4
├── columns: k:1!null i:2!null f:3 j:4
├── eq columns: [6] = [6]
├── left fixed columns: [1] = [1]
├── right fixed columns: [2] = [2]
Expand All @@ -1413,7 +1413,7 @@ project
├── fd: ()-->(1,2)
└── filters
├── j:4 <@ '{"foo": "1"}' [outer=(4), immutable]
├── t4.k:1 = 1 [outer=(1), constraints=(/1: [/1 - /1]; tight), fd=()-->(1)]
├── k:1 = 1 [outer=(1), constraints=(/1: [/1 - /1]; tight), fd=()-->(1)]
└── i:2 = 2 [outer=(2), constraints=(/2: [/2 - /2]; tight), fd=()-->(2)]

index-candidates
Expand All @@ -1433,12 +1433,12 @@ project
├── immutable
├── cost: 1125.07
└── select
├── columns: t4.k:1 f:3 j:4
├── columns: k:1 f:3 j:4
├── immutable
├── cost: 1124.95
├── fd: ()-->(4)
├── scan t4
│ ├── columns: t4.k:1 f:3 j:4
│ ├── columns: k:1 f:3 j:4
│ └── cost: 1114.92
└── filters
└── j:4 IS NULL [outer=(4), immutable, constraints=(/4: [/NULL - /NULL]; tight), fd=()-->(4)]
Expand All @@ -1459,11 +1459,11 @@ project
├── columns: k:1 f:3
├── cost: 1125.07
└── select
├── columns: t4.k:1 f:3 a:5
├── columns: k:1 f:3 a:5
├── cost: 1124.95
├── fd: ()-->(5)
├── scan t4
│ ├── columns: t4.k:1 f:3 a:5
│ ├── columns: k:1 f:3 a:5
│ └── cost: 1114.92
└── filters
└── a:5 IS NULL [outer=(5), constraints=(/5: [/NULL - /NULL]; tight), fd=()-->(5)]
Expand All @@ -1487,7 +1487,7 @@ project
├── immutable
├── cost: 805.048889
└── index-join t4
├── columns: t4.k:1 f:3 a:5!null
├── columns: k:1 f:3 a:5!null
├── immutable
├── cost: 803.928889
└── scan t4@_hyp_1
Expand All @@ -1513,11 +1513,11 @@ project
├── columns: k:1 f:3
├── cost: 1125.07
└── select
├── columns: t4.k:1 f:3 a:5!null
├── columns: k:1 f:3 a:5!null
├── cost: 1124.95
├── fd: ()-->(5)
├── scan t4
│ ├── columns: t4.k:1 f:3 a:5
│ ├── columns: k:1 f:3 a:5
│ └── cost: 1114.92
└── filters
└── a:5 = ARRAY[1] [outer=(5), constraints=(/5: [/ARRAY[1] - /ARRAY[1]]; tight), fd=()-->(5)]
Expand All @@ -1543,7 +1543,7 @@ project
├── immutable
├── cost: 21.9920001
└── index-join t4
├── columns: t4.k:1 i:2!null f:3 a:5!null
├── columns: k:1 i:2!null f:3 a:5!null
├── immutable
├── cost: 21.9610001
├── fd: ()-->(2)
Expand Down Expand Up @@ -1575,11 +1575,11 @@ project
├── immutable
├── cost: 381.103333
└── select
├── columns: t4.k:1 f:3!null a:5!null
├── columns: k:1 f:3!null a:5!null
├── immutable
├── cost: 380.716667
├── scan t4@_hyp_1
│ ├── columns: t4.k:1 f:3!null a:5
│ ├── columns: k:1 f:3!null a:5
│ ├── constraint: /3/6: [/3.0000000000000004 - ]
│ └── cost: 377.353333
└── filters
Expand Down Expand Up @@ -1777,3 +1777,82 @@ project
exec-ddl
DROP INDEX t1@expr
----

# Regression test for #83965.
exec-ddl
CREATE TABLE t83965a (c INT);
----

exec-ddl
CREATE TABLE t83965b (c INT);
----

exec-ddl
CREATE TABLE t83965c (c INT);
----

exec-ddl
CREATE TABLE t83965d (c INT);
----

exec-ddl
CREATE TABLE t83965e (c VARBIT(1)[]);
----

exec-ddl
CREATE TABLE t83965f (c INT);
----

index-recommendations
SELECT bool_and(t83965e.c < t83965e.c) FROM t83965f, t83965a, t83965c, t83965b, t83965d, t83965e
----
No index recommendations.
--
Optimal Plan.
scalar-group-by
├── columns: bool_and:26
├── cardinality: [1 - 1]
├── cost: 4.00225225e+16
├── key: ()
├── fd: ()-->(26)
├── project
│ ├── columns: column25:25
│ ├── cost: 3.00225225e+16
│ ├── inner-join (cross)
│ │ ├── columns: t83965e.c:21
│ │ ├── cost: 1.00225225e+16
│ │ ├── inner-join (cross)
│ │ │ ├── columns: t83965e.c:21
│ │ │ ├── cost: 1.00225225e+13
│ │ │ ├── inner-join (cross)
│ │ │ │ ├── columns: t83965e.c:21
│ │ │ │ ├── cost: 1.00225268e+10
│ │ │ │ ├── inner-join (cross)
│ │ │ │ │ ├── columns: t83965e.c:21
│ │ │ │ │ ├── cost: 10025690.6
│ │ │ │ │ ├── inner-join (cross)
│ │ │ │ │ │ ├── columns: t83965e.c:21
│ │ │ │ │ │ ├── cost: 12128.7063
│ │ │ │ │ │ ├── scan t83965d
│ │ │ │ │ │ │ └── cost: 1044.22
│ │ │ │ │ │ ├── scan t83965e
│ │ │ │ │ │ │ ├── columns: t83965e.c:21
│ │ │ │ │ │ │ └── cost: 1054.32
│ │ │ │ │ │ └── filters (true)
│ │ │ │ │ ├── scan t83965b
│ │ │ │ │ │ └── cost: 1044.22
│ │ │ │ │ └── filters (true)
│ │ │ │ ├── scan t83965c
│ │ │ │ │ └── cost: 1044.22
│ │ │ │ └── filters (true)
│ │ │ ├── scan t83965a
│ │ │ │ └── cost: 1044.22
│ │ │ └── filters (true)
│ │ ├── scan t83965f
│ │ │ └── cost: 1044.22
│ │ └── filters (true)
│ └── projections
│ └── (t83965e.c:21 IS NOT DISTINCT FROM CAST(NULL AS VARBIT(1)[])) AND CAST(NULL AS BOOL) [as=column25:25, outer=(21)]
└── aggregations
└── bool-and [as=bool_and:26, outer=(25)]
└── column25:25
2 changes: 1 addition & 1 deletion pkg/sql/opt/metadata.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -615,7 +615,7 @@ func (md *Metadata) UpdateTableMeta(tables map[cat.StableID]cat.Table) {
// will have extra inverted columns added. Add any new inverted columns to
// the metadata.
for j, n := md.tables[i].Table.ColumnCount(), tab.ColumnCount(); j < n; j++ {
md.AddColumn(string(tab.Column(i).ColName()), types.Bytes)
md.AddColumn(string(tab.Column(j).ColName()), types.Bytes)
}
md.tables[i].Table = tab
}
Expand Down