don't use put for now

Author: James Cor

server/handler.go

@@ -701,7 +701,10 @@ func (h *Handler) resultForDefaultIter(ctx *sql.Context, c *mysql.Conn, schema s
 		defer wg.Done()
 		for {
 			if r == nil {
-				r = &sqltypes.Result{Fields: resultFields}
+				r = &sqltypes.Result{
+					Fields: resultFields,
+					Rows:   make([][]sqltypes.Value, 0, rowsBatch),
+				}
 			}
 			if r.RowsAffected == rowsBatch {
 				if err := resetCallback(r, more); err != nil {

sql/rowexec/join_iters.go

@@ -212,8 +212,9 @@ func (i *joinIter) buildRow(primary, secondary sql.Row) sql.Row {
 }
 
 func (i *joinIter) Close(ctx *sql.Context) (err error) {
-	i.rowBuffer.Reset()
-	sql.RowBufPool.Put(i.rowBuffer)
+	//i.rowBuffer.Reset()
+	//sql.RowBufPool.Put(i.rowBuffer)
+	i.rowBuffer = nil
 
 	if i.primary != nil {
 		if err = i.primary.Close(ctx); err != nil {
@@ -416,8 +417,9 @@ func (i *existsIter) buildRow(primary, secondary sql.Row) sql.Row {
 }
 
 func (i *existsIter) Close(ctx *sql.Context) (err error) {
-	i.rowBuffer.Reset()
-	sql.RowBufPool.Put(i.rowBuffer)
+	i.rowBuffer = nil
+	//i.rowBuffer.Reset()
+	//sql.RowBufPool.Put(i.rowBuffer)
 
 	if i.primary != nil {
 		if err = i.primary.Close(ctx); err != nil {
@@ -587,8 +589,9 @@ func (i *fullJoinIter) buildRow(primary, secondary sql.Row) sql.Row {
 }
 
 func (i *fullJoinIter) Close(ctx *sql.Context) (err error) {
-	i.rowBuffer.Reset()
-	sql.RowBufPool.Put(i.rowBuffer)
+	i.rowBuffer = nil
+	//i.rowBuffer.Reset()
+	//sql.RowBufPool.Put(i.rowBuffer)
 
 	if i.l != nil {
 		err = i.l.Close(ctx)
@@ -706,8 +709,9 @@ func (i *crossJoinIterator) removeParentRow(r sql.Row) sql.Row {
 }
 
 func (i *crossJoinIterator) Close(ctx *sql.Context) (err error) {
-	i.rowBuffer.Reset() // TODO: just set i.rowBuffer = nil?
-	sql.RowBufPool.Put(i.rowBuffer)
+	i.rowBuffer = nil
+	//i.rowBuffer.Reset()
+	//sql.RowBufPool.Put(i.rowBuffer)
 
 	if i.l != nil {
 		err = i.l.Close(ctx)
@@ -909,8 +913,9 @@ func (i *lateralJoinIterator) Next(ctx *sql.Context) (sql.Row, error) {
 }
 
 func (i *lateralJoinIterator) Close(ctx *sql.Context) error {
-	i.rowBuffer.Reset()
-	sql.RowBufPool.Put(i.rowBuffer)
+	i.rowBuffer = nil
+	//i.rowBuffer.Reset()
+	//sql.RowBufPool.Put(i.rowBuffer)
 
 	var lerr, rerr error
 	if i.lIter != nil {

sql/rowexec/range_heap_iter.go

@@ -36,6 +36,8 @@ type rangeHeapJoinIter struct {
 	childRowIter  sql.RowIter
 	pendingRow    sql.Row
 	activeRanges  []sql.Row
+
+	rowBuffer *sql.RowBuffer
 }
 
 func newRangeHeapJoinIter(ctx *sql.Context, b sql.NodeExecBuilder, j *plan.JoinNode, row sql.Row) (sql.RowIter, error) {
@@ -68,9 +70,11 @@ func newRangeHeapJoinIter(ctx *sql.Context, b sql.NodeExecBuilder, j *plan.JoinN
 		return nil, errors.New("right side of join must be a range heap")
 	}
 
+	rowBuffer := sql.RowBufPool.Get().(*sql.RowBuffer)
+
 	parentLen := len(row)
 
-	primaryRow := make(sql.Row, parentLen+len(j.Left().Schema()))
+	primaryRow := rowBuffer.Get(parentLen + len(j.Left().Schema()))
 	copy(primaryRow, row)
 
 	return sql.NewSpanIter(span, &rangeHeapJoinIter{
@@ -88,6 +92,8 @@ func newRangeHeapJoinIter(ctx *sql.Context, b sql.NodeExecBuilder, j *plan.JoinN
 		parentLen: parentLen,
 
 		rangeHeapPlan: rhp,
+
+		rowBuffer: rowBuffer,
 	}), nil
 }
 
@@ -202,13 +208,16 @@ func (iter *rangeHeapJoinIter) removeParentRow(r sql.Row) sql.Row {
 
 // buildRow builds the result set row using the rows from the primary and secondary tables
 func (iter *rangeHeapJoinIter) buildRow(primary, secondary sql.Row) sql.Row {
-	row := make(sql.Row, iter.rowSize)
+	row := iter.rowBuffer.Get(iter.rowSize)
 	copy(row, primary)
 	copy(row[len(primary):], secondary)
 	return row
 }
 
 func (iter *rangeHeapJoinIter) Close(ctx *sql.Context) (err error) {
+	iter.rowBuffer.Reset()
+	sql.RowBufPool.Put(iter.rowBuffer)
+	
 	if iter.primary != nil {
 		if err = iter.primary.Close(ctx); err != nil {
 			if iter.secondary != nil {