storage: move ConfigureForSharedStorage

Move ConfigureForSharedStorage out of the deprecated engineccl package.

Epic: none
Release note: none

Author: jbowens

pkg/ccl/storageccl/engineccl/BUILD.bazel

@@ -26,7 +26,6 @@ go_library(
         "@com_github_cockroachdb_errors//:errors",
         "@com_github_cockroachdb_errors//oserror",
         "@com_github_cockroachdb_pebble//:pebble",
-        "@com_github_cockroachdb_pebble//objstorage/remote",
         "@com_github_cockroachdb_pebble//rangekey",
         "@com_github_cockroachdb_pebble//vfs",
         "@com_github_cockroachdb_pebble//vfs/atomicfs",

pkg/ccl/storageccl/engineccl/shared_storage.go

@@ -15,19 +15,9 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/storage"
 	"github.com/cockroachdb/cockroach/pkg/util/uuid"
 	"github.com/cockroachdb/pebble"
-	"github.com/cockroachdb/pebble/objstorage/remote"
 	"github.com/cockroachdb/pebble/rangekey"
 )
 
-func configureForSharedStorage(opts *pebble.Options, remoteStorage remote.Storage) error {
-	opts.Experimental.RemoteStorage = remote.MakeSimpleFactory(map[remote.Locator]remote.Storage{
-		"": remoteStorage,
-	})
-	opts.Experimental.CreateOnShared = remote.CreateOnSharedLower
-	opts.Experimental.CreateOnSharedLocator = ""
-	return nil
-}
-
 // iterateReplicaKeySpansShared iterates over the range's user key span,
 // skipping any keys present in shared files. It calls the appropriate visitor
 // function for the type of key visited, namely, point keys, range deletes and
@@ -75,6 +65,5 @@ func iterateReplicaKeySpansShared(
 }
 
 func init() {
-	storage.ConfigureForSharedStorage = configureForSharedStorage
 	rditer.IterateReplicaKeySpansShared = iterateReplicaKeySpansShared
 }

pkg/storage/pebble.go

@@ -848,10 +848,6 @@ func (r remoteStorageAdaptor) CreateStorage(locator remote.Locator) (remote.Stor
 	return &externalStorageWrapper{p: r.p, ctx: r.ctx, es: es}, err
 }
 
-// ConfigureForSharedStorage is used to configure a pebble Options for shared
-// storage.
-var ConfigureForSharedStorage func(opts *pebble.Options, storage remote.Storage) error
-
 // newPebble creates a new Pebble instance, at the specified path.
 // Do not use directly (except in test); use Open instead.
 //
@@ -1064,9 +1060,6 @@ func newPebble(ctx context.Context, cfg engineConfig) (p *Pebble, err error) {
 	// in it is needed for CRDB to function properly.
 	if cfg.sharedStorage != nil {
 		esWrapper := &externalStorageWrapper{p: p, es: cfg.sharedStorage, ctx: logCtx}
-		if ConfigureForSharedStorage == nil {
-			return nil, errors.New("shared storage requires CCL features")
-		}
 		if err := ConfigureForSharedStorage(cfg.opts, esWrapper); err != nil {
 			return nil, errors.Wrap(err, "error when configuring shared storage")
 		}

pkg/storage/shared_storage.go

@@ -12,9 +12,21 @@ import (
 
 	"github.com/cockroachdb/cockroach/pkg/cloud"
 	"github.com/cockroachdb/errors"
+	"github.com/cockroachdb/pebble"
 	"github.com/cockroachdb/pebble/objstorage/remote"
 )
 
+// ConfigureForSharedStorage mutates the provided Pebble options to use shared
+// storage using the provided remote storage.
+func ConfigureForSharedStorage(opts *pebble.Options, remoteStorage remote.Storage) error {
+	opts.Experimental.RemoteStorage = remote.MakeSimpleFactory(map[remote.Locator]remote.Storage{
+		"": remoteStorage,
+	})
+	opts.Experimental.CreateOnShared = remote.CreateOnSharedLower
+	opts.Experimental.CreateOnSharedLocator = ""
+	return nil
+}
+
 // externalStorageReader implements remote.ObjectReader on top of
 // cloud.ExternalStorage..
 type externalStorageReader struct {