Skip to content

Commit

Permalink
Improve naming consistency.
Browse files Browse the repository at this point in the history
  • Loading branch information
jmalloc committed Mar 1, 2024
1 parent 158e271 commit da9d2de
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
16 changes: 8 additions & 8 deletions driver/memory/memoryjournal/journal.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ type state struct {
// journ is an implementation of [journal.Journal] that manipulates a journal's
// in-memory [state].
type journ struct {
name string
state *state
beforeAppendHook func(name string, rec []byte) error
afterAppendHook func(name string, rec []byte) error
name string
state *state
beforeAppend func(name string, rec []byte) error
afterAppend func(name string, rec []byte) error
}

func (j *journ) Bounds(ctx context.Context) (begin, end journal.Position, err error) {
Expand Down Expand Up @@ -92,8 +92,8 @@ func (j *journ) Append(ctx context.Context, end journal.Position, rec []byte) er
j.state.Lock()
defer j.state.Unlock()

if j.beforeAppendHook != nil {
if err := j.beforeAppendHook(j.name, rec); err != nil {
if j.beforeAppend != nil {
if err := j.beforeAppend(j.name, rec); err != nil {
return err
}
}
Expand All @@ -108,8 +108,8 @@ func (j *journ) Append(ctx context.Context, end journal.Position, rec []byte) er
panic("position out of range, this causes undefined behavior in a 'real' journal implementation")
}

if j.afterAppendHook != nil {
if err := j.afterAppendHook(j.name, rec); err != nil {
if j.afterAppend != nil {
if err := j.afterAppend(j.name, rec); err != nil {
return err
}
}
Expand Down
8 changes: 4 additions & 4 deletions driver/memory/memoryjournal/store.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ func (s *Store) Open(ctx context.Context, name string) (journal.Journal, error)
}

return &journ{
name: name,
state: st.(*state),
beforeAppendHook: s.BeforeAppend,
afterAppendHook: s.AfterAppend,
name: name,
state: st.(*state),
beforeAppend: s.BeforeAppend,
afterAppend: s.AfterAppend,
}, ctx.Err()
}

0 comments on commit da9d2de

Please sign in to comment.