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.

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

Use one canonical style for unlimited queries #14870

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions go/test/endtoend/onlineddl/vtgate_util.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ package onlineddl
import (
"context"
"fmt"
"math"
"os"
"testing"
"time"
Expand Down Expand Up @@ -57,7 +56,7 @@ func VtgateExecQuery(t *testing.T, vtParams *mysql.ConnParams, query string, exp
require.Nil(t, err)
defer conn.Close()

qr, err := conn.ExecuteFetch(query, math.MaxInt, true)
qr, err := conn.ExecuteFetch(query, -1, true)
if expectError == "" {
require.NoError(t, err)
} else {
Expand Down
3 changes: 1 addition & 2 deletions go/vt/vttablet/endtoend/misc_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import (
"context"
"fmt"
"io"
"math"
"net/http"
"reflect"
"strings"
Expand Down Expand Up @@ -913,7 +912,7 @@ func TestShowTablesWithSizes(t *testing.T) {
"show_tables_with_sizes_employees": {"BASE TABLE", ""},
}

rs, err := conn.ExecuteFetch(conn.BaseShowTablesWithSizes(), math.MaxInt, false)
rs, err := conn.ExecuteFetch(conn.BaseShowTablesWithSizes(), -1, false)
require.NoError(t, err)
require.NotEmpty(t, rs.Rows)

Expand Down
5 changes: 2 additions & 3 deletions go/vt/vttablet/onlineddl/executor.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import (
"context"
"errors"
"fmt"
"math"
"os"
"path"
"strconv"
Expand Down Expand Up @@ -291,7 +290,7 @@ func (e *Executor) executeQuery(ctx context.Context, query string) (result *sqlt
}
defer conn.Recycle()

return conn.Conn.Exec(ctx, query, math.MaxInt32, true)
return conn.Conn.Exec(ctx, query, -1, true)
}

func (e *Executor) executeQueryWithSidecarDBReplacement(ctx context.Context, query string) (result *sqltypes.Result, err error) {
Expand All @@ -308,7 +307,7 @@ func (e *Executor) executeQueryWithSidecarDBReplacement(ctx context.Context, que
if err != nil {
return nil, err
}
return conn.Conn.Exec(ctx, uq, math.MaxInt32, true)
return conn.Conn.Exec(ctx, uq, -1, true)
}

// TabletAliasString returns tablet alias as string (duh)
Expand Down
13 changes: 6 additions & 7 deletions go/vt/vttablet/onlineddl/vrepl.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import (
"context"
"errors"
"fmt"
"math"
"strconv"
"strings"

Expand Down Expand Up @@ -185,7 +184,7 @@ func (v *VRepl) readAutoIncrement(ctx context.Context, conn *dbconnpool.DBConnec
return 0, err
}

rs, err := conn.ExecuteFetch(query, math.MaxInt, true)
rs, err := conn.ExecuteFetch(query, -1, true)
if err != nil {
return 0, err
}
Expand All @@ -199,7 +198,7 @@ func (v *VRepl) readAutoIncrement(ctx context.Context, conn *dbconnpool.DBConnec
// readTableColumns reads column list from given table
func (v *VRepl) readTableColumns(ctx context.Context, conn *dbconnpool.DBConnection, tableName string) (columns *vrepl.ColumnList, virtualColumns *vrepl.ColumnList, pkColumns *vrepl.ColumnList, err error) {
parsed := sqlparser.BuildParsedQuery(sqlShowColumnsFrom, tableName)
rs, err := conn.ExecuteFetch(parsed.Query, math.MaxInt, true)
rs, err := conn.ExecuteFetch(parsed.Query, -1, true)
if err != nil {
return nil, nil, nil, err
}
Expand Down Expand Up @@ -237,7 +236,7 @@ func (v *VRepl) readTableUniqueKeys(ctx context.Context, conn *dbconnpool.DBConn
if err != nil {
return nil, err
}
rs, err := conn.ExecuteFetch(query, math.MaxInt, true)
rs, err := conn.ExecuteFetch(query, -1, true)
if err != nil {
return nil, err
}
Expand All @@ -260,7 +259,7 @@ func (v *VRepl) readTableUniqueKeys(ctx context.Context, conn *dbconnpool.DBConn
// When `fast_analyze_table=1`, an `ANALYZE TABLE` command only analyzes the clustering index (normally the `PRIMARY KEY`).
// This is useful when you want to get a better estimate of the number of table rows, as fast as possible.
func (v *VRepl) isFastAnalyzeTableSupported(ctx context.Context, conn *dbconnpool.DBConnection) (isSupported bool, err error) {
rs, err := conn.ExecuteFetch(sqlShowVariablesLikeFastAnalyzeTable, math.MaxInt, true)
rs, err := conn.ExecuteFetch(sqlShowVariablesLikeFastAnalyzeTable, -1, true)
if err != nil {
return false, err
}
Expand Down Expand Up @@ -295,7 +294,7 @@ func (v *VRepl) executeAnalyzeTable(ctx context.Context, conn *dbconnpool.DBConn
// readTableStatus reads table status information
func (v *VRepl) readTableStatus(ctx context.Context, conn *dbconnpool.DBConnection, tableName string) (tableRows int64, err error) {
parsed := sqlparser.BuildParsedQuery(sqlShowTableStatus, tableName)
rs, err := conn.ExecuteFetch(parsed.Query, math.MaxInt, true)
rs, err := conn.ExecuteFetch(parsed.Query, -1, true)
if err != nil {
return 0, err
}
Expand All @@ -316,7 +315,7 @@ func (v *VRepl) applyColumnTypes(ctx context.Context, conn *dbconnpool.DBConnect
if err != nil {
return err
}
rs, err := conn.ExecuteFetch(query, math.MaxInt, true)
rs, err := conn.ExecuteFetch(query, -1, true)
if err != nil {
return err
}
Expand Down
3 changes: 1 addition & 2 deletions go/vt/vttablet/tabletserver/gc/tablegc.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ package gc
import (
"context"
"fmt"
"math"
"sort"
"sync"
"sync/atomic"
Expand Down Expand Up @@ -420,7 +419,7 @@ func (collector *TableGC) readTables(ctx context.Context) (gcTables []*gcTable,
}
defer conn.Recycle()

res, err := conn.Conn.Exec(ctx, sqlShowVtTables, math.MaxInt32, true)
res, err := conn.Conn.Exec(ctx, sqlShowVtTables, -1, true)
if err != nil {
return nil, err
}
Expand Down
3 changes: 1 addition & 2 deletions go/vt/vttablet/tabletserver/vstreamer/snapshot_conn.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ package vstreamer
import (
"context"
"fmt"
"math"
"strings"
"sync/atomic"
"time"
Expand Down Expand Up @@ -255,7 +254,7 @@ func (conn *snapshotConn) startSnapshotAllTables(ctx context.Context) (gtid stri
return "", err
}
// get list of all tables
rs, err := conn.ExecuteFetch("show full tables", math.MaxInt32, true)
rs, err := conn.ExecuteFetch("show full tables", -1, true)
if err != nil {
return "", err
}
Expand Down
Loading