diff --git a/etcdutl/etcdutl/backup_command.go b/etcdutl/etcdutl/backup_command.go index 045d1e7a7be..7fc59436208 100644 --- a/etcdutl/etcdutl/backup_command.go +++ b/etcdutl/etcdutl/backup_command.go @@ -31,8 +31,8 @@ import ( "go.etcd.io/etcd/server/v3/etcdserver/api/membership" "go.etcd.io/etcd/server/v3/etcdserver/api/snap" "go.etcd.io/etcd/server/v3/etcdserver/api/v2store" - "go.etcd.io/etcd/server/v3/mvcc/backend" - "go.etcd.io/etcd/server/v3/mvcc/buckets" + "go.etcd.io/etcd/server/v3/storage/backend" + "go.etcd.io/etcd/server/v3/storage/buckets" "go.etcd.io/etcd/server/v3/verify" "go.etcd.io/etcd/server/v3/wal" "go.etcd.io/etcd/server/v3/wal/walpb" diff --git a/etcdutl/etcdutl/defrag_command.go b/etcdutl/etcdutl/defrag_command.go index 231d9e034e0..67880c0c269 100644 --- a/etcdutl/etcdutl/defrag_command.go +++ b/etcdutl/etcdutl/defrag_command.go @@ -22,7 +22,7 @@ import ( "github.com/spf13/cobra" "go.etcd.io/etcd/pkg/v3/cobrautl" "go.etcd.io/etcd/server/v3/datadir" - "go.etcd.io/etcd/server/v3/mvcc/backend" + "go.etcd.io/etcd/server/v3/storage/backend" ) var ( diff --git a/etcdutl/snapshot/v3_snapshot.go b/etcdutl/snapshot/v3_snapshot.go index 07886d0f637..fe86cc1af04 100644 --- a/etcdutl/snapshot/v3_snapshot.go +++ b/etcdutl/snapshot/v3_snapshot.go @@ -40,8 +40,8 @@ import ( "go.etcd.io/etcd/server/v3/etcdserver/api/snap" "go.etcd.io/etcd/server/v3/etcdserver/api/v2store" "go.etcd.io/etcd/server/v3/etcdserver/cindex" - "go.etcd.io/etcd/server/v3/mvcc/backend" - "go.etcd.io/etcd/server/v3/mvcc/buckets" + "go.etcd.io/etcd/server/v3/storage/backend" + "go.etcd.io/etcd/server/v3/storage/buckets" "go.etcd.io/etcd/server/v3/verify" "go.etcd.io/etcd/server/v3/wal" "go.etcd.io/etcd/server/v3/wal/walpb" diff --git a/server/auth/range_perm_cache.go b/server/auth/range_perm_cache.go index 9fccd1158df..f4d0a1a925f 100644 --- a/server/auth/range_perm_cache.go +++ b/server/auth/range_perm_cache.go @@ -17,8 +17,8 @@ package auth import ( "go.etcd.io/etcd/api/v3/authpb" "go.etcd.io/etcd/pkg/v3/adt" - "go.etcd.io/etcd/server/v3/mvcc/backend" - "go.etcd.io/etcd/server/v3/mvcc/buckets" + "go.etcd.io/etcd/server/v3/storage/backend" + "go.etcd.io/etcd/server/v3/storage/buckets" "go.uber.org/zap" ) diff --git a/server/auth/store.go b/server/auth/store.go index 53f0aab10d9..05d0160497f 100644 --- a/server/auth/store.go +++ b/server/auth/store.go @@ -28,8 +28,8 @@ import ( "go.etcd.io/etcd/api/v3/authpb" pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" - "go.etcd.io/etcd/server/v3/mvcc/backend" - "go.etcd.io/etcd/server/v3/mvcc/buckets" + "go.etcd.io/etcd/server/v3/storage/backend" + "go.etcd.io/etcd/server/v3/storage/buckets" "go.uber.org/zap" "golang.org/x/crypto/bcrypt" diff --git a/server/auth/store_test.go b/server/auth/store_test.go index 4b1778268d1..c84692e9398 100644 --- a/server/auth/store_test.go +++ b/server/auth/store_test.go @@ -27,8 +27,8 @@ import ( "go.etcd.io/etcd/api/v3/authpb" pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" - "go.etcd.io/etcd/server/v3/mvcc/backend" - betesting "go.etcd.io/etcd/server/v3/mvcc/backend/testing" + "go.etcd.io/etcd/server/v3/storage/backend" + betesting "go.etcd.io/etcd/server/v3/storage/backend/testing" "go.uber.org/zap" "golang.org/x/crypto/bcrypt" diff --git a/server/etcdserver/api/v3alarm/alarms.go b/server/etcdserver/api/v3alarm/alarms.go index 5f565158a07..1cda05071d9 100644 --- a/server/etcdserver/api/v3alarm/alarms.go +++ b/server/etcdserver/api/v3alarm/alarms.go @@ -20,8 +20,8 @@ import ( pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/client/pkg/v3/types" - "go.etcd.io/etcd/server/v3/mvcc/backend" - "go.etcd.io/etcd/server/v3/mvcc/buckets" + "go.etcd.io/etcd/server/v3/storage/backend" + "go.etcd.io/etcd/server/v3/storage/buckets" "go.uber.org/zap" ) diff --git a/server/etcdserver/api/v3compactor/periodic.go b/server/etcdserver/api/v3compactor/periodic.go index 083c72ede24..218076c01d1 100644 --- a/server/etcdserver/api/v3compactor/periodic.go +++ b/server/etcdserver/api/v3compactor/periodic.go @@ -20,7 +20,7 @@ import ( "time" pb "go.etcd.io/etcd/api/v3/etcdserverpb" - "go.etcd.io/etcd/server/v3/mvcc" + "go.etcd.io/etcd/server/v3/storage/mvcc" "github.com/jonboulle/clockwork" "go.uber.org/zap" diff --git a/server/etcdserver/api/v3compactor/revision.go b/server/etcdserver/api/v3compactor/revision.go index 83be6279478..37492f2b4d5 100644 --- a/server/etcdserver/api/v3compactor/revision.go +++ b/server/etcdserver/api/v3compactor/revision.go @@ -20,7 +20,7 @@ import ( "time" pb "go.etcd.io/etcd/api/v3/etcdserverpb" - "go.etcd.io/etcd/server/v3/mvcc" + "go.etcd.io/etcd/server/v3/storage/mvcc" "github.com/jonboulle/clockwork" "go.uber.org/zap" diff --git a/server/etcdserver/api/v3rpc/maintenance.go b/server/etcdserver/api/v3rpc/maintenance.go index 82085c54673..02b2ac8745d 100644 --- a/server/etcdserver/api/v3rpc/maintenance.go +++ b/server/etcdserver/api/v3rpc/maintenance.go @@ -27,9 +27,9 @@ import ( "go.etcd.io/etcd/raft/v3" "go.etcd.io/etcd/server/v3/auth" "go.etcd.io/etcd/server/v3/etcdserver" - "go.etcd.io/etcd/server/v3/mvcc" - "go.etcd.io/etcd/server/v3/mvcc/backend" - "go.etcd.io/etcd/server/v3/mvcc/buckets" + "go.etcd.io/etcd/server/v3/storage/backend" + "go.etcd.io/etcd/server/v3/storage/buckets" + "go.etcd.io/etcd/server/v3/storage/mvcc" "go.uber.org/zap" ) diff --git a/server/etcdserver/api/v3rpc/util.go b/server/etcdserver/api/v3rpc/util.go index f61fae03b96..373d430e24f 100644 --- a/server/etcdserver/api/v3rpc/util.go +++ b/server/etcdserver/api/v3rpc/util.go @@ -24,7 +24,7 @@ import ( "go.etcd.io/etcd/server/v3/etcdserver" "go.etcd.io/etcd/server/v3/etcdserver/api/membership" "go.etcd.io/etcd/server/v3/lease" - "go.etcd.io/etcd/server/v3/mvcc" + "go.etcd.io/etcd/server/v3/storage/mvcc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/server/etcdserver/api/v3rpc/util_test.go b/server/etcdserver/api/v3rpc/util_test.go index d7f5a3ce92f..3ffbbbb8cdb 100644 --- a/server/etcdserver/api/v3rpc/util_test.go +++ b/server/etcdserver/api/v3rpc/util_test.go @@ -20,7 +20,7 @@ import ( "testing" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" - "go.etcd.io/etcd/server/v3/mvcc" + "go.etcd.io/etcd/server/v3/storage/mvcc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/server/etcdserver/api/v3rpc/watch.go b/server/etcdserver/api/v3rpc/watch.go index c56ec4b26e7..b8466354b1e 100644 --- a/server/etcdserver/api/v3rpc/watch.go +++ b/server/etcdserver/api/v3rpc/watch.go @@ -26,7 +26,7 @@ import ( "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/server/v3/auth" "go.etcd.io/etcd/server/v3/etcdserver" - "go.etcd.io/etcd/server/v3/mvcc" + "go.etcd.io/etcd/server/v3/storage/mvcc" "go.uber.org/zap" ) diff --git a/server/etcdserver/apply.go b/server/etcdserver/apply.go index 5a77ef37734..5235d61cd8d 100644 --- a/server/etcdserver/apply.go +++ b/server/etcdserver/apply.go @@ -32,7 +32,7 @@ import ( "go.etcd.io/etcd/server/v3/etcdserver/api" "go.etcd.io/etcd/server/v3/etcdserver/api/membership" "go.etcd.io/etcd/server/v3/lease" - "go.etcd.io/etcd/server/v3/mvcc" + "go.etcd.io/etcd/server/v3/storage/mvcc" "github.com/gogo/protobuf/proto" "go.uber.org/zap" diff --git a/server/etcdserver/apply_auth.go b/server/etcdserver/apply_auth.go index 74fd2b4fc37..bf043aa731b 100644 --- a/server/etcdserver/apply_auth.go +++ b/server/etcdserver/apply_auth.go @@ -23,7 +23,7 @@ import ( "go.etcd.io/etcd/server/v3/auth" "go.etcd.io/etcd/server/v3/etcdserver/api/membership" "go.etcd.io/etcd/server/v3/lease" - "go.etcd.io/etcd/server/v3/mvcc" + "go.etcd.io/etcd/server/v3/storage/mvcc" ) type authApplierV3 struct { diff --git a/server/etcdserver/backend.go b/server/etcdserver/backend.go index 3e95a8ccb89..885a5e54a88 100644 --- a/server/etcdserver/backend.go +++ b/server/etcdserver/backend.go @@ -22,8 +22,8 @@ import ( "go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/etcd/server/v3/config" "go.etcd.io/etcd/server/v3/etcdserver/api/snap" - "go.etcd.io/etcd/server/v3/mvcc/backend" - "go.etcd.io/etcd/server/v3/mvcc/buckets" + "go.etcd.io/etcd/server/v3/storage/backend" + "go.etcd.io/etcd/server/v3/storage/buckets" "go.uber.org/zap" ) diff --git a/server/etcdserver/bootstrap.go b/server/etcdserver/bootstrap.go index 959a2723b0f..831577c7024 100644 --- a/server/etcdserver/bootstrap.go +++ b/server/etcdserver/bootstrap.go @@ -41,8 +41,8 @@ import ( "go.etcd.io/etcd/server/v3/etcdserver/api/v2discovery" "go.etcd.io/etcd/server/v3/etcdserver/api/v2store" "go.etcd.io/etcd/server/v3/etcdserver/cindex" - "go.etcd.io/etcd/server/v3/mvcc/backend" - "go.etcd.io/etcd/server/v3/mvcc/buckets" + "go.etcd.io/etcd/server/v3/storage/backend" + "go.etcd.io/etcd/server/v3/storage/buckets" "go.etcd.io/etcd/server/v3/wal" "go.etcd.io/etcd/server/v3/wal/walpb" ) diff --git a/server/etcdserver/cindex/cindex.go b/server/etcdserver/cindex/cindex.go index 492178a5fac..c73abd73762 100644 --- a/server/etcdserver/cindex/cindex.go +++ b/server/etcdserver/cindex/cindex.go @@ -18,8 +18,8 @@ import ( "sync" "sync/atomic" - "go.etcd.io/etcd/server/v3/mvcc/backend" - "go.etcd.io/etcd/server/v3/mvcc/buckets" + "go.etcd.io/etcd/server/v3/storage/backend" + "go.etcd.io/etcd/server/v3/storage/buckets" ) type Backend interface { diff --git a/server/etcdserver/cindex/cindex_test.go b/server/etcdserver/cindex/cindex_test.go index 8a57fac7b58..36d48b00b69 100644 --- a/server/etcdserver/cindex/cindex_test.go +++ b/server/etcdserver/cindex/cindex_test.go @@ -20,9 +20,9 @@ import ( "time" "github.com/stretchr/testify/assert" - "go.etcd.io/etcd/server/v3/mvcc/backend" - betesting "go.etcd.io/etcd/server/v3/mvcc/backend/testing" - "go.etcd.io/etcd/server/v3/mvcc/buckets" + "go.etcd.io/etcd/server/v3/storage/backend" + betesting "go.etcd.io/etcd/server/v3/storage/backend/testing" + "go.etcd.io/etcd/server/v3/storage/buckets" ) // TestConsistentIndex ensures that LoadConsistentIndex/Save/ConsistentIndex and backend.BatchTx can work well together. diff --git a/server/etcdserver/corrupt.go b/server/etcdserver/corrupt.go index 3a4bab6d5c4..bc1b4674ae0 100644 --- a/server/etcdserver/corrupt.go +++ b/server/etcdserver/corrupt.go @@ -28,7 +28,7 @@ import ( "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/client/pkg/v3/types" "go.etcd.io/etcd/pkg/v3/traceutil" - "go.etcd.io/etcd/server/v3/mvcc" + "go.etcd.io/etcd/server/v3/storage/mvcc" "go.uber.org/zap" ) diff --git a/server/etcdserver/server.go b/server/etcdserver/server.go index dd1f73300aa..54f76fb0dea 100644 --- a/server/etcdserver/server.go +++ b/server/etcdserver/server.go @@ -62,9 +62,9 @@ import ( serverversion "go.etcd.io/etcd/server/v3/etcdserver/version" "go.etcd.io/etcd/server/v3/lease" "go.etcd.io/etcd/server/v3/lease/leasehttp" - "go.etcd.io/etcd/server/v3/mvcc" - "go.etcd.io/etcd/server/v3/mvcc/backend" - "go.etcd.io/etcd/server/v3/mvcc/buckets" + "go.etcd.io/etcd/server/v3/storage/backend" + "go.etcd.io/etcd/server/v3/storage/buckets" + "go.etcd.io/etcd/server/v3/storage/mvcc" ) const ( diff --git a/server/etcdserver/server_test.go b/server/etcdserver/server_test.go index e6499b5d1bf..d0230e02f64 100644 --- a/server/etcdserver/server_test.go +++ b/server/etcdserver/server_test.go @@ -51,9 +51,9 @@ import ( "go.etcd.io/etcd/server/v3/mock/mockstorage" "go.etcd.io/etcd/server/v3/mock/mockstore" "go.etcd.io/etcd/server/v3/mock/mockwait" - "go.etcd.io/etcd/server/v3/mvcc" - betesting "go.etcd.io/etcd/server/v3/mvcc/backend/testing" - "go.etcd.io/etcd/server/v3/mvcc/buckets" + betesting "go.etcd.io/etcd/server/v3/storage/backend/testing" + "go.etcd.io/etcd/server/v3/storage/buckets" + "go.etcd.io/etcd/server/v3/storage/mvcc" "go.uber.org/zap" "go.uber.org/zap/zaptest" ) diff --git a/server/etcdserver/snapshot_merge.go b/server/etcdserver/snapshot_merge.go index 72d10c1796d..74c823b6211 100644 --- a/server/etcdserver/snapshot_merge.go +++ b/server/etcdserver/snapshot_merge.go @@ -19,7 +19,7 @@ import ( "go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/etcd/server/v3/etcdserver/api/snap" - "go.etcd.io/etcd/server/v3/mvcc/backend" + "go.etcd.io/etcd/server/v3/storage/backend" humanize "github.com/dustin/go-humanize" "go.uber.org/zap" diff --git a/server/etcdserver/v3_server.go b/server/etcdserver/v3_server.go index 442288a6ee2..c0bb5ac7eee 100644 --- a/server/etcdserver/v3_server.go +++ b/server/etcdserver/v3_server.go @@ -30,7 +30,7 @@ import ( "go.etcd.io/etcd/server/v3/etcdserver/api/membership" "go.etcd.io/etcd/server/v3/lease" "go.etcd.io/etcd/server/v3/lease/leasehttp" - "go.etcd.io/etcd/server/v3/mvcc" + "go.etcd.io/etcd/server/v3/storage/mvcc" "github.com/gogo/protobuf/proto" "go.uber.org/zap" diff --git a/server/etcdserver/version/version.go b/server/etcdserver/version/version.go index 4caa94b5965..d498abf00fb 100644 --- a/server/etcdserver/version/version.go +++ b/server/etcdserver/version/version.go @@ -20,8 +20,8 @@ import ( "github.com/coreos/go-semver/semver" "go.uber.org/zap" - "go.etcd.io/etcd/server/v3/mvcc/backend" - "go.etcd.io/etcd/server/v3/mvcc/buckets" + "go.etcd.io/etcd/server/v3/storage/backend" + "go.etcd.io/etcd/server/v3/storage/buckets" ) var ( diff --git a/server/etcdserver/version/version_test.go b/server/etcdserver/version/version_test.go index 405aa2b563a..6b82b712003 100644 --- a/server/etcdserver/version/version_test.go +++ b/server/etcdserver/version/version_test.go @@ -22,9 +22,9 @@ import ( "github.com/stretchr/testify/assert" "go.etcd.io/etcd/api/v3/version" "go.etcd.io/etcd/raft/v3/raftpb" - "go.etcd.io/etcd/server/v3/mvcc/backend" - betesting "go.etcd.io/etcd/server/v3/mvcc/backend/testing" - "go.etcd.io/etcd/server/v3/mvcc/buckets" + "go.etcd.io/etcd/server/v3/storage/backend" + betesting "go.etcd.io/etcd/server/v3/storage/backend/testing" + "go.etcd.io/etcd/server/v3/storage/buckets" "go.uber.org/zap" ) diff --git a/server/lease/leasehttp/http_test.go b/server/lease/leasehttp/http_test.go index ada3d3a2e2a..4fb8fd7eb79 100644 --- a/server/lease/leasehttp/http_test.go +++ b/server/lease/leasehttp/http_test.go @@ -22,7 +22,7 @@ import ( "time" "go.etcd.io/etcd/server/v3/lease" - betesting "go.etcd.io/etcd/server/v3/mvcc/backend/testing" + betesting "go.etcd.io/etcd/server/v3/storage/backend/testing" "go.uber.org/zap/zaptest" ) diff --git a/server/lease/lessor.go b/server/lease/lessor.go index 666fa746020..676c32fe1b9 100644 --- a/server/lease/lessor.go +++ b/server/lease/lessor.go @@ -26,8 +26,8 @@ import ( pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/server/v3/lease/leasepb" - "go.etcd.io/etcd/server/v3/mvcc/backend" - "go.etcd.io/etcd/server/v3/mvcc/buckets" + "go.etcd.io/etcd/server/v3/storage/backend" + "go.etcd.io/etcd/server/v3/storage/buckets" "go.uber.org/zap" ) diff --git a/server/lease/lessor_bench_test.go b/server/lease/lessor_bench_test.go index 06feec810c5..570663deb2d 100644 --- a/server/lease/lessor_bench_test.go +++ b/server/lease/lessor_bench_test.go @@ -19,7 +19,7 @@ import ( "testing" "time" - betesting "go.etcd.io/etcd/server/v3/mvcc/backend/testing" + betesting "go.etcd.io/etcd/server/v3/storage/backend/testing" "go.uber.org/zap" ) diff --git a/server/lease/lessor_test.go b/server/lease/lessor_test.go index ef421aa395c..f62af386d47 100644 --- a/server/lease/lessor_test.go +++ b/server/lease/lessor_test.go @@ -27,8 +27,8 @@ import ( "time" pb "go.etcd.io/etcd/api/v3/etcdserverpb" - "go.etcd.io/etcd/server/v3/mvcc/backend" - "go.etcd.io/etcd/server/v3/mvcc/buckets" + "go.etcd.io/etcd/server/v3/storage/backend" + "go.etcd.io/etcd/server/v3/storage/buckets" "go.uber.org/zap" ) diff --git a/server/proxy/grpcproxy/watcher.go b/server/proxy/grpcproxy/watcher.go index 5f6c3db8084..a15edda8847 100644 --- a/server/proxy/grpcproxy/watcher.go +++ b/server/proxy/grpcproxy/watcher.go @@ -20,7 +20,7 @@ import ( pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/client/v3" - "go.etcd.io/etcd/server/v3/mvcc" + "go.etcd.io/etcd/server/v3/storage/mvcc" ) type watchRange struct { diff --git a/server/mvcc/backend/backend.go b/server/storage/backend/backend.go similarity index 100% rename from server/mvcc/backend/backend.go rename to server/storage/backend/backend.go diff --git a/server/mvcc/backend/backend_bench_test.go b/server/storage/backend/backend_bench_test.go similarity index 92% rename from server/mvcc/backend/backend_bench_test.go rename to server/storage/backend/backend_bench_test.go index 7bfae653178..950707658fb 100644 --- a/server/mvcc/backend/backend_bench_test.go +++ b/server/storage/backend/backend_bench_test.go @@ -20,8 +20,8 @@ import ( "time" "github.com/stretchr/testify/assert" - betesting "go.etcd.io/etcd/server/v3/mvcc/backend/testing" - "go.etcd.io/etcd/server/v3/mvcc/buckets" + betesting "go.etcd.io/etcd/server/v3/storage/backend/testing" + "go.etcd.io/etcd/server/v3/storage/buckets" ) func BenchmarkBackendPut(b *testing.B) { diff --git a/server/mvcc/backend/backend_test.go b/server/storage/backend/backend_test.go similarity index 98% rename from server/mvcc/backend/backend_test.go rename to server/storage/backend/backend_test.go index af93f1ab859..c18b631891c 100644 --- a/server/mvcc/backend/backend_test.go +++ b/server/storage/backend/backend_test.go @@ -23,9 +23,9 @@ import ( "github.com/stretchr/testify/assert" bolt "go.etcd.io/bbolt" - "go.etcd.io/etcd/server/v3/mvcc/backend" - betesting "go.etcd.io/etcd/server/v3/mvcc/backend/testing" - "go.etcd.io/etcd/server/v3/mvcc/buckets" + "go.etcd.io/etcd/server/v3/storage/backend" + betesting "go.etcd.io/etcd/server/v3/storage/backend/testing" + "go.etcd.io/etcd/server/v3/storage/buckets" ) func TestBackendClose(t *testing.T) { diff --git a/server/mvcc/backend/batch_tx.go b/server/storage/backend/batch_tx.go similarity index 100% rename from server/mvcc/backend/batch_tx.go rename to server/storage/backend/batch_tx.go diff --git a/server/mvcc/backend/batch_tx_test.go b/server/storage/backend/batch_tx_test.go similarity index 96% rename from server/mvcc/backend/batch_tx_test.go rename to server/storage/backend/batch_tx_test.go index 75b377fed8e..d5e8febf36b 100644 --- a/server/mvcc/backend/batch_tx_test.go +++ b/server/storage/backend/batch_tx_test.go @@ -20,9 +20,9 @@ import ( "time" bolt "go.etcd.io/bbolt" - "go.etcd.io/etcd/server/v3/mvcc/backend" - betesting "go.etcd.io/etcd/server/v3/mvcc/backend/testing" - "go.etcd.io/etcd/server/v3/mvcc/buckets" + "go.etcd.io/etcd/server/v3/storage/backend" + betesting "go.etcd.io/etcd/server/v3/storage/backend/testing" + "go.etcd.io/etcd/server/v3/storage/buckets" ) func TestBatchTxPut(t *testing.T) { diff --git a/server/mvcc/backend/config_default.go b/server/storage/backend/config_default.go similarity index 100% rename from server/mvcc/backend/config_default.go rename to server/storage/backend/config_default.go diff --git a/server/mvcc/backend/config_linux.go b/server/storage/backend/config_linux.go similarity index 100% rename from server/mvcc/backend/config_linux.go rename to server/storage/backend/config_linux.go diff --git a/server/mvcc/backend/config_windows.go b/server/storage/backend/config_windows.go similarity index 100% rename from server/mvcc/backend/config_windows.go rename to server/storage/backend/config_windows.go diff --git a/server/mvcc/backend/doc.go b/server/storage/backend/doc.go similarity index 100% rename from server/mvcc/backend/doc.go rename to server/storage/backend/doc.go diff --git a/server/mvcc/backend/export_test.go b/server/storage/backend/export_test.go similarity index 100% rename from server/mvcc/backend/export_test.go rename to server/storage/backend/export_test.go diff --git a/server/mvcc/backend/hooks.go b/server/storage/backend/hooks.go similarity index 100% rename from server/mvcc/backend/hooks.go rename to server/storage/backend/hooks.go diff --git a/server/mvcc/backend/hooks_test.go b/server/storage/backend/hooks_test.go similarity index 95% rename from server/mvcc/backend/hooks_test.go rename to server/storage/backend/hooks_test.go index 03a90dd3d83..d1a93f8dc61 100644 --- a/server/mvcc/backend/hooks_test.go +++ b/server/storage/backend/hooks_test.go @@ -20,9 +20,9 @@ import ( "time" "github.com/stretchr/testify/assert" - "go.etcd.io/etcd/server/v3/mvcc/backend" - betesting "go.etcd.io/etcd/server/v3/mvcc/backend/testing" - "go.etcd.io/etcd/server/v3/mvcc/buckets" + "go.etcd.io/etcd/server/v3/storage/backend" + betesting "go.etcd.io/etcd/server/v3/storage/backend/testing" + "go.etcd.io/etcd/server/v3/storage/buckets" ) var ( diff --git a/server/mvcc/backend/metrics.go b/server/storage/backend/metrics.go similarity index 100% rename from server/mvcc/backend/metrics.go rename to server/storage/backend/metrics.go diff --git a/server/mvcc/backend/read_tx.go b/server/storage/backend/read_tx.go similarity index 100% rename from server/mvcc/backend/read_tx.go rename to server/storage/backend/read_tx.go diff --git a/server/mvcc/backend/testing/betesting.go b/server/storage/backend/testing/betesting.go similarity index 97% rename from server/mvcc/backend/testing/betesting.go rename to server/storage/backend/testing/betesting.go index ddf27018e7d..0e7d2267665 100644 --- a/server/mvcc/backend/testing/betesting.go +++ b/server/storage/backend/testing/betesting.go @@ -21,7 +21,7 @@ import ( "time" "github.com/stretchr/testify/assert" - "go.etcd.io/etcd/server/v3/mvcc/backend" + "go.etcd.io/etcd/server/v3/storage/backend" "go.uber.org/zap/zaptest" ) diff --git a/server/mvcc/backend/tx_buffer.go b/server/storage/backend/tx_buffer.go similarity index 100% rename from server/mvcc/backend/tx_buffer.go rename to server/storage/backend/tx_buffer.go diff --git a/server/mvcc/buckets/alarm.go b/server/storage/buckets/alarm.go similarity index 97% rename from server/mvcc/buckets/alarm.go rename to server/storage/buckets/alarm.go index 41a660fb6f1..cc3160df30e 100644 --- a/server/mvcc/buckets/alarm.go +++ b/server/storage/buckets/alarm.go @@ -16,7 +16,7 @@ package buckets import ( "go.etcd.io/etcd/api/v3/etcdserverpb" - "go.etcd.io/etcd/server/v3/mvcc/backend" + "go.etcd.io/etcd/server/v3/storage/backend" "go.uber.org/zap" ) diff --git a/server/mvcc/buckets/auth.go b/server/storage/buckets/auth.go similarity index 97% rename from server/mvcc/buckets/auth.go rename to server/storage/buckets/auth.go index 099298a95c2..950810b8233 100644 --- a/server/mvcc/buckets/auth.go +++ b/server/storage/buckets/auth.go @@ -17,7 +17,7 @@ package buckets import ( "bytes" "encoding/binary" - "go.etcd.io/etcd/server/v3/mvcc/backend" + "go.etcd.io/etcd/server/v3/storage/backend" ) const ( diff --git a/server/mvcc/buckets/auth_roles.go b/server/storage/buckets/auth_roles.go similarity index 97% rename from server/mvcc/buckets/auth_roles.go rename to server/storage/buckets/auth_roles.go index e5e1ce5c3c6..af151ada9ac 100644 --- a/server/mvcc/buckets/auth_roles.go +++ b/server/storage/buckets/auth_roles.go @@ -16,7 +16,7 @@ package buckets import ( "go.etcd.io/etcd/api/v3/authpb" - "go.etcd.io/etcd/server/v3/mvcc/backend" + "go.etcd.io/etcd/server/v3/storage/backend" "go.uber.org/zap" ) diff --git a/server/mvcc/buckets/auth_test.go b/server/storage/buckets/auth_test.go similarity index 95% rename from server/mvcc/buckets/auth_test.go rename to server/storage/buckets/auth_test.go index b2386d25c54..3390ac0ff27 100644 --- a/server/mvcc/buckets/auth_test.go +++ b/server/storage/buckets/auth_test.go @@ -21,8 +21,8 @@ import ( "time" "github.com/stretchr/testify/assert" - "go.etcd.io/etcd/server/v3/mvcc/backend" - betesting "go.etcd.io/etcd/server/v3/mvcc/backend/testing" + "go.etcd.io/etcd/server/v3/storage/backend" + betesting "go.etcd.io/etcd/server/v3/storage/backend/testing" ) // TestAuthEnabled ensures that UnsafeSaveAuthEnabled&UnsafeReadAuthEnabled work well together. diff --git a/server/mvcc/buckets/auth_users.go b/server/storage/buckets/auth_users.go similarity index 97% rename from server/mvcc/buckets/auth_users.go rename to server/storage/buckets/auth_users.go index 4544f957c14..4ae4b2d0b9a 100644 --- a/server/mvcc/buckets/auth_users.go +++ b/server/storage/buckets/auth_users.go @@ -16,7 +16,7 @@ package buckets import ( "go.etcd.io/etcd/api/v3/authpb" - "go.etcd.io/etcd/server/v3/mvcc/backend" + "go.etcd.io/etcd/server/v3/storage/backend" "go.uber.org/zap" ) diff --git a/server/mvcc/buckets/bucket.go b/server/storage/buckets/bucket.go similarity index 98% rename from server/mvcc/buckets/bucket.go rename to server/storage/buckets/bucket.go index c133a98a016..3da963e1c53 100644 --- a/server/mvcc/buckets/bucket.go +++ b/server/storage/buckets/bucket.go @@ -18,7 +18,7 @@ import ( "bytes" "go.etcd.io/etcd/client/pkg/v3/types" - "go.etcd.io/etcd/server/v3/mvcc/backend" + "go.etcd.io/etcd/server/v3/storage/backend" ) var ( diff --git a/server/mvcc/buckets/cindex.go b/server/storage/buckets/cindex.go similarity index 98% rename from server/mvcc/buckets/cindex.go rename to server/storage/buckets/cindex.go index 097a87b9e71..61922220747 100644 --- a/server/mvcc/buckets/cindex.go +++ b/server/storage/buckets/cindex.go @@ -16,7 +16,7 @@ package buckets import ( "encoding/binary" - "go.etcd.io/etcd/server/v3/mvcc/backend" + "go.etcd.io/etcd/server/v3/storage/backend" ) // UnsafeCreateMetaBucket creates the `meta` bucket (if it does not exists yet). diff --git a/server/mvcc/buckets/confstate.go b/server/storage/buckets/confstate.go similarity index 97% rename from server/mvcc/buckets/confstate.go rename to server/storage/buckets/confstate.go index 58f7d14fabc..37b2d010501 100644 --- a/server/mvcc/buckets/confstate.go +++ b/server/storage/buckets/confstate.go @@ -19,7 +19,7 @@ import ( "log" "go.etcd.io/etcd/raft/v3/raftpb" - "go.etcd.io/etcd/server/v3/mvcc/backend" + "go.etcd.io/etcd/server/v3/storage/backend" "go.uber.org/zap" ) diff --git a/server/mvcc/buckets/confstate_test.go b/server/storage/buckets/confstate_test.go similarity index 96% rename from server/mvcc/buckets/confstate_test.go rename to server/storage/buckets/confstate_test.go index e70217313b4..87f66b9258e 100644 --- a/server/mvcc/buckets/confstate_test.go +++ b/server/storage/buckets/confstate_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" "go.etcd.io/etcd/raft/v3/raftpb" - betesting "go.etcd.io/etcd/server/v3/mvcc/backend/testing" + betesting "go.etcd.io/etcd/server/v3/storage/backend/testing" "go.uber.org/zap/zaptest" ) diff --git a/server/mvcc/buckets/lease.go b/server/storage/buckets/lease.go similarity index 97% rename from server/mvcc/buckets/lease.go rename to server/storage/buckets/lease.go index 6aa40fc73ac..8ba412d59c4 100644 --- a/server/mvcc/buckets/lease.go +++ b/server/storage/buckets/lease.go @@ -19,7 +19,7 @@ import ( "math" "go.etcd.io/etcd/server/v3/lease/leasepb" - "go.etcd.io/etcd/server/v3/mvcc/backend" + "go.etcd.io/etcd/server/v3/storage/backend" ) func UnsafeCreateLeaseBucket(tx backend.BatchTx) { diff --git a/server/mvcc/buckets/membership.go b/server/storage/buckets/membership.go similarity index 99% rename from server/mvcc/buckets/membership.go rename to server/storage/buckets/membership.go index e20143fbe1b..8fdfa33dc74 100644 --- a/server/mvcc/buckets/membership.go +++ b/server/storage/buckets/membership.go @@ -20,7 +20,7 @@ import ( "go.etcd.io/etcd/client/pkg/v3/types" "go.etcd.io/etcd/server/v3/etcdserver/api/membership" - "go.etcd.io/etcd/server/v3/mvcc/backend" + "go.etcd.io/etcd/server/v3/storage/backend" "github.com/coreos/go-semver/semver" "go.uber.org/zap" diff --git a/server/mvcc/buckets/version.go b/server/storage/buckets/version.go similarity index 97% rename from server/mvcc/buckets/version.go rename to server/storage/buckets/version.go index 261e6f89109..32a9bc1a5fb 100644 --- a/server/mvcc/buckets/version.go +++ b/server/storage/buckets/version.go @@ -17,7 +17,7 @@ package buckets import ( "github.com/coreos/go-semver/semver" "go.etcd.io/bbolt" - "go.etcd.io/etcd/server/v3/mvcc/backend" + "go.etcd.io/etcd/server/v3/storage/backend" ) // ReadStorageVersion loads storage version from given backend transaction. diff --git a/server/mvcc/buckets/version_test.go b/server/storage/buckets/version_test.go similarity index 96% rename from server/mvcc/buckets/version_test.go rename to server/storage/buckets/version_test.go index cc6f6469acd..b9ea7bb9e5f 100644 --- a/server/mvcc/buckets/version_test.go +++ b/server/storage/buckets/version_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" "go.etcd.io/bbolt" - "go.etcd.io/etcd/server/v3/mvcc/backend" - "go.etcd.io/etcd/server/v3/mvcc/backend/testing" + "go.etcd.io/etcd/server/v3/storage/backend" + "go.etcd.io/etcd/server/v3/storage/backend/testing" ) // TestVersion ensures that UnsafeSetStorageVersion/UnsafeReadStorageVersion work well together. diff --git a/server/mvcc/doc.go b/server/storage/mvcc/doc.go similarity index 100% rename from server/mvcc/doc.go rename to server/storage/mvcc/doc.go diff --git a/server/mvcc/index.go b/server/storage/mvcc/index.go similarity index 100% rename from server/mvcc/index.go rename to server/storage/mvcc/index.go diff --git a/server/mvcc/index_bench_test.go b/server/storage/mvcc/index_bench_test.go similarity index 100% rename from server/mvcc/index_bench_test.go rename to server/storage/mvcc/index_bench_test.go diff --git a/server/mvcc/index_test.go b/server/storage/mvcc/index_test.go similarity index 100% rename from server/mvcc/index_test.go rename to server/storage/mvcc/index_test.go diff --git a/server/mvcc/key_index.go b/server/storage/mvcc/key_index.go similarity index 100% rename from server/mvcc/key_index.go rename to server/storage/mvcc/key_index.go diff --git a/server/mvcc/key_index_test.go b/server/storage/mvcc/key_index_test.go similarity index 100% rename from server/mvcc/key_index_test.go rename to server/storage/mvcc/key_index_test.go diff --git a/server/mvcc/kv.go b/server/storage/mvcc/kv.go similarity index 99% rename from server/mvcc/kv.go rename to server/storage/mvcc/kv.go index 79c2e687005..10c4821b146 100644 --- a/server/mvcc/kv.go +++ b/server/storage/mvcc/kv.go @@ -20,7 +20,7 @@ import ( "go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/pkg/v3/traceutil" "go.etcd.io/etcd/server/v3/lease" - "go.etcd.io/etcd/server/v3/mvcc/backend" + "go.etcd.io/etcd/server/v3/storage/backend" ) type RangeOptions struct { diff --git a/server/mvcc/kv_test.go b/server/storage/mvcc/kv_test.go similarity index 99% rename from server/mvcc/kv_test.go rename to server/storage/mvcc/kv_test.go index ad33b4041fc..f2be7f90414 100644 --- a/server/mvcc/kv_test.go +++ b/server/storage/mvcc/kv_test.go @@ -26,8 +26,8 @@ import ( "go.etcd.io/etcd/client/pkg/v3/testutil" "go.etcd.io/etcd/pkg/v3/traceutil" "go.etcd.io/etcd/server/v3/lease" - "go.etcd.io/etcd/server/v3/mvcc/backend" - betesting "go.etcd.io/etcd/server/v3/mvcc/backend/testing" + "go.etcd.io/etcd/server/v3/storage/backend" + betesting "go.etcd.io/etcd/server/v3/storage/backend/testing" "github.com/prometheus/client_golang/prometheus" dto "github.com/prometheus/client_model/go" diff --git a/server/mvcc/kv_view.go b/server/storage/mvcc/kv_view.go similarity index 100% rename from server/mvcc/kv_view.go rename to server/storage/mvcc/kv_view.go diff --git a/server/mvcc/kvstore.go b/server/storage/mvcc/kvstore.go similarity index 99% rename from server/mvcc/kvstore.go rename to server/storage/mvcc/kvstore.go index 2fb3f60eb9c..be30d6a4344 100644 --- a/server/mvcc/kvstore.go +++ b/server/storage/mvcc/kvstore.go @@ -27,8 +27,8 @@ import ( "go.etcd.io/etcd/pkg/v3/schedule" "go.etcd.io/etcd/pkg/v3/traceutil" "go.etcd.io/etcd/server/v3/lease" - "go.etcd.io/etcd/server/v3/mvcc/backend" - "go.etcd.io/etcd/server/v3/mvcc/buckets" + "go.etcd.io/etcd/server/v3/storage/backend" + "go.etcd.io/etcd/server/v3/storage/buckets" "go.uber.org/zap" ) diff --git a/server/mvcc/kvstore_bench_test.go b/server/storage/mvcc/kvstore_bench_test.go similarity index 97% rename from server/mvcc/kvstore_bench_test.go rename to server/storage/mvcc/kvstore_bench_test.go index e4a72b65d91..d30046d2042 100644 --- a/server/mvcc/kvstore_bench_test.go +++ b/server/storage/mvcc/kvstore_bench_test.go @@ -22,8 +22,8 @@ import ( "go.etcd.io/etcd/pkg/v3/traceutil" "go.etcd.io/etcd/server/v3/etcdserver/cindex" "go.etcd.io/etcd/server/v3/lease" - betesting "go.etcd.io/etcd/server/v3/mvcc/backend/testing" - "go.etcd.io/etcd/server/v3/mvcc/buckets" + betesting "go.etcd.io/etcd/server/v3/storage/backend/testing" + "go.etcd.io/etcd/server/v3/storage/buckets" "go.uber.org/zap" ) diff --git a/server/mvcc/kvstore_compaction.go b/server/storage/mvcc/kvstore_compaction.go similarity index 98% rename from server/mvcc/kvstore_compaction.go rename to server/storage/mvcc/kvstore_compaction.go index d6d186d83db..17e59f570c8 100644 --- a/server/mvcc/kvstore_compaction.go +++ b/server/storage/mvcc/kvstore_compaction.go @@ -18,7 +18,7 @@ import ( "encoding/binary" "time" - "go.etcd.io/etcd/server/v3/mvcc/buckets" + "go.etcd.io/etcd/server/v3/storage/buckets" "go.uber.org/zap" ) diff --git a/server/mvcc/kvstore_compaction_test.go b/server/storage/mvcc/kvstore_compaction_test.go similarity index 96% rename from server/mvcc/kvstore_compaction_test.go rename to server/storage/mvcc/kvstore_compaction_test.go index 36eebad023b..a8d3e3baac0 100644 --- a/server/mvcc/kvstore_compaction_test.go +++ b/server/storage/mvcc/kvstore_compaction_test.go @@ -23,8 +23,8 @@ import ( "go.etcd.io/etcd/pkg/v3/traceutil" "go.etcd.io/etcd/server/v3/lease" - betesting "go.etcd.io/etcd/server/v3/mvcc/backend/testing" - "go.etcd.io/etcd/server/v3/mvcc/buckets" + betesting "go.etcd.io/etcd/server/v3/storage/backend/testing" + "go.etcd.io/etcd/server/v3/storage/buckets" "go.uber.org/zap" ) diff --git a/server/mvcc/kvstore_test.go b/server/storage/mvcc/kvstore_test.go similarity index 99% rename from server/mvcc/kvstore_test.go rename to server/storage/mvcc/kvstore_test.go index 12049d56196..3dd500e2915 100644 --- a/server/mvcc/kvstore_test.go +++ b/server/storage/mvcc/kvstore_test.go @@ -35,9 +35,9 @@ import ( "go.etcd.io/etcd/pkg/v3/schedule" "go.etcd.io/etcd/pkg/v3/traceutil" "go.etcd.io/etcd/server/v3/lease" - "go.etcd.io/etcd/server/v3/mvcc/backend" - betesting "go.etcd.io/etcd/server/v3/mvcc/backend/testing" - "go.etcd.io/etcd/server/v3/mvcc/buckets" + "go.etcd.io/etcd/server/v3/storage/backend" + betesting "go.etcd.io/etcd/server/v3/storage/backend/testing" + "go.etcd.io/etcd/server/v3/storage/buckets" "go.uber.org/zap" ) diff --git a/server/mvcc/kvstore_txn.go b/server/storage/mvcc/kvstore_txn.go similarity index 98% rename from server/mvcc/kvstore_txn.go rename to server/storage/mvcc/kvstore_txn.go index 93d7db20e06..0db10ed13f0 100644 --- a/server/mvcc/kvstore_txn.go +++ b/server/storage/mvcc/kvstore_txn.go @@ -20,8 +20,8 @@ import ( "go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/pkg/v3/traceutil" "go.etcd.io/etcd/server/v3/lease" - "go.etcd.io/etcd/server/v3/mvcc/backend" - "go.etcd.io/etcd/server/v3/mvcc/buckets" + "go.etcd.io/etcd/server/v3/storage/backend" + "go.etcd.io/etcd/server/v3/storage/buckets" "go.uber.org/zap" ) diff --git a/server/mvcc/metrics.go b/server/storage/mvcc/metrics.go similarity index 100% rename from server/mvcc/metrics.go rename to server/storage/mvcc/metrics.go diff --git a/server/mvcc/metrics_txn.go b/server/storage/mvcc/metrics_txn.go similarity index 100% rename from server/mvcc/metrics_txn.go rename to server/storage/mvcc/metrics_txn.go diff --git a/server/mvcc/revision.go b/server/storage/mvcc/revision.go similarity index 100% rename from server/mvcc/revision.go rename to server/storage/mvcc/revision.go diff --git a/server/mvcc/revision_test.go b/server/storage/mvcc/revision_test.go similarity index 100% rename from server/mvcc/revision_test.go rename to server/storage/mvcc/revision_test.go diff --git a/server/mvcc/store.go b/server/storage/mvcc/store.go similarity index 95% rename from server/mvcc/store.go rename to server/storage/mvcc/store.go index 04ef2e3cb22..60745fb7fc0 100644 --- a/server/mvcc/store.go +++ b/server/storage/mvcc/store.go @@ -15,8 +15,8 @@ package mvcc import ( - "go.etcd.io/etcd/server/v3/mvcc/backend" - "go.etcd.io/etcd/server/v3/mvcc/buckets" + "go.etcd.io/etcd/server/v3/storage/backend" + "go.etcd.io/etcd/server/v3/storage/buckets" ) func UnsafeReadFinishedCompact(tx backend.ReadTx) (finishedComact int64, found bool) { diff --git a/server/mvcc/store_test.go b/server/storage/mvcc/store_test.go similarity index 92% rename from server/mvcc/store_test.go rename to server/storage/mvcc/store_test.go index f83f0d731ad..e3276462af8 100644 --- a/server/mvcc/store_test.go +++ b/server/storage/mvcc/store_test.go @@ -8,9 +8,9 @@ import ( "github.com/stretchr/testify/assert" - "go.etcd.io/etcd/server/v3/mvcc/backend" - betesting "go.etcd.io/etcd/server/v3/mvcc/backend/testing" - "go.etcd.io/etcd/server/v3/mvcc/buckets" + "go.etcd.io/etcd/server/v3/storage/backend" + betesting "go.etcd.io/etcd/server/v3/storage/backend/testing" + "go.etcd.io/etcd/server/v3/storage/buckets" ) // TestScheduledCompact ensures that UnsafeSetScheduledCompact&UnsafeReadScheduledCompact work well together. diff --git a/server/mvcc/util.go b/server/storage/mvcc/util.go similarity index 91% rename from server/mvcc/util.go rename to server/storage/mvcc/util.go index 83cbf44bf84..30952709714 100644 --- a/server/mvcc/util.go +++ b/server/storage/mvcc/util.go @@ -18,8 +18,8 @@ import ( "fmt" "go.etcd.io/etcd/api/v3/mvccpb" - "go.etcd.io/etcd/server/v3/mvcc/backend" - "go.etcd.io/etcd/server/v3/mvcc/buckets" + "go.etcd.io/etcd/server/v3/storage/backend" + "go.etcd.io/etcd/server/v3/storage/buckets" ) func WriteKV(be backend.Backend, kv mvccpb.KeyValue) { diff --git a/server/mvcc/watchable_store.go b/server/storage/mvcc/watchable_store.go similarity index 99% rename from server/mvcc/watchable_store.go rename to server/storage/mvcc/watchable_store.go index 3c7edb33371..c78b3b80294 100644 --- a/server/mvcc/watchable_store.go +++ b/server/storage/mvcc/watchable_store.go @@ -21,8 +21,8 @@ import ( "go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/pkg/v3/traceutil" "go.etcd.io/etcd/server/v3/lease" - "go.etcd.io/etcd/server/v3/mvcc/backend" - "go.etcd.io/etcd/server/v3/mvcc/buckets" + "go.etcd.io/etcd/server/v3/storage/backend" + "go.etcd.io/etcd/server/v3/storage/buckets" "go.uber.org/zap" ) diff --git a/server/mvcc/watchable_store_bench_test.go b/server/storage/mvcc/watchable_store_bench_test.go similarity index 98% rename from server/mvcc/watchable_store_bench_test.go rename to server/storage/mvcc/watchable_store_bench_test.go index 0cdc09e3ba0..20eb132ac51 100644 --- a/server/mvcc/watchable_store_bench_test.go +++ b/server/storage/mvcc/watchable_store_bench_test.go @@ -21,7 +21,7 @@ import ( "go.etcd.io/etcd/pkg/v3/traceutil" "go.etcd.io/etcd/server/v3/lease" - betesting "go.etcd.io/etcd/server/v3/mvcc/backend/testing" + betesting "go.etcd.io/etcd/server/v3/storage/backend/testing" "go.uber.org/zap" ) diff --git a/server/mvcc/watchable_store_test.go b/server/storage/mvcc/watchable_store_test.go similarity index 99% rename from server/mvcc/watchable_store_test.go rename to server/storage/mvcc/watchable_store_test.go index bc09a4a0366..c34e7446bb1 100644 --- a/server/mvcc/watchable_store_test.go +++ b/server/storage/mvcc/watchable_store_test.go @@ -26,7 +26,7 @@ import ( "go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/pkg/v3/traceutil" "go.etcd.io/etcd/server/v3/lease" - betesting "go.etcd.io/etcd/server/v3/mvcc/backend/testing" + betesting "go.etcd.io/etcd/server/v3/storage/backend/testing" "go.uber.org/zap" ) diff --git a/server/mvcc/watchable_store_txn.go b/server/storage/mvcc/watchable_store_txn.go similarity index 100% rename from server/mvcc/watchable_store_txn.go rename to server/storage/mvcc/watchable_store_txn.go diff --git a/server/mvcc/watcher.go b/server/storage/mvcc/watcher.go similarity index 100% rename from server/mvcc/watcher.go rename to server/storage/mvcc/watcher.go diff --git a/server/mvcc/watcher_bench_test.go b/server/storage/mvcc/watcher_bench_test.go similarity index 94% rename from server/mvcc/watcher_bench_test.go rename to server/storage/mvcc/watcher_bench_test.go index 5a90a46ebb6..049c0203b32 100644 --- a/server/mvcc/watcher_bench_test.go +++ b/server/storage/mvcc/watcher_bench_test.go @@ -19,7 +19,7 @@ import ( "testing" "go.etcd.io/etcd/server/v3/lease" - betesting "go.etcd.io/etcd/server/v3/mvcc/backend/testing" + betesting "go.etcd.io/etcd/server/v3/storage/backend/testing" "go.uber.org/zap" ) diff --git a/server/mvcc/watcher_group.go b/server/storage/mvcc/watcher_group.go similarity index 100% rename from server/mvcc/watcher_group.go rename to server/storage/mvcc/watcher_group.go diff --git a/server/mvcc/watcher_test.go b/server/storage/mvcc/watcher_test.go similarity index 99% rename from server/mvcc/watcher_test.go rename to server/storage/mvcc/watcher_test.go index bbada4ed5dc..1086635f46a 100644 --- a/server/mvcc/watcher_test.go +++ b/server/storage/mvcc/watcher_test.go @@ -24,7 +24,7 @@ import ( "go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/server/v3/lease" - betesting "go.etcd.io/etcd/server/v3/mvcc/backend/testing" + betesting "go.etcd.io/etcd/server/v3/storage/backend/testing" "go.uber.org/zap" ) diff --git a/server/verify/verify.go b/server/verify/verify.go index d27f77280ae..df55aab2032 100644 --- a/server/verify/verify.go +++ b/server/verify/verify.go @@ -20,8 +20,8 @@ import ( "go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/etcd/server/v3/datadir" - "go.etcd.io/etcd/server/v3/mvcc/backend" - "go.etcd.io/etcd/server/v3/mvcc/buckets" + "go.etcd.io/etcd/server/v3/storage/backend" + "go.etcd.io/etcd/server/v3/storage/buckets" wal2 "go.etcd.io/etcd/server/v3/wal" "go.etcd.io/etcd/server/v3/wal/walpb" "go.uber.org/zap" diff --git a/tests/integration/clientv3/maintenance_test.go b/tests/integration/clientv3/maintenance_test.go index 8661d535697..4bd137d8f35 100644 --- a/tests/integration/clientv3/maintenance_test.go +++ b/tests/integration/clientv3/maintenance_test.go @@ -32,8 +32,8 @@ import ( "go.etcd.io/etcd/api/v3/version" "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/server/v3/lease" - "go.etcd.io/etcd/server/v3/mvcc" - "go.etcd.io/etcd/server/v3/mvcc/backend" + "go.etcd.io/etcd/server/v3/storage/backend" + "go.etcd.io/etcd/server/v3/storage/mvcc" "go.etcd.io/etcd/tests/v3/integration" ) diff --git a/tests/integration/v3_alarm_test.go b/tests/integration/v3_alarm_test.go index 0151dc27fcb..55f0366cb6d 100644 --- a/tests/integration/v3_alarm_test.go +++ b/tests/integration/v3_alarm_test.go @@ -25,8 +25,8 @@ import ( pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/pkg/v3/traceutil" - "go.etcd.io/etcd/server/v3/mvcc" - "go.etcd.io/etcd/server/v3/mvcc/backend" + "go.etcd.io/etcd/server/v3/storage/backend" + "go.etcd.io/etcd/server/v3/storage/mvcc" "go.uber.org/zap/zaptest" ) diff --git a/tools/benchmark/cmd/mvcc.go b/tools/benchmark/cmd/mvcc.go index fd7d6aee010..ebb134e0e0c 100644 --- a/tools/benchmark/cmd/mvcc.go +++ b/tools/benchmark/cmd/mvcc.go @@ -21,8 +21,8 @@ import ( "go.uber.org/zap" "go.etcd.io/etcd/server/v3/lease" - "go.etcd.io/etcd/server/v3/mvcc" - "go.etcd.io/etcd/server/v3/mvcc/backend" + "go.etcd.io/etcd/server/v3/storage/backend" + "go.etcd.io/etcd/server/v3/storage/mvcc" "github.com/spf13/cobra" ) diff --git a/tools/etcd-dump-db/backend.go b/tools/etcd-dump-db/backend.go index 3fe609d9cc4..d53d86358b9 100644 --- a/tools/etcd-dump-db/backend.go +++ b/tools/etcd-dump-db/backend.go @@ -20,11 +20,11 @@ import ( "path/filepath" "go.etcd.io/etcd/api/v3/authpb" - "go.etcd.io/etcd/server/v3/mvcc/buckets" + "go.etcd.io/etcd/server/v3/storage/buckets" "go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/server/v3/lease/leasepb" - "go.etcd.io/etcd/server/v3/mvcc/backend" + "go.etcd.io/etcd/server/v3/storage/backend" bolt "go.etcd.io/bbolt" )