Merge pull request #407 from ahrtr/refactor_inode_20230215

Refactor: move inode to internal/common package

allocate_test.go

@@ -2,20 +2,22 @@ package bbolt
 
 import (
 	"testing"
+
+	"go.etcd.io/bbolt/internal/common"
 )
 
 func TestTx_allocatePageStats(t *testing.T) {
 	f := newTestFreelist()
-	ids := []pgid{2, 3}
+	ids := []common.Pgid{2, 3}
 	f.readIDs(ids)
 
 	tx := &Tx{
 		db: &DB{
 			freelist: f,
-			pageSize: defaultPageSize,
+			pageSize: common.DefaultPageSize,
 		},
-		meta:  &meta{},
-		pages: make(map[pgid]*page),
+		meta:  &common.Meta{},
+		pages: make(map[common.Pgid]*common.Page),
 	}
 
 	txStats := tx.Stats()

bolt_unix.go

@@ -10,6 +10,8 @@ import (
 	"unsafe"
 
 	"golang.org/x/sys/unix"
+
+	"go.etcd.io/bbolt/internal/common"
 )
 
 // flock acquires an advisory lock on a file descriptor.
@@ -36,7 +38,7 @@ func flock(db *DB, exclusive bool, timeout time.Duration) error {
 
 		// If we timed out then return an error.
 		if timeout != 0 && time.Since(t) > timeout-flockRetryTimeout {
-			return ErrTimeout
+			return common.ErrTimeout
 		}
 
 		// Wait for a bit and try again.

bolt_windows.go

@@ -8,6 +8,8 @@ import (
 	"unsafe"
 
 	"golang.org/x/sys/windows"
+
+	"go.etcd.io/bbolt/internal/common"
 )
 
 // fdatasync flushes written data to a file descriptor.
@@ -42,7 +44,7 @@ func flock(db *DB, exclusive bool, timeout time.Duration) error {
 
 		// If we timed oumercit then return an error.
 		if timeout != 0 && time.Since(t) > timeout-flockRetryTimeout {
-			return ErrTimeout
+			return common.ErrTimeout
 		}
 
 		// Wait for a bit and try again.
@@ -93,7 +95,7 @@ func mmap(db *DB, sz int) error {
 	}
 
 	// Convert to a byte array.
-	db.data = ((*[maxMapSize]byte)(unsafe.Pointer(addr)))
+	db.data = (*[maxMapSize]byte)(unsafe.Pointer(addr))
 	db.datasz = sz
 
 	return nil