Commit 8f2712fa authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent 741b31d4
...@@ -28,10 +28,9 @@ import ( ...@@ -28,10 +28,9 @@ import (
"../../zodb" "../../zodb"
"./fsb" "./fsb"
"lab.nexedi.com/kirr/go123/mem"
//"github.com/hydrogen18/stalecucumber"
pickle "github.com/kisielk/og-rek" pickle "github.com/kisielk/og-rek"
"lab.nexedi.com/kirr/go123/mem"
) )
// fsIndex is Oid -> Tid's position mapping used to associate Oid with latest // fsIndex is Oid -> Tid's position mapping used to associate Oid with latest
...@@ -62,8 +61,8 @@ func fsIndexNew() *fsIndex { ...@@ -62,8 +61,8 @@ func fsIndexNew() *fsIndex {
const ( const (
oidPrefixMask zodb.Oid = (1<<64-1) ^ (1<<16 - 1) // 0xffffffffffff0000 oidPrefixMask zodb.Oid = (1<<64-1) ^ (1<<16 - 1) // 0xffffffffffff0000
posInvalidMask uint64 = (1<<64-1) ^ (1<<48 - 1) // 0xffff000000000000 posInvalidMask uint64 = (1<<64-1) ^ (1<<48 - 1) // 0xffff000000000000
) )
// IndexSaveError is the error type returned by index save routines // IndexSaveError is the error type returned by index save routines
...@@ -316,6 +315,8 @@ func LoadIndexFile(path string) (topPos int64, fsi *fsIndex, err error) { ...@@ -316,6 +315,8 @@ func LoadIndexFile(path string) (topPos int64, fsi *fsIndex, err error) {
} }
// TODO move vvv to common place
// CountReader is an io.Reader that count total bytes read // CountReader is an io.Reader that count total bytes read
type CountReader struct { type CountReader struct {
io.Reader io.Reader
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment