testing

Author: James Cor

sql/aggregates.go

@@ -109,7 +109,7 @@ type WindowFrame interface {
 	StartCurrentRow() bool
 	// EndCurrentRow returns whether a frame end is CURRENT ROW
 	EndCurrentRow() bool
-	// StartNFollowing returns a frame's start preceding Expression or nil
+	// StartNPreceding returns a frame's start preceding Expression or nil
 	StartNPreceding() Expression
 	// StartNFollowing returns a frame's start following Expression or nil
 	StartNFollowing() Expression

sql/rowexec/builder.go

@@ -16,6 +16,7 @@ package rowexec
 
 import (
 	"runtime/trace"
+	"sync"
 
 	"github.com/dolthub/go-mysql-server/sql"
 	"github.com/dolthub/go-mysql-server/sql/plan"
@@ -58,3 +59,19 @@ func FinalizeIters(ctx *sql.Context, analyzed sql.Node, qFlags *sql.QueryFlags,
 	iter = AddExpressionCloser(analyzed, iter)
 	return iter, sch, nil
 }
+
+// TODO: find a proper place for this
+var rowBuffers = sync.Pool{
+	New: func() interface{} {
+		return make(sql.Row, 0, 4096) // TODO: this is apparently max number of columns
+	},
+}
+
+func GetRow(length int) sql.Row {
+	row := rowBuffers.Get().(sql.Row)
+	return row[:length]
+}
+
+func PutRow(row sql.Row) {
+	rowBuffers.Put(row[:0])
+}

sql/rowexec/merge_join.go

@@ -46,7 +46,8 @@ func newMergeJoinIter(ctx *sql.Context, b sql.NodeExecBuilder, j *plan.JoinNode,
 		return nil, err
 	}
 
-	fullRow := make(sql.Row, len(row)+len(j.Left().Schema())+len(j.Right().Schema()))
+	fullRow := GetRow(len(row) + len(j.Left().Schema()) + len(j.Right().Schema()))
+	// TODO: what is this for
 	fullRow[0] = row
 	if len(row) > 0 {
 		copy(fullRow[0:], row[:])
@@ -586,5 +587,6 @@ func (i *mergeJoinIter) Close(ctx *sql.Context) (err error) {
 		}
 	}
 
+	PutRow(i.fullRow)
 	return err
 }

sql/rows.go

@@ -16,12 +16,10 @@ package sql
 
 import (
 	"fmt"
+	"github.com/dolthub/go-mysql-server/sql/values"
+	"github.com/dolthub/vitess/go/vt/proto/query"
 	"io"
 	"strings"
-
-	"github.com/dolthub/vitess/go/vt/proto/query"
-
-	"github.com/dolthub/go-mysql-server/sql/values"
 )
 
 // Row is a tuple of values.