wip

go/test/endtoend/vtgate/queries/misc/misc_test.go

@@ -25,6 +25,7 @@ import (
 	"time"
 
 	"vitess.io/vitess/go/mysql"
+	"vitess.io/vitess/go/vt/log"
 
 	_ "github.com/go-sql-driver/mysql"
 	"github.com/stretchr/testify/assert"
@@ -142,6 +143,7 @@ func TestSetAndGetLastInsertID(t *testing.T) {
 				name = "tx - " + name
 			}
 			mcmp.Run(name, func(mcmp *utils.MySQLCompare) {
+				log.Errorf("Test start time - %v", time.Now())
 				mcmp.Exec(query)
 				mcmp.Exec("select last_insert_id()")
 				if mcmp.AsT().Failed() {

go/vt/vtgate/evalengine/compiler_asm.go

@@ -30,13 +30,15 @@ import (
 	"math"
 	"math/bits"
 	"net/netip"
+	"runtime/debug"
 	"strconv"
 	"time"
 
 	"github.com/google/uuid"
 
 	"vitess.io/vitess/go/mysql/collations/charset/types"
 	"vitess.io/vitess/go/mysql/collations/colldata"
+	"vitess.io/vitess/go/vt/log"
 
 	"vitess.io/vitess/go/hack"
 	"vitess.io/vitess/go/mysql/collations"
@@ -5149,7 +5151,14 @@ func (asm *assembler) Fn_LAST_INSERT_ID() {
 
 func (asm *assembler) Fn_LAST_INSERT_ID_NULL() {
 	asm.emit(func(env *ExpressionEnv) int {
+		log.Errorf("Triggering new code - %v", string(debug.Stack()))
 		env.VCursor().SetLastInsertID(0)
 		return 1
 	}, "FN LAST_INSERT_ID NULL")
 }
+
+func (asm *assembler) addJump(end *jump) {
+	asm.emit(func(env *ExpressionEnv) int {
+		return end.offset()
+	}, "JUMP")
+}

go/vt/vtgate/evalengine/compiler_test.go

@@ -966,7 +966,7 @@ func runTest(t *testing.T, expr sqlparser.Expr, cfg *evalengine.Config, tc struc
 	vc := &testVcursor{env: vtenv.NewTestEnv()}
 	env := evalengine.NewExpressionEnv(context.Background(), nil, vc)
 
-	_, err = env.EvaluateAST(converted)
+	_, err = env.Evaluate(converted)
 	require.NoError(t, err)
 	if tc.missing {
 		require.Nil(t, vc.lastInsertID)

go/vt/vtgate/evalengine/fn_misc.go

@@ -224,6 +224,7 @@ func (call *builtinLastInsertID) compile(c *compiler) (ctype, error) {
 	c.compileToUint64(arg, 1)
 	c.asm.Fn_LAST_INSERT_ID()
 	end := c.asm.jumpFrom()
+	c.asm.addJump(end)
 
 	c.asm.jumpDestination(setZero)
 	c.asm.Fn_LAST_INSERT_ID_NULL()