Test for alter NULL enum value

Author: max-hoffman

enginetest/queries/script_queries.go

@@ -120,6 +120,21 @@ var ScriptTests = []ScriptTest{
 			},
 		},
 	},
+	{
+		Name: "alter nil enum",
+		SetUpScript: []string{
+			"create table xy (x int primary key, y enum ('a', 'b'));",
+			"insert into xy values (0, NULL),(1, 'b')",
+		},
+		Assertions: []ScriptTestAssertion{
+			{
+				Query: "alter table xy modify y enum('a','b','c')",
+			},
+			//{
+			//	Query: "alter table xy modify y enum('a')",
+			//},
+		},
+	},
 	{
 		Name: "issue 7958, update join uppercase table name validation",
 		SetUpScript: []string{

sql/rowexec/ddl_iters.go

@@ -565,7 +565,7 @@ func (i *modifyColumnIter) rewriteTable(ctx *sql.Context, rwt sql.RewritableTabl
 		}
 
 		// remap old enum values to new enum values
-		if isOldEnum && isNewEnum {
+		if isOldEnum && isNewEnum && newRow[newColIdx] != nil {
 			oldIdx := int(newRow[newColIdx].(uint16))
 			oldStr, _ := oldEnum.At(oldIdx)
 			newIdx := newEnum.IndexOf(oldStr)

sql/rowexec/merge_join.go

@@ -180,7 +180,7 @@ func (i *mergeJoinIter) Next(ctx *sql.Context) (sql.Row, error) {
 	// We use two variables to manage the lookahead state management.
 	// |matchedleft| is a forward-looking indicator of whether the current left
 	// row has satisfied a join condition. It is reset to false when we
-	// increment left. |matchincleft| is true when the most recent call to
+	// increment left. |matchingleft| is true when the most recent call to
 	// |incmatch| incremented the left row. The two vars combined let us
 	// lookahead during msSelect to 1) identify proper nullified row matches,
 	// and 2) maintain forward-looking state for the next |i.fullrow|.

sql/rows_test.go

@@ -0,0 +1,58 @@
+package sql
+
+import (
+	"fmt"
+	"testing"
+)
+
+var result_ []interface{}
+
+func BenchmarkSliceCopy(b *testing.B) {
+	var res []interface{}
+
+	r := []interface{}{1, 2, 3}
+	for i := 0; i < b.N; i++ {
+		res = make([]interface{}, len(r))
+		copy(res, r)
+	}
+	result_ = res
+}
+
+func TestRowCopy2(t *testing.T) {
+	r1 := UntypedSqlRow{1, 2, 3}
+	r2 := r1.Copy()
+	r1[0] = 4
+	fmt.Println(r1, r2)
+}
+
+func BenchmarkRowCopy(b *testing.B) {
+	var res Row
+
+	r := UntypedSqlRow{1, 2, 3}
+	for i := 0; i < b.N; i++ {
+		res = r.Copy()
+	}
+	result_ = res.Values()
+}
+
+func BenchmarkUntypedRowCopyToRow(b *testing.B) {
+	var res Row
+	r := UntypedSqlRow{1, 2, 3}
+	for i := 0; i < b.N; i++ {
+		r2 := make(UntypedSqlRow, len(r))
+		copy(r2, r)
+		res = r2
+	}
+	result_ = res.Values()
+}
+
+func BenchmarkUntypedRowCopy(b *testing.B) {
+	var res UntypedSqlRow
+	r := UntypedSqlRow{1, 2, 3}
+	for i := 0; i < b.N; i++ {
+		r2 := make(UntypedSqlRow, len(r))
+		copy(r2, r)
+		res = r2
+	}
+	result_ = res.Values()
+}