Skip to content

Fix SQL engine panic when database is locked #10383

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
coffeegoddd merged 2 commits into from
Jan 29, 2026
Merged

Fix SQL engine panic when database is locked #10383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f8583cb
/cmd/dolt/commands/engine: fix panic
coffeegoddd Jan 29, 2026
37408a9
/go/{cmd,libraries}: update function signature
coffeegoddd Jan 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion go/cmd/dolt/commands/dump.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -627,7 +627,11 @@ func getTableWriter(ctx context.Context, dEnv *env.DoltEnv, tblOpts *tableOption
if err != nil {
return nil, errhand.BuildDError("error: ").AddCause(err).Build()
}
opts := editor.Options{Deaf: dEnv.DbEaFactory(ctx), Tempdir: tmpDir}
deaf, err := dEnv.DbEaFactory(ctx)
if err != nil {
return nil, errhand.BuildDError("error: ").AddCause(err).Build()
}
opts := editor.Options{Deaf: deaf, Tempdir: tmpDir}

writer, err := dEnv.FS.OpenForWriteAppend(filePath, os.ModePerm)
if err != nil {
Expand Down
10 changes: 8 additions & 2 deletions go/cmd/dolt/commands/engine/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,15 @@ func CollectDBs(ctx context.Context, mrEnv *env.MultiRepoEnv, useBulkEditor bool
}

func newDatabase(ctx context.Context, name string, dEnv *env.DoltEnv, useBulkEditor bool) (sqle.Database, error) {
deaf := dEnv.DbEaFactory(ctx)
var deaf editor.DbEaFactory
var err error
if useBulkEditor {
deaf = dEnv.BulkDbEaFactory(ctx)
deaf, err = dEnv.BulkDbEaFactory(ctx)
} else {
deaf, err = dEnv.DbEaFactory(ctx)
}
if err != nil {
return sqle.Database{}, err
}
tmpDir, err := dEnv.TempTableFilesDir()
if err != nil {
Expand Down
6 changes: 5 additions & 1 deletion go/cmd/dolt/commands/filter-branch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,11 @@ func rebaseSqlEngine(ctx context.Context, dEnv *env.DoltEnv, root doltdb.RootVal
if err != nil {
return nil, nil, err
}
opts := editor.Options{Deaf: dEnv.DbEaFactory(ctx), Tempdir: tmpDir}
deaf, err := dEnv.DbEaFactory(ctx)
if err != nil {
return nil, nil, err
}
opts := editor.Options{Deaf: deaf, Tempdir: tmpDir}
db, err := dsqle.NewDatabase(ctx, filterDbName, dEnv.DbData(ctx), opts)
if err != nil {
return nil, nil, err
Expand Down
6 changes: 5 additions & 1 deletion go/cmd/dolt/commands/indexcmds/rebuild.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,11 @@ func (cmd RebuildCmd) Exec(ctx context.Context, commandStr string, args []string
if err != nil {
return HandleErr(errhand.BuildDError("error: ").AddCause(err).Build(), nil)
}
opts := editor.Options{Deaf: dEnv.DbEaFactory(ctx), Tempdir: tmpDir}
deaf, err := dEnv.DbEaFactory(ctx)
if err != nil {
return HandleErr(errhand.BuildDError("error: ").AddCause(err).Build(), nil)
}
opts := editor.Options{Deaf: deaf, Tempdir: tmpDir}
sch, err := table.GetSchema(ctx)
if err != nil {
return HandleErr(errhand.BuildDError("could not get table schema").AddCause(err).Build(), nil)
Expand Down
6 changes: 5 additions & 1 deletion go/cmd/dolt/commands/schcmds/export.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,11 @@ func exportSchemas(ctx context.Context, apr *argparser.ArgParseResults, root dol
if err != nil {
return errhand.BuildDError("error: ").AddCause(err).Build()
}
opts := editor.Options{Deaf: dEnv.DbEaFactory(ctx), Tempdir: tmpDir}
deaf, err := dEnv.DbEaFactory(ctx)
if err != nil {
return errhand.BuildDError("error: ").AddCause(err).Build()
}
opts := editor.Options{Deaf: deaf, Tempdir: tmpDir}
verr := exportTblSchema(ctx, tn, root, wr, opts)
if verr != nil {
return verr
Expand Down
6 changes: 5 additions & 1 deletion go/cmd/dolt/commands/schcmds/show.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,11 @@ func printSchemas(ctx context.Context, apr *argparser.ArgParseResults, dEnv *env
if err != nil {
return errhand.BuildDError("error: ").AddCause(err).Build()
}
opts := editor.Options{Deaf: dEnv.DbEaFactory(ctx), Tempdir: tmpDir}
deaf, err := dEnv.DbEaFactory(ctx)
if err != nil {
return errhand.BuildDError("error: ").AddCause(err).Build()
}
opts := editor.Options{Deaf: deaf, Tempdir: tmpDir}
sqlCtx, engine, _ := dsqle.PrepareCreateTableStmt(ctx, dsqle.NewUserSpaceDatabase(root, opts))

var notFound []string
Expand Down
6 changes: 5 additions & 1 deletion go/cmd/dolt/commands/tblcmds/export.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,11 @@ func getTableWriter(ctx context.Context, root doltdb.RootValue, dEnv *env.DoltEn
return nil, errhand.BuildDError("Error opening writer for %s.", exOpts.DestName()).AddCause(err).Build()
}

wr, err := exOpts.dest.NewCreatingWriter(ctx, exOpts, root, rdSchema, editor.Options{Deaf: dEnv.DbEaFactory(ctx)}, writer)
deaf, err := dEnv.DbEaFactory(ctx)
if err != nil {
return nil, errhand.BuildDError("Error opening writer for %s.", exOpts.DestName()).AddCause(err).Build()
}
wr, err := exOpts.dest.NewCreatingWriter(ctx, exOpts, root, rdSchema, editor.Options{Deaf: deaf}, writer)
if err != nil {
return nil, errhand.BuildDError("Error opening writer for %s.", exOpts.DestName()).AddCause(err).Build()
}
Expand Down
30 changes: 24 additions & 6 deletions go/libraries/doltcore/env/environment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1332,20 +1332,38 @@ func (dEnv *DoltEnv) TempTableFilesDir() (string, error) {
return absPath, nil
}

func (dEnv *DoltEnv) DbEaFactory(ctx context.Context) editor.DbEaFactory {
func (dEnv *DoltEnv) DbEaFactory(ctx context.Context) (editor.DbEaFactory, error) {
tmpDir, err := dEnv.TempTableFilesDir()
if err != nil {
return nil
return nil, err
}

db := dEnv.DoltDB(ctx)
if db == nil {
if dEnv.DBLoadError != nil {
return nil, dEnv.DBLoadError
}
return nil, errors.New("DoltDB failed to initialize but no error was recorded")
}
return editor.NewDbEaFactory(tmpDir, dEnv.DoltDB(ctx).ValueReadWriter())

return editor.NewDbEaFactory(tmpDir, db.ValueReadWriter()), nil
}

func (dEnv *DoltEnv) BulkDbEaFactory(ctx context.Context) editor.DbEaFactory {
func (dEnv *DoltEnv) BulkDbEaFactory(ctx context.Context) (editor.DbEaFactory, error) {
tmpDir, err := dEnv.TempTableFilesDir()
if err != nil {
return nil
return nil, err
}

db := dEnv.DoltDB(ctx)
if db == nil {
if dEnv.DBLoadError != nil {
return nil, dEnv.DBLoadError
}
return nil, errors.New("DoltDB failed to initialize but no error was recorded")
}
return editor.NewBulkImportTEAFactory(dEnv.DoltDB(ctx).ValueReadWriter(), tmpDir)

return editor.NewBulkImportTEAFactory(db.ValueReadWriter(), tmpDir), nil
}

func (dEnv *DoltEnv) IsAccessModeReadOnly(ctx context.Context) (bool, error) {
Expand Down
6 changes: 5 additions & 1 deletion go/libraries/doltcore/mvdata/data_loc_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,11 @@ func TestCreateRdWr(t *testing.T) {
if tdErr != nil {
t.Fatal("Unexpected error accessing .dolt directory.", tdErr)
}
opts := editor.Options{Deaf: dEnv.DbEaFactory(ctx), Tempdir: tmpDir}
deaf, err := dEnv.DbEaFactory(ctx)
if err != nil {
t.Fatal("Unexpected error accessing .dolt directory.", err)
}
opts := editor.Options{Deaf: deaf, Tempdir: tmpDir}

filePath, fpErr := dEnv.FS.Abs(strings.Split(loc.String(), ":")[1])
if fpErr != nil {
Expand Down
4 changes: 3 additions & 1 deletion go/libraries/doltcore/sqle/alterschema_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,9 @@ func TestDropPks(t *testing.T) {
defer dEnv.DoltDB(ctx).Close()
tmpDir, err := dEnv.TempTableFilesDir()
require.NoError(t, err)
opts := editor.Options{Deaf: dEnv.DbEaFactory(ctx), Tempdir: tmpDir}
deaf, err := dEnv.DbEaFactory(ctx)
require.NoError(t, err)
opts := editor.Options{Deaf: deaf, Tempdir: tmpDir}
db, err := NewDatabase(ctx, "dolt", dEnv.DbData(ctx), opts)
require.NoError(t, err)

Expand Down
8 changes: 6 additions & 2 deletions go/libraries/doltcore/sqle/common_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,9 @@ type SetupFn func(t *testing.T, dEnv *env.DoltEnv)
func executeSelect(t *testing.T, ctx context.Context, dEnv *env.DoltEnv, root doltdb.RootValue, query string) ([]sql.Row, sql.Schema, error) {
tmpDir, err := dEnv.TempTableFilesDir()
require.NoError(t, err)
opts := editor.Options{Deaf: dEnv.DbEaFactory(ctx), Tempdir: tmpDir}
deaf, err := dEnv.DbEaFactory(ctx)
require.NoError(t, err)
opts := editor.Options{Deaf: deaf, Tempdir: tmpDir}
db, err := NewDatabase(ctx, "dolt", dEnv.DbData(ctx), opts)
require.NoError(t, err)

Expand Down Expand Up @@ -72,7 +74,9 @@ func executeSelect(t *testing.T, ctx context.Context, dEnv *env.DoltEnv, root do
func executeModify(t *testing.T, ctx context.Context, dEnv *env.DoltEnv, root doltdb.RootValue, query string) (doltdb.RootValue, error) {
tmpDir, err := dEnv.TempTableFilesDir()
require.NoError(t, err)
opts := editor.Options{Deaf: dEnv.DbEaFactory(ctx), Tempdir: tmpDir}
deaf, err := dEnv.DbEaFactory(ctx)
require.NoError(t, err)
opts := editor.Options{Deaf: deaf, Tempdir: tmpDir}
db, err := NewDatabase(ctx, "dolt", dEnv.DbData(ctx), opts)
require.NoError(t, err)

Expand Down
7 changes: 6 additions & 1 deletion go/libraries/doltcore/sqle/database_provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -962,8 +962,13 @@ func (p *DoltDatabaseProvider) registerNewDatabase(ctx *sql.Context, name string
return err
}

deaf, err := newEnv.DbEaFactory(ctx)
if err != nil {
return err
}

opts := editor.Options{
Deaf: newEnv.DbEaFactory(ctx),
Deaf: deaf,
// TODO: this doesn't seem right, why is this getting set in the constructor to the DB
ForeignKeyChecksDisabled: fkChecks.(int8) == 0,
}
Expand Down
4 changes: 3 additions & 1 deletion go/libraries/doltcore/sqle/database_provider_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,9 @@ func TestDatabaseProvider(t *testing.T) {
dEnv := dtestutils.CreateTestEnv()
tmpDir, err := dEnv.TempTableFilesDir()
require.NoError(t, err)
opts := editor.Options{Deaf: dEnv.DbEaFactory(ctx), Tempdir: tmpDir}
deaf, err := dEnv.DbEaFactory(ctx)
require.NoError(t, err)
opts := editor.Options{Deaf: deaf, Tempdir: tmpDir}
db, err := NewDatabase(context.Background(), "dolt", dEnv.DbData(ctx), opts)
require.NoError(t, err)

Expand Down
4 changes: 3 additions & 1 deletion go/libraries/doltcore/sqle/database_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,9 @@ func TestNeedsToReloadEvents(t *testing.T) {
dEnv := dtestutils.CreateTestEnv()
tmpDir, err := dEnv.TempTableFilesDir()
require.NoError(t, err)
opts := editor.Options{Deaf: dEnv.DbEaFactory(ctx), Tempdir: tmpDir}
deaf, err := dEnv.DbEaFactory(ctx)
require.NoError(t, err)
opts := editor.Options{Deaf: deaf, Tempdir: tmpDir}

timestamp := time.Now().Truncate(time.Minute).UTC()

Expand Down
4 changes: 3 additions & 1 deletion go/libraries/doltcore/sqle/index/mergeable_indexes_setup_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@ func setupIndexes(t *testing.T, tableName, insertQuery string) (*sqle.Engine, *s
dEnv := dtestutils.CreateTestEnv()
tmpDir, err := dEnv.TempTableFilesDir()
require.NoError(t, err)
opts := editor.Options{Deaf: dEnv.DbEaFactory(ctx), Tempdir: tmpDir}
deaf, err := dEnv.DbEaFactory(ctx)
require.NoError(t, err)
opts := editor.Options{Deaf: deaf, Tempdir: tmpDir}
db, err := dsqle.NewDatabase(context.Background(), "dolt", dEnv.DbData(ctx), opts)
require.NoError(t, err)

Expand Down
4 changes: 3 additions & 1 deletion go/libraries/doltcore/sqle/kvexec/count_agg_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,9 @@ func TestCountAgg(t *testing.T) {
tmpDir, err := dEnv.TempTableFilesDir()
require.NoError(t, err)

opts := editor.Options{Deaf: dEnv.DbEaFactory(ctx), Tempdir: tmpDir}
deaf, err := dEnv.DbEaFactory(ctx)
require.NoError(t, err)
opts := editor.Options{Deaf: deaf, Tempdir: tmpDir}
db, err := sqle.NewDatabase(context.Background(), "dolt", dEnv.DbData(ctx), opts)
require.NoError(t, err)

Expand Down
4 changes: 3 additions & 1 deletion go/libraries/doltcore/sqle/kvexec/lookup_join_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,9 @@ func TestLookupJoin(t *testing.T) {
tmpDir, err := dEnv.TempTableFilesDir()
require.NoError(t, err)

opts := editor.Options{Deaf: dEnv.DbEaFactory(ctx), Tempdir: tmpDir}
deaf, err := dEnv.DbEaFactory(ctx)
require.NoError(t, err)
opts := editor.Options{Deaf: deaf, Tempdir: tmpDir}
db, err := sqle.NewDatabase(context.Background(), "dolt", dEnv.DbData(ctx), opts)
require.NoError(t, err)

Expand Down
6 changes: 5 additions & 1 deletion go/libraries/doltcore/sqle/logictest/dolt/doltharness.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,11 @@ func sqlNewEngine(ctx context.Context, dEnv *env.DoltEnv) (*sqle.Engine, dsess.D
if err != nil {
return nil, nil, err
}
opts := editor.Options{Deaf: dEnv.DbEaFactory(ctx), Tempdir: tmpDir}
deaf, err := dEnv.DbEaFactory(ctx)
if err != nil {
return nil, nil, err
}
opts := editor.Options{Deaf: deaf, Tempdir: tmpDir}
db, err := dsql.NewDatabase(context.Background(), "dolt", dEnv.DbData(ctx), opts)
if err != nil {
return nil, nil, err
Expand Down
4 changes: 3 additions & 1 deletion go/libraries/doltcore/sqle/procedures_table_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,9 @@ func TestProceduresMigration(t *testing.T) {
dEnv := dtestutils.CreateTestEnv()
tmpDir, err := dEnv.TempTableFilesDir()
require.NoError(t, err)
opts := editor.Options{Deaf: dEnv.DbEaFactory(ctx), Tempdir: tmpDir}
deaf, err := dEnv.DbEaFactory(ctx)
require.NoError(t, err)
opts := editor.Options{Deaf: deaf, Tempdir: tmpDir}

timestamp := time.Now().Truncate(time.Minute).UTC()

Expand Down
7 changes: 6 additions & 1 deletion go/libraries/doltcore/sqle/replication.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,13 @@ func GetCommitHooks(ctx context.Context, dEnv *env.DoltEnv, logger io.Writer) ([
// skip errors related to database construction only and return a partially functional dsqle.ReadReplicaDatabase
// that will log warnings when attempting to perform replica commands.
func newReplicaDatabase(ctx context.Context, name string, remoteName string, dEnv *env.DoltEnv) (ReadReplicaDatabase, error) {
deaf, err := dEnv.DbEaFactory(ctx)
if err != nil {
return ReadReplicaDatabase{}, err
}

opts := editor.Options{
Deaf: dEnv.DbEaFactory(ctx),
Deaf: deaf,
}

db, err := NewDatabase(ctx, name, dEnv.DbData(ctx), opts)
Expand Down
8 changes: 6 additions & 2 deletions go/libraries/doltcore/sqle/schema_table_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,9 @@ func TestAncientSchemaTableMigration(t *testing.T) {
dEnv := dtestutils.CreateTestEnv()
tmpDir, err := dEnv.TempTableFilesDir()
require.NoError(t, err)
opts := editor.Options{Deaf: dEnv.DbEaFactory(ctx), Tempdir: tmpDir}
deaf, err := dEnv.DbEaFactory(ctx)
require.NoError(t, err)
opts := editor.Options{Deaf: deaf, Tempdir: tmpDir}
db, err := NewDatabase(context.Background(), "dolt", dEnv.DbData(ctx), opts)
require.NoError(t, err)

Expand Down Expand Up @@ -113,7 +115,9 @@ func TestV1SchemasTable(t *testing.T) {
dEnv := dtestutils.CreateTestEnv()
tmpDir, err := dEnv.TempTableFilesDir()
require.NoError(t, err)
opts := editor.Options{Deaf: dEnv.DbEaFactory(ctx), Tempdir: tmpDir}
deaf, err := dEnv.DbEaFactory(ctx)
require.NoError(t, err)
opts := editor.Options{Deaf: deaf, Tempdir: tmpDir}
db, err := NewDatabase(context.Background(), "dolt", dEnv.DbData(ctx), opts)
require.NoError(t, err)

Expand Down
5 changes: 4 additions & 1 deletion go/libraries/doltcore/sqle/statspro/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,7 +611,10 @@ func (sc *StatsController) initStorage(ctx context.Context, fs filesys.Filesys)
return nil, err
}

deaf := dEnv.DbEaFactory(ctx)
deaf, err := dEnv.DbEaFactory(ctx)
if err != nil {
return nil, err
}

tmpDir, err := dEnv.TempTableFilesDir()
if err != nil {
Expand Down
12 changes: 10 additions & 2 deletions go/libraries/doltcore/sqle/testutil.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,11 @@ func ExecuteSql(ctx context.Context, dEnv *env.DoltEnv, root doltdb.RootValue, s
return nil, err
}

opts := editor.Options{Deaf: dEnv.DbEaFactory(ctx), Tempdir: tmpDir}
deaf, err := dEnv.DbEaFactory(ctx)
if err != nil {
return nil, err
}
opts := editor.Options{Deaf: deaf, Tempdir: tmpDir}
db, err := NewDatabase(context.Background(), "dolt", dEnv.DbData(ctx), opts)
if err != nil {
return nil, err
Expand Down Expand Up @@ -167,7 +171,11 @@ func ExecuteSelect(ctx context.Context, dEnv *env.DoltEnv, root doltdb.RootValue
return nil, err
}

opts := editor.Options{Deaf: dEnv.DbEaFactory(ctx), Tempdir: tmpDir}
deaf, err := dEnv.DbEaFactory(ctx)
if err != nil {
return nil, err
}
opts := editor.Options{Deaf: deaf, Tempdir: tmpDir}
db, err := NewDatabase(context.Background(), "dolt", dbData, opts)
if err != nil {
return nil, err
Expand Down
4 changes: 3 additions & 1 deletion go/libraries/doltcore/sqle/writer/noms_table_writer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,9 @@ func TestTableEditor(t *testing.T) {

tmpDir, err := dEnv.TempTableFilesDir()
require.NoError(t, err)
opts := editor.Options{Deaf: dEnv.DbEaFactory(ctx), Tempdir: tmpDir}
deaf, err := dEnv.DbEaFactory(ctx)
require.NoError(t, err)
opts := editor.Options{Deaf: deaf, Tempdir: tmpDir}
db, err := sqle.NewDatabase(context.Background(), "dolt", dEnv.DbData(ctx), opts)
require.NoError(t, err)

Expand Down
Loading