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

Merged
merged 2 commits into from
Jul 11, 2022
Merged

opt: fix incorrect column indexing in index recommendations #84169

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
f678273
opt: fix incorrect column indexing in index recommendations
mgartner Jul 11, 2022
41a794b
opt: clarify logic in Metadata.UpdateTableMeta
mgartner Jul 11, 2022
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
72 changes: 36 additions & 36 deletions pkg/sql/opt/indexrec/testdata/geospatial-index-candidates-recommendations
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ select
├── immutable
├── cost: 1054.09
├── index-join t2
│ ├── columns: t2.k:1 i:2 s:3 geom1:4 geog1:5 bbox1:6 bbox2:7 geom2:8 geog2:9 inet1:10
│ ├── columns: k:1 i:2 s:3 geom1:4 geog1:5 bbox1:6 bbox2:7 geom2:8 geog2:9 inet1:10
│ ├── cost: 941.837778
│ └── inverted-filter
│ ├── columns: rowid:11!null
Expand Down Expand Up @@ -77,7 +77,7 @@ select
│ ├── cost: 250.706667
│ ├── key: (11)
│ └── scan t2@_hyp_1
│ ├── columns: rowid:11!null k:14!null
│ ├── columns: rowid:11!null geom1_inverted_key:14!null
│ ├── inverted constraint: /14/11
│ │ └── spans
│ │ ├── ["B\xfd\x10\x00\x00\x00\x00\x00\x00\x00", "B\xfd\x10\x00\x00\x00\x00\x00\x00\x00"]
Expand Down Expand Up @@ -136,7 +136,7 @@ select
├── immutable
├── cost: 1054.09
├── index-join t2
│ ├── columns: t2.k:1 i:2 s:3 geom1:4 geog1:5 bbox1:6 bbox2:7 geom2:8 geog2:9 inet1:10
│ ├── columns: k:1 i:2 s:3 geom1:4 geog1:5 bbox1:6 bbox2:7 geom2:8 geog2:9 inet1:10
│ ├── cost: 941.837778
│ └── inverted-filter
│ ├── columns: rowid:11!null
Expand Down Expand Up @@ -179,7 +179,7 @@ select
│ ├── cost: 250.706667
│ ├── key: (11)
│ └── scan t2@_hyp_1
│ ├── columns: rowid:11!null k:14!null
│ ├── columns: rowid:11!null geom2_inverted_key:14!null
│ ├── inverted constraint: /14/11
│ │ └── spans
│ │ ├── ["B\xfd\x10\x00\x00\x00\x00\x00\x00\x00", "B\xfd\x10\x00\x00\x00\x00\x00\x00\x00"]
Expand Down Expand Up @@ -251,7 +251,7 @@ select
├── immutable
├── cost: 2246.15
├── scan t2
│ ├── columns: t2.k:1 i:2 s:3 geom1:4 geog1:5 bbox1:6 bbox2:7 geom2:8 geog2:9 inet1:10
│ ├── columns: k:1 i:2 s:3 geom1:4 geog1:5 bbox1:6 bbox2:7 geom2:8 geog2:9 inet1:10
│ └── cost: 1236.12
└── filters
└── st_coveredby(geom1:4, geom2:8) [outer=(4,8), immutable, constraints=(/4: (/NULL - ]; /8: (/NULL - ])]
Expand Down Expand Up @@ -282,7 +282,7 @@ select
├── immutable
├── cost: 12054.09
├── index-join t2
│ ├── columns: t2.k:1 i:2 s:3 geom1:4 geog1:5 bbox1:6 bbox2:7 geom2:8 geog2:9 inet1:10
│ ├── columns: k:1 i:2 s:3 geom1:4 geog1:5 bbox1:6 bbox2:7 geom2:8 geog2:9 inet1:10
│ ├── cost: 941.837778
│ └── inverted-filter
│ ├── columns: rowid:11!null
Expand Down Expand Up @@ -325,7 +325,7 @@ select
│ ├── cost: 250.706667
│ ├── key: (11)
│ └── scan t2@_hyp_1
│ ├── columns: rowid:11!null k:14!null
│ ├── columns: rowid:11!null geom2_inverted_key:14!null
│ ├── inverted constraint: /14/11
│ │ └── spans
│ │ ├── ["B\xfd\x10\x00\x00\x00\x00\x00\x00\x00", "B\xfd\x10\x00\x00\x00\x00\x00\x00\x00"]
Expand Down Expand Up @@ -383,7 +383,7 @@ select
├── immutable
├── cost: 101246.15
├── scan t2
│ ├── columns: t2.k:1 i:2 s:3 geom1:4 geog1:5 bbox1:6 bbox2:7 geom2:8 geog2:9 inet1:10
│ ├── columns: k:1 i:2 s:3 geom1:4 geog1:5 bbox1:6 bbox2:7 geom2:8 geog2:9 inet1:10
│ └── cost: 1236.12
└── filters
└── st_containsproperly(geom1:4, geom2:8) [outer=(4,8), immutable, constraints=(/4: (/NULL - ]; /8: (/NULL - ])]
Expand All @@ -406,7 +406,7 @@ select
├── immutable
├── cost: 101246.15
├── scan t2
│ ├── columns: t2.k:1 i:2 s:3 geom1:4 geog1:5 bbox1:6 bbox2:7 geom2:8 geog2:9 inet1:10
│ ├── columns: k:1 i:2 s:3 geom1:4 geog1:5 bbox1:6 bbox2:7 geom2:8 geog2:9 inet1:10
│ └── cost: 1236.12
└── filters
└── st_crosses(geom1:4, geom2:8) [outer=(4,8), immutable, constraints=(/4: (/NULL - ]; /8: (/NULL - ])]
Expand Down Expand Up @@ -444,7 +444,7 @@ select
├── immutable
├── cost: 12054.09
├── index-join t2
│ ├── columns: t2.k:1 i:2 s:3 geom1:4 geog1:5 bbox1:6 bbox2:7 geom2:8 geog2:9 inet1:10
│ ├── columns: k:1 i:2 s:3 geom1:4 geog1:5 bbox1:6 bbox2:7 geom2:8 geog2:9 inet1:10
│ ├── cost: 941.837778
│ └── inverted-filter
│ ├── columns: rowid:11!null
Expand Down Expand Up @@ -487,7 +487,7 @@ select
│ ├── cost: 250.706667
│ ├── key: (11)
│ └── scan t2@_hyp_1
│ ├── columns: rowid:11!null k:14!null
│ ├── columns: rowid:11!null geom1_inverted_key:14!null
│ ├── inverted constraint: /14/11
│ │ └── spans
│ │ ├── ["B\xfd\x10\x00\x00\x00\x00\x00\x00\x00", "B\xfd\x10\x00\x00\x00\x00\x00\x00\x00"]
Expand Down Expand Up @@ -546,7 +546,7 @@ select
├── immutable
├── cost: 1058.09
├── index-join t2
│ ├── columns: t2.k:1 i:2 s:3 geom1:4 geog1:5 bbox1:6 bbox2:7 geom2:8 geog2:9 inet1:10
│ ├── columns: k:1 i:2 s:3 geom1:4 geog1:5 bbox1:6 bbox2:7 geom2:8 geog2:9 inet1:10
│ ├── cost: 945.837778
│ └── inverted-filter
│ ├── columns: rowid:11!null
Expand Down Expand Up @@ -590,7 +590,7 @@ select
│ ├── cost: 254.706667
│ ├── key: (11)
│ └── scan t2@_hyp_1
│ ├── columns: rowid:11!null k:14!null
│ ├── columns: rowid:11!null geom1_inverted_key:14!null
│ ├── inverted constraint: /14/11
│ │ └── spans
│ │ ├── ["B\xfd\x10\x00\x00\x00\x00\x00\x00\x00", "B\xfd\x10\x00\x00\x00\x00\x00\x00\x00"]
Expand Down Expand Up @@ -649,7 +649,7 @@ select
├── immutable
├── cost: 101246.15
├── scan t2
│ ├── columns: t2.k:1 i:2 s:3 geom1:4 geog1:5 bbox1:6 bbox2:7 geom2:8 geog2:9 inet1:10
│ ├── columns: k:1 i:2 s:3 geom1:4 geog1:5 bbox1:6 bbox2:7 geom2:8 geog2:9 inet1:10
│ └── cost: 1236.12
└── filters
└── st_overlaps(geom1:4, geom2:8) [outer=(4,8), immutable, constraints=(/4: (/NULL - ]; /8: (/NULL - ])]
Expand Down Expand Up @@ -693,7 +693,7 @@ select
├── immutable
├── cost: 926.978889
├── index-join t2
│ ├── columns: t2.k:1 i:2 s:3 geom1:4 geog1:5 bbox1:6 bbox2:7 geom2:8 geog2:9 inet1:10
│ ├── columns: k:1 i:2 s:3 geom1:4 geog1:5 bbox1:6 bbox2:7 geom2:8 geog2:9 inet1:10
│ ├── cost: 925.837778
│ └── inverted-filter
│ ├── columns: rowid:11!null
Expand Down Expand Up @@ -732,7 +732,7 @@ select
│ ├── cost: 234.706667
│ ├── key: (11)
│ └── scan t2@_hyp_1
│ ├── columns: rowid:11!null k:14!null
│ ├── columns: rowid:11!null geog2_inverted_key:14!null
│ ├── inverted constraint: /14/11
│ │ └── spans
│ │ ├── ["B\xfdL\x00\x00\x00\x00\x00\x00\x00", "B\xfdL\x00\x00\x00\x00\x00\x00\x00"]
Expand Down Expand Up @@ -786,7 +786,7 @@ select
├── immutable
├── cost: 1246.15
├── scan t2
│ ├── columns: t2.k:1 i:2 s:3 geom1:4 geog1:5 bbox1:6 bbox2:7 geom2:8 geog2:9 inet1:10
│ ├── columns: k:1 i:2 s:3 geom1:4 geog1:5 bbox1:6 bbox2:7 geom2:8 geog2:9 inet1:10
│ └── cost: 1236.12
└── filters
└── st_dwithinexclusive(geog1:5, geog2:9, 10.0) [outer=(5,9), immutable, constraints=(/5: (/NULL - ]; /9: (/NULL - ])]
Expand Down Expand Up @@ -824,7 +824,7 @@ select
├── immutable
├── cost: 1221.85
├── scan t2@_hyp_1
│ ├── columns: t2.k:1 i:2 s:3 geom1:4 geog1:5 bbox1:6!null bbox2:7 geom2:8 geog2:9 inet1:10
│ ├── columns: k:1 i:2 s:3 geom1:4 geog1:5 bbox1:6!null bbox2:7 geom2:8 geog2:9 inet1:10
│ ├── constraint: /6/11: (/NULL - ]
│ └── cost: 1211.92
└── filters
Expand Down Expand Up @@ -855,7 +855,7 @@ select
├── immutable
├── cost: 946.988889
├── index-join t2
│ ├── columns: t2.k:1 i:2 s:3 geom1:4 geog1:5 bbox1:6 bbox2:7 geom2:8 geog2:9 inet1:10
│ ├── columns: k:1 i:2 s:3 geom1:4 geog1:5 bbox1:6 bbox2:7 geom2:8 geog2:9 inet1:10
│ ├── cost: 945.837778
│ └── inverted-filter
│ ├── columns: rowid:11!null
Expand Down Expand Up @@ -899,7 +899,7 @@ select
│ ├── cost: 254.706667
│ ├── key: (11)
│ └── scan t2@_hyp_3
│ ├── columns: rowid:11!null k:14!null
│ ├── columns: rowid:11!null geom1_inverted_key:14!null
│ ├── inverted constraint: /14/11
│ │ └── spans
│ │ ├── ["B\xfd\x10\x00\x00\x00\x00\x00\x00\x00", "B\xfd\x10\x00\x00\x00\x00\x00\x00\x00"]
Expand Down Expand Up @@ -1055,7 +1055,7 @@ select
├── immutable
├── cost: 23165.2111
├── index-join t2
│ ├── columns: t2.k:1 i:2 s:3 geom1:4 geog1:5 bbox1:6 bbox2:7 geom2:8 geog2:9 inet1:10
│ ├── columns: k:1 i:2 s:3 geom1:4 geog1:5 bbox1:6 bbox2:7 geom2:8 geog2:9 inet1:10
│ ├── cost: 941.837778
│ └── inverted-filter
│ ├── columns: rowid:11!null
Expand Down Expand Up @@ -1098,7 +1098,7 @@ select
│ ├── cost: 250.706667
│ ├── key: (11)
│ └── scan t2@_hyp_1
│ ├── columns: rowid:11!null k:14!null
│ ├── columns: rowid:11!null geom1_inverted_key:14!null
│ ├── inverted constraint: /14/11
│ │ └── spans
│ │ ├── ["B\xfd\x10\x00\x00\x00\x00\x00\x00\x00", "B\xfd\x10\x00\x00\x00\x00\x00\x00\x00"]
Expand Down Expand Up @@ -1162,7 +1162,7 @@ select
├── cost: 133.301112
├── fd: ()-->(1)
├── index-join t2
│ ├── columns: t2.k:1 i:2 s:3 geom1:4 geog1:5 bbox1:6 bbox2:7 geom2:8 geog2:9 inet1:10
│ ├── columns: k:1 i:2 s:3 geom1:4 geog1:5 bbox1:6 bbox2:7 geom2:8 geog2:9 inet1:10
│ ├── cost: 22.148889
│ └── inverted-filter
│ ├── columns: rowid:11!null
Expand Down Expand Up @@ -1205,7 +1205,7 @@ select
│ ├── cost: 15.2177778
│ ├── key: (11)
│ └── scan t2@_hyp_3
│ ├── columns: rowid:11!null k:15!null
│ ├── columns: rowid:11!null geom1_inverted_key:15!null
│ ├── constraint: /1: [/2 - /2]
│ ├── inverted constraint: /15/11
│ │ └── spans
Expand Down Expand Up @@ -1267,7 +1267,7 @@ select
├── immutable
├── cost: 12054.1
├── index-join t2
│ ├── columns: t2.k:1 i:2 s:3 geom1:4 geog1:5 bbox1:6 bbox2:7 geom2:8 geog2:9 inet1:10
│ ├── columns: k:1 i:2 s:3 geom1:4 geog1:5 bbox1:6 bbox2:7 geom2:8 geog2:9 inet1:10
│ ├── cost: 941.837778
│ └── inverted-filter
│ ├── columns: rowid:11!null
Expand Down Expand Up @@ -1310,7 +1310,7 @@ select
│ ├── cost: 250.706667
│ ├── key: (11)
│ └── scan t2@_hyp_2
│ ├── columns: rowid:11!null k:14!null
│ ├── columns: rowid:11!null geom1_inverted_key:14!null
│ ├── inverted constraint: /14/11
│ │ └── spans
│ │ ├── ["B\xfd\x10\x00\x00\x00\x00\x00\x00\x00", "B\xfd\x10\x00\x00\x00\x00\x00\x00\x00"]
Expand Down Expand Up @@ -1349,7 +1349,7 @@ select
│ └── fd: (11)-->(14)
└── filters
├── st_overlaps(geom1:4, '01010000C00000000000000000000000000000000000000000000000000000000000000000') [outer=(4), immutable, constraints=(/4: (/NULL - ])]
└── t2.k:1 > 2 [outer=(1), constraints=(/1: [/3 - ]; tight)]
└── k:1 > 2 [outer=(1), constraints=(/1: [/3 - ]; tight)]

# 4.Geospatial inverted + EQ + EQ: combined index (inverted + equal, inverted +
# equal group, equal group candidates)
Expand Down Expand Up @@ -1385,7 +1385,7 @@ inner-join (zigzag t2@_hyp_1 t2@_hyp_2)
├── fd: ()-->(1,2)
└── filters
├── st_overlaps(geom1:4, '01010000C00000000000000000000000000000000000000000000000000000000000000000') [outer=(4), immutable, constraints=(/4: (/NULL - ])]
├── t2.k:1 = 2 [outer=(1), constraints=(/1: [/2 - /2]; tight), fd=()-->(1)]
├── k:1 = 2 [outer=(1), constraints=(/1: [/2 - /2]; tight), fd=()-->(1)]
└── i:2 = 3 [outer=(2), constraints=(/2: [/3 - /3]; tight), fd=()-->(2)]

# 5. Geospatial inverted + R + R: combined index (inverted + equal, inverted +
Expand All @@ -1411,7 +1411,7 @@ select
├── immutable
├── cost: 12054.11
├── index-join t2
│ ├── columns: t2.k:1 i:2 s:3 geom1:4 geog1:5 bbox1:6 bbox2:7 geom2:8 geog2:9 inet1:10
│ ├── columns: k:1 i:2 s:3 geom1:4 geog1:5 bbox1:6 bbox2:7 geom2:8 geog2:9 inet1:10
│ ├── cost: 941.837778
│ └── inverted-filter
│ ├── columns: rowid:11!null
Expand Down Expand Up @@ -1454,7 +1454,7 @@ select
│ ├── cost: 250.706667
│ ├── key: (11)
│ └── scan t2@_hyp_3
│ ├── columns: rowid:11!null k:14!null
│ ├── columns: rowid:11!null geom1_inverted_key:14!null
│ ├── inverted constraint: /14/11
│ │ └── spans
│ │ ├── ["B\xfd\x10\x00\x00\x00\x00\x00\x00\x00", "B\xfd\x10\x00\x00\x00\x00\x00\x00\x00"]
Expand Down Expand Up @@ -1493,7 +1493,7 @@ select
│ └── fd: (11)-->(14)
└── filters
├── st_overlaps(geom1:4, '01010000C00000000000000000000000000000000000000000000000000000000000000000') [outer=(4), immutable, constraints=(/4: (/NULL - ])]
├── t2.k:1 > 2 [outer=(1), constraints=(/1: [/3 - ]; tight)]
├── k:1 > 2 [outer=(1), constraints=(/1: [/3 - ]; tight)]
└── i:2 > 3 [outer=(2), constraints=(/2: [/4 - ]; tight)]

# 6. Geospatial inverted + EQ + R: combined index (inverted + equal, equal +
Expand Down Expand Up @@ -1607,7 +1607,7 @@ select
├── cost: 22.1900001
├── fd: ()-->(1)
├── index-join t2
│ ├── columns: t2.k:1 i:2 s:3 geom1:4 geog1:5 bbox1:6 bbox2:7 geom2:8 geog2:9 inet1:10
│ ├── columns: k:1 i:2 s:3 geom1:4 geog1:5 bbox1:6 bbox2:7 geom2:8 geog2:9 inet1:10
│ ├── cost: 22.148889
│ └── inverted-filter
│ ├── columns: rowid:11!null
Expand Down Expand Up @@ -1651,7 +1651,7 @@ select
│ ├── cost: 15.2177778
│ ├── key: (11)
│ └── scan t2@_hyp_3
│ ├── columns: rowid:11!null k:15!null
│ ├── columns: rowid:11!null geom1_inverted_key:15!null
│ ├── constraint: /1: [/2 - /2]
│ ├── inverted constraint: /15/11
│ │ └── spans
Expand Down Expand Up @@ -1716,7 +1716,7 @@ select
├── immutable
├── cost: 420.726667
├── scan t2@_hyp_3
│ ├── columns: t2.k:1!null i:2 s:3 geom1:4 geog1:5 bbox1:6 bbox2:7 geom2:8 geog2:9 inet1:10
│ ├── columns: k:1!null i:2 s:3 geom1:4 geog1:5 bbox1:6 bbox2:7 geom2:8 geog2:9 inet1:10
│ ├── constraint: /1/11: [/3 - ]
│ └── cost: 417.353333
└── filters
Expand All @@ -1743,11 +1743,11 @@ select
├── immutable
├── cost: 2246.16
├── scan t2
│ ├── columns: t2.k:1 i:2 s:3 geom1:4 geog1:5 bbox1:6 bbox2:7 geom2:8 geog2:9 inet1:10
│ ├── columns: k:1 i:2 s:3 geom1:4 geog1:5 bbox1:6 bbox2:7 geom2:8 geog2:9 inet1:10
│ └── cost: 1236.12
└── filters
├── st_covers(geom1:4, geom2:8) [outer=(4,8), immutable, constraints=(/4: (/NULL - ]; /8: (/NULL - ])]
└── (~t2.k:1) = 1 [outer=(1), immutable]
└── (~k:1) = 1 [outer=(1), immutable]

# 16. Geospatial Inverted + J + EQ: combined index between join + equal,
# inverted + equal
Expand Down
Loading