gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues Projects Releases Wiki Activity

adjust variable names

Browse source
This commit is contained in:
chrislu 2022-09-08 18:54:16 -07:00
parent 2bfc8970d2
commit 406a80da4b
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
weed/storage/volume_read.go
View file

@ -134,12 +134,9 @@ func (v *Volume) readNeedleDataInto(n *needle.Needle, readOption *ReadOption, wr
// read needle data // read needle data
crc := needle.CRC(0) crc := needle.CRC(0)
r := v.DataBackend for x := offset; x < offset+size; x += int64(len(buf)) {
volumeOffset := actualOffset count, err := n.ReadNeedleData(v.DataBackend, actualOffset, buf, x)
needleOffset := offset toWrite := min(count, int(offset+size-x))
for x := needleOffset; x < needleOffset+size; x += int64(len(buf)) {
count, err := n.ReadNeedleData(r, volumeOffset, buf, x)
toWrite := min(count, int(needleOffset+size-x))
if toWrite > 0 { if toWrite > 0 {
crc = crc.Update(buf[0:toWrite]) crc = crc.Update(buf[0:toWrite])
if _, err = writer.Write(buf[0:toWrite]); err != nil { if _, err = writer.Write(buf[0:toWrite]); err != nil {
@ -157,7 +154,7 @@ func (v *Volume) readNeedleDataInto(n *needle.Needle, readOption *ReadOption, wr
break break
} }
} }
if needleOffset == 0 && size == int64(n.DataSize) && (n.Checksum != crc && uint32(n.Checksum) != crc.Value()) { if offset == 0 && size == int64(n.DataSize) && (n.Checksum != crc && uint32(n.Checksum) != crc.Value()) {
// the crc.Value() function is to be deprecated. this double checking is for backward compatible. // the crc.Value() function is to be deprecated. this double checking is for backward compatible.
return fmt.Errorf("ReadNeedleData checksum %v expected %v", crc, n.Checksum) return fmt.Errorf("ReadNeedleData checksum %v expected %v", crc, n.Checksum)
} }