Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
80422: sql: support virtual table indexes with generators r=AlexTalks a=AlexTalks

While previously virtual schema tables had support for defining tables
with a `populate` function, which eagerly loads all rows, or a
`generator` function, which lazy loads each row when called (possibly
running in a worker Goroutine), and also had support for virtual indexes
which would have their own `populate` functions, there was a subtle lack
of support for using virtual indexes with virtual tables that used a
`generator`, since the virtual index constraint logic would fall back to
a (possibly undefined) `populate` function in several cases. This change
fixes the nil pointer exception that could occur if using virtual
indexes with a table using a `generator`, and validates that the virtual
index is supported prior to use.

Release Note: None

Release Justification: Bug fix

80989: outliers: collect statement fingerprint id r=matthewtodd a=matthewtodd

This change also helps set us up for #79451, where we'll be working with
per-fingerprint statement latencies.

Release note: None

81076: Authors: add linville to authors r=davidwding a=mdlinville

Release note: None

81080: opt: calculate lookup join remaining filters more accurately r=mgartner a=mgartner

#### opt: return ordinals of equality filters from memo.ExtractJoinEqualityColumns

This is a prerequisite for future refactoring of
`lookupjoin.ConstraintBuilder`.

Release note: None

#### opt: calculate lookup join remaining filters more accurately

`lookupjoin.ConstraintBuilder` now determines the remaining filters for
a lookup join constraint more accurately by tracking the ordinals of
filters that are covered by the constraint, rather than trying to reduce
the filters original filters based on the key columns, lookup
expression, and constant expression.

Release note: None


81089: vendor: bump panicparse r=erikgrinaker,nvanbenschoten a=tbg

This picks up maruel/panicparse#74.
Without this commit, the `pkg/kv/kvserver/concurrency` datadriven
tests are flaky on Mac M1s since those tests rely on panicparse
to parse strack traces for goroutine monitoring.

Release note: None


Co-authored-by: Alex Sarkesian <sarkesian@cockroachlabs.com>
Co-authored-by: Matthew Todd <todd@cockroachlabs.com>
Co-authored-by: Matt Linville <linville@cockroachlabs.com>
Co-authored-by: Marcus Gartner <marcus@cockroachlabs.com>
Co-authored-by: Tobias Grieger <tobias.b.grieger@gmail.com>
  • Loading branch information
6 people committed May 6, 2022
6 parents 40d8803 + 622be5c + e158e02 + c5c33f2 + 1406925 + a3b9d02 commit 44c2fd5
Show file tree
Hide file tree
Showing 27 changed files with 169 additions and 85 deletions.
7 changes: 4 additions & 3 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ Andy Yang <ayang@cockroachlabs.com> andyyang890 <42660547+andyyang890@users.nore
Angela Chang <angelachang27@gmail.com> changangela <angelachang27@gmail.com> <angela@cockroachlabs.com>
Angela Wen <angelaw@cockroachlabs.com> angelapwen <angelaw@cockroachlabs.com>
Angela Xu <angelax@cockroachlabs.com> angelazxu <angelazxu@berkeley.edu>
Anne Zhu <anne.zhu@cockroachlabs.com>
Anne Zhu <anne.zhu@cockroachlabs.com>
Antoine Grondin <antoinegrondin@gmail.com>
Anzo Teh <anzoteh@hotmail.com> anzoteh96 <anzot@cockroachlabs.com> <anzo9684@gmail.com>
Archer Zhang <archer.xn@gmail.com> azhng <archerz@cockroachlabs.com>
Expand Down Expand Up @@ -194,7 +194,7 @@ James Graves <james.c.graves.jr@gmail.com>
James Jung <james.jung@cockroachlabs.com> <jameswsj18@gmail.com>
James H. Linder <jamesl@cockroachlabs.com>
Jan Owsiany <jan.owsiany@gmail.com>
Jane Xing <zhouxing@uchicago.edu> <jane@cockroachlabs.com>
Jane Xing <zhouxing@uchicago.edu> <jane@cockroachlabs.com>
Jason E. Aten <j.e.aten@gmail.com>
Jason Young <RustJason@users.noreply.github.com>
Jay Kominek <kominek@gmail.com>
Expand Down Expand Up @@ -288,6 +288,7 @@ Marylia Gutierrez <marylia@cockroachlabs.com>
Masha Schneider <masha@cockroachlabs.com> <mshv14282@gmail.com>
Matt Jibson <matt.jibson@gmail.com> <@cockroachlabs.com>
Matt Sherman <sherman@cockroachlabs.com>
Matt Linville <linville@cockroachlabs.com>
Matt Tracy <matt.r.tracy@gmail.com> <matt@cockroachlabs.com>
Matthew O'Connor <matthew@squareup.com> <matthew.t.oconnor@gmail.com>
Matthew Todd <todd@cockroachlabs.com> <matthew@matthewtodd.org>
Expand Down Expand Up @@ -340,7 +341,7 @@ phelanm <phelanm@gmail.com>
Philippe Laflamme <philippe.laflamme@gmail.com>
phynalle <phynalism@gmail.com>
Piotr Zurek <p.zurek@gmail.com>
PJ Tatlow <pj@cockroachlabs.com> pjtatlow <pjtatlow@gmail.com>
PJ Tatlow <pj@cockroachlabs.com> pjtatlow <pjtatlow@gmail.com>
pocockn <pocockn@hotmail.co.uk>
Pooja Maniar <maniar.pooja36@gmail.com> <poojam@cockroachlabs.com>
Poornima Malepati <poornima.malepati@gmail.com> Poornima <poornima.malepati@gmail.com>
Expand Down
12 changes: 6 additions & 6 deletions DEPS.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -5279,10 +5279,10 @@ def go_deps():
name = "com_github_maruel_panicparse_v2",
build_file_proto_mode = "disable_global",
importpath = "github.com/maruel/panicparse/v2",
sha256 = "a51ff19f83c9a1e468b5d722d0857eb468d0f9baa29365e700c2e6ec24bd47a7",
strip_prefix = "github.com/cockroachdb/panicparse/v2@v2.0.0-20211103220158-604c82a44f1e",
sha256 = "973a277ad8d81ac3b1381947c268768f17d6b10eac04bff7e60b2116d02b7208",
strip_prefix = "github.com/maruel/panicparse/v2@v2.2.1",
urls = [
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/panicparse/v2/com_github_cockroachdb_panicparse_v2-v2.0.0-20211103220158-604c82a44f1e.zip",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/maruel/panicparse/v2/com_github_maruel_panicparse_v2-v2.2.1.zip",
],
)
go_repository(
Expand Down Expand Up @@ -5369,10 +5369,10 @@ def go_deps():
name = "com_github_mattn_go_colorable",
build_file_proto_mode = "disable_global",
importpath = "github.com/mattn/go-colorable",
sha256 = "2a78bab4fa8a66b3ae48fcd50fc5970db4011a8cee0a3ad7c13da0fb624c95e5",
strip_prefix = "github.com/mattn/go-colorable@v0.1.11",
sha256 = "c4637499409a4081fbbd7ea0640aa0af30c0e06a70aa1b207780b0251650d8cd",
strip_prefix = "github.com/mattn/go-colorable@v0.1.12",
urls = [
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/mattn/go-colorable/com_github_mattn_go_colorable-v0.1.11.zip",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/mattn/go-colorable/com_github_mattn_go_colorable-v0.1.12.zip",
],
)
go_repository(
Expand Down
4 changes: 2 additions & 2 deletions build/bazelutil/distdir_files.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,6 @@ DISTDIR_FILES = {
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/go-test-teamcity/com_github_cockroachdb_go_test_teamcity-v0.0.0-20191211140407-cff980ad0a55.zip": "bac30148e525b79d004da84d16453ddd2d5cd20528e9187f1d7dac708335674b",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/gostdlib/com_github_cockroachdb_gostdlib-v1.13.0.zip": "b3d43d8f95edf65f73a5348f29e1159823cac64b148f8d3bb48340bf55d70872",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/logtags/com_github_cockroachdb_logtags-v0.0.0-20211118104740-dabe8e521a4f.zip": "1972c3f171f118add3fd9e64bcea6cbb9959a3b7fa0ada308e8a7310813fea74",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/panicparse/v2/com_github_cockroachdb_panicparse_v2-v2.0.0-20211103220158-604c82a44f1e.zip": "a51ff19f83c9a1e468b5d722d0857eb468d0f9baa29365e700c2e6ec24bd47a7",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20220426173801-b33d6e173cae.zip": "dfa5ce136f7d8d40ddf24077323df27de81f0e1889c1058e4453c77cd8c2cb75",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/redact/com_github_cockroachdb_redact-v1.1.3.zip": "7778b1e4485e4f17f35e5e592d87eb99c29e173ac9507801d000ad76dd0c261e",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/returncheck/com_github_cockroachdb_returncheck-v0.0.0-20200612231554-92cdbca611dd.zip": "ce92ba4352deec995b1f2eecf16eba7f5d51f5aa245a1c362dfe24c83d31f82b",
Expand Down Expand Up @@ -562,9 +561,10 @@ DISTDIR_FILES = {
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/martini-contrib/auth/com_github_martini_contrib_auth-v0.0.0-20150219114609-fa62c19b7ae8.zip": "b3b2a267bb6ef227960e4391cc2bc868d0e6bceb2cb32372242c60f28f643cb2",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/martini-contrib/gzip/com_github_martini_contrib_gzip-v0.0.0-20151124214156-6c035326b43f.zip": "803830ec3e7c75b135f0215579834192d01ce43da81934d903ed4ff9fa4dac9b",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/martini-contrib/render/com_github_martini_contrib_render-v0.0.0-20150707142108-ec18f8345a11.zip": "2edd7f64b2f1f053f86a51856cd0f02b1f762af61a458a2e282dab76ad093d70",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/maruel/panicparse/v2/com_github_maruel_panicparse_v2-v2.2.1.zip": "973a277ad8d81ac3b1381947c268768f17d6b10eac04bff7e60b2116d02b7208",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/marusama/semaphore/com_github_marusama_semaphore-v0.0.0-20190110074507-6952cef993b2.zip": "2bc0cfc69824299ce542fd221820905ded92a3e236428f0f157887c081eb367d",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/matryer/moq/com_github_matryer_moq-v0.0.0-20190312154309-6cfb0558e1bd.zip": "b9fb2bc3d0894dfaa3cc4298f49c97346ccb66f2f0e6911f4f224ffc9acc3972",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/mattn/go-colorable/com_github_mattn_go_colorable-v0.1.11.zip": "2a78bab4fa8a66b3ae48fcd50fc5970db4011a8cee0a3ad7c13da0fb624c95e5",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/mattn/go-colorable/com_github_mattn_go_colorable-v0.1.12.zip": "c4637499409a4081fbbd7ea0640aa0af30c0e06a70aa1b207780b0251650d8cd",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/mattn/go-ieproxy/com_github_mattn_go_ieproxy-v0.0.1.zip": "2a1ad026c677bddef4136c76da19db2204d568b4c2246b2e00a79b47d8c01192",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/mattn/go-isatty/com_github_mattn_go_isatty-v0.0.14.zip": "6b8f017658d900de873fc567237548ef2054082aed64669655e51beeefee83c7",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/mattn/go-runewidth/com_github_mattn_go_runewidth-v0.0.10.zip": "030dcf3ea6cb39b34269f119ee5fe5e9d5834daf409e1f3f48c065a45326f4a6",
Expand Down
4 changes: 1 addition & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ require (
github.com/lib/pq/auth/kerberos v0.0.0-20200720160335-984a6aa1ca46
github.com/linkedin/goavro/v2 v2.10.0
github.com/lufia/iostat v1.2.1
github.com/maruel/panicparse/v2 v2.2.0
github.com/maruel/panicparse/v2 v2.2.1
github.com/marusama/semaphore v0.0.0-20190110074507-6952cef993b2
github.com/mattn/go-isatty v0.0.14
github.com/mattn/goveralls v0.0.2
Expand Down Expand Up @@ -371,5 +371,3 @@ replace github.com/knz/go-libedit => github.com/otan-cockroach/go-libedit v1.10.
replace go.etcd.io/etcd/pkg/v3 => go.etcd.io/etcd/pkg/v3 v3.0.0-20201109164711-01844fd28560

replace github.com/docker/docker => github.com/moby/moby v20.10.6+incompatible

replace github.com/maruel/panicparse/v2 => github.com/cockroachdb/panicparse/v2 v2.0.0-20211103220158-604c82a44f1e
7 changes: 4 additions & 3 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -453,8 +453,6 @@ github.com/cockroachdb/gostdlib v1.13.0/go.mod h1:eXX95p9QDrYwJfJ6AgeN9QnRa/lqqi
github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI=
github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f h1:6jduT9Hfc0njg5jJ1DdKCFPdMBrp/mdZfCpa5h+WM74=
github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs=
github.com/cockroachdb/panicparse/v2 v2.0.0-20211103220158-604c82a44f1e h1:FrERdkPlRj+v7fc+PGpey3GUiDGuTR5CsmLCA54YJ8I=
github.com/cockroachdb/panicparse/v2 v2.0.0-20211103220158-604c82a44f1e/go.mod h1:pMxsKyCewnV3xPaFvvT9NfwvDTcIx2Xqg0qL5Gq0SjM=
github.com/cockroachdb/pebble v0.0.0-20220426173801-b33d6e173cae h1:7lGpwt2wTBh7FApXTEdTDX5OFWsEg9CCe8wMlHJZDwA=
github.com/cockroachdb/pebble v0.0.0-20220426173801-b33d6e173cae/go.mod h1:buxOO9GBtOcq1DiXDpIPYrmxY020K2A8lOrwno5FetU=
github.com/cockroachdb/redact v1.0.8/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
Expand Down Expand Up @@ -1541,6 +1539,8 @@ github.com/marstr/guid v1.1.0/go.mod h1:74gB1z2wpxxInTG6yaqA7KrtM0NZ+RbrcqDvYHef
github.com/martini-contrib/auth v0.0.0-20150219114609-fa62c19b7ae8/go.mod h1:ahTFgV/NtzY/CALneRrC67m1dis5arHTQDfyIhKk69E=
github.com/martini-contrib/gzip v0.0.0-20151124214156-6c035326b43f/go.mod h1:jhUB0rZB2TPWqy0yGugKRRictO591eSO7If7O4MfCaA=
github.com/martini-contrib/render v0.0.0-20150707142108-ec18f8345a11/go.mod h1:Ah2dBMoxZEqk118as2T4u4fjfXarE0pPnMJaArZQZsI=
github.com/maruel/panicparse/v2 v2.2.1 h1:VXY1afcZVisbGdNIRQV15vmM7K40pTCiou0b/xwtOBU=
github.com/maruel/panicparse/v2 v2.2.1/go.mod h1:WizmeHJfpyKYYKGInKv8ax8jh7DJnQE5yFDuzFfHzIU=
github.com/marusama/semaphore v0.0.0-20190110074507-6952cef993b2 h1:sq+a5mb8zHbmHhrIH06oqIMGsanjpbxNgxEgZVfgpvQ=
github.com/marusama/semaphore v0.0.0-20190110074507-6952cef993b2/go.mod h1:TmeOqAKoDinfPfSohs14CO3VcEf7o+Bem6JiNe05yrQ=
github.com/matryer/moq v0.0.0-20190312154309-6cfb0558e1bd/go.mod h1:9ELz6aaclSIGnZBoaSLZ3NAl1VTufbOrXBPvtcy6WiQ=
Expand All @@ -1552,6 +1552,7 @@ github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope
github.com/mattn/go-colorable v0.1.7/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
github.com/mattn/go-colorable v0.1.11/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
github.com/mattn/go-ieproxy v0.0.0-20190610004146-91bb50d98149/go.mod h1:31jz6HNzdxOmlERGGEc4v/dMssOfmp2p5bT/okiKFFc=
github.com/mattn/go-ieproxy v0.0.1 h1:qiyop7gCflfhwCzGyeT0gro3sF9AIg9HU98JORTkqfI=
github.com/mattn/go-ieproxy v0.0.1/go.mod h1:pYabZ6IHcRpFh7vIaLfK7rdcWgFEb3SFJ6/gNWuh88E=
Expand Down Expand Up @@ -2620,7 +2621,6 @@ golang.org/x/sys v0.0.0-20210917161153-d61c044b1678/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20211013075003-97ac67df715c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20211015200801-69063c4bb744/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
Expand All @@ -2630,6 +2630,7 @@ golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220408201424-a24fb2fb8a0f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 h1:xHms4gcpe1YE7A3yIllJXP16CMAGuqwO2lX1mTyyRRc=
golang.org/x/sys v0.0.0-20220422013727-9388b58f7150/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
Expand Down
8 changes: 5 additions & 3 deletions pkg/sql/crdb_internal.go
Original file line number Diff line number Diff line change
Expand Up @@ -6083,9 +6083,10 @@ CREATE TABLE crdb_internal.cluster_locks (
var crdbInternalNodeExecutionOutliersTable = virtualSchemaTable{
schema: `
CREATE TABLE crdb_internal.node_execution_outliers (
session_id STRING NOT NULL,
transaction_id UUID NOT NULL,
statement_id STRING NOT NULL
session_id STRING NOT NULL,
transaction_id UUID NOT NULL,
statement_id STRING NOT NULL,
statement_fingerprint_id BYTES NOT NULL
);`,
populate: func(ctx context.Context, p *planner, db catalog.DatabaseDescriptor, addRow func(...tree.Datum) error) (err error) {
p.extendedEvalCtx.statsProvider.IterateOutliers(ctx, func(
Expand All @@ -6095,6 +6096,7 @@ CREATE TABLE crdb_internal.node_execution_outliers (
tree.NewDString(hex.EncodeToString(o.Session.ID)),
tree.NewDUuid(tree.DUuid{UUID: *o.Transaction.ID}),
tree.NewDString(hex.EncodeToString(o.Statement.ID)),
tree.NewDBytes(tree.DBytes(sqlstatsutil.EncodeUint64ToBytes(uint64(o.Statement.FingerprintID)))),
))
})
return err
Expand Down
6 changes: 4 additions & 2 deletions pkg/sql/logictest/testdata/logic_test/create_statements
Original file line number Diff line number Diff line change
Expand Up @@ -870,11 +870,13 @@ CREATE TABLE crdb_internal.node_distsql_flows (
CREATE TABLE crdb_internal.node_execution_outliers (
session_id STRING NOT NULL,
transaction_id UUID NOT NULL,
statement_id STRING NOT NULL
statement_id STRING NOT NULL,
statement_fingerprint_id BYTES NOT NULL
) CREATE TABLE crdb_internal.node_execution_outliers (
session_id STRING NOT NULL,
transaction_id UUID NOT NULL,
statement_id STRING NOT NULL
statement_id STRING NOT NULL,
statement_fingerprint_id BYTES NOT NULL
) {} {}
CREATE TABLE crdb_internal.node_inflight_trace_spans (
trace_id INT8 NOT NULL,
Expand Down
2 changes: 1 addition & 1 deletion pkg/sql/opt/exec/execbuilder/relational.go
Original file line number Diff line number Diff line change
Expand Up @@ -1121,7 +1121,7 @@ func (b *Builder) buildHashJoin(join memo.RelExpr) (execPlan, error) {
}
}

leftEq, rightEq := memo.ExtractJoinEqualityColumns(
leftEq, rightEq, _ := memo.ExtractJoinEqualityColumns(
leftExpr.Relational().OutputCols,
rightExpr.Relational().OutputCols,
*filters,
Expand Down
1 change: 0 additions & 1 deletion pkg/sql/opt/exec/execbuilder/testdata/lookup_join_spans
Original file line number Diff line number Diff line change
Expand Up @@ -920,7 +920,6 @@ vectorized: true
│ estimated row count: 196 (missing stats)
│ table: order_line@ol_io
│ lookup condition: (s_i_id = ol_i_id) AND (ol_o_id IN (20, 21))
│ pred: (ol_o_id IN (19, 20, 21)) AND (ol_o_id >= 20)
└── • scan
columns: (s_i_id)
Expand Down
1 change: 1 addition & 0 deletions pkg/sql/opt/lookupjoin/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ go_library(
"//pkg/sql/opt/props",
"//pkg/sql/sem/eval",
"//pkg/sql/sem/tree",
"//pkg/util",
],
)

Expand Down
Loading

0 comments on commit 44c2fd5

Please sign in to comment.