From 778e5e1894d9102c4d57b814ac76a2fe0f64eb1d Mon Sep 17 00:00:00 2001 From: Max Hoffman Date: Tue, 4 Feb 2025 12:48:21 -0800 Subject: [PATCH] [kvexec] fix left join nullability bug --- go/go.mod | 2 +- go/go.sum | 4 ++-- go/libraries/doltcore/sqle/kvexec/lookup_join.go | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go/go.mod b/go/go.mod index 2fc96289a25..39c042a572b 100644 --- a/go/go.mod +++ b/go/go.mod @@ -56,7 +56,7 @@ require ( github.com/cespare/xxhash/v2 v2.2.0 github.com/creasty/defaults v1.6.0 github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2 - github.com/dolthub/go-mysql-server v0.19.1-0.20250131110511-67aa2a430366 + github.com/dolthub/go-mysql-server v0.19.1-0.20250204204538-8837bc29ed89 github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 github.com/dolthub/swiss v0.1.0 github.com/esote/minmaxheap v1.0.0 diff --git a/go/go.sum b/go/go.sum index 0af441a1c7c..793ba395597 100644 --- a/go/go.sum +++ b/go/go.sum @@ -179,8 +179,8 @@ github.com/dolthub/fslock v0.0.3 h1:iLMpUIvJKMKm92+N1fmHVdxJP5NdyDK5bK7z7Ba2s2U= github.com/dolthub/fslock v0.0.3/go.mod h1:QWql+P17oAAMLnL4HGB5tiovtDuAjdDTPbuqx7bYfa0= github.com/dolthub/go-icu-regex v0.0.0-20241215010122-db690dd53c90 h1:Sni8jrP0sy/w9ZYXoff4g/ixe+7bFCZlfCqXKJSU+zM= github.com/dolthub/go-icu-regex v0.0.0-20241215010122-db690dd53c90/go.mod h1:ylU4XjUpsMcvl/BKeRRMXSH7e7WBrPXdSLvnRJYrxEA= -github.com/dolthub/go-mysql-server v0.19.1-0.20250131110511-67aa2a430366 h1:pJ+upgX6hrhyqgpkmk9Ye9lIPSualMHZcUMs8kWknV4= -github.com/dolthub/go-mysql-server v0.19.1-0.20250131110511-67aa2a430366/go.mod h1:jYEJ8tNkA7K3k39X8iMqaX3MSMmViRgh222JSLHDgVc= +github.com/dolthub/go-mysql-server v0.19.1-0.20250204204538-8837bc29ed89 h1:AfX/0gZdxj1PT+yiuZOhEPt0X+mJF76rWLsnucJeNpI= +github.com/dolthub/go-mysql-server v0.19.1-0.20250204204538-8837bc29ed89/go.mod h1:jYEJ8tNkA7K3k39X8iMqaX3MSMmViRgh222JSLHDgVc= github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 h1:OAsXLAPL4du6tfbBgK0xXHZkOlos63RdKYS3Sgw/dfI= github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63/go.mod h1:lV7lUeuDhH5thVGDCKXbatwKy2KW80L4rMT46n+Y2/Q= github.com/dolthub/ishell v0.0.0-20240701202509-2b217167d718 h1:lT7hE5k+0nkBdj/1UOSFwjWpNxf+LCApbRHgnCA17XE= diff --git a/go/libraries/doltcore/sqle/kvexec/lookup_join.go b/go/libraries/doltcore/sqle/kvexec/lookup_join.go index 65bfebc927a..f2657f9dcd0 100644 --- a/go/libraries/doltcore/sqle/kvexec/lookup_join.go +++ b/go/libraries/doltcore/sqle/kvexec/lookup_join.go @@ -113,7 +113,7 @@ func (l *lookupJoinKvIter) Next(ctx *sql.Context) (sql.Row, error) { return nil, io.EOF } - l.dstKey, err = l.keyTupleMapper.dstKeyTuple(ctx, l.srcKey, l.srcVal) + l.dstKey, err = l.keyTupleMapper.dstKeyTuple(l.srcKey, l.srcVal) if err != nil { return nil, err } @@ -173,7 +173,7 @@ func (l *lookupJoinKvIter) Next(ctx *sql.Context) (sql.Row, error) { // override default left join behavior l.dstKey = nil continue - } else if !sql.IsTrue(res) && l.dstKey != nil { + } else if !sql.IsTrue(res) && dstKey != nil { continue } } @@ -292,7 +292,7 @@ func (m *lookupMapping) valid() bool { return true } -func (m *lookupMapping) dstKeyTuple(ctx context.Context, srcKey, srcVal val.Tuple) (val.Tuple, error) { +func (m *lookupMapping) dstKeyTuple(srcKey, srcVal val.Tuple) (val.Tuple, error) { var litIdx int for to := range m.srcMapping { from := m.srcMapping.MapOrdinal(to)