Skip to content

updated parameter list in test to new method #6434

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

Merged
sougou merged 1 commit into from
Jul 10, 2020
Merged

updated parameter list in test to new method #6434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 go/vt/vttablet/tabletserver/tabletserver_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2694,12 +2694,12 @@ func TestReserveStats(t *testing.T) {
assert.EqualValues(t, 2, tsv.te.txPool.env.Stats().UserActiveReservedCount.Counts()["test"])

// Use previous reserved connection to start transaction
_, reBeTxID, _, err := tsv.BeginExecute(ctx, &target, "select 42", nil, reRID, &querypb.ExecuteOptions{})
_, reBeTxID, _, err := tsv.BeginExecute(ctx, &target, nil, "select 42", nil, reRID, &querypb.ExecuteOptions{})
require.NoError(t, err)
assert.EqualValues(t, 2, tsv.te.txPool.env.Stats().UserActiveReservedCount.Counts()["test"])

// Starts transaction.
_, beTxID, _, err := tsv.BeginExecute(ctx, &target, "select 42", nil, 0, &querypb.ExecuteOptions{})
_, beTxID, _, err := tsv.BeginExecute(ctx, &target, nil, "select 42", nil, 0, &querypb.ExecuteOptions{})
require.NoError(t, err)
assert.EqualValues(t, 2, tsv.te.txPool.env.Stats().UserActiveReservedCount.Counts()["test"])

Expand Down
2 changes: 1 addition & 1 deletion go/vt/vttablet/tabletserver/tx_engine_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ func TestTxEngineClose(t *testing.T) {
require.NoError(t, err)
require.Equal(t, "begin", beginSQL)
c.Unlock()
c, beginSQL, err = te.txPool.Begin(ctx, &querypb.ExecuteOptions{}, false, 0)
c, beginSQL, err = te.txPool.Begin(ctx, &querypb.ExecuteOptions{}, false, 0, nil)
require.NoError(t, err)
require.Equal(t, "begin", beginSQL)
c.Unlock()
Expand Down