[no-release-notes] go: sqle: DatabaseProvider: Fix double-creation of push-on-write commit hooks in registerNewDatabase. #8830
Conversation
… push-on-write commit hooks in registerNewDatabase.
|
|
||
| func (ddb *DoltDB) PrependCommitHook(ctx context.Context, hook CommitHook) *DoltDB { | ||
| ddb.db = ddb.db.SetCommitHooks(ctx, append([]CommitHook{hook}, ddb.db.PostCommitHooks()...)) | ||
| func (ddb *DoltDB) PrependCommitHooks(ctx context.Context, hooks ...CommitHook) *DoltDB { |
There was a problem hiding this comment.
SetCommitHooks was destructive and potentially dangerous. For now, it seems easier to make hook writers coordinate on these things upstream.
| return err | ||
| } | ||
| dbs, err := ApplyReplicationConfig(ctx, sql.NewBackgroundThreads(), mrEnv, cli.CliErr, db) | ||
| sdb, err := applyReadReplicationConfigToDatabase(ctx, newEnv, db) |
There was a problem hiding this comment.
ApplyReplicationConfig creates the commit hooks and is responsible for the transform of the dsess.SqlDatabase into a ReadOnlyDatabase if it needs to be configured as such. Here, we just need the later functionality: the other functionality is already handled (and more) by our InitDatabaseHook.
| if replicationRemoteName == "" { | ||
| return nil | ||
| } | ||
| func NewConfigureReplicationDatabaseHook(bThreads *sql.BackgroundThreads) func(ctx *sql.Context, p *DoltDatabaseProvider, name string, newEnv *env.DoltEnv, _ dsess.SqlDatabase) error { |
There was a problem hiding this comment.
Kinda hate that the hook is a func instead of an interface but I guess that's not new
There was a problem hiding this comment.
Crazy this is a new file, what would uncle bob martin say
| @@ -115,6 +115,22 @@ func newReplicaDatabase(ctx context.Context, name string, remoteName string, dEn | |||
| return rrd, nil | |||
| } | |||
|
|
|||
| func applyReadReplicationConfigToDatabase(ctx context.Context, dEnv *env.DoltEnv, db dsess.SqlDatabase) (dsess.SqlDatabase, error) { | |||
There was a problem hiding this comment.
Probably should comment similar to the PR note here
No description provided.