Skip to content
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

Jump to bottom

Fix concurrent map writes in lake/journal.Store #5279

Merged
merged 1 commit into from
Sep 16, 2024
Merged

Fix concurrent map writes in lake/journal.Store #5279

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 12 additions & 13 deletions lake/journal/store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ var (
)

type Store struct {
journal *Queue
logger *zap.Logger
unmarshaler *zson.UnmarshalZNGContext
journal *Queue
logger *zap.Logger
keyTypes []interface{}

mu sync.RWMutex // Protects everything below.
table map[string]Entry
Expand Down Expand Up @@ -74,13 +74,10 @@ func OpenStore(ctx context.Context, engine storage.Engine, logger *zap.Logger, p
}

func newStore(journal *Queue, logger *zap.Logger, keyTypes ...interface{}) *Store {
u := zson.NewZNGUnmarshaler()
u.Bind(Add{}, Delete{}, Update{})
u.Bind(keyTypes...)
return &Store{
journal: journal,
logger: logger.Named("journal"),
unmarshaler: u,
journal: journal,
logger: logger.Named("journal"),
keyTypes: append([]interface{}{Add{}, Delete{}, Update{}}, keyTypes...),
}
}

Expand All @@ -95,7 +92,9 @@ func (s *Store) load(ctx context.Context) error {
if head == current {
return nil
}
at, table, err := s.getSnapshot(ctx)
unmarshaler := zson.NewZNGUnmarshaler()
unmarshaler.Bind(s.keyTypes...)
at, table, err := s.getSnapshot(ctx, unmarshaler)
if err != nil && !errors.Is(err, fs.ErrNotExist) {
s.logger.Error("Loading snapshot", zap.Error(err))
}
Expand Down Expand Up @@ -126,7 +125,7 @@ func (s *Store) load(ctx context.Context) error {
return nil
}
var e Entry
if err := s.unmarshaler.Unmarshal(*val, &e); err != nil {
if err := unmarshaler.Unmarshal(*val, &e); err != nil {
return err
}
switch e := e.(type) {
Expand All @@ -146,7 +145,7 @@ func (s *Store) load(ctx context.Context) error {
}
}

func (s *Store) getSnapshot(ctx context.Context) (ID, map[string]Entry, error) {
func (s *Store) getSnapshot(ctx context.Context, unmarshaler *zson.UnmarshalZNGContext) (ID, map[string]Entry, error) {
table := make(map[string]Entry)
r, err := s.journal.engine.Get(ctx, s.snapshotURI())
if err != nil {
Expand All @@ -169,7 +168,7 @@ func (s *Store) getSnapshot(ctx context.Context) (ID, map[string]Entry, error) {
return at, table, err
}
var e Entry
if err := s.unmarshaler.Unmarshal(*val, &e); err != nil {
if err := unmarshaler.Unmarshal(*val, &e); err != nil {
return at, nil, err
}
table[e.Key()] = e
Expand Down