Skip to content

*: avoid variable name conflict with imported package name #3184

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

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

*: avoid variable name conflict with imported package name #3184

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8b9bf95
*: avoid variable name conflict with imported package name
mattisonchao Dec 26, 2023
415e486
Remove useless files
mattisonchao Dec 26, 2023
2261f9c
Add missing part
mattisonchao Dec 26, 2023
5228914
Delete .idea/workspace.xml
mattisonchao Dec 27, 2023
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: 3 additions & 3 deletions db.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -824,8 +824,8 @@ func (d *DB) applyInternal(batch *Batch, opts *WriteOptions, noSyncWait bool) er
panic(fmt.Sprintf("pebble: batch db mismatch: %p != %p", batch.db, d))
}

sync := opts.GetSync()
if sync && d.opts.DisableWAL {
syncWrite := opts.GetSync()
if syncWrite && d.opts.DisableWAL {
return errors.New("pebble: WAL disabled")
}

Expand Down Expand Up @@ -855,7 +855,7 @@ func (d *DB) applyInternal(batch *Batch, opts *WriteOptions, noSyncWait bool) er
return err
}
}
if err := d.commit.Commit(batch, sync, noSyncWait); err != nil {
if err := d.commit.Commit(batch, syncWrite, noSyncWait); err != nil {
// There isn't much we can do on an error here. The commit pipeline will be
// horked at this point.
d.opts.Logger.Fatalf("pebble: fatal commit error: %v", err)
Expand Down