Drop support for go 1.20

[btrtrc.git] / request-strategy / piece-request-order.go

diff --git a/request-strategy/piece-request-order.go b/request-strategy/piece-request-order.go
index 35dcf709c9fea3336349a1b7d73ba0177ff1173a..3056741db389a453de42e87899125ae563a5d658 100644 (file)
--- a/request-strategy/piece-request-order.go
+++ b/request-strategy/piece-request-order.go
@@ -1,27 +1,23 @@
-package request_strategy
+package requestStrategy
 
-import (
-       "fmt"
+import "github.com/anacrolix/torrent/metainfo"
 
-       "github.com/anacrolix/torrent/metainfo"
-       "github.com/tidwall/btree"
-)
+type Btree interface {
+       Delete(pieceRequestOrderItem)
+       Add(pieceRequestOrderItem)
+       Scan(func(pieceRequestOrderItem) bool)
+}
 
-func NewPieceOrder() *PieceRequestOrder {
+func NewPieceOrder(btree Btree, cap int) *PieceRequestOrder {
        return &PieceRequestOrder{
-               tree: btree.NewOptions(
-                       func(a, b pieceRequestOrderItem) bool {
-                               return a.Less(&b)
-                       },
-                       btree.Options{NoLocks: true}),
-               keys: make(map[PieceRequestOrderKey]PieceRequestOrderState),
+               tree: btree,
+               keys: make(map[PieceRequestOrderKey]PieceRequestOrderState, cap),
        }
 }
 
 type PieceRequestOrder struct {
-       tree     *btree.BTree[pieceRequestOrderItem]
-       keys     map[PieceRequestOrderKey]PieceRequestOrderState
-       pathHint btree.PathHint
+       tree Btree
+       keys map[PieceRequestOrderKey]PieceRequestOrderState
 }
 
 type PieceRequestOrderKey struct {
@@ -48,18 +44,14 @@ func (me *PieceRequestOrder) Add(key PieceRequestOrderKey, state PieceRequestOrd
        if _, ok := me.keys[key]; ok {
                panic(key)
        }
-       if _, ok := me.tree.SetHint(pieceRequestOrderItem{
-               key:   key,
-               state: state,
-       }, &me.pathHint); ok {
-               panic("shouldn't already have this")
-       }
+       me.tree.Add(pieceRequestOrderItem{key, state})
        me.keys[key] = state
 }
 
-type PieceRequestOrderPathHint = btree.PathHint
-
-func (me *PieceRequestOrder) Update(key PieceRequestOrderKey, state PieceRequestOrderState) {
+func (me *PieceRequestOrder) Update(
+       key PieceRequestOrderKey,
+       state PieceRequestOrderState,
+) {
        oldState, ok := me.keys[key]
        if !ok {
                panic("key should have been added already")
@@ -67,17 +59,8 @@ func (me *PieceRequestOrder) Update(key PieceRequestOrderKey, state PieceRequest
        if state == oldState {
                return
        }
-       item := pieceRequestOrderItem{
-               key:   key,
-               state: oldState,
-       }
-       if _, ok := me.tree.DeleteHint(item, &me.pathHint); !ok {
-               panic(fmt.Sprintf("%#v", key))
-       }
-       item.state = state
-       if _, ok := me.tree.SetHint(item, &me.pathHint); ok {
-               panic(key)
-       }
+       me.tree.Delete(pieceRequestOrderItem{key, oldState})
+       me.tree.Add(pieceRequestOrderItem{key, state})
        me.keys[key] = state
 }
 
@@ -89,10 +72,7 @@ func (me *PieceRequestOrder) existingItemForKey(key PieceRequestOrderKey) pieceR
 }
 
 func (me *PieceRequestOrder) Delete(key PieceRequestOrderKey) {
-       item := me.existingItemForKey(key)
-       if _, ok := me.tree.DeleteHint(item, &me.pathHint); !ok {
-               panic(key)
-       }
+       me.tree.Delete(pieceRequestOrderItem{key, me.keys[key]})
        delete(me.keys, key)
 }