diff --git a/ast/ast.go b/ast/ast.go index 6eacd25131222..3f34a37b87646 100644 --- a/ast/ast.go +++ b/ast/ast.go @@ -146,9 +146,6 @@ type RecordSet interface { // NewChunk creates a new chunk with initial capacity. NewChunk() *chunk.Chunk - // SupportChunk check if the RecordSet supports Chunk structure. - SupportChunk() bool - // Close closes the underlying iterator, call Next after Close will // restart the iteration. Close() error diff --git a/executor/adapter.go b/executor/adapter.go index aaa30e2983fa4..37d2cf4291b6d 100644 --- a/executor/adapter.go +++ b/executor/adapter.go @@ -131,10 +131,6 @@ func (a *recordSet) NewChunk() *chunk.Chunk { return chunk.NewChunk(a.executor.retTypes()) } -func (a *recordSet) SupportChunk() bool { - return true -} - func (a *recordSet) Close() error { err := a.executor.Close() a.stmt.logSlowQuery(a.txnStartTS, a.lastErr == nil) diff --git a/server/conn.go b/server/conn.go index fb2e9e382957f..cac1fd854a2f1 100644 --- a/server/conn.go +++ b/server/conn.go @@ -924,7 +924,7 @@ func (cc *clientConn) writeResultset(ctx context.Context, rs ResultSet, binary b buf = buf[:stackSize] log.Errorf("query: %s:\n%s", cc.lastCmd, buf) }() - if cc.server.cfg.EnableChunk && rs.SupportChunk() { + if cc.server.cfg.EnableChunk { err := cc.writeChunks(ctx, rs, binary, more) if err != nil { return errors.Trace(err) diff --git a/server/driver.go b/server/driver.go index 0ff8af9309c6f..c59895dc5c0d2 100644 --- a/server/driver.go +++ b/server/driver.go @@ -124,7 +124,6 @@ type PreparedStatement interface { type ResultSet interface { Columns() []*ColumnInfo Next(context.Context) (types.Row, error) - SupportChunk() bool NewChunk() *chunk.Chunk NextChunk(context.Context, *chunk.Chunk) error Close() error diff --git a/server/driver_tidb.go b/server/driver_tidb.go index 181201111cbab..ed934a58e3c9c 100644 --- a/server/driver_tidb.go +++ b/server/driver_tidb.go @@ -306,10 +306,6 @@ func (trs *tidbResultSet) NextChunk(ctx context.Context, chk *chunk.Chunk) error return trs.recordSet.NextChunk(ctx, chk) } -func (trs *tidbResultSet) SupportChunk() bool { - return trs.recordSet.SupportChunk() -} - func (trs *tidbResultSet) Close() error { return trs.recordSet.Close() } diff --git a/statistics/statistics_test.go b/statistics/statistics_test.go index bdd40c98ea301..f1c4c2ffc13a4 100644 --- a/statistics/statistics_test.go +++ b/statistics/statistics_test.go @@ -109,10 +109,6 @@ func (r *recordSet) NewChunk() *chunk.Chunk { return chunk.NewChunk(fields) } -func (r *recordSet) SupportChunk() bool { - return true -} - func (r *recordSet) Close() error { r.cursor = 0 return nil diff --git a/store/mockstore/mocktikv/analyze.go b/store/mockstore/mocktikv/analyze.go index b42a77b525634..c81ac84218c0e 100644 --- a/store/mockstore/mocktikv/analyze.go +++ b/store/mockstore/mocktikv/analyze.go @@ -238,10 +238,6 @@ func (e *analyzeColumnsExec) NewChunk() *chunk.Chunk { return chunk.NewChunk(fields) } -func (e *analyzeColumnsExec) SupportChunk() bool { - return true -} - // Close implements the ast.RecordSet Close interface. func (e *analyzeColumnsExec) Close() error { return nil diff --git a/tidb.go b/tidb.go index aca342d1cd2fc..fb259d30f8e46 100644 --- a/tidb.go +++ b/tidb.go @@ -217,7 +217,7 @@ func GetRows4Test(ctx context.Context, sctx sessionctx.Context, rs ast.RecordSet return nil, nil } var rows []types.Row - if sctx.GetSessionVars().EnableChunk && rs.SupportChunk() { + if sctx.GetSessionVars().EnableChunk { for { // Since we collect all the rows, we can not reuse the chunk. chk := rs.NewChunk()