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

[Forward Port] #6940 - Fix error handling in olap mode #6949

Merged
merged 4 commits into from
Oct 26, 2020
Merged

[Forward Port] #6940 - Fix error handling in olap mode #6949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
70dcb35
added e2e test for insert statement in olap mode
harshit-gangal Oct 24, 2020
c0e2383
check error before calling callback
harshit-gangal Oct 24, 2020
c51402f
fix test to delete row afterwards
harshit-gangal Oct 24, 2020
eb4a631
addressed review comment
harshit-gangal Oct 26, 2020
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
14 changes: 14 additions & 0 deletions go/test/endtoend/vtgate/misc_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,6 +350,7 @@ func TestOffsetAndLimitWithOLAP(t *testing.T) {
conn, err := mysql.Connect(ctx, &vtParams)
require.NoError(t, err)
defer conn.Close()
defer exec(t, conn, "set workload=oltp;delete from t1")

exec(t, conn, "insert into t1(id1, id2) values (1, 1), (2, 2), (3, 3), (4, 4), (5, 5)")
assertMatches(t, conn, "select id1 from t1 order by id1 limit 3 offset 2", "[[INT64(3)] [INT64(4)] [INT64(5)]]")
Expand Down Expand Up @@ -404,6 +405,19 @@ func TestInformationSchemaWithSubquery(t *testing.T) {
assert.Empty(t, result.Rows)
}

func TestInsertStmtInOLAP(t *testing.T) {
defer cluster.PanicHandler(t)
ctx := context.Background()
conn, err := mysql.Connect(ctx, &vtParams)
require.NoError(t, err)
defer conn.Close()

exec(t, conn, `set workload='olap'`)
_, err = conn.ExecuteFetch(`insert into t1(id1, id2) values (1, 1), (2, 2), (3, 3), (4, 4), (5, 5)`, 1000, true)
require.Error(t, err)
assertMatches(t, conn, `select id1 from t1 order by id1`, `[]`)
}

func assertMatches(t *testing.T, conn *mysql.Conn, query, expected string) {
t.Helper()
qr := exec(t, conn, query)
Expand Down
21 changes: 11 additions & 10 deletions go/vt/vtgate/executor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1229,22 +1229,23 @@ func (e *Executor) StreamExecute(ctx context.Context, method string, safeSession
return nil
})

// Send left-over rows.
if len(result.Rows) > 0 || !seenResults {
if err := callback(result); err != nil {
return err
// Send left-over rows if there is no error on execution.
if err == nil {
if len(result.Rows) > 0 || !seenResults {
if err := callback(result); err != nil {
return err
}
}
// save session stats for future queries
if !safeSession.foundRowsHandled {
safeSession.FoundRows = foundRows
}
safeSession.RowCount = -1
}

logStats.ExecuteTime = time.Since(execStart)
e.updateQueryCounts(plan.Instructions.RouteType(), plan.Instructions.GetKeyspaceName(), plan.Instructions.GetTableName(), int64(logStats.ShardQueries))

// save session stats for future queries
if !safeSession.foundRowsHandled {
safeSession.FoundRows = foundRows
}
safeSession.RowCount = -1

return err
}

Expand Down