*: remove SupportChunk() from interface ResultSet and RecordSet (ping…

…cap#5969)

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

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)

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)

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

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()
 }

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

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

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()