Merge pull request #595 from erizocosmico/fix/inner-join-iter

ajnavarro · web-flow · commit 92013a1dbd15 · 2019-01-18T14:14:47.000+01:00
sql: fix row construction in innerJoinIter
diff --git a/sql/plan/innerjoin.go b/sql/plan/innerjoin.go
@@ -167,7 +167,9 @@ func (i *innerJoinIter) Next() (sql.Row, error) {
 			return nil, err
 		}
 
-		row := append(i.leftRow[:], rightRow...)
+		var row = make(sql.Row, len(i.leftRow)+len(rightRow))
+		copy(row, i.leftRow)
+		copy(row[len(i.leftRow):], rightRow)
 
 		v, err := i.cond.Eval(i.ctx, row)
 		if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,9 @@ func (i *innerJoinIter) Next() (sql.Row, error) {`
`167`	`167`	`return nil, err`
`168`	`168`	`}`
`169`	`169`
`170`		`- row := append(i.leftRow[:], rightRow...)`
	`170`	`+ var row = make(sql.Row, len(i.leftRow)+len(rightRow))`
	`171`	`+ copy(row, i.leftRow)`
	`172`	`+ copy(row[len(i.leftRow):], rightRow)`
`171`	`173`
`172`	`174`	`v, err := i.cond.Eval(i.ctx, row)`
`173`	`175`	`if err != nil {`