Merge #144505

craig[bot] · RaduBerinde · craig[bot] · commit 5d7028c6f968 · 2025-04-16T02:28:15.000Z
144505: sql, kv revert btree uses to older version r=RaduBerinde a=RaduBerinde Pebble recently started using `github.com/google/btree`. A recent Pebble bump caused a bump of this dependency. This bump causes a regression in terms of allocations. This PR is a temporary fix: we change the current uses to a fork at the old version. Separately we will look at switching each use to use the newer `btree` that uses generics instead of interfaces. Fixes: #144488 Informs: #144504 Release note: None Co-authored-by: Radu Berinde <radu@cockroachlabs.com>
diff --git a/DEPS.bzl b/DEPS.bzl
@@ -7972,6 +7972,16 @@ def go_deps():
             "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/RaduBerinde/axisds/com_github_raduberinde_axisds-v0.0.0-20250405232732-ecb85bedf677.zip",
         ],
     )
+    go_repository(
+        name = "com_github_raduberinde_btree",
+        build_file_proto_mode = "disable_global",
+        importpath = "github.com/RaduBerinde/btree",
+        sha256 = "1c845dc6e77f27888fa66c8521df4d1d30f3ccf6892e8c1ba0aab4db24e717c1",
+        strip_prefix = "github.com/RaduBerinde/btree@v1.0.2-0.20250415192849-8beea01764ce",
+        urls = [
+            "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/RaduBerinde/btree/com_github_raduberinde_btree-v1.0.2-0.20250415192849-8beea01764ce.zip",
+        ],
+    )
     go_repository(
         name = "com_github_rcrowley_go_metrics",
         build_file_proto_mode = "disable_global",
diff --git a/build/bazelutil/distdir_files.bzl b/build/bazelutil/distdir_files.bzl
@@ -206,6 +206,7 @@ DISTDIR_FILES = {
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/PuerkitoBio/purell/com_github_puerkitobio_purell-v1.1.1.zip": "59e636760d7f2ab41c2f80c1784b1c73d381d44888d1999228dedd634ddcf5ed",
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/PuerkitoBio/urlesc/com_github_puerkitobio_urlesc-v0.0.0-20170810143723-de5bf2ad4578.zip": "1793124273dd94e7089e95716d40529bcf70b9e87162d60218f68dde4d6aeb9d",
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/RaduBerinde/axisds/com_github_raduberinde_axisds-v0.0.0-20250405232732-ecb85bedf677.zip": "53a2821f7d7cc76e91278e457d5f58bc5a856c7968d4170435dac86f2d003a87",
+    "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/RaduBerinde/btree/com_github_raduberinde_btree-v1.0.2-0.20250415192849-8beea01764ce.zip": "1c845dc6e77f27888fa66c8521df4d1d30f3ccf6892e8c1ba0aab4db24e717c1",
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/SAP/go-hdb/com_github_sap_go_hdb-v0.14.1.zip": "273de28a254c39e9f24293b864c1d664488e4a5d44d535755a5e5b68ae7eed8d",
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/Shopify/goreferrer/com_github_shopify_goreferrer-v0.0.0-20220729165902-8cddb4f5de06.zip": "280a2f55812e8b475cfd9d467a3b3d5859315788e68592a8fc5d6cedadc0503f",
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/Shopify/logrus-bugsnag/com_github_shopify_logrus_bugsnag-v0.0.0-20171204204709-577dee27f20d.zip": "a4cc3fa4b7b493b36b96ea035caa7afcf7307b0c4efc5e523a46597e171b95ce",
diff --git a/go.mod b/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
+	github.com/google/btree v1.1.3 // indirect
 	github.com/google/pprof v0.0.0-20240227163752-401108e1b7e7
 	github.com/google/uuid v1.6.0 // indirect
 	google.golang.org/api v0.114.0
@@ -103,6 +103,7 @@ require (
 	github.com/MichaelTJones/walk v0.0.0-20161122175330-4748e29d5718
 	github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46
 	github.com/PuerkitoBio/goquery v1.5.1
+	github.com/RaduBerinde/btree v1.0.2-0.20250415192849-8beea01764ce
 	github.com/VividCortex/ewma v1.1.1
 	github.com/alessio/shellescape v1.4.1
 	github.com/andy-kimball/arenaskl v0.0.0-20200617143215-f701008588b9
diff --git a/go.sum b/go.sum
@@ -264,6 +264,8 @@ github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdko
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
 github.com/RaduBerinde/axisds v0.0.0-20250405232732-ecb85bedf677 h1:NofOMIO/Z3301wDc9gIM/M0/+YjvOYSvUe7+30bkxkA=
 github.com/RaduBerinde/axisds v0.0.0-20250405232732-ecb85bedf677/go.mod h1:YO26VdZg1RVVjEhjmeEJE/4bLnD2mowj5eDiZQSLtlE=
+github.com/RaduBerinde/btree v1.0.2-0.20250415192849-8beea01764ce h1:jmg1o6EkSTLFQ4vdTBzob5AjFBzNH4ELn56iKhMVk48=
+github.com/RaduBerinde/btree v1.0.2-0.20250415192849-8beea01764ce/go.mod h1:1+GykKoq3bIUWDVjNWWxWYblBduYahx5NGepZjgYqvI=
 github.com/SAP/go-hdb v0.14.1/go.mod h1:7fdQLVC2lER3urZLjZCm0AuMQfApof92n3aylBPEkMo=
 github.com/Shopify/goreferrer v0.0.0-20181106222321-ec9c9a553398/go.mod h1:a1uqRtAwp2Xwc6WNPJEufxJ7fx3npB4UV/JOLmbu5I0=
 github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ=
diff --git a/pkg/ccl/changefeedccl/BUILD.bazel b/pkg/ccl/changefeedccl/BUILD.bazel
@@ -165,12 +165,12 @@ go_library(
         "@com_github_cockroachdb_redact//:redact",
         "@com_github_gogo_protobuf//jsonpb",
         "@com_github_gogo_protobuf//types",
-        "@com_github_google_btree//:btree",
         "@com_github_ibm_sarama//:sarama",
         "@com_github_klauspost_compress//zstd",
         "@com_github_klauspost_pgzip//:pgzip",
         "@com_github_lib_pq//:pq",
         "@com_github_linkedin_goavro_v2//:goavro",
+        "@com_github_raduberinde_btree//:btree",
         "@com_github_rcrowley_go_metrics//:go-metrics",
         "@com_github_twmb_franz_go//pkg/kerr",
         "@com_github_twmb_franz_go//pkg/kgo",
diff --git a/pkg/ccl/changefeedccl/sink_cloudstorage.go b/pkg/ccl/changefeedccl/sink_cloudstorage.go
@@ -18,6 +18,7 @@ import (
 	"sync/atomic"
 	"time"
 
+	"github.com/RaduBerinde/btree" // TODO(#144504): switch to the newer btree
 	"github.com/cockroachdb/cockroach/pkg/base"
 	"github.com/cockroachdb/cockroach/pkg/ccl/changefeedccl/changefeedbase"
 	"github.com/cockroachdb/cockroach/pkg/ccl/changefeedccl/kvevent"
@@ -34,7 +35,6 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/util/log/logcrash"
 	"github.com/cockroachdb/cockroach/pkg/util/timeutil"
 	"github.com/cockroachdb/errors"
-	"github.com/google/btree"
 	// Placeholder for pgzip and zdstd.
 	_ "github.com/klauspost/compress/zstd"
 	_ "github.com/klauspost/pgzip"
diff --git a/pkg/ccl/sqlproxyccl/acl/BUILD.bazel b/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",
     ],
 )
@@ -48,9 +48,9 @@ go_test(
         "//pkg/util/stop",
         "//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",
         "@com_github_stretchr_testify//require",
         "@in_gopkg_yaml_v2//:yaml_v2",
     ],
diff --git a/pkg/ccl/sqlproxyccl/acl/watcher.go b/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
diff --git a/pkg/ccl/sqlproxyccl/acl/watcher_test.go b/pkg/ccl/sqlproxyccl/acl/watcher_test.go
@@ -11,6 +11,7 @@ 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"
@@ -19,7 +20,6 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/util/leaktest"
 	"github.com/cockroachdb/cockroach/pkg/util/stop"
 	"github.com/cockroachdb/errors"
-	"github.com/google/btree"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/pkg/kv/kvclient/kvcoord/BUILD.bazel b/pkg/kv/kvclient/kvcoord/BUILD.bazel
@@ -98,7 +98,7 @@ go_library(
         "@com_github_cockroachdb_logtags//:logtags",
         "@com_github_cockroachdb_redact//:redact",
         "@com_github_gogo_protobuf//proto",
-        "@com_github_google_btree//:btree",
+        "@com_github_raduberinde_btree//:btree",
         "@io_opentelemetry_go_otel//attribute",
     ],
 )
diff --git a/pkg/kv/kvclient/kvcoord/txn_interceptor_pipeliner.go b/pkg/kv/kvclient/kvcoord/txn_interceptor_pipeliner.go
@@ -10,6 +10,7 @@ import (
 	"math"
 	"sort"
 
+	gbtree "github.com/RaduBerinde/btree" // TODO(#144504): switch to the newer btree
 	"github.com/cockroachdb/cockroach/pkg/kv/kvpb"
 	"github.com/cockroachdb/cockroach/pkg/kv/kvserver/concurrency/lock"
 	"github.com/cockroachdb/cockroach/pkg/roachpb"
@@ -21,7 +22,6 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/util/log"
 	"github.com/cockroachdb/errors"
 	"github.com/cockroachdb/redact"
-	gbtree "github.com/google/btree"
 )
 
 // The degree of the inFlightWrites btree.
diff --git a/pkg/kv/kvserver/BUILD.bazel b/pkg/kv/kvserver/BUILD.bazel
@@ -260,10 +260,10 @@ go_library(
         "@com_github_cockroachdb_pebble//vfs",
         "@com_github_cockroachdb_redact//:redact",
         "@com_github_gogo_protobuf//proto",
-        "@com_github_google_btree//:btree",
         "@com_github_kr_pretty//:pretty",
         "@com_github_prometheus_client_golang//prometheus",
         "@com_github_prometheus_client_model//go",
+        "@com_github_raduberinde_btree//:btree",
         "@io_opentelemetry_go_otel//attribute",
         "@org_golang_google_grpc//:grpc",
         "@org_golang_x_time//rate",
@@ -571,12 +571,12 @@ go_test(
         "@com_github_cockroachdb_redact//:redact",
         "@com_github_dustin_go_humanize//:go-humanize",
         "@com_github_gogo_protobuf//proto",
-        "@com_github_google_btree//:btree",
         "@com_github_jackc_pgx_v5//:pgx",
         "@com_github_kr_pretty//:pretty",
         "@com_github_lib_pq//:pq",
         "@com_github_olekukonko_tablewriter//:tablewriter",
         "@com_github_prometheus_common//expfmt",
+        "@com_github_raduberinde_btree//:btree",
         "@com_github_stretchr_testify//assert",
         "@com_github_stretchr_testify//require",
         "@org_golang_google_grpc//:grpc",
diff --git a/pkg/kv/kvserver/asim/state/BUILD.bazel b/pkg/kv/kvserver/asim/state/BUILD.bazel
@@ -42,7 +42,7 @@ go_library(
         "//pkg/util/metric",
         "//pkg/util/stop",
         "//pkg/util/timeutil",
-        "@com_github_google_btree//:btree",
+        "@com_github_raduberinde_btree//:btree",
         "@org_golang_google_protobuf//proto",
     ],
 )
diff --git a/pkg/kv/kvserver/asim/state/change.go b/pkg/kv/kvserver/asim/state/change.go
@@ -9,10 +9,10 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/RaduBerinde/btree" // TODO(#144504): switch to the newer btree
 	"github.com/cockroachdb/cockroach/pkg/kv/kvpb"
 	"github.com/cockroachdb/cockroach/pkg/kv/kvserver"
 	"github.com/cockroachdb/cockroach/pkg/roachpb"
-	"github.com/google/btree"
 )
 
 // Change is a state change for a range, to a target store that has some delay.
diff --git a/pkg/kv/kvserver/asim/state/impl.go b/pkg/kv/kvserver/asim/state/impl.go
@@ -17,6 +17,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/RaduBerinde/btree" // TODO(#144504): switch to the newer btree
 	"github.com/cockroachdb/cockroach/pkg/kv/kvserver"
 	"github.com/cockroachdb/cockroach/pkg/kv/kvserver/allocator"
 	"github.com/cockroachdb/cockroach/pkg/kv/kvserver/allocator/allocatorimpl"
@@ -33,7 +34,6 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/spanconfig/spanconfigreporter"
 	"github.com/cockroachdb/cockroach/pkg/util/hlc"
 	"github.com/cockroachdb/cockroach/pkg/util/timeutil"
-	"github.com/google/btree"
 )
 
 type state struct {
diff --git a/pkg/kv/kvserver/replica_placeholder.go b/pkg/kv/kvserver/replica_placeholder.go
@@ -9,8 +9,8 @@ import (
 	"fmt"
 	"sync/atomic"
 
+	"github.com/RaduBerinde/btree" // TODO(#144504): switch to the newer btree
 	"github.com/cockroachdb/cockroach/pkg/roachpb"
-	"github.com/google/btree"
 )
 
 // ReplicaPlaceholder represents a "lock" of a part of the keyspace on a given
diff --git a/pkg/kv/kvserver/scanner_test.go b/pkg/kv/kvserver/scanner_test.go
@@ -11,6 +11,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/RaduBerinde/btree" // TODO(#144504): switch to the newer btree
 	"github.com/cockroachdb/cockroach/pkg/roachpb"
 	"github.com/cockroachdb/cockroach/pkg/storage/enginepb"
 	"github.com/cockroachdb/cockroach/pkg/testutils"
@@ -21,7 +22,6 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/util/syncutil"
 	"github.com/cockroachdb/cockroach/pkg/util/timeutil"
 	"github.com/cockroachdb/errors"
-	"github.com/google/btree"
 )
 
 func makeAmbCtx() log.AmbientContext {
diff --git a/pkg/kv/kvserver/store_replica_btree.go b/pkg/kv/kvserver/store_replica_btree.go
@@ -8,11 +8,11 @@ package kvserver
 import (
 	"context"
 
+	"github.com/RaduBerinde/btree" // TODO(#144504): switch to the newer btree
 	"github.com/cockroachdb/cockroach/pkg/roachpb"
 	"github.com/cockroachdb/cockroach/pkg/util/iterutil"
 	"github.com/cockroachdb/errors"
 	"github.com/cockroachdb/redact"
-	"github.com/google/btree"
 )
 
 // IterationOrder specifies the order in which replicas will be iterated through
diff --git a/pkg/sql/catalog/nstree/BUILD.bazel b/pkg/sql/catalog/nstree/BUILD.bazel
@@ -30,7 +30,7 @@ go_library(
         "//pkg/util/hlc",
         "//pkg/util/iterutil",
         "@com_github_cockroachdb_errors//:errors",
-        "@com_github_google_btree//:btree",
+        "@com_github_raduberinde_btree//:btree",
     ],
 )
 
diff --git a/pkg/sql/catalog/nstree/by_id.go b/pkg/sql/catalog/nstree/by_id.go
@@ -8,8 +8,8 @@ package nstree
 import (
 	"sync"
 
+	"github.com/RaduBerinde/btree" // TODO(#144504): switch to the newer btree
 	"github.com/cockroachdb/cockroach/pkg/sql/catalog/descpb"
-	"github.com/google/btree"
 )
 
 func (t byIDMap) len() int {
diff --git a/pkg/sql/catalog/nstree/by_id_map.go b/pkg/sql/catalog/nstree/by_id_map.go
@@ -6,9 +6,9 @@
 package nstree
 
 import (
+	"github.com/RaduBerinde/btree" // TODO(#144504): switch to the newer btree
 	"github.com/cockroachdb/cockroach/pkg/sql/catalog"
 	"github.com/cockroachdb/cockroach/pkg/sql/catalog/descpb"
-	"github.com/google/btree"
 )
 
 type byIDMap struct {
diff --git a/pkg/sql/catalog/nstree/by_name.go b/pkg/sql/catalog/nstree/by_name.go
@@ -8,9 +8,9 @@ package nstree
 import (
 	"sync"
 
+	"github.com/RaduBerinde/btree" // TODO(#144504): switch to the newer btree
 	"github.com/cockroachdb/cockroach/pkg/sql/catalog"
 	"github.com/cockroachdb/cockroach/pkg/sql/catalog/descpb"
-	"github.com/google/btree"
 )
 
 type byNameItem struct {
diff --git a/pkg/sql/catalog/nstree/by_name_map.go b/pkg/sql/catalog/nstree/by_name_map.go
@@ -6,9 +6,9 @@
 package nstree
 
 import (
+	"github.com/RaduBerinde/btree" // TODO(#144504): switch to the newer btree
 	"github.com/cockroachdb/cockroach/pkg/sql/catalog"
 	"github.com/cockroachdb/cockroach/pkg/sql/catalog/descpb"
-	"github.com/google/btree"
 )
 
 type byNameMap struct {
diff --git a/pkg/sql/catalog/nstree/set.go b/pkg/sql/catalog/nstree/set.go
@@ -6,8 +6,8 @@
 package nstree
 
 import (
+	"github.com/RaduBerinde/btree" // TODO(#144504): switch to the newer btree
 	"github.com/cockroachdb/cockroach/pkg/sql/catalog"
-	"github.com/google/btree"
 )
 
 // Set is a set of namespace keys. Safe for use without initialization.
diff --git a/pkg/sql/catalog/nstree/tree.go b/pkg/sql/catalog/nstree/tree.go
@@ -10,8 +10,8 @@ package nstree
 import (
 	"sync"
 
+	"github.com/RaduBerinde/btree" // TODO(#144504): switch to the newer btree
 	"github.com/cockroachdb/cockroach/pkg/util/iterutil"
-	"github.com/google/btree"
 )
 
 type item interface {
diff --git a/pkg/sql/schemachanger/rel/BUILD.bazel b/pkg/sql/schemachanger/rel/BUILD.bazel
@@ -41,7 +41,7 @@ go_library(
         "//pkg/util/timeutil",
         "//pkg/util/uuid",
         "@com_github_cockroachdb_errors//:errors",
-        "@com_github_google_btree//:btree",
+        "@com_github_raduberinde_btree//:btree",
         "@in_gopkg_yaml_v2//:yaml_v2",
         "@in_gopkg_yaml_v3//:yaml_v3",
     ],
diff --git a/pkg/sql/schemachanger/rel/database.go b/pkg/sql/schemachanger/rel/database.go
@@ -8,9 +8,9 @@ package rel
 import (
 	"reflect"
 
+	"github.com/RaduBerinde/btree" // TODO(#144504): switch to the newer btree
 	"github.com/cockroachdb/cockroach/pkg/util/iterutil"
 	"github.com/cockroachdb/errors"
-	"github.com/google/btree"
 )
 
 // Database is a data structure for indexing entities.
diff --git a/pkg/sql/schemachanger/rel/database_items.go b/pkg/sql/schemachanger/rel/database_items.go
@@ -8,7 +8,7 @@ package rel
 import (
 	"sync"
 
-	"github.com/google/btree"
+	"github.com/RaduBerinde/btree" // TODO(#144504): switch to the newer btree
 )
 
 // valuesItem is used to construct query bounds from the tree.
diff --git a/pkg/sql/schemachanger/scplan/internal/scgraph/BUILD.bazel b/pkg/sql/schemachanger/scplan/internal/scgraph/BUILD.bazel
@@ -21,7 +21,7 @@ go_library(
         "//pkg/util/iterutil",
         "@com_github_cockroachdb_errors//:errors",
         "@com_github_cockroachdb_redact//:redact",
-        "@com_github_google_btree//:btree",
+        "@com_github_raduberinde_btree//:btree",
     ],
 )
 
diff --git a/pkg/sql/schemachanger/scplan/internal/scgraph/dep_edge_tree.go b/pkg/sql/schemachanger/scplan/internal/scgraph/dep_edge_tree.go
@@ -8,11 +8,11 @@ package scgraph
 import (
 	"sync"
 
+	"github.com/RaduBerinde/btree" // TODO(#144504): switch to the newer btree
 	"github.com/cockroachdb/cockroach/pkg/sql/schemachanger/scpb"
 	"github.com/cockroachdb/cockroach/pkg/sql/schemachanger/screl"
 	"github.com/cockroachdb/cockroach/pkg/util/iterutil"
 	"github.com/cockroachdb/errors"
-	"github.com/google/btree"
 )
 
 // edgeTreeOrder order in which the edge tree is sorted,
diff --git a/pkg/sql/tests/BUILD.bazel b/pkg/sql/tests/BUILD.bazel
@@ -146,13 +146,13 @@ go_test(
         "@com_github_cockroachdb_cockroach_go_v2//crdb/crdbpgxv5",
         "@com_github_cockroachdb_datadriven//:datadriven",
         "@com_github_cockroachdb_errors//:errors",
-        "@com_github_google_btree//:btree",
         "@com_github_google_pprof//profile",
         "@com_github_jackc_pgx_v5//:pgx",
         "@com_github_jackc_pgx_v5//pgconn",
         "@com_github_kr_pretty//:pretty",
         "@com_github_lib_pq//:pq",
         "@com_github_petermattis_goid//:goid",
+        "@com_github_raduberinde_btree//:btree",
         "@com_github_stretchr_testify//assert",
         "@com_github_stretchr_testify//require",
         "@org_golang_x_sync//errgroup",
diff --git a/pkg/sql/tests/enum_test.go b/pkg/sql/tests/enum_test.go
diff --git a/pkg/util/metric/aggmetric/BUILD.bazel b/pkg/util/metric/aggmetric/BUILD.bazel
diff --git a/pkg/util/metric/aggmetric/agg_metric.go b/pkg/util/metric/aggmetric/agg_metric.go

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ go_library(`
`98`	`98`	`"@com_github_cockroachdb_logtags//:logtags",`
`99`	`99`	`"@com_github_cockroachdb_redact//:redact",`
`100`	`100`	`"@com_github_gogo_protobuf//proto",`
`101`		`- "@com_github_google_btree//:btree",`
	`101`	`+ "@com_github_raduberinde_btree//:btree",`
`102`	`102`	`"@io_opentelemetry_go_otel//attribute",`
`103`	`103`	`],`
`104`	`104`	`)`