finalizer apply from outside

octu0 · May 12, 2023 · 311dbf1 · 311dbf1
1 parent 9e70e8d
commit 311dbf1
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 11 deletions.
diff --git a/codec/codec.go b/codec/codec.go
@@ -38,10 +38,6 @@ type Payload struct {
 	release   func()
 }
 
-func (p *Payload) setFinalizer() {
-	runtime.SetFinalizer(p, finalizePayload)
-}
-
 func (p *Payload) Read(buf []byte) (int, error) {
 	return p.Value.Read(buf)
 }

diff --git a/codec/decoder.go b/codec/decoder.go
@@ -111,7 +111,7 @@ func (d *Decoder) Decode() (*Payload, error) {
 		ValueSize: header.ValueSize,
 		release:   releaseFn,
 	}
-	p.setFinalizer()
+	runtime.SetFinalizer(p, finalizePayload)
 	d.r.Seek(p.N, io.SeekCurrent)
 	d.offset += p.N
 	return p, nil

diff --git a/datafile/datafile.go b/datafile/datafile.go
@@ -9,6 +9,7 @@ import (
 	"github.com/pkg/errors"
 
 	"github.com/octu0/bitcaskdb/codec"
+	"github.com/octu0/bitcaskdb/runtime"
 )
 
 type EOFType bool
@@ -111,7 +112,7 @@ func (df *defaultDatafile) Read() (*Entry, error) {
 			p.Close()
 		},
 	}
-	e.setFinalizer()
+	runtime.SetFinalizer(e, finalizeEntry)
 	return e, nil
 }
 
@@ -189,7 +190,7 @@ func (df *defaultDatafile) ReadAt(index, size int64) (*Entry, error) {
 			f.Close()
 		},
 	}
-	e.setFinalizer()
+	runtime.SetFinalizer(e, finalizeEntry)
 	return e, nil
 }
 

diff --git a/datafile/entry.go b/datafile/entry.go
@@ -33,10 +33,6 @@ type Entry struct {
 	release   func()
 }
 
-func (e *Entry) setFinalizer() {
-	runtime.SetFinalizer(e, finalizeEntry)
-}
-
 func (e *Entry) Read(p []byte) (int, error) {
 	return e.Value.Read(p)
 }