Merge pull request #566 from dusk125/upgrade-go1.21

Update to go1.21.1

.github/workflows/failpoint_test.yaml

@@ -11,7 +11,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v4
         with:
-          go-version: "1.20.7"
+          go-version: "1.21.1"
       - run: |
           make gofail-enable
           make test-failpoint

.github/workflows/tests.yaml

@@ -15,7 +15,7 @@ jobs:
     - uses: actions/checkout@v4
     - uses: actions/setup-go@v4
       with:
-        go-version: "1.20.7"
+        go-version: "1.21.1"
     - run: make fmt
     - env:
         TARGET: ${{ matrix.target }}
@@ -66,7 +66,7 @@ jobs:
     - uses: actions/checkout@v4
     - uses: actions/setup-go@v4
       with:
-        go-version: "1.20.7"
+        go-version: "1.21.1"
     - run: make fmt
     - env:
         TARGET: ${{ matrix.target }}
@@ -94,6 +94,6 @@ jobs:
     - uses: actions/checkout@v4
     - uses: actions/setup-go@v4
       with:
-        go-version: "1.20.7"
+        go-version: "1.21.1"
     - run: make coverage
 

cmd/bbolt/README.md

@@ -72,7 +72,7 @@
   ```bash
   $bbolt version
   bbolt version: 1.3.7
-  Go Version: go1.20.7
+  Go Version: go1.21.1
   Go OS/Arch: darwin/arm64
   ```
 

freelist.go

@@ -311,15 +311,13 @@ func (f *freelist) write(p *common.Page) error {
 		p.SetCount(uint16(l))
 	} else if l < 0xFFFF {
 		p.SetCount(uint16(l))
-		var ids []common.Pgid
 		data := common.UnsafeAdd(unsafe.Pointer(p), unsafe.Sizeof(*p))
-		common.UnsafeSlice(unsafe.Pointer(&ids), data, l)
+		ids := unsafe.Slice((*common.Pgid)(data), l)
 		f.copyall(ids)
 	} else {
 		p.SetCount(0xFFFF)
-		var ids []common.Pgid
 		data := common.UnsafeAdd(unsafe.Pointer(p), unsafe.Sizeof(*p))
-		common.UnsafeSlice(unsafe.Pointer(&ids), data, l+1)
+		ids := unsafe.Slice((*common.Pgid)(data), l+1)
 		ids[0] = common.Pgid(l)
 		f.copyall(ids[1:])
 	}

go.mod

@@ -1,6 +1,6 @@
 module go.etcd.io/bbolt
 
-go 1.20
+go 1.21
 
 require (
 	github.com/spf13/cobra v1.7.0

internal/common/page.go

@@ -13,6 +13,7 @@ const MinKeysPerPage = 2
 
 const BranchPageElementSize = unsafe.Sizeof(branchPageElement{})
 const LeafPageElementSize = unsafe.Sizeof(leafPageElement{})
+const pgidSize = unsafe.Sizeof(Pgid(0))
 
 const (
 	BranchPageFlag   = 0x01
@@ -99,9 +100,8 @@ func (p *Page) LeafPageElements() []leafPageElement {
 	if p.count == 0 {
 		return nil
 	}
-	var elems []leafPageElement
 	data := UnsafeAdd(unsafe.Pointer(p), unsafe.Sizeof(*p))
-	UnsafeSlice(unsafe.Pointer(&elems), data, int(p.count))
+	elems := unsafe.Slice((*leafPageElement)(data), int(p.count))
 	return elems
 }
 
@@ -116,9 +116,8 @@ func (p *Page) BranchPageElements() []branchPageElement {
 	if p.count == 0 {
 		return nil
 	}
-	var elems []branchPageElement
 	data := UnsafeAdd(unsafe.Pointer(p), unsafe.Sizeof(*p))
-	UnsafeSlice(unsafe.Pointer(&elems), data, int(p.count))
+	elems := unsafe.Slice((*branchPageElement)(data), int(p.count))
 	return elems
 }
 
@@ -149,9 +148,8 @@ func (p *Page) FreelistPageIds() []Pgid {
 		return nil
 	}
 
-	var ids []Pgid
-	data := UnsafeIndex(unsafe.Pointer(p), unsafe.Sizeof(*p), unsafe.Sizeof(ids[0]), idx)
-	UnsafeSlice(unsafe.Pointer(&ids), data, count)
+	data := UnsafeIndex(unsafe.Pointer(p), unsafe.Sizeof(*p), pgidSize, idx)
+	ids := unsafe.Slice((*Pgid)(data), count)
 
 	return ids
 }

internal/common/unsafe.go

@@ -1,7 +1,6 @@
 package common
 
 import (
-	"reflect"
 	"unsafe"
 )
 
@@ -26,14 +25,3 @@ func UnsafeByteSlice(base unsafe.Pointer, offset uintptr, i, j int) []byte {
 	// all), so this is believed to be correct.
 	return (*[pageMaxAllocSize]byte)(UnsafeAdd(base, offset))[i:j:j]
 }
-
-// UnsafeSlice modifies the data, len, and cap of a slice variable pointed to by
-// the slice parameter.  This helper should be used over other direct
-// manipulation of reflect.SliceHeader to prevent misuse, namely, converting
-// from reflect.SliceHeader to a Go slice type.
-func UnsafeSlice(slice, data unsafe.Pointer, len int) {
-	s := (*reflect.SliceHeader)(slice)
-	s.Data = uintptr(data)
-	s.Cap = len
-	s.Len = len
-}