diff options
| -rw-r--r-- | weed/storage/needle/needle_write_v2.go | 15 | ||||
| -rw-r--r-- | weed/storage/needle/needle_write_v3.go | 76 |
2 files changed, 15 insertions, 76 deletions
diff --git a/weed/storage/needle/needle_write_v2.go b/weed/storage/needle/needle_write_v2.go index 82cb50e88..8ec7c666b 100644 --- a/weed/storage/needle/needle_write_v2.go +++ b/weed/storage/needle/needle_write_v2.go @@ -9,6 +9,13 @@ import ( ) 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() header := make([]byte, NeedleHeaderSize+TimestampSize) 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) } } - padding := PaddingLength(n.Size, Version2) - util.Uint32toBytes(header[0:NeedleChecksumSize], uint32(n.Checksum)) - bytesBuffer.Write(header[0 : NeedleChecksumSize+padding]) - + padding := PaddingLength(n.Size, version) + writeFooter(n, header, bytesBuffer, int(padding)) size = Size(n.DataSize) - actualSize = GetActualSize(n.Size, Version2) + actualSize = GetActualSize(n.Size, version) return size, actualSize, nil } diff --git a/weed/storage/needle/needle_write_v3.go b/weed/storage/needle/needle_write_v3.go index 20a6256cc..0146f1eb8 100644 --- a/weed/storage/needle/needle_write_v3.go +++ b/weed/storage/needle/needle_write_v3.go @@ -2,81 +2,15 @@ package needle import ( "bytes" - "math" . "github.com/seaweedfs/seaweedfs/weed/storage/types" "github.com/seaweedfs/seaweedfs/weed/util" ) func writeNeedleV3(n *Needle, offset uint64, bytesBuffer *bytes.Buffer) (size Size, actualSize int64, err error) { - bytesBuffer.Reset() - header := make([]byte, NeedleHeaderSize+TimestampSize) - CookieToBytes(header[0:CookieSize], n.Cookie) - NeedleIdToBytes(header[CookieSize:CookieSize+NeedleIdSize], n.Id) - 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 + return writeNeedleCommon(n, offset, bytesBuffer, Version3, func(n *Needle, header []byte, bytesBuffer *bytes.Buffer, padding int) { + util.Uint32toBytes(header[0:NeedleChecksumSize], uint32(n.Checksum)) + util.Uint64toBytes(header[NeedleChecksumSize:NeedleChecksumSize+TimestampSize], n.AppendAtNs) + bytesBuffer.Write(header[0 : NeedleChecksumSize+TimestampSize+padding]) + }) } |