Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

server: Create storage package and move mvcc files to it

Browse Source
This commit is contained in:
Marek Siarkowicz 2021-07-08 15:49:16 +02:00
parent ef6c276fae
commit 5e40a8b00c
95 changed files with 118 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etcdutl/etcdutl/backup_command.go
View File

@ -31,8 +31,8 @@ import (
"go.etcd.io/etcd/server/v3/etcdserver/api/membership" "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/snap"
"go.etcd.io/etcd/server/v3/etcdserver/api/v2store" "go.etcd.io/etcd/server/v3/etcdserver/api/v2store"
"go.etcd.io/etcd/server/v3/mvcc/backend" "go.etcd.io/etcd/server/v3/storage/backend"
"go.etcd.io/etcd/server/v3/mvcc/buckets" "go.etcd.io/etcd/server/v3/storage/buckets"
"go.etcd.io/etcd/server/v3/verify" "go.etcd.io/etcd/server/v3/verify"
"go.etcd.io/etcd/server/v3/wal" "go.etcd.io/etcd/server/v3/wal"
"go.etcd.io/etcd/server/v3/wal/walpb" "go.etcd.io/etcd/server/v3/wal/walpb"

2
etcdutl/etcdutl/defrag_command.go
View File

@ -22,7 +22,7 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"go.etcd.io/etcd/pkg/v3/cobrautl" "go.etcd.io/etcd/pkg/v3/cobrautl"
"go.etcd.io/etcd/server/v3/datadir" "go.etcd.io/etcd/server/v3/datadir"
"go.etcd.io/etcd/server/v3/mvcc/backend" "go.etcd.io/etcd/server/v3/storage/backend"
) )
var ( var (

4
etcdutl/snapshot/v3_snapshot.go
View File

@ -40,8 +40,8 @@ import (
"go.etcd.io/etcd/server/v3/etcdserver/api/snap" "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/api/v2store"
"go.etcd.io/etcd/server/v3/etcdserver/cindex" "go.etcd.io/etcd/server/v3/etcdserver/cindex"
"go.etcd.io/etcd/server/v3/mvcc/backend" "go.etcd.io/etcd/server/v3/storage/backend"
"go.etcd.io/etcd/server/v3/mvcc/buckets" "go.etcd.io/etcd/server/v3/storage/buckets"
"go.etcd.io/etcd/server/v3/verify" "go.etcd.io/etcd/server/v3/verify"
"go.etcd.io/etcd/server/v3/wal" "go.etcd.io/etcd/server/v3/wal"
"go.etcd.io/etcd/server/v3/wal/walpb" "go.etcd.io/etcd/server/v3/wal/walpb"

4
server/auth/range_perm_cache.go
View File

@ -17,8 +17,8 @@ package auth
import ( import (
"go.etcd.io/etcd/api/v3/authpb" "go.etcd.io/etcd/api/v3/authpb"
"go.etcd.io/etcd/pkg/v3/adt" "go.etcd.io/etcd/pkg/v3/adt"
"go.etcd.io/etcd/server/v3/mvcc/backend" "go.etcd.io/etcd/server/v3/storage/backend"
"go.etcd.io/etcd/server/v3/mvcc/buckets" "go.etcd.io/etcd/server/v3/storage/buckets"
"go.uber.org/zap" "go.uber.org/zap"
) )

4
server/auth/store.go
View File

@ -28,8 +28,8 @@ import (
"go.etcd.io/etcd/api/v3/authpb" "go.etcd.io/etcd/api/v3/authpb"
pb "go.etcd.io/etcd/api/v3/etcdserverpb" pb "go.etcd.io/etcd/api/v3/etcdserverpb"
"go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
"go.etcd.io/etcd/server/v3/mvcc/backend" "go.etcd.io/etcd/server/v3/storage/backend"
"go.etcd.io/etcd/server/v3/mvcc/buckets" "go.etcd.io/etcd/server/v3/storage/buckets"
"go.uber.org/zap" "go.uber.org/zap"
"golang.org/x/crypto/bcrypt" "golang.org/x/crypto/bcrypt"

4
server/auth/store_test.go
View File

@ -27,8 +27,8 @@ import (
"go.etcd.io/etcd/api/v3/authpb" "go.etcd.io/etcd/api/v3/authpb"
pb "go.etcd.io/etcd/api/v3/etcdserverpb" pb "go.etcd.io/etcd/api/v3/etcdserverpb"
"go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
"go.etcd.io/etcd/server/v3/mvcc/backend" "go.etcd.io/etcd/server/v3/storage/backend"
betesting "go.etcd.io/etcd/server/v3/mvcc/backend/testing" betesting "go.etcd.io/etcd/server/v3/storage/backend/testing"
"go.uber.org/zap" "go.uber.org/zap"
"golang.org/x/crypto/bcrypt" "golang.org/x/crypto/bcrypt"

4
server/etcdserver/api/v3alarm/alarms.go
View File

@ -20,8 +20,8 @@ import (
pb "go.etcd.io/etcd/api/v3/etcdserverpb" pb "go.etcd.io/etcd/api/v3/etcdserverpb"
"go.etcd.io/etcd/client/pkg/v3/types" "go.etcd.io/etcd/client/pkg/v3/types"
"go.etcd.io/etcd/server/v3/mvcc/backend" "go.etcd.io/etcd/server/v3/storage/backend"
"go.etcd.io/etcd/server/v3/mvcc/buckets" "go.etcd.io/etcd/server/v3/storage/buckets"
"go.uber.org/zap" "go.uber.org/zap"
) )

2
server/etcdserver/api/v3compactor/periodic.go
View File

@ -20,7 +20,7 @@ import (
"time" "time"
pb "go.etcd.io/etcd/api/v3/etcdserverpb" 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" "github.com/jonboulle/clockwork"
"go.uber.org/zap" "go.uber.org/zap"

2
server/etcdserver/api/v3compactor/revision.go
View File

@ -20,7 +20,7 @@ import (
"time" "time"
pb "go.etcd.io/etcd/api/v3/etcdserverpb" 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" "github.com/jonboulle/clockwork"
"go.uber.org/zap" "go.uber.org/zap"

6
server/etcdserver/api/v3rpc/maintenance.go
View File

@ -27,9 +27,9 @@ import (
"go.etcd.io/etcd/raft/v3" "go.etcd.io/etcd/raft/v3"
"go.etcd.io/etcd/server/v3/auth" "go.etcd.io/etcd/server/v3/auth"
"go.etcd.io/etcd/server/v3/etcdserver" "go.etcd.io/etcd/server/v3/etcdserver"
"go.etcd.io/etcd/server/v3/mvcc" "go.etcd.io/etcd/server/v3/storage/backend"
"go.etcd.io/etcd/server/v3/mvcc/backend" "go.etcd.io/etcd/server/v3/storage/buckets"
"go.etcd.io/etcd/server/v3/mvcc/buckets" "go.etcd.io/etcd/server/v3/storage/mvcc"
"go.uber.org/zap" "go.uber.org/zap"
) )

2
server/etcdserver/api/v3rpc/util.go
View File

@ -24,7 +24,7 @@ import (
"go.etcd.io/etcd/server/v3/etcdserver" "go.etcd.io/etcd/server/v3/etcdserver"
"go.etcd.io/etcd/server/v3/etcdserver/api/membership" "go.etcd.io/etcd/server/v3/etcdserver/api/membership"
"go.etcd.io/etcd/server/v3/lease" "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/codes"
"google.golang.org/grpc/status" "google.golang.org/grpc/status"

2
server/etcdserver/api/v3rpc/util_test.go
View File

@ -20,7 +20,7 @@ import (
"testing" "testing"
"go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "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/codes"
"google.golang.org/grpc/status" "google.golang.org/grpc/status"

2
server/etcdserver/api/v3rpc/watch.go
View File

@ -26,7 +26,7 @@ import (
"go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
"go.etcd.io/etcd/server/v3/auth" "go.etcd.io/etcd/server/v3/auth"
"go.etcd.io/etcd/server/v3/etcdserver" "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" "go.uber.org/zap"
) )

2
server/etcdserver/apply.go
View File

@ -32,7 +32,7 @@ import (
"go.etcd.io/etcd/server/v3/etcdserver/api" "go.etcd.io/etcd/server/v3/etcdserver/api"
"go.etcd.io/etcd/server/v3/etcdserver/api/membership" "go.etcd.io/etcd/server/v3/etcdserver/api/membership"
"go.etcd.io/etcd/server/v3/lease" "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" "github.com/gogo/protobuf/proto"
"go.uber.org/zap" "go.uber.org/zap"

2
server/etcdserver/apply_auth.go
View File

@ -23,7 +23,7 @@ import (
"go.etcd.io/etcd/server/v3/auth" "go.etcd.io/etcd/server/v3/auth"
"go.etcd.io/etcd/server/v3/etcdserver/api/membership" "go.etcd.io/etcd/server/v3/etcdserver/api/membership"
"go.etcd.io/etcd/server/v3/lease" "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 { type authApplierV3 struct {

4
server/etcdserver/backend.go
View File

@ -22,8 +22,8 @@ import (
"go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/etcd/raft/v3/raftpb"
"go.etcd.io/etcd/server/v3/config" "go.etcd.io/etcd/server/v3/config"
"go.etcd.io/etcd/server/v3/etcdserver/api/snap" "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"
"go.etcd.io/etcd/server/v3/mvcc/buckets" "go.etcd.io/etcd/server/v3/storage/buckets"
"go.uber.org/zap" "go.uber.org/zap"
) )

4
server/etcdserver/bootstrap.go
View File

@ -41,8 +41,8 @@ import (
"go.etcd.io/etcd/server/v3/etcdserver/api/v2discovery" "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/api/v2store"
"go.etcd.io/etcd/server/v3/etcdserver/cindex" "go.etcd.io/etcd/server/v3/etcdserver/cindex"
"go.etcd.io/etcd/server/v3/mvcc/backend" "go.etcd.io/etcd/server/v3/storage/backend"
"go.etcd.io/etcd/server/v3/mvcc/buckets" "go.etcd.io/etcd/server/v3/storage/buckets"
"go.etcd.io/etcd/server/v3/wal" "go.etcd.io/etcd/server/v3/wal"
"go.etcd.io/etcd/server/v3/wal/walpb" "go.etcd.io/etcd/server/v3/wal/walpb"
) )

4
server/etcdserver/cindex/cindex.go
View File

@ -18,8 +18,8 @@ import (
"sync" "sync"
"sync/atomic" "sync/atomic"
"go.etcd.io/etcd/server/v3/mvcc/backend" "go.etcd.io/etcd/server/v3/storage/backend"
"go.etcd.io/etcd/server/v3/mvcc/buckets" "go.etcd.io/etcd/server/v3/storage/buckets"
) )
type Backend interface { type Backend interface {

6
server/etcdserver/cindex/cindex_test.go
View File

@ -20,9 +20,9 @@ import (
"time" "time"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"go.etcd.io/etcd/server/v3/mvcc/backend" "go.etcd.io/etcd/server/v3/storage/backend"
betesting "go.etcd.io/etcd/server/v3/mvcc/backend/testing" betesting "go.etcd.io/etcd/server/v3/storage/backend/testing"
"go.etcd.io/etcd/server/v3/mvcc/buckets" "go.etcd.io/etcd/server/v3/storage/buckets"
) )
// TestConsistentIndex ensures that LoadConsistentIndex/Save/ConsistentIndex and backend.BatchTx can work well together. // TestConsistentIndex ensures that LoadConsistentIndex/Save/ConsistentIndex and backend.BatchTx can work well together.

2
server/etcdserver/corrupt.go
View File

@ -28,7 +28,7 @@ import (
"go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
"go.etcd.io/etcd/client/pkg/v3/types" "go.etcd.io/etcd/client/pkg/v3/types"
"go.etcd.io/etcd/pkg/v3/traceutil" "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" "go.uber.org/zap"
) )

6
server/etcdserver/server.go
View File

@ -62,9 +62,9 @@ import (
serverversion "go.etcd.io/etcd/server/v3/etcdserver/version" serverversion "go.etcd.io/etcd/server/v3/etcdserver/version"
"go.etcd.io/etcd/server/v3/lease" "go.etcd.io/etcd/server/v3/lease"
"go.etcd.io/etcd/server/v3/lease/leasehttp" "go.etcd.io/etcd/server/v3/lease/leasehttp"
"go.etcd.io/etcd/server/v3/mvcc" "go.etcd.io/etcd/server/v3/storage/backend"
"go.etcd.io/etcd/server/v3/mvcc/backend" "go.etcd.io/etcd/server/v3/storage/buckets"
"go.etcd.io/etcd/server/v3/mvcc/buckets" "go.etcd.io/etcd/server/v3/storage/mvcc"
) )
const ( const (

6
server/etcdserver/server_test.go
View File

@ -51,9 +51,9 @@ import (
"go.etcd.io/etcd/server/v3/mock/mockstorage" "go.etcd.io/etcd/server/v3/mock/mockstorage"
"go.etcd.io/etcd/server/v3/mock/mockstore" "go.etcd.io/etcd/server/v3/mock/mockstore"
"go.etcd.io/etcd/server/v3/mock/mockwait" "go.etcd.io/etcd/server/v3/mock/mockwait"
"go.etcd.io/etcd/server/v3/mvcc" betesting "go.etcd.io/etcd/server/v3/storage/backend/testing"
betesting "go.etcd.io/etcd/server/v3/mvcc/backend/testing" "go.etcd.io/etcd/server/v3/storage/buckets"
"go.etcd.io/etcd/server/v3/mvcc/buckets" "go.etcd.io/etcd/server/v3/storage/mvcc"
"go.uber.org/zap" "go.uber.org/zap"
"go.uber.org/zap/zaptest" "go.uber.org/zap/zaptest"
) )

2
server/etcdserver/snapshot_merge.go
View File

@ -19,7 +19,7 @@ import (
"go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/etcd/raft/v3/raftpb"
"go.etcd.io/etcd/server/v3/etcdserver/api/snap" "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" humanize "github.com/dustin/go-humanize"
"go.uber.org/zap" "go.uber.org/zap"

2
server/etcdserver/v3_server.go
View File

@ -30,7 +30,7 @@ import (
"go.etcd.io/etcd/server/v3/etcdserver/api/membership" "go.etcd.io/etcd/server/v3/etcdserver/api/membership"
"go.etcd.io/etcd/server/v3/lease" "go.etcd.io/etcd/server/v3/lease"
"go.etcd.io/etcd/server/v3/lease/leasehttp" "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" "github.com/gogo/protobuf/proto"
"go.uber.org/zap" "go.uber.org/zap"

4
server/etcdserver/version/version.go
View File

@ -20,8 +20,8 @@ import (
"github.com/coreos/go-semver/semver" "github.com/coreos/go-semver/semver"
"go.uber.org/zap" "go.uber.org/zap"
"go.etcd.io/etcd/server/v3/mvcc/backend" "go.etcd.io/etcd/server/v3/storage/backend"
"go.etcd.io/etcd/server/v3/mvcc/buckets" "go.etcd.io/etcd/server/v3/storage/buckets"
) )
var ( var (

6
server/etcdserver/version/version_test.go
View File

@ -22,9 +22,9 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"go.etcd.io/etcd/api/v3/version" "go.etcd.io/etcd/api/v3/version"
"go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/etcd/raft/v3/raftpb"
"go.etcd.io/etcd/server/v3/mvcc/backend" "go.etcd.io/etcd/server/v3/storage/backend"
betesting "go.etcd.io/etcd/server/v3/mvcc/backend/testing" betesting "go.etcd.io/etcd/server/v3/storage/backend/testing"
"go.etcd.io/etcd/server/v3/mvcc/buckets" "go.etcd.io/etcd/server/v3/storage/buckets"
"go.uber.org/zap" "go.uber.org/zap"
) )

2
server/lease/leasehttp/http_test.go
View File

@ -22,7 +22,7 @@ import (
"time" "time"
"go.etcd.io/etcd/server/v3/lease" "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" "go.uber.org/zap/zaptest"
) )

4
server/lease/lessor.go
View File

@ -26,8 +26,8 @@ import (
pb "go.etcd.io/etcd/api/v3/etcdserverpb" pb "go.etcd.io/etcd/api/v3/etcdserverpb"
"go.etcd.io/etcd/server/v3/lease/leasepb" "go.etcd.io/etcd/server/v3/lease/leasepb"
"go.etcd.io/etcd/server/v3/mvcc/backend" "go.etcd.io/etcd/server/v3/storage/backend"
"go.etcd.io/etcd/server/v3/mvcc/buckets" "go.etcd.io/etcd/server/v3/storage/buckets"
"go.uber.org/zap" "go.uber.org/zap"
) )

2
server/lease/lessor_bench_test.go
View File

@ -19,7 +19,7 @@ import (
"testing" "testing"
"time" "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" "go.uber.org/zap"
) )

4
server/lease/lessor_test.go
View File

@ -27,8 +27,8 @@ import (
"time" "time"
pb "go.etcd.io/etcd/api/v3/etcdserverpb" pb "go.etcd.io/etcd/api/v3/etcdserverpb"
"go.etcd.io/etcd/server/v3/mvcc/backend" "go.etcd.io/etcd/server/v3/storage/backend"
"go.etcd.io/etcd/server/v3/mvcc/buckets" "go.etcd.io/etcd/server/v3/storage/buckets"
"go.uber.org/zap" "go.uber.org/zap"
) )

2
server/proxy/grpcproxy/watcher.go
View File

@ -20,7 +20,7 @@ import (
pb "go.etcd.io/etcd/api/v3/etcdserverpb" pb "go.etcd.io/etcd/api/v3/etcdserverpb"
"go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/api/v3/mvccpb"
"go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/server/v3/mvcc" "go.etcd.io/etcd/server/v3/storage/mvcc"
) )
type watchRange struct { type watchRange struct {

0
server/mvcc/backend/backend.go → server/storage/backend/backend.go
View File

4
server/mvcc/backend/backend_bench_test.go → server/storage/backend/backend_bench_test.go
View File

@ -20,8 +20,8 @@ import (
"time" "time"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
betesting "go.etcd.io/etcd/server/v3/mvcc/backend/testing" betesting "go.etcd.io/etcd/server/v3/storage/backend/testing"
"go.etcd.io/etcd/server/v3/mvcc/buckets" "go.etcd.io/etcd/server/v3/storage/buckets"
) )
func BenchmarkBackendPut(b *testing.B) { func BenchmarkBackendPut(b *testing.B) {

6
server/mvcc/backend/backend_test.go → server/storage/backend/backend_test.go
View File

@ -23,9 +23,9 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
bolt "go.etcd.io/bbolt" bolt "go.etcd.io/bbolt"
"go.etcd.io/etcd/server/v3/mvcc/backend" "go.etcd.io/etcd/server/v3/storage/backend"
betesting "go.etcd.io/etcd/server/v3/mvcc/backend/testing" betesting "go.etcd.io/etcd/server/v3/storage/backend/testing"
"go.etcd.io/etcd/server/v3/mvcc/buckets" "go.etcd.io/etcd/server/v3/storage/buckets"
) )
func TestBackendClose(t *testing.T) { func TestBackendClose(t *testing.T) {

0
server/mvcc/backend/batch_tx.go → server/storage/backend/batch_tx.go
View File

6
server/mvcc/backend/batch_tx_test.go → server/storage/backend/batch_tx_test.go
View File

@ -20,9 +20,9 @@ import (
"time" "time"
bolt "go.etcd.io/bbolt" bolt "go.etcd.io/bbolt"
"go.etcd.io/etcd/server/v3/mvcc/backend" "go.etcd.io/etcd/server/v3/storage/backend"
betesting "go.etcd.io/etcd/server/v3/mvcc/backend/testing" betesting "go.etcd.io/etcd/server/v3/storage/backend/testing"
"go.etcd.io/etcd/server/v3/mvcc/buckets" "go.etcd.io/etcd/server/v3/storage/buckets"
) )
func TestBatchTxPut(t *testing.T) { func TestBatchTxPut(t *testing.T) {

0
server/mvcc/backend/config_default.go → server/storage/backend/config_default.go
View File

0
server/mvcc/backend/config_linux.go → server/storage/backend/config_linux.go
View File

0
server/mvcc/backend/config_windows.go → server/storage/backend/config_windows.go
View File

0
server/mvcc/backend/doc.go → server/storage/backend/doc.go
View File

0
server/mvcc/backend/export_test.go → server/storage/backend/export_test.go
View File

0
server/mvcc/backend/hooks.go → server/storage/backend/hooks.go
View File

6
server/mvcc/backend/hooks_test.go → server/storage/backend/hooks_test.go
View File

@ -20,9 +20,9 @@ import (
"time" "time"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"go.etcd.io/etcd/server/v3/mvcc/backend" "go.etcd.io/etcd/server/v3/storage/backend"
betesting "go.etcd.io/etcd/server/v3/mvcc/backend/testing" betesting "go.etcd.io/etcd/server/v3/storage/backend/testing"
"go.etcd.io/etcd/server/v3/mvcc/buckets" "go.etcd.io/etcd/server/v3/storage/buckets"
) )
var ( var (

0
server/mvcc/backend/metrics.go → server/storage/backend/metrics.go
View File

0
server/mvcc/backend/read_tx.go → server/storage/backend/read_tx.go
View File

2
server/mvcc/backend/testing/betesting.go → server/storage/backend/testing/betesting.go
View File

@ -21,7 +21,7 @@ import (
"time" "time"
"github.com/stretchr/testify/assert" "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" "go.uber.org/zap/zaptest"
) )

0
server/mvcc/backend/tx_buffer.go → server/storage/backend/tx_buffer.go
View File

2
server/mvcc/buckets/alarm.go → server/storage/buckets/alarm.go
View File

@ -16,7 +16,7 @@ package buckets
import ( import (
"go.etcd.io/etcd/api/v3/etcdserverpb" "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" "go.uber.org/zap"
) )

2
server/mvcc/buckets/auth.go → server/storage/buckets/auth.go
View File

@ -17,7 +17,7 @@ package buckets
import ( import (
"bytes" "bytes"
"encoding/binary" "encoding/binary"
"go.etcd.io/etcd/server/v3/mvcc/backend" "go.etcd.io/etcd/server/v3/storage/backend"
) )
const ( const (

2
server/mvcc/buckets/auth_roles.go → server/storage/buckets/auth_roles.go
View File

@ -16,7 +16,7 @@ package buckets
import ( import (
"go.etcd.io/etcd/api/v3/authpb" "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" "go.uber.org/zap"
) )

4
server/mvcc/buckets/auth_test.go → server/storage/buckets/auth_test.go
View File

@ -21,8 +21,8 @@ import (
"time" "time"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"go.etcd.io/etcd/server/v3/mvcc/backend" "go.etcd.io/etcd/server/v3/storage/backend"
betesting "go.etcd.io/etcd/server/v3/mvcc/backend/testing" betesting "go.etcd.io/etcd/server/v3/storage/backend/testing"
) )
// TestAuthEnabled ensures that UnsafeSaveAuthEnabled&UnsafeReadAuthEnabled work well together. // TestAuthEnabled ensures that UnsafeSaveAuthEnabled&UnsafeReadAuthEnabled work well together.

2
server/mvcc/buckets/auth_users.go → server/storage/buckets/auth_users.go
View File

@ -16,7 +16,7 @@ package buckets
import ( import (
"go.etcd.io/etcd/api/v3/authpb" "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" "go.uber.org/zap"
) )

2
server/mvcc/buckets/bucket.go → server/storage/buckets/bucket.go
View File

@ -18,7 +18,7 @@ import (
"bytes" "bytes"
"go.etcd.io/etcd/client/pkg/v3/types" "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 ( var (

2
server/mvcc/buckets/cindex.go → server/storage/buckets/cindex.go
View File

@ -16,7 +16,7 @@ package buckets
import ( import (
"encoding/binary" "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). // UnsafeCreateMetaBucket creates the `meta` bucket (if it does not exists yet).

2
server/mvcc/buckets/confstate.go → server/storage/buckets/confstate.go
View File

@ -19,7 +19,7 @@ import (
"log" "log"
"go.etcd.io/etcd/raft/v3/raftpb" "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" "go.uber.org/zap"
) )

2
server/mvcc/buckets/confstate_test.go → server/storage/buckets/confstate_test.go
View File

@ -19,7 +19,7 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"go.etcd.io/etcd/raft/v3/raftpb" "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" "go.uber.org/zap/zaptest"
) )

2
server/mvcc/buckets/lease.go → server/storage/buckets/lease.go
View File

@ -19,7 +19,7 @@ import (
"math" "math"
"go.etcd.io/etcd/server/v3/lease/leasepb" "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) { func UnsafeCreateLeaseBucket(tx backend.BatchTx) {

2
server/mvcc/buckets/membership.go → server/storage/buckets/membership.go
View File

@ -20,7 +20,7 @@ import (
"go.etcd.io/etcd/client/pkg/v3/types" "go.etcd.io/etcd/client/pkg/v3/types"
"go.etcd.io/etcd/server/v3/etcdserver/api/membership" "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" "github.com/coreos/go-semver/semver"
"go.uber.org/zap" "go.uber.org/zap"

2
server/mvcc/buckets/version.go → server/storage/buckets/version.go
View File

@ -17,7 +17,7 @@ package buckets
import ( import (
"github.com/coreos/go-semver/semver" "github.com/coreos/go-semver/semver"
"go.etcd.io/bbolt" "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. // ReadStorageVersion loads storage version from given backend transaction.

4
server/mvcc/buckets/version_test.go → server/storage/buckets/version_test.go
View File

@ -22,8 +22,8 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"go.etcd.io/bbolt" "go.etcd.io/bbolt"
"go.etcd.io/etcd/server/v3/mvcc/backend" "go.etcd.io/etcd/server/v3/storage/backend"
"go.etcd.io/etcd/server/v3/mvcc/backend/testing" "go.etcd.io/etcd/server/v3/storage/backend/testing"
) )
// TestVersion ensures that UnsafeSetStorageVersion/UnsafeReadStorageVersion work well together. // TestVersion ensures that UnsafeSetStorageVersion/UnsafeReadStorageVersion work well together.

0
server/mvcc/doc.go → server/storage/mvcc/doc.go
View File

0
server/mvcc/index.go → server/storage/mvcc/index.go
View File

0
server/mvcc/index_bench_test.go → server/storage/mvcc/index_bench_test.go
View File

0
server/mvcc/index_test.go → server/storage/mvcc/index_test.go
View File

0
server/mvcc/key_index.go → server/storage/mvcc/key_index.go
View File

0
server/mvcc/key_index_test.go → server/storage/mvcc/key_index_test.go
View File

2
server/mvcc/kv.go → server/storage/mvcc/kv.go
View File

@ -20,7 +20,7 @@ import (
"go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/api/v3/mvccpb"
"go.etcd.io/etcd/pkg/v3/traceutil" "go.etcd.io/etcd/pkg/v3/traceutil"
"go.etcd.io/etcd/server/v3/lease" "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 { type RangeOptions struct {

4
server/mvcc/kv_test.go → server/storage/mvcc/kv_test.go
View File

@ -26,8 +26,8 @@ import (
"go.etcd.io/etcd/client/pkg/v3/testutil" "go.etcd.io/etcd/client/pkg/v3/testutil"
"go.etcd.io/etcd/pkg/v3/traceutil" "go.etcd.io/etcd/pkg/v3/traceutil"
"go.etcd.io/etcd/server/v3/lease" "go.etcd.io/etcd/server/v3/lease"
"go.etcd.io/etcd/server/v3/mvcc/backend" "go.etcd.io/etcd/server/v3/storage/backend"
betesting "go.etcd.io/etcd/server/v3/mvcc/backend/testing" betesting "go.etcd.io/etcd/server/v3/storage/backend/testing"
"github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus"
dto "github.com/prometheus/client_model/go" dto "github.com/prometheus/client_model/go"

0
server/mvcc/kv_view.go → server/storage/mvcc/kv_view.go
View File

4
server/mvcc/kvstore.go → server/storage/mvcc/kvstore.go
View File

@ -27,8 +27,8 @@ import (
"go.etcd.io/etcd/pkg/v3/schedule" "go.etcd.io/etcd/pkg/v3/schedule"
"go.etcd.io/etcd/pkg/v3/traceutil" "go.etcd.io/etcd/pkg/v3/traceutil"
"go.etcd.io/etcd/server/v3/lease" "go.etcd.io/etcd/server/v3/lease"
"go.etcd.io/etcd/server/v3/mvcc/backend" "go.etcd.io/etcd/server/v3/storage/backend"
"go.etcd.io/etcd/server/v3/mvcc/buckets" "go.etcd.io/etcd/server/v3/storage/buckets"
"go.uber.org/zap" "go.uber.org/zap"
) )

4
server/mvcc/kvstore_bench_test.go → server/storage/mvcc/kvstore_bench_test.go
View File

@ -22,8 +22,8 @@ import (
"go.etcd.io/etcd/pkg/v3/traceutil" "go.etcd.io/etcd/pkg/v3/traceutil"
"go.etcd.io/etcd/server/v3/etcdserver/cindex" "go.etcd.io/etcd/server/v3/etcdserver/cindex"
"go.etcd.io/etcd/server/v3/lease" "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.etcd.io/etcd/server/v3/mvcc/buckets" "go.etcd.io/etcd/server/v3/storage/buckets"
"go.uber.org/zap" "go.uber.org/zap"
) )

2
server/mvcc/kvstore_compaction.go → server/storage/mvcc/kvstore_compaction.go
View File

@ -18,7 +18,7 @@ import (
"encoding/binary" "encoding/binary"
"time" "time"
"go.etcd.io/etcd/server/v3/mvcc/buckets" "go.etcd.io/etcd/server/v3/storage/buckets"
"go.uber.org/zap" "go.uber.org/zap"
) )

4
server/mvcc/kvstore_compaction_test.go → server/storage/mvcc/kvstore_compaction_test.go
View File

@ -23,8 +23,8 @@ import (
"go.etcd.io/etcd/pkg/v3/traceutil" "go.etcd.io/etcd/pkg/v3/traceutil"
"go.etcd.io/etcd/server/v3/lease" "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.etcd.io/etcd/server/v3/mvcc/buckets" "go.etcd.io/etcd/server/v3/storage/buckets"
"go.uber.org/zap" "go.uber.org/zap"
) )

6
server/mvcc/kvstore_test.go → server/storage/mvcc/kvstore_test.go
View File

@ -35,9 +35,9 @@ import (
"go.etcd.io/etcd/pkg/v3/schedule" "go.etcd.io/etcd/pkg/v3/schedule"
"go.etcd.io/etcd/pkg/v3/traceutil" "go.etcd.io/etcd/pkg/v3/traceutil"
"go.etcd.io/etcd/server/v3/lease" "go.etcd.io/etcd/server/v3/lease"
"go.etcd.io/etcd/server/v3/mvcc/backend" "go.etcd.io/etcd/server/v3/storage/backend"
betesting "go.etcd.io/etcd/server/v3/mvcc/backend/testing" betesting "go.etcd.io/etcd/server/v3/storage/backend/testing"
"go.etcd.io/etcd/server/v3/mvcc/buckets" "go.etcd.io/etcd/server/v3/storage/buckets"
"go.uber.org/zap" "go.uber.org/zap"
) )

4
server/mvcc/kvstore_txn.go → server/storage/mvcc/kvstore_txn.go
View File

@ -20,8 +20,8 @@ import (
"go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/api/v3/mvccpb"
"go.etcd.io/etcd/pkg/v3/traceutil" "go.etcd.io/etcd/pkg/v3/traceutil"
"go.etcd.io/etcd/server/v3/lease" "go.etcd.io/etcd/server/v3/lease"
"go.etcd.io/etcd/server/v3/mvcc/backend" "go.etcd.io/etcd/server/v3/storage/backend"
"go.etcd.io/etcd/server/v3/mvcc/buckets" "go.etcd.io/etcd/server/v3/storage/buckets"
"go.uber.org/zap" "go.uber.org/zap"
) )

0
server/mvcc/metrics.go → server/storage/mvcc/metrics.go
View File

0
server/mvcc/metrics_txn.go → server/storage/mvcc/metrics_txn.go
View File

0
server/mvcc/revision.go → server/storage/mvcc/revision.go
View File

0
server/mvcc/revision_test.go → server/storage/mvcc/revision_test.go
View File

4
server/mvcc/store.go → server/storage/mvcc/store.go
View File

@ -15,8 +15,8 @@
package mvcc package mvcc
import ( import (
"go.etcd.io/etcd/server/v3/mvcc/backend" "go.etcd.io/etcd/server/v3/storage/backend"
"go.etcd.io/etcd/server/v3/mvcc/buckets" "go.etcd.io/etcd/server/v3/storage/buckets"
) )
func UnsafeReadFinishedCompact(tx backend.ReadTx) (finishedComact int64, found bool) { func UnsafeReadFinishedCompact(tx backend.ReadTx) (finishedComact int64, found bool) {

6
server/mvcc/store_test.go → server/storage/mvcc/store_test.go
View File

@ -8,9 +8,9 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"go.etcd.io/etcd/server/v3/mvcc/backend" "go.etcd.io/etcd/server/v3/storage/backend"
betesting "go.etcd.io/etcd/server/v3/mvcc/backend/testing" betesting "go.etcd.io/etcd/server/v3/storage/backend/testing"
"go.etcd.io/etcd/server/v3/mvcc/buckets" "go.etcd.io/etcd/server/v3/storage/buckets"
) )
// TestScheduledCompact ensures that UnsafeSetScheduledCompact&UnsafeReadScheduledCompact work well together. // TestScheduledCompact ensures that UnsafeSetScheduledCompact&UnsafeReadScheduledCompact work well together.

4
server/mvcc/util.go → server/storage/mvcc/util.go
View File

@ -18,8 +18,8 @@ import (
"fmt" "fmt"
"go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/api/v3/mvccpb"
"go.etcd.io/etcd/server/v3/mvcc/backend" "go.etcd.io/etcd/server/v3/storage/backend"
"go.etcd.io/etcd/server/v3/mvcc/buckets" "go.etcd.io/etcd/server/v3/storage/buckets"
) )
func WriteKV(be backend.Backend, kv mvccpb.KeyValue) { func WriteKV(be backend.Backend, kv mvccpb.KeyValue) {

4
server/mvcc/watchable_store.go → server/storage/mvcc/watchable_store.go
View File

@ -21,8 +21,8 @@ import (
"go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/api/v3/mvccpb"
"go.etcd.io/etcd/pkg/v3/traceutil" "go.etcd.io/etcd/pkg/v3/traceutil"
"go.etcd.io/etcd/server/v3/lease" "go.etcd.io/etcd/server/v3/lease"
"go.etcd.io/etcd/server/v3/mvcc/backend" "go.etcd.io/etcd/server/v3/storage/backend"
"go.etcd.io/etcd/server/v3/mvcc/buckets" "go.etcd.io/etcd/server/v3/storage/buckets"
"go.uber.org/zap" "go.uber.org/zap"
) )

2
server/mvcc/watchable_store_bench_test.go → server/storage/mvcc/watchable_store_bench_test.go
View File

@ -21,7 +21,7 @@ import (
"go.etcd.io/etcd/pkg/v3/traceutil" "go.etcd.io/etcd/pkg/v3/traceutil"
"go.etcd.io/etcd/server/v3/lease" "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" "go.uber.org/zap"
) )

2
server/mvcc/watchable_store_test.go → server/storage/mvcc/watchable_store_test.go
View File

@ -26,7 +26,7 @@ import (
"go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/api/v3/mvccpb"
"go.etcd.io/etcd/pkg/v3/traceutil" "go.etcd.io/etcd/pkg/v3/traceutil"
"go.etcd.io/etcd/server/v3/lease" "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" "go.uber.org/zap"
) )

0
server/mvcc/watchable_store_txn.go → server/storage/mvcc/watchable_store_txn.go
View File

0
server/mvcc/watcher.go → server/storage/mvcc/watcher.go
View File

2
server/mvcc/watcher_bench_test.go → server/storage/mvcc/watcher_bench_test.go
View File

@ -19,7 +19,7 @@ import (
"testing" "testing"
"go.etcd.io/etcd/server/v3/lease" "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" "go.uber.org/zap"
) )

0
server/mvcc/watcher_group.go → server/storage/mvcc/watcher_group.go
View File

2
server/mvcc/watcher_test.go → server/storage/mvcc/watcher_test.go
View File

@ -24,7 +24,7 @@ import (
"go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/api/v3/mvccpb"
"go.etcd.io/etcd/server/v3/lease" "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" "go.uber.org/zap"
) )

4
server/verify/verify.go
View File

@ -20,8 +20,8 @@ import (
"go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/etcd/raft/v3/raftpb"
"go.etcd.io/etcd/server/v3/datadir" "go.etcd.io/etcd/server/v3/datadir"
"go.etcd.io/etcd/server/v3/mvcc/backend" "go.etcd.io/etcd/server/v3/storage/backend"
"go.etcd.io/etcd/server/v3/mvcc/buckets" "go.etcd.io/etcd/server/v3/storage/buckets"
wal2 "go.etcd.io/etcd/server/v3/wal" wal2 "go.etcd.io/etcd/server/v3/wal"
"go.etcd.io/etcd/server/v3/wal/walpb" "go.etcd.io/etcd/server/v3/wal/walpb"
"go.uber.org/zap" "go.uber.org/zap"

4
tests/integration/clientv3/maintenance_test.go
View File

@ -32,8 +32,8 @@ import (
"go.etcd.io/etcd/api/v3/version" "go.etcd.io/etcd/api/v3/version"
"go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/server/v3/lease" "go.etcd.io/etcd/server/v3/lease"
"go.etcd.io/etcd/server/v3/mvcc" "go.etcd.io/etcd/server/v3/storage/backend"
"go.etcd.io/etcd/server/v3/mvcc/backend" "go.etcd.io/etcd/server/v3/storage/mvcc"
"go.etcd.io/etcd/tests/v3/integration" "go.etcd.io/etcd/tests/v3/integration"
) )

4
tests/integration/v3_alarm_test.go
View File

@ -25,8 +25,8 @@ import (
pb "go.etcd.io/etcd/api/v3/etcdserverpb" pb "go.etcd.io/etcd/api/v3/etcdserverpb"
"go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
"go.etcd.io/etcd/pkg/v3/traceutil" "go.etcd.io/etcd/pkg/v3/traceutil"
"go.etcd.io/etcd/server/v3/mvcc" "go.etcd.io/etcd/server/v3/storage/backend"
"go.etcd.io/etcd/server/v3/mvcc/backend" "go.etcd.io/etcd/server/v3/storage/mvcc"
"go.uber.org/zap/zaptest" "go.uber.org/zap/zaptest"
) )

4
tools/benchmark/cmd/mvcc.go
View File

@ -21,8 +21,8 @@ import (
"go.uber.org/zap" "go.uber.org/zap"
"go.etcd.io/etcd/server/v3/lease" "go.etcd.io/etcd/server/v3/lease"
"go.etcd.io/etcd/server/v3/mvcc" "go.etcd.io/etcd/server/v3/storage/backend"
"go.etcd.io/etcd/server/v3/mvcc/backend" "go.etcd.io/etcd/server/v3/storage/mvcc"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )

4
tools/etcd-dump-db/backend.go
View File

@ -20,11 +20,11 @@ import (
"path/filepath" "path/filepath"
"go.etcd.io/etcd/api/v3/authpb" "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/api/v3/mvccpb"
"go.etcd.io/etcd/server/v3/lease/leasepb" "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" bolt "go.etcd.io/bbolt"
) )