mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2025-06-28 04:44:13 +08:00
refactor
Some checks failed
go: build dev binaries / cleanup (push) Waiting to run
go: build dev binaries / build_dev_linux_windows (amd64, linux) (push) Blocked by required conditions
go: build dev binaries / build_dev_linux_windows (amd64, windows) (push) Blocked by required conditions
go: build dev binaries / build_dev_darwin (amd64, darwin) (push) Blocked by required conditions
go: build dev binaries / build_dev_darwin (arm64, darwin) (push) Blocked by required conditions
docker: build dev containers / build-dev-containers (push) Waiting to run
End to End / FUSE Mount (push) Waiting to run
go: build binary / Build (push) Waiting to run
Ceph S3 tests / Ceph S3 tests (push) Waiting to run
test s3 over https using aws-cli / awscli-tests (push) Waiting to run
helm: lint and test charts / lint-test (push) Has been cancelled
Some checks failed
go: build dev binaries / cleanup (push) Waiting to run
go: build dev binaries / build_dev_linux_windows (amd64, linux) (push) Blocked by required conditions
go: build dev binaries / build_dev_linux_windows (amd64, windows) (push) Blocked by required conditions
go: build dev binaries / build_dev_darwin (amd64, darwin) (push) Blocked by required conditions
go: build dev binaries / build_dev_darwin (arm64, darwin) (push) Blocked by required conditions
docker: build dev containers / build-dev-containers (push) Waiting to run
End to End / FUSE Mount (push) Waiting to run
go: build binary / Build (push) Waiting to run
Ceph S3 tests / Ceph S3 tests (push) Waiting to run
test s3 over https using aws-cli / awscli-tests (push) Waiting to run
helm: lint and test charts / lint-test (push) Has been cancelled
This commit is contained in:
parent
81aeec74a4
commit
33ecc8442e
@ -9,6 +9,13 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func writeNeedleV2(n *Needle, offset uint64, bytesBuffer *bytes.Buffer) (size Size, actualSize int64, err error) {
|
func writeNeedleV2(n *Needle, offset uint64, bytesBuffer *bytes.Buffer) (size Size, actualSize int64, err error) {
|
||||||
|
return writeNeedleCommon(n, offset, bytesBuffer, Version2, func(n *Needle, header []byte, bytesBuffer *bytes.Buffer, padding int) {
|
||||||
|
util.Uint32toBytes(header[0:NeedleChecksumSize], uint32(n.Checksum))
|
||||||
|
bytesBuffer.Write(header[0 : NeedleChecksumSize+padding])
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func writeNeedleCommon(n *Needle, offset uint64, bytesBuffer *bytes.Buffer, version Version, writeFooter func(n *Needle, header []byte, bytesBuffer *bytes.Buffer, padding int)) (size Size, actualSize int64, err error) {
|
||||||
bytesBuffer.Reset()
|
bytesBuffer.Reset()
|
||||||
header := make([]byte, NeedleHeaderSize+TimestampSize)
|
header := make([]byte, NeedleHeaderSize+TimestampSize)
|
||||||
CookieToBytes(header[0:CookieSize], n.Cookie)
|
CookieToBytes(header[0:CookieSize], n.Cookie)
|
||||||
@ -71,11 +78,9 @@ func writeNeedleV2(n *Needle, offset uint64, bytesBuffer *bytes.Buffer) (size Si
|
|||||||
bytesBuffer.Write(n.Pairs)
|
bytesBuffer.Write(n.Pairs)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
padding := PaddingLength(n.Size, Version2)
|
padding := PaddingLength(n.Size, version)
|
||||||
util.Uint32toBytes(header[0:NeedleChecksumSize], uint32(n.Checksum))
|
writeFooter(n, header, bytesBuffer, int(padding))
|
||||||
bytesBuffer.Write(header[0 : NeedleChecksumSize+padding])
|
|
||||||
|
|
||||||
size = Size(n.DataSize)
|
size = Size(n.DataSize)
|
||||||
actualSize = GetActualSize(n.Size, Version2)
|
actualSize = GetActualSize(n.Size, version)
|
||||||
return size, actualSize, nil
|
return size, actualSize, nil
|
||||||
}
|
}
|
||||||
|
@ -2,81 +2,15 @@ package needle
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"bytes"
|
"bytes"
|
||||||
"math"
|
|
||||||
|
|
||||||
. "github.com/seaweedfs/seaweedfs/weed/storage/types"
|
. "github.com/seaweedfs/seaweedfs/weed/storage/types"
|
||||||
"github.com/seaweedfs/seaweedfs/weed/util"
|
"github.com/seaweedfs/seaweedfs/weed/util"
|
||||||
)
|
)
|
||||||
|
|
||||||
func writeNeedleV3(n *Needle, offset uint64, bytesBuffer *bytes.Buffer) (size Size, actualSize int64, err error) {
|
func writeNeedleV3(n *Needle, offset uint64, bytesBuffer *bytes.Buffer) (size Size, actualSize int64, err error) {
|
||||||
bytesBuffer.Reset()
|
return writeNeedleCommon(n, offset, bytesBuffer, Version3, func(n *Needle, header []byte, bytesBuffer *bytes.Buffer, padding int) {
|
||||||
header := make([]byte, NeedleHeaderSize+TimestampSize)
|
util.Uint32toBytes(header[0:NeedleChecksumSize], uint32(n.Checksum))
|
||||||
CookieToBytes(header[0:CookieSize], n.Cookie)
|
util.Uint64toBytes(header[NeedleChecksumSize:NeedleChecksumSize+TimestampSize], n.AppendAtNs)
|
||||||
NeedleIdToBytes(header[CookieSize:CookieSize+NeedleIdSize], n.Id)
|
bytesBuffer.Write(header[0 : NeedleChecksumSize+TimestampSize+padding])
|
||||||
if len(n.Name) >= math.MaxUint8 {
|
})
|
||||||
n.NameSize = math.MaxUint8
|
|
||||||
} else {
|
|
||||||
n.NameSize = uint8(len(n.Name))
|
|
||||||
}
|
|
||||||
n.DataSize, n.MimeSize = uint32(len(n.Data)), uint8(len(n.Mime))
|
|
||||||
if n.DataSize > 0 {
|
|
||||||
n.Size = 4 + Size(n.DataSize) + 1
|
|
||||||
if n.HasName() {
|
|
||||||
n.Size = n.Size + 1 + Size(n.NameSize)
|
|
||||||
}
|
|
||||||
if n.HasMime() {
|
|
||||||
n.Size = n.Size + 1 + Size(n.MimeSize)
|
|
||||||
}
|
|
||||||
if n.HasLastModifiedDate() {
|
|
||||||
n.Size = n.Size + LastModifiedBytesLength
|
|
||||||
}
|
|
||||||
if n.HasTtl() {
|
|
||||||
n.Size = n.Size + TtlBytesLength
|
|
||||||
}
|
|
||||||
if n.HasPairs() {
|
|
||||||
n.Size += 2 + Size(n.PairsSize)
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
n.Size = 0
|
|
||||||
}
|
|
||||||
SizeToBytes(header[CookieSize+NeedleIdSize:CookieSize+NeedleIdSize+SizeSize], n.Size)
|
|
||||||
bytesBuffer.Write(header[0:NeedleHeaderSize])
|
|
||||||
if n.DataSize > 0 {
|
|
||||||
util.Uint32toBytes(header[0:4], n.DataSize)
|
|
||||||
bytesBuffer.Write(header[0:4])
|
|
||||||
bytesBuffer.Write(n.Data)
|
|
||||||
util.Uint8toBytes(header[0:1], n.Flags)
|
|
||||||
bytesBuffer.Write(header[0:1])
|
|
||||||
if n.HasName() {
|
|
||||||
util.Uint8toBytes(header[0:1], n.NameSize)
|
|
||||||
bytesBuffer.Write(header[0:1])
|
|
||||||
bytesBuffer.Write(n.Name[:n.NameSize])
|
|
||||||
}
|
|
||||||
if n.HasMime() {
|
|
||||||
util.Uint8toBytes(header[0:1], n.MimeSize)
|
|
||||||
bytesBuffer.Write(header[0:1])
|
|
||||||
bytesBuffer.Write(n.Mime)
|
|
||||||
}
|
|
||||||
if n.HasLastModifiedDate() {
|
|
||||||
util.Uint64toBytes(header[0:8], n.LastModified)
|
|
||||||
bytesBuffer.Write(header[8-LastModifiedBytesLength : 8])
|
|
||||||
}
|
|
||||||
if n.HasTtl() && n.Ttl != nil {
|
|
||||||
n.Ttl.ToBytes(header[0:TtlBytesLength])
|
|
||||||
bytesBuffer.Write(header[0:TtlBytesLength])
|
|
||||||
}
|
|
||||||
if n.HasPairs() {
|
|
||||||
util.Uint16toBytes(header[0:2], n.PairsSize)
|
|
||||||
bytesBuffer.Write(header[0:2])
|
|
||||||
bytesBuffer.Write(n.Pairs)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
padding := PaddingLength(n.Size, Version3)
|
|
||||||
util.Uint32toBytes(header[0:NeedleChecksumSize], uint32(n.Checksum))
|
|
||||||
util.Uint64toBytes(header[NeedleChecksumSize:NeedleChecksumSize+TimestampSize], n.AppendAtNs)
|
|
||||||
bytesBuffer.Write(header[0 : NeedleChecksumSize+TimestampSize+padding])
|
|
||||||
|
|
||||||
size = Size(n.DataSize)
|
|
||||||
actualSize = GetActualSize(n.Size, Version3)
|
|
||||||
return size, actualSize, nil
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user