sqlproxyccl/acl: use newer btree

Use `BtreeG` in the acl watcher code.
Informs: #144504
Release note: None

Author: RaduBerinde

go.mod

@@ -34,7 +34,7 @@ require (
 	github.com/golang/mock v1.6.0
 	github.com/golang/protobuf v1.5.4
 	github.com/golang/snappy v0.0.5-0.20231225225746-43d5d4cd4e0e
-	github.com/google/btree v1.1.3 // indirect
+	github.com/google/btree v1.1.3
 	github.com/google/pprof v0.0.0-20240227163752-401108e1b7e7
 	github.com/google/uuid v1.6.0 // indirect
 	google.golang.org/api v0.114.0

pkg/ccl/sqlproxyccl/acl/BUILD.bazel

@@ -21,9 +21,9 @@ go_library(
         "//pkg/util/syncutil",
         "//pkg/util/timeutil",
         "@com_github_cockroachdb_errors//:errors",
+        "@com_github_google_btree//:btree",
         "@com_github_pires_go_proxyproto//:go-proxyproto",
         "@com_github_pires_go_proxyproto//tlvparse",
-        "@com_github_raduberinde_btree//:btree",
         "@in_gopkg_yaml_v2//:yaml_v2",
     ],
 )
@@ -50,7 +50,6 @@ go_test(
         "@com_github_cockroachdb_errors//:errors",
         "@com_github_pires_go_proxyproto//:go-proxyproto",
         "@com_github_pires_go_proxyproto//tlvparse",
-        "@com_github_raduberinde_btree//:btree",
         "@com_github_stretchr_testify//require",
         "@in_gopkg_yaml_v2//:yaml_v2",
     ],

pkg/ccl/sqlproxyccl/acl/watcher.go

@@ -9,11 +9,11 @@ import (
 	"context"
 	"time"
 
-	"github.com/RaduBerinde/btree" // TODO(#144504): switch to the newer btree
 	"github.com/cockroachdb/cockroach/pkg/util/log"
 	"github.com/cockroachdb/cockroach/pkg/util/metric"
 	"github.com/cockroachdb/cockroach/pkg/util/syncutil"
 	"github.com/cockroachdb/cockroach/pkg/util/timeutil"
+	"github.com/google/btree"
 )
 
 // Watcher maintains a list of connections waiting for changes to the
@@ -33,7 +33,7 @@ type Watcher struct {
 	options *aclOptions
 
 	// All of the listeners waiting for changes to the access control list.
-	listeners *btree.BTree
+	listeners *btree.BTreeG[*listener]
 
 	// These control whether or not a connection is allowd based on it's
 	// ConnectionTags.
@@ -128,7 +128,7 @@ func NewWatcher(ctx context.Context, opts ...Option) (*Watcher, error) {
 		opt(options)
 	}
 	w := &Watcher{
-		listeners:   btree.New(8),
+		listeners:   btree.NewG[*listener](8, func(a, b *listener) bool { return a.id < b.id }),
 		options:     options,
 		controllers: make([]AccessController, 0),
 	}
@@ -235,7 +235,7 @@ func (w *Watcher) addAccessController(
 func (w *Watcher) updateAccessController(
 	ctx context.Context, index int, controller AccessController,
 ) {
-	var copy *btree.BTree
+	var copy *btree.BTreeG[*listener]
 	var controllers []AccessController
 	func() {
 		w.mu.Lock()
@@ -304,14 +304,10 @@ func (w *Watcher) removeListener(l *listener) {
 	w.listeners.Delete(l)
 }
 
-// Less implements the btree.Item interface for listener.
-func (l *listener) Less(than btree.Item) bool {
-	return l.id < than.(*listener).id
-}
-
-func checkListeners(ctx context.Context, listeners *btree.BTree, controllers []AccessController) {
-	listeners.Ascend(func(i btree.Item) bool {
-		lst := i.(*listener)
+func checkListeners(
+	ctx context.Context, listeners *btree.BTreeG[*listener], controllers []AccessController,
+) {
+	listeners.Ascend(func(lst *listener) bool {
 		if err := checkConnection(ctx, lst.connection, controllers); err != nil {
 			lst.mu.Lock()
 			defer lst.mu.Unlock()

pkg/ccl/sqlproxyccl/acl/watcher_test.go

@@ -11,7 +11,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/RaduBerinde/btree" // TODO(#144504): switch to the newer btree
 	"github.com/cockroachdb/cockroach/pkg/ccl/sqlproxyccl/tenant"
 	"github.com/cockroachdb/cockroach/pkg/ccl/sqlproxyccl/tenantdirsvr"
 	"github.com/cockroachdb/cockroach/pkg/ccl/testutilsccl"
@@ -403,8 +402,8 @@ func TestACLWatcher(t *testing.T) {
 		require.Nil(t, err)
 
 		var l *listener
-		watcher.listeners.Ascend(func(i btree.Item) bool {
-			l = i.(*listener)
+		watcher.listeners.Ascend(func(lst *listener) bool {
+			l = lst
 			return false
 		})
 		require.NotNil(t, l)