diff options
Diffstat (limited to 'go/storage')
| -rw-r--r-- | go/storage/volume.go | 9 | ||||
| -rw-r--r-- | go/storage/volume_vacuum.go | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/go/storage/volume.go b/go/storage/volume.go index 937798649..7bd8e7467 100644 --- a/go/storage/volume.go +++ b/go/storage/volume.go @@ -309,6 +309,7 @@ func (v *Volume) freeze() error { func ScanVolumeFile(dirname string, collection string, id VolumeId, visitSuperBlock func(SuperBlock) error, + readNeedleBody bool, visitNeedle func(n *Needle, offset int64) error) (err error) { var v *Volume if v, err = loadVolumeWithoutIndex(dirname, collection, id); err != nil { @@ -327,9 +328,11 @@ func ScanVolumeFile(dirname string, collection string, id VolumeId, return } for n != nil { - if err = n.ReadNeedleBody(v.dataFile, version, offset+int64(NeedleHeaderSize), rest); err != nil { - err = fmt.Errorf("cannot read needle body: %s", err) - return + if readNeedleBody { + if err = n.ReadNeedleBody(v.dataFile, version, offset+int64(NeedleHeaderSize), rest); err != nil { + err = fmt.Errorf("cannot read needle body: %s", err) + return + } } if err = visitNeedle(n, offset); err != nil { return diff --git a/go/storage/volume_vacuum.go b/go/storage/volume_vacuum.go index 9ccf9f588..7d2a38cb8 100644 --- a/go/storage/volume_vacuum.go +++ b/go/storage/volume_vacuum.go @@ -62,7 +62,7 @@ func (v *Volume) copyDataAndGenerateIndexFile(dstName, idxName string) (err erro err = ScanVolumeFile(v.dir, v.Collection, v.Id, func(superBlock SuperBlock) error { _, err = dst.Write(superBlock.Bytes()) return err - }, func(n *Needle, offset int64) error { + }, true, func(n *Needle, offset int64) error { nv, ok := v.nm.Get(n.Id) glog.V(4).Infoln("needle expected offset ", offset, "ok", ok, "nv", nv) if ok && int64(nv.Offset)*NeedlePaddingSize == offset && nv.Size > 0 { |