Skip to content

Commit

Permalink
engine: Goland-rename to storage
Browse files Browse the repository at this point in the history 
No manual edits.

Release note: None
  • Loading branch information
@tbg
tbg committed Mar 4, 2020
1 parent ca5a834 commit 6c7b80e
Show file tree
Hide file tree
Showing 322 changed files with 1,781 additions and 1,779 deletions.
6 changes: 3 additions & 3 deletions pkg/ccl/changefeedccl/changefeed_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ import (
"github.com/cockroachdb/cockroach/pkg/ccl/changefeedccl/cdctest"
"github.com/cockroachdb/cockroach/pkg/ccl/changefeedccl/changefeedbase"
"github.com/cockroachdb/cockroach/pkg/ccl/utilccl"
"github.com/cockroachdb/cockroach/pkg/engine"
"github.com/cockroachdb/cockroach/pkg/internal/client"
"github.com/cockroachdb/cockroach/pkg/jobs"
"github.com/cockroachdb/cockroach/pkg/jobs/jobspb"
Expand All @@ -39,6 +38,7 @@ import (
"github.com/cockroachdb/cockroach/pkg/server/telemetry"
"github.com/cockroachdb/cockroach/pkg/sql/execinfra"
"github.com/cockroachdb/cockroach/pkg/sql/sqlbase"
"github.com/cockroachdb/cockroach/pkg/storage"
"github.com/cockroachdb/cockroach/pkg/testutils"
"github.com/cockroachdb/cockroach/pkg/testutils/serverutils"
"github.com/cockroachdb/cockroach/pkg/testutils/sqlutils"
Expand Down Expand Up @@ -821,12 +821,12 @@ func fetchDescVersionModificationTime(
t.Fatal(pErr.GoError())
}
for _, file := range res.(*roachpb.ExportResponse).Files {
it, err := engine.NewMemSSTIterator(file.SST, false /* verify */)
it, err := storage.NewMemSSTIterator(file.SST, false /* verify */)
if err != nil {
t.Fatal(err)
}
defer it.Close()
for it.SeekGE(engine.NilKey); ; it.Next() {
for it.SeekGE(storage.NilKey); ; it.Next() {
if ok, err := it.Valid(); err != nil {
t.Fatal(err)
} else if !ok {
Expand Down
2 changes: 1 addition & 1 deletion pkg/ccl/changefeedccl/kvfeed/scanner.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ import (
"sync/atomic"
"time"

"github.com/cockroachdb/cockroach/pkg/engine/enginepb"
"github.com/cockroachdb/cockroach/pkg/gossip"
"github.com/cockroachdb/cockroach/pkg/internal/client"
"github.com/cockroachdb/cockroach/pkg/keys"
"github.com/cockroachdb/cockroach/pkg/kv/kvserver"
"github.com/cockroachdb/cockroach/pkg/roachpb"
"github.com/cockroachdb/cockroach/pkg/settings/cluster"
"github.com/cockroachdb/cockroach/pkg/sql/covering"
"github.com/cockroachdb/cockroach/pkg/storage/enginepb"
"github.com/cockroachdb/cockroach/pkg/util/ctxgroup"
"github.com/cockroachdb/cockroach/pkg/util/hlc"
"github.com/cockroachdb/cockroach/pkg/util/log"
Expand Down
6 changes: 3 additions & 3 deletions pkg/ccl/changefeedccl/schemafeed/schema_feed.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ import (
"time"

"github.com/cockroachdb/cockroach/pkg/ccl/changefeedccl/changefeedbase"
"github.com/cockroachdb/cockroach/pkg/engine"
"github.com/cockroachdb/cockroach/pkg/internal/client"
"github.com/cockroachdb/cockroach/pkg/jobs/jobspb"
"github.com/cockroachdb/cockroach/pkg/keys"
"github.com/cockroachdb/cockroach/pkg/roachpb"
"github.com/cockroachdb/cockroach/pkg/settings/cluster"
"github.com/cockroachdb/cockroach/pkg/sql"
"github.com/cockroachdb/cockroach/pkg/sql/sqlbase"
"github.com/cockroachdb/cockroach/pkg/storage"
"github.com/cockroachdb/cockroach/pkg/util/encoding"
"github.com/cockroachdb/cockroach/pkg/util/hlc"
"github.com/cockroachdb/cockroach/pkg/util/log"
Expand Down Expand Up @@ -479,12 +479,12 @@ func fetchTableDescriptorVersions(
var tableDescs []*sqlbase.TableDescriptor
for _, file := range res.(*roachpb.ExportResponse).Files {
if err := func() error {
it, err := engine.NewMemSSTIterator(file.SST, false /* verify */)
it, err := storage.NewMemSSTIterator(file.SST, false /* verify */)
if err != nil {
return err
}
defer it.Close()
for it.SeekGE(engine.NilKey); ; it.Next() {
for it.SeekGE(storage.NilKey); ; it.Next() {
if ok, err := it.Valid(); err != nil {
return err
} else if !ok {
Expand Down
2 changes: 1 addition & 1 deletion pkg/ccl/cliccl/debug.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"github.com/cockroachdb/cockroach/pkg/ccl/cliccl/cliflagsccl"
"github.com/cockroachdb/cockroach/pkg/ccl/storageccl/engineccl/enginepbccl"
"github.com/cockroachdb/cockroach/pkg/cli"
"github.com/cockroachdb/cockroach/pkg/engine/enginepb"
"github.com/cockroachdb/cockroach/pkg/storage/enginepb"
"github.com/cockroachdb/cockroach/pkg/util/protoutil"
"github.com/cockroachdb/cockroach/pkg/util/stop"
"github.com/cockroachdb/cockroach/pkg/util/timeutil"
Expand Down
2 changes: 1 addition & 1 deletion pkg/ccl/cmdccl/enc_utils/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"path/filepath"

"github.com/cockroachdb/cockroach/pkg/ccl/storageccl/engineccl/enginepbccl"
"github.com/cockroachdb/cockroach/pkg/engine/enginepb"
"github.com/cockroachdb/cockroach/pkg/storage/enginepb"
"github.com/cockroachdb/cockroach/pkg/util/log"
"github.com/cockroachdb/cockroach/pkg/util/protoutil"
"github.com/pkg/errors"
Expand Down
2 changes: 1 addition & 1 deletion pkg/ccl/followerreadsccl/followerreads_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ import (
"time"

"github.com/cockroachdb/cockroach/pkg/ccl/utilccl"
"github.com/cockroachdb/cockroach/pkg/engine/enginepb"
"github.com/cockroachdb/cockroach/pkg/internal/client"
"github.com/cockroachdb/cockroach/pkg/kv/kvserver"
"github.com/cockroachdb/cockroach/pkg/roachpb"
"github.com/cockroachdb/cockroach/pkg/rpc"
"github.com/cockroachdb/cockroach/pkg/settings/cluster"
"github.com/cockroachdb/cockroach/pkg/sql/physicalplan/replicaoracle"
"github.com/cockroachdb/cockroach/pkg/storage/enginepb"
"github.com/cockroachdb/cockroach/pkg/testutils"
"github.com/cockroachdb/cockroach/pkg/util/hlc"
"github.com/cockroachdb/cockroach/pkg/util/leaktest"
Expand Down
8 changes: 4 additions & 4 deletions pkg/ccl/importccl/bench_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ import (
"github.com/cockroachdb/cockroach/pkg/base"
"github.com/cockroachdb/cockroach/pkg/ccl/importccl"
"github.com/cockroachdb/cockroach/pkg/ccl/workloadccl/format"
"github.com/cockroachdb/cockroach/pkg/engine"
"github.com/cockroachdb/cockroach/pkg/keys"
"github.com/cockroachdb/cockroach/pkg/roachpb"
"github.com/cockroachdb/cockroach/pkg/server"
"github.com/cockroachdb/cockroach/pkg/sql/row"
"github.com/cockroachdb/cockroach/pkg/sql/sem/tree"
"github.com/cockroachdb/cockroach/pkg/sql/sessiondata"
"github.com/cockroachdb/cockroach/pkg/sql/sqlbase"
"github.com/cockroachdb/cockroach/pkg/storage"
"github.com/cockroachdb/cockroach/pkg/testutils"
"github.com/cockroachdb/cockroach/pkg/testutils/serverutils"
"github.com/cockroachdb/cockroach/pkg/util/ctxgroup"
Expand Down Expand Up @@ -91,16 +91,16 @@ func benchmarkWriteAndLink(b *testing.B, dir string, tables []tableSSTable) {
b.SetBytes(bytes)

ctx := context.Background()
cache := engine.NewRocksDBCache(server.DefaultCacheSize)
cache := storage.NewRocksDBCache(server.DefaultCacheSize)
defer cache.Release()

b.ResetTimer()
for i := 0; i < b.N; i++ {
b.StopTimer()
cfg := engine.RocksDBConfig{
cfg := storage.RocksDBConfig{
StorageConfig: base.StorageConfig{
Dir: filepath.Join(dir, `rocksdb`, timeutil.Now().String())}}
db, err := engine.NewRocksDB(cfg, cache)
db, err := storage.NewRocksDB(cfg, cache)
if err != nil {
b.Fatal(err)
}
Expand Down
14 changes: 7 additions & 7 deletions pkg/ccl/importccl/load.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import (
"github.com/cockroachdb/cockroach/pkg/blobs"
"github.com/cockroachdb/cockroach/pkg/ccl/backupccl"
"github.com/cockroachdb/cockroach/pkg/config/zonepb"
"github.com/cockroachdb/cockroach/pkg/engine"
"github.com/cockroachdb/cockroach/pkg/internal/client"
"github.com/cockroachdb/cockroach/pkg/keys"
"github.com/cockroachdb/cockroach/pkg/kv/kvserver/cloud"
Expand All @@ -33,6 +32,7 @@ import (
"github.com/cockroachdb/cockroach/pkg/sql/sem/transform"
"github.com/cockroachdb/cockroach/pkg/sql/sem/tree"
"github.com/cockroachdb/cockroach/pkg/sql/sqlbase"
"github.com/cockroachdb/cockroach/pkg/storage"
"github.com/cockroachdb/cockroach/pkg/util/hlc"
"github.com/cockroachdb/cockroach/pkg/util/log"
"github.com/cockroachdb/cockroach/pkg/util/protoutil"
Expand Down Expand Up @@ -143,7 +143,7 @@ func Load(
var tableDesc *sqlbase.ImmutableTableDescriptor
var tableName string
var prevKey roachpb.Key
var kvs []engine.MVCCKeyValue
var kvs []storage.MVCCKeyValue
var kvBytes int64
backup := backupccl.BackupManifest{
Descriptors: []sqlbase.Descriptor{
Expand Down Expand Up @@ -250,8 +250,8 @@ func Load(
}
prevKey = kv.Key
kvBytes += int64(len(kv.Key) + len(kv.Value.RawBytes))
kvs = append(kvs, engine.MVCCKeyValue{
Key: engine.MVCCKey{Key: kv.Key, Timestamp: kv.Value.Timestamp},
kvs = append(kvs, storage.MVCCKeyValue{
Key: storage.MVCCKey{Key: kv.Key, Timestamp: kv.Value.Timestamp},
Value: kv.Value.RawBytes,
})
})
Expand Down Expand Up @@ -376,7 +376,7 @@ func writeSST(
backup *backupccl.BackupManifest,
base cloud.ExternalStorage,
tempPrefix string,
kvs []engine.MVCCKeyValue,
kvs []storage.MVCCKeyValue,
ts hlc.Timestamp,
) error {
if len(kvs) == 0 {
Expand All @@ -386,8 +386,8 @@ func writeSST(
filename := fmt.Sprintf("load-%d.sst", rand.Int63())
log.Info(ctx, "writesst ", filename)

sstFile := &engine.MemFile{}
sst := engine.MakeBackupSSTWriter(sstFile)
sstFile := &storage.MemFile{}
sst := storage.MakeBackupSSTWriter(sstFile)
defer sst.Close()
for _, kv := range kvs {
kv.Key.Timestamp = ts
Expand Down
8 changes: 4 additions & 4 deletions pkg/ccl/storageccl/bench_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ import (

"github.com/cockroachdb/cockroach/pkg/base"
"github.com/cockroachdb/cockroach/pkg/ccl/utilccl/sampledataccl"
"github.com/cockroachdb/cockroach/pkg/engine"
"github.com/cockroachdb/cockroach/pkg/internal/client"
"github.com/cockroachdb/cockroach/pkg/keys"
"github.com/cockroachdb/cockroach/pkg/kv/kvserver/cloud"
"github.com/cockroachdb/cockroach/pkg/roachpb"
"github.com/cockroachdb/cockroach/pkg/sql/sqlbase"
"github.com/cockroachdb/cockroach/pkg/storage"
"github.com/cockroachdb/cockroach/pkg/testutils"
"github.com/cockroachdb/cockroach/pkg/testutils/testcluster"
"github.com/cockroachdb/cockroach/pkg/util/hlc"
Expand Down Expand Up @@ -54,8 +54,8 @@ func BenchmarkAddSSTable(b *testing.B) {
b.StopTimer()
b.ResetTimer()
for i := 0; i < b.N; i++ {
sstFile := &engine.MemFile{}
sst := engine.MakeBackupSSTWriter(sstFile)
sstFile := &storage.MemFile{}
sst := storage.MakeBackupSSTWriter(sstFile)

id++
backup.ResetKeyValueIteration()
Expand Down Expand Up @@ -107,7 +107,7 @@ func BenchmarkWriteBatch(b *testing.B) {
kvDB := tc.Server(0).DB()

id := sqlbase.ID(keys.MinUserDescID)
var batch engine.RocksDBBatchBuilder
var batch storage.RocksDBBatchBuilder

var totalLen int64
b.StopTimer()
Expand Down
26 changes: 13 additions & 13 deletions pkg/ccl/storageccl/engineccl/bench_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ import (
"testing"

"github.com/cockroachdb/cockroach/pkg/base"
"github.com/cockroachdb/cockroach/pkg/engine"
"github.com/cockroachdb/cockroach/pkg/roachpb"
"github.com/cockroachdb/cockroach/pkg/settings/cluster"
"github.com/cockroachdb/cockroach/pkg/storage"
"github.com/cockroachdb/cockroach/pkg/testutils"
"github.com/cockroachdb/cockroach/pkg/util/encoding"
"github.com/cockroachdb/cockroach/pkg/util/hlc"
Expand All @@ -43,22 +43,22 @@ import (
// whether to use a temporary or permanent location.
func loadTestData(
dir string, numKeys, numBatches, batchTimeSpan, valueBytes int,
) (engine.Engine, error) {
) (storage.Engine, error) {
ctx := context.Background()

exists := true
if _, err := os.Stat(dir); os.IsNotExist(err) {
exists = false
}

eng, err := engine.NewRocksDB(
engine.RocksDBConfig{
eng, err := storage.NewRocksDB(
storage.RocksDBConfig{
StorageConfig: base.StorageConfig{
Settings: cluster.MakeTestingClusterSettings(),
Dir: dir,
},
},
engine.RocksDBCache{},
storage.RocksDBCache{},
)
if err != nil {
return nil, err
Expand All @@ -84,7 +84,7 @@ func loadTestData(
sstTimestamps[i] = int64((i + 1) * batchTimeSpan)
}

var batch engine.Batch
var batch storage.Batch
var minWallTime int64
for i, key := range keys {
if scaled := len(keys) / numBatches; (i % scaled) == 0 {
Expand All @@ -104,7 +104,7 @@ func loadTestData(
timestamp := hlc.Timestamp{WallTime: minWallTime + rand.Int63n(int64(batchTimeSpan))}
value := roachpb.MakeValueFromBytes(randutil.RandBytes(rng, valueBytes))
value.InitChecksum(key)
if err := engine.MVCCPut(ctx, batch, nil, key, timestamp, value, nil); err != nil {
if err := storage.MVCCPut(ctx, batch, nil, key, timestamp, value, nil); err != nil {
return nil, err
}
}
Expand All @@ -125,7 +125,7 @@ func loadTestData(
func runIterate(
b *testing.B,
loadFactor float32,
makeIterator func(engine.Engine, hlc.Timestamp, hlc.Timestamp) engine.Iterator,
makeIterator func(storage.Engine, hlc.Timestamp, hlc.Timestamp) storage.Iterator,
) {
const numKeys = 100000
const numBatches = 100
Expand All @@ -149,7 +149,7 @@ func runIterate(
endTime := hlc.Timestamp{WallTime: int64(loadFactor * numBatches * batchTimeSpan)}
it := makeIterator(eng, startTime, endTime)
defer it.Close()
for it.SeekGE(engine.MVCCKey{}); ; it.Next() {
for it.SeekGE(storage.MVCCKey{}); ; it.Next() {
if ok, err := it.Valid(); !ok {
if err != nil {
b.Fatal(err)
Expand All @@ -170,13 +170,13 @@ func BenchmarkTimeBoundIterate(b *testing.B) {
for _, loadFactor := range []float32{1.0, 0.5, 0.1, 0.05, 0.0} {
b.Run(fmt.Sprintf("LoadFactor=%.2f", loadFactor), func(b *testing.B) {
b.Run("NormalIterator", func(b *testing.B) {
runIterate(b, loadFactor, func(e engine.Engine, _, _ hlc.Timestamp) engine.Iterator {
return e.NewIterator(engine.IterOptions{UpperBound: roachpb.KeyMax})
runIterate(b, loadFactor, func(e storage.Engine, _, _ hlc.Timestamp) storage.Iterator {
return e.NewIterator(storage.IterOptions{UpperBound: roachpb.KeyMax})
})
})
b.Run("TimeBoundIterator", func(b *testing.B) {
runIterate(b, loadFactor, func(e engine.Engine, startTime, endTime hlc.Timestamp) engine.Iterator {
return e.NewIterator(engine.IterOptions{
runIterate(b, loadFactor, func(e storage.Engine, startTime, endTime hlc.Timestamp) storage.Iterator {
return e.NewIterator(storage.IterOptions{
MinTimestampHint: startTime,
MaxTimestampHint: endTime,
UpperBound: roachpb.KeyMax,
Expand Down
2 changes: 1 addition & 1 deletion pkg/ccl/storageccl/engineccl/ctr_stream.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"fmt"

"github.com/cockroachdb/cockroach/pkg/ccl/storageccl/engineccl/enginepbccl"
"github.com/cockroachdb/cockroach/pkg/engine/enginepb"
"github.com/cockroachdb/cockroach/pkg/storage/enginepb"
)

// FileCipherStreamCreator wraps the KeyManager interface and provides functions to create a
Expand Down
2 changes: 1 addition & 1 deletion pkg/ccl/storageccl/engineccl/ctr_stream_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"testing"

"github.com/cockroachdb/cockroach/pkg/ccl/storageccl/engineccl/enginepbccl"
"github.com/cockroachdb/cockroach/pkg/engine/enginepb"
"github.com/cockroachdb/cockroach/pkg/storage/enginepb"
"github.com/cockroachdb/cockroach/pkg/util/leaktest"
"github.com/kr/pretty"
"github.com/stretchr/testify/require"
Expand Down
12 changes: 6 additions & 6 deletions pkg/ccl/storageccl/engineccl/encrypted_fs.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (

"github.com/cockroachdb/cockroach/pkg/ccl/baseccl"
"github.com/cockroachdb/cockroach/pkg/ccl/storageccl/engineccl/enginepbccl"
"github.com/cockroachdb/cockroach/pkg/engine"
"github.com/cockroachdb/cockroach/pkg/engine/enginepb"
"github.com/cockroachdb/cockroach/pkg/storage"
"github.com/cockroachdb/cockroach/pkg/storage/enginepb"
"github.com/cockroachdb/cockroach/pkg/util/protoutil"
"github.com/cockroachdb/cockroach/pkg/util/syncutil"
"github.com/cockroachdb/pebble/vfs"
Expand Down Expand Up @@ -107,7 +107,7 @@ func (f *encryptedFile) ReadAt(p []byte, off int64) (n int, err error) {
// encryptedFS implements vfs.FS.
type encryptedFS struct {
vfs.FS
fileRegistry *engine.PebbleFileRegistry
fileRegistry *storage.PebbleFileRegistry
streamCreator *FileCipherStreamCreator
}

Expand Down Expand Up @@ -255,7 +255,7 @@ func (e *encryptionStatsHandler) GetKeyIDFromSettings(settings []byte) (string,

// Init initializes engine.NewEncryptedEncFunc.
func init() {
engine.NewEncryptedEnvFunc = newEncryptedEnv
storage.NewEncryptedEnvFunc = newEncryptedEnv
}

// newEncryptedEnv creates an encrypted environment and returns the vfs.FS to use for reading and
Expand All @@ -264,8 +264,8 @@ func init() {
//
// See the comment at the top of this file for the structure of this environment.
func newEncryptedEnv(
fs vfs.FS, fr *engine.PebbleFileRegistry, dbDir string, readOnly bool, optionBytes []byte,
) (vfs.FS, engine.EncryptionStatsHandler, error) {
fs vfs.FS, fr *storage.PebbleFileRegistry, dbDir string, readOnly bool, optionBytes []byte,
) (vfs.FS, storage.EncryptionStatsHandler, error) {
options := &baseccl.EncryptionOptions{}
if err := protoutil.Unmarshal(optionBytes, options); err != nil {
return nil, nil, err
Expand Down
Loading

0 comments on commit 6c7b80e

Please sign in to comment.