mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-02-10 18:49:02 -06:00
Code Issues Packages Projects Releases 128 Wiki Activity

Removed custom session var management during session.AddDB, moved it all to setSessionVarsForDb

Browse Source
This commit is contained in:
Zach Musgrave
2021-07-29 16:42:20 -07:00
parent a367bda243
commit e320ec692e
1 changed files with 3 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
go/libraries/doltcore/sqle/dsess/session.go
View File

@@ -1054,21 +1054,11 @@ func (sess *Session) AddDB(ctx *sql.Context, dbState InitialDbState) error {
// WorkingSet is nil in the case of a read only, detached head DB
if dbState.WorkingSet != nil {
headRef, err := dbState.WorkingSet.Ref().ToHeadRef()
if err != nil {
return err
}
err = sess.Session.SetSessionVariable(ctx, HeadRefKey(db.Name()), headRef.String())
if err != nil {
return err
}
sessionState.WorkingSet = dbState.WorkingSet
workingRoot := dbState.WorkingSet.WorkingRoot()
logrus.Tracef("working root intialized to %s", workingRoot.DebugString(ctx, false))
err = sess.setRoot(ctx, db.Name(), workingRoot)
err := sess.setRoot(ctx, db.Name(), workingRoot)
if err != nil {
return err
}
@@ -1078,16 +1068,6 @@ func (sess *Session) AddDB(ctx *sql.Context, dbState InitialDbState) error {
return err
}
hash, err := headRoot.HashOf()
if err != nil {
return err
}
err = sess.Session.SetSessionVariable(ctx, WorkingKey(db.Name()), hash.String())
if err != nil {
return err
}
sessionState.headRoot = headRoot
}
@@ -1095,19 +1075,10 @@ func (sess *Session) AddDB(ctx *sql.Context, dbState InitialDbState) error {
// TODO: this needs to be kept up to date as the working set ref changes
sessionState.headCommit = dbState.HeadCommit
headCommitHash, err := dbState.HeadCommit.HashOf()
if err != nil {
return err
}
err = sess.Session.SetSessionVariable(ctx, HeadKey(db.Name()), headCommitHash.String())
if err != nil {
return err
}
// After setting the initial root we have no state to commit
sessionState.dirty = false
return nil
return sess.setSessionVarsForDb(ctx, db.Name())
}
// CreateTemporaryTablesRoot creates an empty root value and a table edit session for the purposes of storing