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

Jump to bottom

[rowexec] dolt-side lookup execution operator #8072

Merged
merged 38 commits into from
Jul 22, 2024
Merged

[rowexec] dolt-side lookup execution operator #8072

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
c531bce
[rowexec] custom rowexec
max-hoffman Jun 25, 2024
f34c015
merge main
max-hoffman Jun 26, 2024
9ef0aee
fix build
max-hoffman Jun 26, 2024
ef8cc8b
testing progress
max-hoffman Jun 26, 2024
3e7979c
save progress
max-hoffman Jun 27, 2024
e762320
fix more tests
max-hoffman Jul 9, 2024
9e31daf
skip optimization for system table indexes
max-hoffman Jul 9, 2024
7d320a9
merge main
max-hoffman Jul 10, 2024
c50e5b8
fix headers
max-hoffman Jul 10, 2024
921e758
[ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/upda…
max-hoffman Jul 10, 2024
e64bcc5
progressive refactors
max-hoffman Jul 10, 2024
db176c7
more refactoring
max-hoffman Jul 10, 2024
bc2fbd9
del comment
max-hoffman Jul 10, 2024
c60837a
Merge branch 'max/dolt-row-exec' of github.com:dolthub/dolt into max/…
max-hoffman Jul 10, 2024
ef3a0cf
merge main
max-hoffman Jul 10, 2024
8fc88fd
fix more tests
max-hoffman Jul 11, 2024
de4fa5f
fix nullSafeEq
max-hoffman Jul 11, 2024
6f25106
validate lookup join type safety
max-hoffman Jul 12, 2024
c586e8f
merge main
max-hoffman Jul 12, 2024
1a7e001
[ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/upda…
max-hoffman Jul 12, 2024
ea05d91
fix more tests
max-hoffman Jul 12, 2024
2ddda2e
remove prints
max-hoffman Jul 12, 2024
b6af5be
merge
max-hoffman Jul 12, 2024
9ae4af6
reformat
max-hoffman Jul 12, 2024
a438e54
delete unused file
max-hoffman Jul 12, 2024
f5ab6be
undo int->string conversion that isn't always valid
max-hoffman Jul 12, 2024
327ce5e
[ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/upda…
max-hoffman Jul 12, 2024
0c301eb
formatting
max-hoffman Jul 12, 2024
f83b4c1
Merge branch 'max/dolt-row-exec' of github.com:dolthub/dolt into max/…
max-hoffman Jul 12, 2024
ba424ee
sometimes dstSchema nil, which is not used
max-hoffman Jul 12, 2024
8a59480
add tests
max-hoffman Jul 14, 2024
85ff8b4
more tests and cleanup
max-hoffman Jul 15, 2024
ecf2475
nick comments
max-hoffman Jul 18, 2024
cbd463b
fmt
max-hoffman Jul 18, 2024
c81367c
more comments
max-hoffman Jul 18, 2024
bd296c3
simplify according to extra testing
max-hoffman Jul 18, 2024
61ab70f
merge main
max-hoffman Jul 18, 2024
f5f3f23
better comments
max-hoffman Jul 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion go/cmd/dolt/commands/engine/sqlengine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ import (
"github.com/dolthub/dolt/go/libraries/doltcore/sqle/cluster"
"github.com/dolthub/dolt/go/libraries/doltcore/sqle/dsess"
"github.com/dolthub/dolt/go/libraries/doltcore/sqle/mysql_file_handler"
drowexec "github.com/dolthub/dolt/go/libraries/doltcore/sqle/rowexec"
"github.com/dolthub/dolt/go/libraries/doltcore/sqle/statsnoms"
"github.com/dolthub/dolt/go/libraries/doltcore/sqle/statspro"
"github.com/dolthub/dolt/go/libraries/doltcore/sqle/writer"
Expand Down Expand Up @@ -194,7 +195,7 @@ func NewSqlEngine(
statsPro := statspro.NewProvider(pro, statsnoms.NewNomsStatsFactory(mrEnv.RemoteDialProvider()))
engine.Analyzer.Catalog.StatsProvider = statsPro

engine.Analyzer.ExecBuilder = rowexec.DefaultBuilder
engine.Analyzer.ExecBuilder = rowexec.NewOverrideBuilder(drowexec.Builder{})
sessFactory := doltSessionFactory(pro, statsPro, mrEnv.Config(), bcController, config.Autocommit)
sqlEngine.provider = pro
sqlEngine.contextFactory = sqlContextFactory()
Expand Down
2 changes: 1 addition & 1 deletion go/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,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.18.2-0.20240717222343-23b065691b11
github.com/dolthub/go-mysql-server v0.18.2-0.20240718204205-22783f1f7266
github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63
github.com/dolthub/swiss v0.1.0
github.com/goccy/go-json v0.10.2
Expand Down
4 changes: 2 additions & 2 deletions go/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,8 +183,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-20230524105445-af7e7991c97e h1:kPsT4a47cw1+y/N5SSCkma7FhAPw7KeGmD6c9PBZW9Y=
github.com/dolthub/go-icu-regex v0.0.0-20230524105445-af7e7991c97e/go.mod h1:KPUcpx070QOfJK1gNe0zx4pA5sicIK1GMikIGLKC168=
github.com/dolthub/go-mysql-server v0.18.2-0.20240717222343-23b065691b11 h1:hBmki6phLRQcIzALub15QlZWnaxgTW+FHqYtWjSoq0A=
github.com/dolthub/go-mysql-server v0.18.2-0.20240717222343-23b065691b11/go.mod h1:P6bG0p+3mH4LS4DLo3BySh10ZJTDqgWyfWBu8gGE3eU=
github.com/dolthub/go-mysql-server v0.18.2-0.20240718204205-22783f1f7266 h1:89gBiQU+gwbYkV0Q7cGqJGAnM5ngzTB87XVjM/RgxaA=
github.com/dolthub/go-mysql-server v0.18.2-0.20240718204205-22783f1f7266/go.mod h1:P6bG0p+3mH4LS4DLo3BySh10ZJTDqgWyfWBu8gGE3eU=
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=
Expand Down
3 changes: 2 additions & 1 deletion go/libraries/doltcore/sqle/enginetest/dolt_harness.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import (
"github.com/dolthub/dolt/go/libraries/doltcore/env"
"github.com/dolthub/dolt/go/libraries/doltcore/sqle"
"github.com/dolthub/dolt/go/libraries/doltcore/sqle/dsess"
drowexec "github.com/dolthub/dolt/go/libraries/doltcore/sqle/rowexec"
"github.com/dolthub/dolt/go/libraries/doltcore/sqle/statsnoms"
"github.com/dolthub/dolt/go/libraries/doltcore/sqle/statspro"
"github.com/dolthub/dolt/go/libraries/doltcore/sqle/writer"
Expand Down Expand Up @@ -251,7 +252,7 @@ func (d *DoltHarness) NewEngine(t *testing.T) (enginetest.QueryEngine, error) {
if err != nil {
return nil, err
}
e.Analyzer.ExecBuilder = rowexec.DefaultBuilder
e.Analyzer.ExecBuilder = rowexec.NewOverrideBuilder(drowexec.Builder{})
d.engine = e

ctx := enginetest.NewContext(d)
Expand Down