Merge branch 'main' of https://github.com/dolthub/go-mysql-server into angela/funcdeps

Author: angelamayxie

enginetest/engine_only_test.go

@@ -357,10 +357,7 @@ func TestUnlockTables(t *testing.T) {
 	catalog.LockTable(ctx, "foo")
 	catalog.LockTable(ctx, "bar")
 
-	node := plan.NewUnlockTables()
-	node.Catalog = catalog
-
-	_, err := node.RowIter(ctx, nil)
+	err := catalog.UnlockTables(ctx, ctx.ID())
 	require.NoError(err)
 
 	require.Equal(1, t1.unlocks)

go.mod

@@ -6,7 +6,7 @@ require (
 	github.com/dolthub/go-icu-regex v0.0.0-20250916051405-78a38d478790
 	github.com/dolthub/jsonpath v0.0.2-0.20240227200619-19675ab05c71
 	github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81
-	github.com/dolthub/vitess v0.0.0-20251105091622-b08b393fd9b1
+	github.com/dolthub/vitess v0.0.0-20251107003339-843d10a6a8d4
 	github.com/go-sql-driver/mysql v1.9.3
 	github.com/gocraft/dbr/v2 v2.7.2
 	github.com/google/uuid v1.3.0

go.sum

@@ -22,6 +22,8 @@ github.com/dolthub/vitess v0.0.0-20251031205214-d09b65bd77b0 h1:RXopPQP1bwb5fsnX
 github.com/dolthub/vitess v0.0.0-20251031205214-d09b65bd77b0/go.mod h1:FLWqdXsAeeBQyFwDjmBVu0GnbjI2MKeRf3tRVdJEKlI=
 github.com/dolthub/vitess v0.0.0-20251105091622-b08b393fd9b1 h1:2uiHo4gkf2n/Cw9uCBDkCWj35Vz48Uhif2B9P+DqgCg=
 github.com/dolthub/vitess v0.0.0-20251105091622-b08b393fd9b1/go.mod h1:FLWqdXsAeeBQyFwDjmBVu0GnbjI2MKeRf3tRVdJEKlI=
+github.com/dolthub/vitess v0.0.0-20251107003339-843d10a6a8d4 h1:vOF5qPLC0Yd4BN/FKJlRLNELIZZlev40TrckORQqzhA=
+github.com/dolthub/vitess v0.0.0-20251107003339-843d10a6a8d4/go.mod h1:FLWqdXsAeeBQyFwDjmBVu0GnbjI2MKeRf3tRVdJEKlI=
 github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=

server/handler.go

@@ -702,7 +702,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/analyzer/costed_index_scan.go

@@ -141,9 +141,11 @@ func costedIndexLookup(ctx *sql.Context, n sql.Node, a *Analyzer, iat sql.IndexA
 		ret = plan.NewTableAlias(aliasName, ret)
 	}
 
-	a.Log("new indexed table: %s/%s/%s", ita.Index().Database(), ita.Index().Table(), ita.Index().ID())
-	a.Log("index stats cnt: %d", stats.RowCount())
-	a.Log("index stats histogram: %s", stats.Histogram().DebugString())
+	if a.Debug {
+		a.Log("new indexed table: %s/%s/%s", ita.Index().Database(), ita.Index().Table(), ita.Index().ID())
+		a.Log("index stats cnt: %d", stats.RowCount())
+		a.Log("index stats histogram: %s", stats.Histogram().DebugString())
+	}
 
 	// excluded from tree + not included in index scan => filter above scan
 	if len(filters) > 0 {

sql/mysql_db/auth.go

@@ -17,7 +17,6 @@ package mysql_db
 import (
 	"bytes"
 	"crypto/sha1"
-	"crypto/x509"
 	"encoding/hex"
 	"net"
 
@@ -108,7 +107,7 @@ var _ mysql.CachingStorage = (*noopCachingStorage)(nil)
 //
 // This implementation also handles authentication when a client doesn't send an auth response and
 // the associated user account does not have a password set.
-func (n noopCachingStorage) UserEntryWithCacheHash(_ []*x509.Certificate, _ []byte, user string, authResponse []byte, remoteAddr net.Addr) (mysql.Getter, mysql.CacheState, error) {
+func (n noopCachingStorage) UserEntryWithCacheHash(_ *mysql.Conn, _ []byte, user string, authResponse []byte, remoteAddr net.Addr) (mysql.Getter, mysql.CacheState, error) {
 	db := n.db
 
 	// If there is no mysql database of user info, then don't approve or reject, since we can't look at
@@ -167,7 +166,7 @@ var _ mysql.PlainTextStorage = (*sha2PlainTextStorage)(nil)
 
 // UserEntryWithPassword implements the mysql.PlainTextStorage interface.
 // The auth framework in Vitess also passes in user certificates, but we don't support that feature yet.
-func (s sha2PlainTextStorage) UserEntryWithPassword(_ []*x509.Certificate, user string, password string, remoteAddr net.Addr) (mysql.Getter, error) {
+func (s sha2PlainTextStorage) UserEntryWithPassword(_ *mysql.Conn, user string, password string, remoteAddr net.Addr) (mysql.Getter, error) {
 	db := s.db
 
 	host, err := extractHostAddress(remoteAddr)
@@ -230,7 +229,7 @@ var _ mysql.PlainTextStorage = (*extendedAuthPlainTextStorage)(nil)
 // UserEntryWithPassword implements the mysql.PlainTextStorage interface. This method is called by the
 // MySQL clear password auth method to authenticate a user with a custom PlaintextAuthPlugin that was
 // previously registered with the MySQLDb instance.
-func (f extendedAuthPlainTextStorage) UserEntryWithPassword(userCerts []*x509.Certificate, user string, password string, remoteAddr net.Addr) (mysql.Getter, error) {
+func (f extendedAuthPlainTextStorage) UserEntryWithPassword(conn *mysql.Conn, user string, password string, remoteAddr net.Addr) (mysql.Getter, error) {
 	db := f.db
 
 	host, err := extractHostAddress(remoteAddr)
@@ -330,7 +329,7 @@ var _ mysql.HashStorage = (*nativePasswordHashStorage)(nil)
 
 // UserEntryWithHash implements the mysql.HashStorage interface. This implementation is called by the MySQL
 // native password auth method to validate a password hash with the user's stored password hash.
-func (nphs *nativePasswordHashStorage) UserEntryWithHash(_ []*x509.Certificate, salt []byte, user string, authResponse []byte, remoteAddr net.Addr) (mysql.Getter, error) {
+func (nphs *nativePasswordHashStorage) UserEntryWithHash(_ *mysql.Conn, salt []byte, user string, authResponse []byte, remoteAddr net.Addr) (mysql.Getter, error) {
 	db := nphs.db
 
 	host, err := extractHostAddress(remoteAddr)

sql/plan/drop_role.go

@@ -19,7 +19,6 @@ import (
 	"strings"
 
 	"github.com/dolthub/go-mysql-server/sql"
-	"github.com/dolthub/go-mysql-server/sql/mysql_db"
 	"github.com/dolthub/go-mysql-server/sql/types"
 )
 
@@ -100,46 +99,3 @@ func (n *DropRole) WithChildren(children ...sql.Node) (sql.Node, error) {
 func (*DropRole) CollationCoercibility(ctx *sql.Context) (collation sql.CollationID, coercibility byte) {
 	return sql.Collation_binary, 7
 }
-
-// RowIter implements the interface sql.Node.
-func (n *DropRole) RowIter(ctx *sql.Context, row sql.Row) (sql.RowIter, error) {
-	mysqlDb, ok := n.MySQLDb.(*mysql_db.MySQLDb)
-	if !ok {
-		return nil, sql.ErrDatabaseNotFound.New("mysql")
-	}
-
-	editor := mysqlDb.Editor()
-	defer editor.Close()
-
-	for _, role := range n.Roles {
-		userPk := mysql_db.UserPrimaryKey{
-			Host: role.Host,
-			User: role.Name,
-		}
-		if role.AnyHost {
-			userPk.Host = "%"
-		}
-		existingUser, ok := editor.GetUser(userPk)
-		if !ok {
-			if n.IfExists {
-				continue
-			}
-			return nil, sql.ErrRoleDeletionFailure.New(role.String("'"))
-		}
-
-		//TODO: if a role is mentioned in the "mandatory_roles" system variable then they cannot be dropped
-		editor.RemoveUser(userPk)
-		editor.RemoveRoleEdgesFromKey(mysql_db.RoleEdgesFromKey{
-			FromHost: existingUser.Host,
-			FromUser: existingUser.User,
-		})
-		editor.RemoveRoleEdgesToKey(mysql_db.RoleEdgesToKey{
-			ToHost: existingUser.Host,
-			ToUser: existingUser.User,
-		})
-	}
-	if err := mysqlDb.Persist(ctx, editor); err != nil {
-		return nil, err
-	}
-	return sql.RowsToRowIter(sql.Row{types.NewOkResult(0)}), nil
-}

sql/plan/drop_user.go

@@ -18,7 +18,6 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/dolthub/go-mysql-server/sql/mysql_db"
 	"github.com/dolthub/go-mysql-server/sql/types"
 
 	"github.com/dolthub/go-mysql-server/sql"
@@ -101,40 +100,3 @@ func (n *DropUser) WithChildren(children ...sql.Node) (sql.Node, error) {
 func (*DropUser) CollationCoercibility(ctx *sql.Context) (collation sql.CollationID, coercibility byte) {
 	return sql.Collation_binary, 7
 }
-
-// RowIter implements the interface sql.Node.
-func (n *DropUser) RowIter(ctx *sql.Context, row sql.Row) (sql.RowIter, error) {
-	mysqlDb, ok := n.MySQLDb.(*mysql_db.MySQLDb)
-	if !ok {
-		return nil, sql.ErrDatabaseNotFound.New("mysql")
-	}
-	editor := mysqlDb.Editor()
-	defer editor.Close()
-	for _, user := range n.Users {
-		existingUser := mysqlDb.GetUser(editor, user.Name, user.Host, false)
-		if existingUser == nil {
-			if n.IfExists {
-				continue
-			}
-			return nil, sql.ErrUserDeletionFailure.New(user.String("'"))
-		}
-
-		//TODO: if a user is mentioned in the "mandatory_roles" (users and roles are interchangeable) system variable then they cannot be dropped
-		editor.RemoveUser(mysql_db.UserPrimaryKey{
-			Host: existingUser.Host,
-			User: existingUser.User,
-		})
-		editor.RemoveRoleEdgesFromKey(mysql_db.RoleEdgesFromKey{
-			FromHost: existingUser.Host,
-			FromUser: existingUser.User,
-		})
-		editor.RemoveRoleEdgesToKey(mysql_db.RoleEdgesToKey{
-			ToHost: existingUser.Host,
-			ToUser: existingUser.User,
-		})
-	}
-	if err := mysqlDb.Persist(ctx, editor); err != nil {
-		return nil, err
-	}
-	return sql.RowsToRowIter(sql.Row{types.NewOkResult(0)}), nil
-}

sql/plan/drop_view.go

@@ -56,11 +56,6 @@ func (dv *SingleDropView) IsReadOnly() bool {
 	return false
 }
 
-// RowIter implements the Node interface. It always returns an empty iterator.
-func (dv *SingleDropView) RowIter(ctx *sql.Context, row sql.Row) (sql.RowIter, error) {
-	return sql.RowsToRowIter(), nil
-}
-
 // Schema implements the Node interface. It always returns nil.
 func (dv *SingleDropView) Schema() sql.Schema { return nil }
 

sql/plan/flush.go

@@ -16,7 +16,6 @@ package plan
 
 import (
 	"github.com/dolthub/go-mysql-server/sql"
-	"github.com/dolthub/go-mysql-server/sql/mysql_db"
 	"github.com/dolthub/go-mysql-server/sql/types"
 )
 
@@ -38,21 +37,6 @@ func NewFlushPrivileges(ft bool) *FlushPrivileges {
 	}
 }
 
-// RowIter implements the interface sql.Node.
-func (f *FlushPrivileges) RowIter(ctx *sql.Context, _ sql.Row) (sql.RowIter, error) {
-	gts, ok := f.MysqlDb.(*mysql_db.MySQLDb)
-	if !ok {
-		return nil, sql.ErrDatabaseNotFound.New("mysql")
-	}
-	editor := gts.Editor()
-	defer editor.Close()
-	err := gts.Persist(ctx, editor)
-	if err != nil {
-		return nil, err
-	}
-	return sql.RowsToRowIter(sql.Row{types.NewOkResult(0)}), nil
-}
-
 // String implements the interface sql.Node.
 func (*FlushPrivileges) String() string { return "FLUSH PRIVILEGES" }