diff options
author | Péter Szilágyi <peterke@gmail.com> | 2016-03-10 17:39:20 +0800 |
---|---|---|
committer | Péter Szilágyi <peterke@gmail.com> | 2016-03-10 18:57:59 +0800 |
commit | ea19e61fbaeb29fc9047419cb138d5ca0f2021fc (patch) | |
tree | db52b61b2073c42a8148f7b713fe388ea520d089 /Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/session_record.go | |
parent | edd7aa054c0f9860c799748439255722e51feccc (diff) | |
download | go-tangerine-ea19e61fbaeb29fc9047419cb138d5ca0f2021fc.tar go-tangerine-ea19e61fbaeb29fc9047419cb138d5ca0f2021fc.tar.gz go-tangerine-ea19e61fbaeb29fc9047419cb138d5ca0f2021fc.tar.bz2 go-tangerine-ea19e61fbaeb29fc9047419cb138d5ca0f2021fc.tar.lz go-tangerine-ea19e61fbaeb29fc9047419cb138d5ca0f2021fc.tar.xz go-tangerine-ea19e61fbaeb29fc9047419cb138d5ca0f2021fc.tar.zst go-tangerine-ea19e61fbaeb29fc9047419cb138d5ca0f2021fc.zip |
Godeps: update goleveldb to fix a compaction data race
Diffstat (limited to 'Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/session_record.go')
-rw-r--r-- | Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/session_record.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/session_record.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/session_record.go index 9802e1a55..854e1aa6f 100644 --- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/session_record.go +++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/session_record.go @@ -36,15 +36,15 @@ const ( type cpRecord struct { level int - ikey iKey + ikey internalKey } type atRecord struct { level int num int64 size int64 - imin iKey - imax iKey + imin internalKey + imax internalKey } type dtRecord struct { @@ -96,7 +96,7 @@ func (p *sessionRecord) setSeqNum(num uint64) { p.seqNum = num } -func (p *sessionRecord) addCompPtr(level int, ikey iKey) { +func (p *sessionRecord) addCompPtr(level int, ikey internalKey) { p.hasRec |= 1 << recCompPtr p.compPtrs = append(p.compPtrs, cpRecord{level, ikey}) } @@ -106,7 +106,7 @@ func (p *sessionRecord) resetCompPtrs() { p.compPtrs = p.compPtrs[:0] } -func (p *sessionRecord) addTable(level int, num, size int64, imin, imax iKey) { +func (p *sessionRecord) addTable(level int, num, size int64, imin, imax internalKey) { p.hasRec |= 1 << recAddTable p.addedTables = append(p.addedTables, atRecord{level, num, size, imin, imax}) } @@ -299,7 +299,7 @@ func (p *sessionRecord) decode(r io.Reader) error { level := p.readLevel("comp-ptr.level", br) ikey := p.readBytes("comp-ptr.ikey", br) if p.err == nil { - p.addCompPtr(level, iKey(ikey)) + p.addCompPtr(level, internalKey(ikey)) } case recAddTable: level := p.readLevel("add-table.level", br) |