forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Style fixes

Browse source
This commit is contained in:
Frank Szendzielarz 2019-06-09 12:20:25 +02:00
parent fb6606843d
commit 5d7e17f484
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
core/rawdb/freezer_table.go
View file

@ -107,28 +107,28 @@ func newTable(path string, name string, readMeter metrics.Meter, writeMeter metr
return newCustomTable(path, name, readMeter, writeMeter, 2*1000*1000*1000, disableSnappy) return newCustomTable(path, name, readMeter, writeMeter, 2*1000*1000*1000, disableSnappy)
} }
// openFreezerFile opens a freezer table file and seeks to the end // openFreezerFileForAppend opens a freezer table file and seeks to the end
func openFreezerFileForAppend(filename string) (*os.File, error) { func openFreezerFileForAppend(filename string) (*os.File, error) {
//open the file without the O_APPEND flag // Open the file without the O_APPEND flag
// because it has differing behaviour during Truncate operations // because it has differing behaviour during Truncate operations
// on different OS's // on different OS's
file, err := os.OpenFile(filename, os.O_RDWR|os.O_CREATE, 0644) file, err := os.OpenFile(filename, os.O_RDWR|os.O_CREATE, 0644)
if err != nil { if err != nil {
return nil, err return nil, err
} }
//seek to end for append // Seek to end for append
if _, err = file.Seek(0, io.SeekEnd); err != nil { if _, err = file.Seek(0, io.SeekEnd); err != nil {
return nil, err return nil, err
} }
return file, nil return file, nil
} }
// openFreezerFile opens a freezer table file for read only access // openFreezerFileForReadOnly opens a freezer table file for read only access
func openFreezerFileForReadOnly(filename string) (*os.File, error) { func openFreezerFileForReadOnly(filename string) (*os.File, error) {
return os.OpenFile(filename, os.O_RDONLY, 0644) return os.OpenFile(filename, os.O_RDONLY, 0644)
} }
// openFreezerFile opens a freezer table making sure it is truncated // openFreezerFileTruncated opens a freezer table making sure it is truncated
func openFreezerFileTruncated(filename string) (*os.File, error) { func openFreezerFileTruncated(filename string) (*os.File, error) {
return os.OpenFile(filename, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0644) return os.OpenFile(filename, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0644)
} }
@ -138,7 +138,7 @@ func truncateFreezerFile(file *os.File, size int64) error {
if err := file.Truncate(size); err != nil { if err := file.Truncate(size); err != nil {
return err return err
} }
//seek to end for append // Seek to end for append
if _, err := file.Seek(0, io.SeekEnd); err != nil { if _, err := file.Seek(0, io.SeekEnd); err != nil {
return err return err
} }
@ -155,10 +155,10 @@ func newCustomTable(path string, name string, readMeter metrics.Meter, writeMete
} }
var idxName string var idxName string
if noCompression { if noCompression {
// raw idx // Raw idx
idxName = fmt.Sprintf("%s.ridx", name) idxName = fmt.Sprintf("%s.ridx", name)
} else { } else {
// compressed idx // Compressed idx
idxName = fmt.Sprintf("%s.cidx", name) idxName = fmt.Sprintf("%s.cidx", name)
} }
offsets, err := openFreezerFileForAppend(filepath.Join(path, idxName)) offsets, err := openFreezerFileForAppend(filepath.Join(path, idxName))
@ -260,7 +260,7 @@ func (t *freezerTable) repair() error {
newLastIndex.unmarshalBinary(buffer) newLastIndex.unmarshalBinary(buffer)
// We might have slipped back into an earlier head-file here // We might have slipped back into an earlier head-file here
if newLastIndex.filenum != lastIndex.filenum { if newLastIndex.filenum != lastIndex.filenum {
// release earlier opened file // Release earlier opened file
t.releaseFile(lastIndex.filenum) t.releaseFile(lastIndex.filenum)
t.head, err = t.openFile(newLastIndex.filenum, openFreezerFileForAppend) t.head, err = t.openFile(newLastIndex.filenum, openFreezerFileForAppend)
if stat, err = t.head.Stat(); err != nil { if stat, err = t.head.Stat(); err != nil {
@ -342,10 +342,10 @@ func (t *freezerTable) truncate(items uint64) error {
if err != nil { if err != nil {
return err return err
} }
// release any files _after the current head -- both the previous head // Release any files _after the current head -- both the previous head
// and any files which may have been opened for reading // and any files which may have been opened for reading
t.releaseFilesAfter(expected.filenum, true) t.releaseFilesAfter(expected.filenum, true)
// set back the historic head // Set back the historic head
t.head = newHead t.head = newHead
atomic.StoreUint32(&t.headId, expected.filenum) atomic.StoreUint32(&t.headId, expected.filenum)
} }