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

lazy loading #2804

Open
wants to merge 16 commits into
base: main
Choose a base branch
from
Open

lazy loading #2804

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
f17583b
fix bad merge
max-hoffman Nov 27, 2024
78bb558
test skip encode
max-hoffman Nov 27, 2024
129227e
small edits
max-hoffman Dec 4, 2024
27a1049
merge with main
Dec 26, 2024
0bae8b3
bad merge
Dec 26, 2024
b5c1e81
[ga-format-pr] Run ./format_repo.sh to fix formatting
jycor Dec 26, 2024
5a79bc7
git push
Dec 26, 2024
486f6d5
Merge branch 'james/lazy' of https://github.com/dolthub/go-mysql-serv…
Dec 26, 2024
8cbd988
Merge branch 'main' into james/lazy
Dec 26, 2024
f86c000
fix tests
Dec 26, 2024
cf72039
fixing more tests
Dec 27, 2024
170512e
fixes
Dec 27, 2024
4be33a6
test
Dec 27, 2024
eacd272
fix race
Dec 27, 2024
399448b
test
Dec 31, 2024
0c43006
Merge branch 'main' into james/lazy
Dec 31, 2024
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
4 changes: 2 additions & 2 deletions driver/result.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ func getOKResult(ctx *sql.Context, rows sql.RowIter) (types.OkResult, bool, erro
return okr, found, err
}

if len(row) != 1 {
if row.Len() != 1 {
continue
}

okr, found = row[0].(types.OkResult)
okr, found = row.GetValue(0).(types.OkResult)
}

err := rows.Close(ctx)
Expand Down
8 changes: 4 additions & 4 deletions driver/rows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,17 +64,17 @@ again:
if err != nil {
return err
}
if len(row) == 0 {
if row.Len() == 0 {
return nil
}

if _, ok := row[0].(types.OkResult); ok {
if _, ok := row.GetValue(0).(types.OkResult); ok {
// skip OK results
goto again
}

for i := range row {
dest[i] = r.convert(i, row[i])
for i := range row.Values() {
dest[i] = r.convert(i, row.GetValue(i))
}
return nil
}
Expand Down
53 changes: 28 additions & 25 deletions enginetest/engine_only_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ import (
"github.com/dolthub/go-mysql-server/sql/planbuilder"
"github.com/dolthub/go-mysql-server/sql/rowexec"
"github.com/dolthub/go-mysql-server/sql/types"
"github.com/dolthub/go-mysql-server/sql/variables"
)

// This file is for tests of the engine that we are very sure do not rely on a particular database implementation. They
Expand Down Expand Up @@ -243,6 +244,8 @@ func TestShowProcessList(t *testing.T) {
addr2 := "127.0.0.1:34568"
username := "foo"

variables.InitStatusVariables()

p := sqle.NewProcessList()
p.AddConnection(1, addr1)
p.AddConnection(2, addr2)
Expand Down Expand Up @@ -278,7 +281,7 @@ func TestShowProcessList(t *testing.T) {
rows, err := sql.RowIterToRows(ctx, iter)
require.NoError(err)

expected := []sql.Row{
expected := []sql.UntypedSqlRow{
{int64(1), username, addr1, nil, "Query", int64(0),
`
a (4/5 partitions)
Expand All @@ -290,7 +293,7 @@ b (2/6 partitions)
{int64(2), username, addr2, nil, "Query", int64(0), "\nfoo (1/2 partitions)\n", "SELECT bar"},
}

require.ElementsMatch(expected, rows)
require.ElementsMatch(expected, sql.RowsToUntyped(rows))
}

func TestConcurrentProcessList(t *testing.T) {
Expand Down Expand Up @@ -483,12 +486,12 @@ func TestRecursiveViewDefinition(t *testing.T) {
}

func TestShowCharset(t *testing.T) {
iterForAllImplemented := func(t *testing.T) []sql.Row {
var rows []sql.Row
iterForAllImplemented := func(t *testing.T) []sql.UntypedSqlRow {
var rows []sql.UntypedSqlRow
iter := sql.NewCharacterSetsIterator()
for charset, ok := iter.Next(); ok; charset, ok = iter.Next() {
if charset.Encoder != nil {
rows = append(rows, sql.Row{
rows = append(rows, sql.UntypedSqlRow{
charset.Name,
charset.Description,
charset.DefaultCollation.String(),
Expand All @@ -501,7 +504,7 @@ func TestShowCharset(t *testing.T) {

tests := []struct {
Query string
RowGen func(t *testing.T) []sql.Row
RowGen func(t *testing.T) []sql.UntypedSqlRow
}{
{
Query: "SHOW CHARACTER SET;",
Expand All @@ -513,12 +516,12 @@ func TestShowCharset(t *testing.T) {
},
{
Query: "SHOW CHARSET LIKE 'utf8%'",
RowGen: func(t *testing.T) []sql.Row {
var rows []sql.Row
RowGen: func(t *testing.T) []sql.UntypedSqlRow {
var rows []sql.UntypedSqlRow
iter := sql.NewCharacterSetsIterator()
for charset, ok := iter.Next(); ok; charset, ok = iter.Next() {
if charset.Encoder != nil && strings.HasPrefix(charset.Name, "utf8") {
rows = append(rows, sql.Row{
rows = append(rows, sql.UntypedSqlRow{
charset.Name,
charset.Description,
charset.DefaultCollation.String(),
Expand All @@ -531,12 +534,12 @@ func TestShowCharset(t *testing.T) {
},
{
Query: "SHOW CHARSET WHERE Charset='binary'",
RowGen: func(t *testing.T) []sql.Row {
var rows []sql.Row
RowGen: func(t *testing.T) []sql.UntypedSqlRow {
var rows []sql.UntypedSqlRow
iter := sql.NewCharacterSetsIterator()
for charset, ok := iter.Next(); ok; charset, ok = iter.Next() {
if charset.Encoder != nil && charset.Name == "binary" {
rows = append(rows, sql.Row{
rows = append(rows, sql.UntypedSqlRow{
charset.Name,
charset.Description,
charset.DefaultCollation.String(),
Expand All @@ -549,12 +552,12 @@ func TestShowCharset(t *testing.T) {
},
{
Query: `SHOW CHARSET WHERE Charset = 'foo'`,
RowGen: func(t *testing.T) []sql.Row {
var rows []sql.Row
RowGen: func(t *testing.T) []sql.UntypedSqlRow {
var rows []sql.UntypedSqlRow
iter := sql.NewCharacterSetsIterator()
for charset, ok := iter.Next(); ok; charset, ok = iter.Next() {
if charset.Encoder != nil && charset.Name == "foo" {
rows = append(rows, sql.Row{
rows = append(rows, sql.UntypedSqlRow{
charset.Name,
charset.Description,
charset.DefaultCollation.String(),
Expand Down Expand Up @@ -659,8 +662,8 @@ func TestTriggerViewWarning(t *testing.T) {
ctx.SetCurrentDatabase("mydb")
enginetest.CreateNewConnectionForServerEngine(ctx, e)

enginetest.TestQueryWithContext(t, ctx, e, harness, "insert into mytable values (4, 'fourth row')", []sql.Row{{types.NewOkResult(1)}}, nil, nil, nil)
enginetest.TestQueryWithContext(t, ctx, e, harness, "SHOW WARNINGS", []sql.Row{{"Warning", 0, "trigger on view is not supported; 'DROP TRIGGER view_trig' to fix"}}, nil, nil, nil)
enginetest.TestQueryWithContext(t, ctx, e, harness, "insert into mytable values (4, 'fourth row')", []sql.UntypedSqlRow{{types.NewOkResult(1)}}, nil, nil, nil)
enginetest.TestQueryWithContext(t, ctx, e, harness, "SHOW WARNINGS", []sql.UntypedSqlRow{{"Warning", 0, "trigger on view is not supported; 'DROP TRIGGER view_trig' to fix"}}, nil, nil, nil)
enginetest.AssertErrWithCtx(t, e, harness, ctx, "insert into myview values (5, 'fifth row')", nil, nil, "expected insert destination to be resolved or unresolved table")
}

Expand Down Expand Up @@ -699,13 +702,13 @@ func TestCollationCoercion(t *testing.T) {
rows, err := sql.RowIterToRows(ctx, iter)
require.NoError(t, err)
require.Equal(t, 1, len(rows))
require.Equal(t, 1, len(rows[0]))
require.Equal(t, 1, rows[0].Len())
if i == 0 {
num, _, err := types.Int64.Convert(rows[0][0])
num, _, err := types.Int64.Convert(rows[0].GetValue(0))
require.NoError(t, err)
require.Equal(t, test.Coercibility, num.(int64))
} else {
str, _, err := types.LongText.Convert(rows[0][0])
str, _, err := types.LongText.Convert(rows[0].GetValue(0))
require.NoError(t, err)
require.Equal(t, test.Collation.Name(), str.(string))
}
Expand Down Expand Up @@ -757,25 +760,25 @@ func TestRegex(t *testing.T) {
Assertions: []queries.ScriptTestAssertion{
{
Query: "SELECT * FROM test1 WHERE v1 REGEXP 'def' ORDER BY v1;",
Expected: []sql.Row{
Expected: []sql.UntypedSqlRow{
{"abcdef"},
},
},
{
Query: "SELECT * FROM test2 WHERE v1 REGEXP 'def' ORDER BY v1;",
Expected: []sql.Row{
Expected: []sql.UntypedSqlRow{
{"abcdef"},
},
},
{
Query: "SELECT * FROM test3 WHERE v1 REGEXP 'def' ORDER BY v1;",
Expected: []sql.Row{
Expected: []sql.UntypedSqlRow{
{"abcDEF"}, {"abcdef"},
},
},
{
Query: "SELECT * FROM test4 WHERE v1 REGEXP 'def' ORDER BY v1;",
Expected: []sql.Row{
Expected: []sql.UntypedSqlRow{
{"abcDEF"}, {"abcdef"},
},
},
Expand Down Expand Up @@ -908,7 +911,7 @@ func (itr *SimpleTableFunctionRowIter) Next(_ *sql.Context) (sql.Row, error) {
}

itr.returnedResults = true
return sql.Row{"foo", 123}, nil
return sql.UntypedSqlRow{"foo", 123}, nil
}

func (itr *SimpleTableFunctionRowIter) Close(_ *sql.Context) error {
Expand Down
Loading
Loading