lsm/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2025-10-21 21:09:24 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make releaseMemory private and return byte array instead, fix other platform compilation issues, reduce in-memory chunk size.

Browse Source
This commit is contained in:
j.laycock
2019-10-01 12:21:44 +01:00
parent d5f5acb734
commit eb27c2b037
4 changed files with 24 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
weed/storage/needle/needle_read_write.go
View File

@@ -164,13 +164,11 @@ func (n *Needle) Append(w *os.File, version Version) (offset uint64, size uint32
func ReadNeedleBlob(r *os.File, offset int64, size uint32, version Version) (dataSlice []byte, err error) {
dataSize := GetActualSize(size, version)
dataSlice = make([]byte, dataSize)
dataSlice = make([]byte, int(dataSize))
mMap, exists := memory_map.FileMemoryMap[r.Name()]
if exists {
mBuffer, err := mMap.ReadMemory(uint64(offset), uint64(dataSize))
copy(dataSlice, mBuffer.Buffer)
mBuffer.ReleaseMemory()
dataSlice, err := mMap.ReadMemory(uint64(offset), uint64(dataSize))
return dataSlice, err
} else {
_, err = r.ReadAt(dataSlice, offset)
@@ -291,10 +289,7 @@ func ReadNeedleHeader(r *os.File, version Version, offset int64) (n *Needle, byt
mMap, exists := memory_map.FileMemoryMap[r.Name()]
if exists {
mBuffer, err := mMap.ReadMemory(uint64(offset), NeedleHeaderSize)
copy(bytes, mBuffer.Buffer)
mBuffer.ReleaseMemory()
bytes, err = mMap.ReadMemory(uint64(offset), NeedleHeaderSize)
if err != nil {
return nil, bytes, 0, err
}