kvserverbase: move MaxCommandSizeDefault out of kvserver

``` $ bazel query "somepath(//pkg/sql, //pkg/kv/kvserver)" INFO: Empty results Loading: 0 packages loaded ``` Release justification: non-production code changes Release note: None
cockroachdb · Mar 15, 2022 · eea3500 · eea3500
1 parent 87a3366
commit eea3500
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/pkg/kv/kvserver/kvserverbase/base.go b/pkg/kv/kvserver/kvserverbase/base.go
@@ -223,3 +223,7 @@ var SplitByLoadMergeDelay = settings.RegisterDurationSetting(
 		return nil
 	},
 )
+
+// MaxCommandSizeDefault is the default for the kv.raft.command.max_size
+// cluster setting.
+const MaxCommandSizeDefault = 64 << 20
diff --git a/pkg/kv/kvserver/replica.go b/pkg/kv/kvserver/replica.go
@@ -93,17 +93,14 @@ const (
 	// MaxCommandSizeFloor is the minimum allowed value for the
 	// kv.raft.command.max_size cluster setting.
 	MaxCommandSizeFloor = 4 << 20 // 4MB
-	// MaxCommandSizeDefault is the default for the kv.raft.command.max_size
-	// cluster setting.
-	MaxCommandSizeDefault = 64 << 20
 )
 
 // MaxCommandSize wraps "kv.raft.command.max_size".
 var MaxCommandSize = settings.RegisterByteSizeSetting(
 	settings.TenantWritable,
 	"kv.raft.command.max_size",
 	"maximum size of a raft command",
-	MaxCommandSizeDefault,
+	kvserverbase.MaxCommandSizeDefault,
 	func(size int64) error {
 		if size < MaxCommandSizeFloor {
 			return fmt.Errorf("max_size must be greater than %s", humanizeutil.IBytes(MaxCommandSizeFloor))

diff --git a/pkg/sql/row/BUILD.bazel b/pkg/sql/row/BUILD.bazel
@@ -30,8 +30,8 @@ go_library(
         "//pkg/keys",
         "//pkg/kv",
         "//pkg/kv/kvclient/kvstreamer",
-        "//pkg/kv/kvserver",
         "//pkg/kv/kvserver/concurrency/lock",
+        "//pkg/kv/kvserver/kvserverbase",
         "//pkg/roachpb",
         "//pkg/settings",
         "//pkg/settings/cluster",

diff --git a/pkg/sql/row/helper.go b/pkg/sql/row/helper.go
@@ -16,7 +16,7 @@ import (
 
 	"github.com/cockroachdb/cockroach/pkg/keys"
 	"github.com/cockroachdb/cockroach/pkg/kv"
-	"github.com/cockroachdb/cockroach/pkg/kv/kvserver"
+	"github.com/cockroachdb/cockroach/pkg/kv/kvserver/kvserverbase"
 	"github.com/cockroachdb/cockroach/pkg/roachpb"
 	"github.com/cockroachdb/cockroach/pkg/settings"
 	"github.com/cockroachdb/cockroach/pkg/sql/catalog"
@@ -48,7 +48,7 @@ var maxRowSizeLog = settings.RegisterByteSizeSetting(
 	"maximum size of row (or column family if multiple column families are in use) that SQL can "+
 		"write to the database, above which an event is logged to SQL_PERF (or SQL_INTERNAL_PERF "+
 		"if the mutating statement was internal); use 0 to disable",
-	kvserver.MaxCommandSizeDefault,
+	kvserverbase.MaxCommandSizeDefault,
 	func(size int64) error {
 		if size != 0 && size < maxRowSizeFloor {
 			return errors.Newf(