[no-release-notes] Change some tests to use t.TempDir instead of os.TempDir so that their temporary files get cleaned up.

.github/workflows/ci-check-repo.yaml

@@ -152,8 +152,6 @@ jobs:
           cwd: "."
           pull: "--ff"
       - name: Check generated protobufs
-        env:
-          USE_BAZEL_VERSION: 7.4.0
         working-directory: ./proto
         env:
           USE_BAZEL_VERSION: 7.4.0

go/cmd/dolt/commands/engine/sqlengine.go

@@ -47,6 +47,7 @@ import (
 	"github.com/dolthub/dolt/go/libraries/doltcore/sqle/statspro"
 	"github.com/dolthub/dolt/go/libraries/doltcore/sqle/writer"
 	"github.com/dolthub/dolt/go/libraries/utils/config"
+	"github.com/dolthub/dolt/go/libraries/utils/filesys"
 )
 
 // SqlEngine packages up the context necessary to run sql queries against dsqle.
@@ -55,6 +56,7 @@ type SqlEngine struct {
 	contextFactory contextFactory
 	dsessFactory   sessionFactory
 	engine         *gms.Engine
+	fs             filesys.Filesys
 }
 
 type sessionFactory func(mysqlSess *sql.BaseSession, pro sql.DatabaseProvider) (*dsess.DoltSession, error)
@@ -194,6 +196,7 @@ func NewSqlEngine(
 	sqlEngine.contextFactory = sqlContextFactory()
 	sqlEngine.dsessFactory = sessFactory
 	sqlEngine.engine = engine
+	sqlEngine.fs = pro.FileSystem()
 
 	// configuring stats depends on sessionBuilder
 	// sessionBuilder needs ref to statsProv
@@ -314,8 +317,15 @@ func (se *SqlEngine) GetUnderlyingEngine() *gms.Engine {
 	return se.engine
 }
 
+func (se *SqlEngine) FileSystem() filesys.Filesys {
+	return se.fs
+}
+
 func (se *SqlEngine) Close() error {
 	if se.engine != nil {
+		if se.engine.Analyzer.Catalog.BinlogReplicaController != nil {
+			dblr.DoltBinlogReplicaController.Close()
+		}
 		return se.engine.Close()
 	}
 	return nil

go/cmd/dolt/commands/sqlserver/server.go

@@ -559,21 +559,27 @@ func ConfigureServices(
 			}
 
 			listenaddr := fmt.Sprintf(":%d", port)
+			sqlContextInterceptor := sqle.SqlContextServerInterceptor{
+				Factory: sqlEngine.NewDefaultContext,
+			}
 			args := remotesrv.ServerArgs{
 				Logger:             logrus.NewEntry(lgr),
 				ReadOnly:           apiReadOnly || serverConfig.ReadOnly(),
 				HttpListenAddr:     listenaddr,
 				GrpcListenAddr:     listenaddr,
 				ConcurrencyControl: remotesapi.PushConcurrencyControl_PUSH_CONCURRENCY_CONTROL_ASSERT_WORKING_SET,
+				Options:            sqlContextInterceptor.Options(),
+				HttpInterceptor:    sqlContextInterceptor.HTTP(nil),
 			}
 			var err error
-			args.FS, args.DBCache, err = sqle.RemoteSrvFSAndDBCache(sqlEngine.NewDefaultContext, sqle.DoNotCreateUnknownDatabases)
+			args.FS = sqlEngine.FileSystem()
+			args.DBCache, err = sqle.RemoteSrvDBCache(sqle.GetInterceptorSqlContext, sqle.DoNotCreateUnknownDatabases)
 			if err != nil {
 				lgr.Errorf("error creating SQL engine context for remotesapi server: %v", err)
 				return err
 			}
 
-			authenticator := newAccessController(sqlEngine.NewDefaultContext, sqlEngine.GetUnderlyingEngine().Analyzer.Catalog.MySQLDb)
+			authenticator := newAccessController(sqle.GetInterceptorSqlContext, sqlEngine.GetUnderlyingEngine().Analyzer.Catalog.MySQLDb)
 			args = sqle.WithUserPasswordAuth(args, authenticator)
 			args.TLSConfig = serverConf.TLSConfig
 
@@ -621,6 +627,7 @@ func ConfigureServices(
 				lgr.Errorf("error creating SQL engine context for remotesapi server: %v", err)
 				return err
 			}
+			args.FS = sqlEngine.FileSystem()
 
 			clusterRemoteSrvTLSConfig, err := LoadClusterTLSConfig(serverConfig.ClusterConfig())
 			if err != nil {
@@ -634,7 +641,7 @@ func ConfigureServices(
 				lgr.Errorf("error creating remotesapi server on port %d: %v", *serverConfig.RemotesapiPort(), err)
 				return err
 			}
-			clusterController.RegisterGrpcServices(sqlEngine.NewDefaultContext, clusterRemoteSrv.srv.GrpcServer())
+			clusterController.RegisterGrpcServices(sqle.GetInterceptorSqlContext, clusterRemoteSrv.srv.GrpcServer())
 
 			clusterRemoteSrv.lis, err = clusterRemoteSrv.srv.Listeners()
 			if err != nil {

go/cmd/dolt/doltversion/version.go

@@ -16,5 +16,5 @@
 package doltversion
 
 const (
-	Version = "1.47.1"
+	Version = "1.48.0"
 )

go/go.mod

@@ -56,7 +56,7 @@ require (
 	github.com/cespare/xxhash/v2 v2.2.0
 	github.com/creasty/defaults v1.6.0
 	github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2
-	github.com/dolthub/go-mysql-server v0.19.1-0.20250123004221-f5a5bcea7eed
+	github.com/dolthub/go-mysql-server v0.19.1-0.20250131110511-67aa2a430366
 	github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63
 	github.com/dolthub/swiss v0.1.0
 	github.com/esote/minmaxheap v1.0.0

go/go.sum

@@ -179,8 +179,8 @@ github.com/dolthub/fslock v0.0.3 h1:iLMpUIvJKMKm92+N1fmHVdxJP5NdyDK5bK7z7Ba2s2U=
 github.com/dolthub/fslock v0.0.3/go.mod h1:QWql+P17oAAMLnL4HGB5tiovtDuAjdDTPbuqx7bYfa0=
 github.com/dolthub/go-icu-regex v0.0.0-20241215010122-db690dd53c90 h1:Sni8jrP0sy/w9ZYXoff4g/ixe+7bFCZlfCqXKJSU+zM=
 github.com/dolthub/go-icu-regex v0.0.0-20241215010122-db690dd53c90/go.mod h1:ylU4XjUpsMcvl/BKeRRMXSH7e7WBrPXdSLvnRJYrxEA=
-github.com/dolthub/go-mysql-server v0.19.1-0.20250123004221-f5a5bcea7eed h1:2EQHWtMkjyN/SNfbg/nh/a0RANq8V8gxNynYum2Kq+s=
-github.com/dolthub/go-mysql-server v0.19.1-0.20250123004221-f5a5bcea7eed/go.mod h1:jYEJ8tNkA7K3k39X8iMqaX3MSMmViRgh222JSLHDgVc=
+github.com/dolthub/go-mysql-server v0.19.1-0.20250131110511-67aa2a430366 h1:pJ+upgX6hrhyqgpkmk9Ye9lIPSualMHZcUMs8kWknV4=
+github.com/dolthub/go-mysql-server v0.19.1-0.20250131110511-67aa2a430366/go.mod h1:jYEJ8tNkA7K3k39X8iMqaX3MSMmViRgh222JSLHDgVc=
 github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 h1:OAsXLAPL4du6tfbBgK0xXHZkOlos63RdKYS3Sgw/dfI=
 github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63/go.mod h1:lV7lUeuDhH5thVGDCKXbatwKy2KW80L4rMT46n+Y2/Q=
 github.com/dolthub/ishell v0.0.0-20240701202509-2b217167d718 h1:lT7hE5k+0nkBdj/1UOSFwjWpNxf+LCApbRHgnCA17XE=

go/libraries/doltcore/doltdb/commit_hooks_test.go

@@ -43,7 +43,7 @@ func TestPushOnWriteHook(t *testing.T) {
 	ctx := context.Background()
 
 	// destination repo
-	testDir, err := test.ChangeToTestDir("TestReplicationDest")
+	testDir, err := test.ChangeToTestDir(t.TempDir(), "TestReplicationDest")
 
 	if err != nil {
 		panic("Couldn't change the working directory to the test directory.")
@@ -62,7 +62,7 @@ func TestPushOnWriteHook(t *testing.T) {
 	destDB, _ := LoadDoltDB(context.Background(), types.Format_Default, LocalDirDoltDB, filesys.LocalFS)
 
 	// source repo
-	testDir, err = test.ChangeToTestDir("TestReplicationSource")
+	testDir, err = test.ChangeToTestDir(t.TempDir(), "TestReplicationSource")
 
 	if err != nil {
 		panic("Couldn't change the working directory to the test directory.")
@@ -183,7 +183,7 @@ func TestAsyncPushOnWrite(t *testing.T) {
 	ctx := context.Background()
 
 	// destination repo
-	testDir, err := test.ChangeToTestDir("TestReplicationDest")
+	testDir, err := test.ChangeToTestDir(t.TempDir(), "TestReplicationDest")
 
 	if err != nil {
 		panic("Couldn't change the working directory to the test directory.")
@@ -202,7 +202,7 @@ func TestAsyncPushOnWrite(t *testing.T) {
 	destDB, _ := LoadDoltDB(context.Background(), types.Format_Default, LocalDirDoltDB, filesys.LocalFS)
 
 	// source repo
-	testDir, err = test.ChangeToTestDir("TestReplicationSource")
+	testDir, err = test.ChangeToTestDir(t.TempDir(), "TestReplicationSource")
 
 	if err != nil {
 		panic("Couldn't change the working directory to the test directory.")

go/libraries/doltcore/doltdb/doltdb_test.go

@@ -219,7 +219,7 @@ func TestEmptyInMemoryRepoCreation(t *testing.T) {
 }
 
 func TestLoadNonExistentLocalFSRepo(t *testing.T) {
-	_, err := test.ChangeToTestDir("TestLoadRepo")
+	_, err := test.ChangeToTestDir(t.TempDir(), "TestLoadRepo")
 
 	if err != nil {
 		panic("Couldn't change the working directory to the test directory.")
@@ -231,7 +231,7 @@ func TestLoadNonExistentLocalFSRepo(t *testing.T) {
 }
 
 func TestLoadBadLocalFSRepo(t *testing.T) {
-	testDir, err := test.ChangeToTestDir("TestLoadRepo")
+	testDir, err := test.ChangeToTestDir(t.TempDir(), "TestLoadRepo")
 
 	if err != nil {
 		panic("Couldn't change the working directory to the test directory.")
@@ -246,7 +246,7 @@ func TestLoadBadLocalFSRepo(t *testing.T) {
 }
 
 func TestLDNoms(t *testing.T) {
-	testDir, err := test.ChangeToTestDir("TestLoadRepo")
+	testDir, err := test.ChangeToTestDir(t.TempDir(), "TestLoadRepo")
 
 	if err != nil {
 		panic("Couldn't change the working directory to the test directory.")

go/libraries/doltcore/dtestutils/environment.go

@@ -16,7 +16,6 @@ package dtestutils
 
 import (
 	"context"
-	"os"
 	"path/filepath"
 
 	"github.com/dolthub/dolt/go/libraries/doltcore/doltdb"
@@ -41,12 +40,7 @@ func CreateTestEnv() *env.DoltEnv {
 // CreateTestEnvForLocalFilesystem creates a new DoltEnv for testing, using a local FS, instead of an in-memory
 // filesystem, for persisting files. This is useful for tests that require a disk-based filesystem and will not
 // work correctly with an in-memory filesystem and in-memory blob store (e.g. dolt_undrop() tests).
-func CreateTestEnvForLocalFilesystem() *env.DoltEnv {
-	tempDir, err := os.MkdirTemp(os.TempDir(), "dolt-*")
-	if err != nil {
-		panic(err)
-	}
-
+func CreateTestEnvForLocalFilesystem(tempDir string) *env.DoltEnv {
 	fs, err := filesys.LocalFilesysWithWorkingDir(tempDir)
 	if err != nil {
 		panic(err)

go/libraries/doltcore/dtestutils/sql_server_driver/cmd.go

@@ -76,13 +76,9 @@ type DoltUser struct {
 var _ DoltCmdable = DoltUser{}
 var _ DoltDebuggable = DoltUser{}
 
-func NewDoltUser() (DoltUser, error) {
-	tmpdir, err := os.MkdirTemp("", "go-sql-server-driver-")
-	if err != nil {
-		return DoltUser{}, err
-	}
+func NewDoltUser(tmpdir string) (DoltUser, error) {
 	res := DoltUser{tmpdir}
-	err = res.DoltExec("config", "--global", "--add", "metrics.disabled", "true")
+	err := res.DoltExec("config", "--global", "--add", "metrics.disabled", "true")
 	if err != nil {
 		return DoltUser{}, err
 	}

go/libraries/doltcore/env/actions/tag.go

@@ -25,6 +25,8 @@ import (
 	"github.com/dolthub/dolt/go/store/datas"
 )
 
+const DefaultPageSize = 100
+
 type TagProps struct {
 	TaggerName  string
 	TaggerEmail string
@@ -97,6 +99,30 @@ func DeleteTagsOnDB(ctx context.Context, ddb *doltdb.DoltDB, tagNames ...string)
 	return nil
 }
 
+// IterUnresolvedTags iterates over tags in dEnv.DoltDB, and calls cb() for each with an unresolved Tag.
+func IterUnresolvedTags(ctx context.Context, ddb *doltdb.DoltDB, cb func(tag *doltdb.TagResolver) (stop bool, err error)) error {
+	tagRefs, err := ddb.GetTags(ctx)
+	if err != nil {
+		return err
+	}
+
+	tagResolvers, err := ddb.GetTagResolvers(ctx, tagRefs)
+	if err != nil {
+		return err
+	}
+
+	for _, tagResolver := range tagResolvers {
+		stop, err := cb(&tagResolver)
+		if err != nil {
+			return err
+		}
+		if stop {
+			break
+		}
+	}
+	return nil
+}
+
 // IterResolvedTags iterates over tags in dEnv.DoltDB from newest to oldest, resolving the tag to a commit and calling cb().
 func IterResolvedTags(ctx context.Context, ddb *doltdb.DoltDB, cb func(tag *doltdb.Tag) (stop bool, err error)) error {
 	tagRefs, err := ddb.GetTags(ctx)
@@ -138,26 +164,81 @@ func IterResolvedTags(ctx context.Context, ddb *doltdb.DoltDB, cb func(tag *dolt
 	return nil
 }
 
-// IterUnresolvedTags iterates over tags in dEnv.DoltDB, and calls cb() for each with an unresovled Tag.
-func IterUnresolvedTags(ctx context.Context, ddb *doltdb.DoltDB, cb func(tag *doltdb.TagResolver) (stop bool, err error)) error {
+// IterResolvedTagsPaginated iterates over tags in dEnv.DoltDB in their default lexicographical order, resolving the tag to a commit and calling cb().
+// Returns the next tag name if there are more results available.
+func IterResolvedTagsPaginated(ctx context.Context, ddb *doltdb.DoltDB, startTag string, cb func(tag *doltdb.Tag) (stop bool, err error)) (string, error) {
+	// tags returned here are sorted lexicographically
 	tagRefs, err := ddb.GetTags(ctx)
 	if err != nil {
-		return err
+		return "", err
 	}
 
-	tagResolvers, err := ddb.GetTagResolvers(ctx, tagRefs)
-	if err != nil {
-		return err
+	// find starting index based on start tag
+	startIdx := 0
+	if startTag != "" {
+		for i, tr := range tagRefs {
+			if tr.GetPath() == startTag {
+				startIdx = i + 1 // start after the given tag
+				break
+			}
+		}
 	}
 
-	for _, tagResolver := range tagResolvers {
-		stop, err := cb(&tagResolver)
+	// get page of results
+	endIdx := startIdx + DefaultPageSize
+	if endIdx > len(tagRefs) {
+		endIdx = len(tagRefs)
+	}
+
+	pageTagRefs := tagRefs[startIdx:endIdx]
+
+	// resolve tags for this page
+	for _, tr := range pageTagRefs {
+		tag, err := ddb.ResolveTag(ctx, tr.(ref.TagRef))
 		if err != nil {
-			return err
+			return "", err
 		}
+
+		stop, err := cb(tag)
+		if err != nil {
+			return "", err
+		}
+
 		if stop {
 			break
 		}
 	}
-	return nil
+
+	// return next tag name if there are more results
+	if endIdx < len(tagRefs) {
+		lastTag := pageTagRefs[len(pageTagRefs)-1]
+		return lastTag.GetPath(), nil
+	}
+
+	return "", nil
+}
+
+// VisitResolvedTag iterates over tags in ddb until the given tag name is found, then calls cb() with the resolved tag.
+func VisitResolvedTag(ctx context.Context, ddb *doltdb.DoltDB, tagName string, cb func(tag *doltdb.Tag) error) error {
+	tagRefs, err := ddb.GetTags(ctx)
+	if err != nil {
+		return err
+	}
+
+	for _, r := range tagRefs {
+		tr, ok := r.(ref.TagRef)
+		if !ok {
+			return fmt.Errorf("DoltDB.GetTags() returned non-tag DoltRef")
+		}
+
+		if tr.GetPath() == tagName {
+			tag, err := ddb.ResolveTag(ctx, tr)
+			if err != nil {
+				return err
+			}
+			return cb(tag)
+		}
+	}
+
+	return doltdb.ErrTagNotFound
 }