rolemembershipcache: extract cache to new package

The caching logic was getting to be quite large, and it already was nicely contained in an easy to move struct. This is a purely mechanical refactor. Release note: None
cockroachdb · Dec 2, 2024 · a63a689 · a63a689
1 parent fd2fec8
commit a63a689
Show file tree

Hide file tree

Showing 8 changed files with 447 additions and 385 deletions.
diff --git a/pkg/BUILD.bazel b/pkg/BUILD.bazel
@@ -2103,6 +2103,7 @@ GO_TARGETS = [
     "//pkg/sql/regionliveness:regionliveness",
     "//pkg/sql/regions:regions",
     "//pkg/sql/regions:regions_test",
+    "//pkg/sql/rolemembershipcache:rolemembershipcache",
     "//pkg/sql/roleoption:roleoption",
     "//pkg/sql/row:row",
     "//pkg/sql/row:row_test",

diff --git a/pkg/server/BUILD.bazel b/pkg/server/BUILD.bazel
@@ -246,6 +246,7 @@ go_library(
         "//pkg/sql/privilege",
         "//pkg/sql/querycache",
         "//pkg/sql/rangeprober",
+        "//pkg/sql/rolemembershipcache",
         "//pkg/sql/roleoption",
         "//pkg/sql/scheduledlogging",
         "//pkg/sql/schemachanger/scdeps",

diff --git a/pkg/server/server_sql.go b/pkg/server/server_sql.go
@@ -89,6 +89,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/sql/pgwire"
 	"github.com/cockroachdb/cockroach/pkg/sql/querycache"
 	"github.com/cockroachdb/cockroach/pkg/sql/rangeprober"
+	"github.com/cockroachdb/cockroach/pkg/sql/rolemembershipcache"
 	"github.com/cockroachdb/cockroach/pkg/sql/scheduledlogging"
 	"github.com/cockroachdb/cockroach/pkg/sql/schemachanger/scdeps"
 	"github.com/cockroachdb/cockroach/pkg/sql/schemachanger/scexec"
@@ -983,8 +984,8 @@ func newSQLServer(ctx context.Context, cfg sqlServerArgs) (*SQLServer, error) {
 		VirtualSchemas:          virtualSchemas,
 		HistogramWindowInterval: cfg.HistogramWindowInterval(),
 		RangeDescriptorCache:    cfg.distSender.RangeDescriptorCache(),
-		RoleMemberCache: sql.NewMembershipCache(
-			serverCacheMemoryMonitor.MakeBoundAccount(), cfg.stopper,
+		RoleMemberCache: rolemembershipcache.NewMembershipCache(
+			serverCacheMemoryMonitor.MakeBoundAccount(), cfg.internalDB, cfg.stopper,
 		),
 		SequenceCacheNode: sessiondatapb.NewSequenceCacheNode(),
 		SessionInitCache: sessioninit.NewCache(

diff --git a/pkg/sql/BUILD.bazel b/pkg/sql/BUILD.bazel
@@ -435,7 +435,6 @@ go_library(
         "//pkg/sql/isql",
         "//pkg/sql/lex",
         "//pkg/sql/lexbase",
-        "//pkg/sql/memsize",
         "//pkg/sql/mutations",
         "//pkg/sql/oidext",
         "//pkg/sql/opt",
@@ -469,6 +468,7 @@ go_library(
         "//pkg/sql/querycache",
         "//pkg/sql/regionliveness",
         "//pkg/sql/regions",
+        "//pkg/sql/rolemembershipcache",
         "//pkg/sql/roleoption",
         "//pkg/sql/row",
         "//pkg/sql/rowcontainer",
@@ -587,7 +587,6 @@ go_library(
         "//pkg/util/startup",
         "//pkg/util/stop",
         "//pkg/util/syncutil",
-        "//pkg/util/syncutil/singleflight",
         "//pkg/util/timeutil",
         "//pkg/util/timeutil/pgdate",
         "//pkg/util/tochar",