fumiama/orbyte
1
0
Fork 0
mirror of https://github.com/fumiama/orbyte.git synced 2026-06-09 04:30:30 +08:00
Code Activity

fix(pbuf): call on nil

Browse Source
This commit is contained in:
源文雨
2025-02-25 00:24:32 +09:00
parent 54fde91245
commit cab9bb4bc1
1 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
pbuf/bytes.go
View File

@@ -19,34 +19,33 @@ type Bytes struct {
// Please notice that Bytes cannnot convert back to // Please notice that Bytes cannnot convert back to
// *orbyte.Item[bytes.Buffer] again. // *orbyte.Item[bytes.Buffer] again.
func BufferItemToBytes(buf *orbyte.Item[bytes.Buffer]) Bytes { func BufferItemToBytes(buf *orbyte.Item[bytes.Buffer]) Bytes {
x := buf.Unwrap() return Bytes{buf: buf, dat: buf.Pointer().Bytes()}
return Bytes{buf: buf, dat: x.Bytes()}
} }
// NewBytes alloc sz bytes. // NewBytes alloc sz bytes.
func (bufferPool BufferPool) NewBytes(sz int) Bytes { func (bufferPool BufferPool) NewBytes(sz int) Bytes {
buf := bufferPool.p.New(sz) buf := bufferPool.p.New(sz)
x := buf.Unwrap() return Bytes{buf: buf, dat: buf.Pointer().Bytes()[:sz]}
return Bytes{buf: buf, dat: x.Bytes()[:sz]}
} }
// InvolveBytes involve outside buf into pool. // InvolveBytes involve outside buf into pool.
func (bufferPool BufferPool) InvolveBytes(b ...byte) Bytes { func (bufferPool BufferPool) InvolveBytes(b ...byte) Bytes {
buf := bufferPool.p.Involve(len(b), bytes.NewBuffer(b)) buf := bufferPool.p.Involve(len(b), bytes.NewBuffer(b))
x := buf.Unwrap() return Bytes{buf: buf, dat: buf.Pointer().Bytes()[:len(b)]}
return Bytes{buf: buf, dat: x.Bytes()[:len(b)]}
} }
// ParseBytes convert outside bytes to Bytes safely // ParseBytes convert outside bytes to Bytes safely
// without adding it into pool. // without adding it into pool.
func (bufferPool BufferPool) ParseBytes(b ...byte) Bytes { func (bufferPool BufferPool) ParseBytes(b ...byte) Bytes {
buf := bufferPool.p.Parse(len(b), bytes.NewBuffer(b)) buf := bufferPool.p.Parse(len(b), bytes.NewBuffer(b))
x := buf.Unwrap() return Bytes{buf: buf, dat: buf.Pointer().Bytes()[:len(b)]}
return Bytes{buf: buf, dat: x.Bytes()[:len(b)]}
} }
// Trans please refer to Item.Trans(). // Trans please refer to Item.Trans().
func (b Bytes) Trans() (tb Bytes) { func (b Bytes) Trans() (tb Bytes) {
if b.buf == nil {
return
}
tb.buf = b.buf.Trans() tb.buf = b.buf.Trans()
tb.dat = b.dat tb.dat = b.dat
return return
@@ -54,11 +53,17 @@ func (b Bytes) Trans() (tb Bytes) {
// Len of slice. // Len of slice.
func (b Bytes) Len() int { func (b Bytes) Len() int {
if b.buf == nil {
return 0
}
return len(b.dat) return len(b.dat)
} }
// Cap of slice. // Cap of slice.
func (b Bytes) Cap() int { func (b Bytes) Cap() int {
if b.buf == nil {
return 0
}
return cap(b.dat) return cap(b.dat)
} }
@@ -69,6 +74,9 @@ func (b Bytes) Bytes() []byte {
// Ref please refer to Item.Ref(). // Ref please refer to Item.Ref().
func (b Bytes) Ref() (rb Bytes) { func (b Bytes) Ref() (rb Bytes) {
if b.buf == nil {
return
}
rb.buf = b.buf.Ref() rb.buf = b.buf.Ref()
rb.dat = b.dat rb.dat = b.dat
return return
@@ -76,6 +84,9 @@ func (b Bytes) Ref() (rb Bytes) {
// Copy please refer to Item.Copy(). // Copy please refer to Item.Copy().
func (b Bytes) Copy() (cb Bytes) { func (b Bytes) Copy() (cb Bytes) {
if b.buf == nil {
return
}
cb.buf = b.buf.Copy() cb.buf = b.buf.Copy()
cb.dat = b.dat cb.dat = b.dat
return return
@@ -104,5 +115,7 @@ func (b Bytes) Slice(from, to int) Bytes {
// Destroy please refer to Item.Destroy(). // Destroy please refer to Item.Destroy().
func (b Bytes) Destroy() { func (b Bytes) Destroy() {
b.buf.Destroy() if b.buf != nil {
b.buf.Destroy()
}
} }