etcdserver/*: move internal v2 packages

Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
This commit is contained in:
Gyuho Lee
2018-05-14 12:49:49 -07:00
parent 294b5745d6
commit 7a92bbfed2
67 changed files with 69 additions and 69 deletions

View File

@ -84,11 +84,12 @@ See [code changes](https://github.com/coreos/etcd/compare/v3.3.0...v3.4.0) and [
- Previously, `Repair(dirpath string) bool`, now `Repair(lg *zap.Logger, dirpath string) bool`.
- Previously, `Create(dirpath string, metadata []byte) (*WAL, error)`, now `Create(lg *zap.Logger, dirpath string, metadata []byte) (*WAL, error)`.
- Remove [`pkg/cors` package](https://github.com/coreos/etcd/pull/9490).
- Change [`--experimental-enable-v2v3`](TODO) flag to `--enable-v2v3`; v2 storage emulation is now stable.
- Move internal package `"github.com/coreos/etcd/snap"` to [`"github.com/coreos/etcd/raftsnap"`](https://github.com/coreos/etcd/pull/9211).
- Move internal package `"github.com/coreos/etcd/etcdserver/auth"` to [`"github.com/coreos/etcd/etcdserver/v2auth"`](https://github.com/coreos/etcd/pull/9275).
- Move internal package `"github.com/coreos/etcd/error"` to [`"github.com/coreos/etcd/etcdserver/v2error"`](https://github.com/coreos/etcd/pull/9274).
- Move internal package `"github.com/coreos/etcd/store"` to [`"github.com/coreos/etcd/etcdserver/v2store"`](https://github.com/coreos/etcd/pull/9274).
- [`--experimental-enable-v2v3`](TODO) has been deprecated, `--enable-v2v3` flag is now stable.
- Move internal package `"github.com/coreos/etcd/etcdserver/auth"` to `"github.com/coreos/etcd/etcdserver/api/v2auth"`.
- Move internal package `"github.com/coreos/etcd/etcdserver/stats"` to `"github.com/coreos/etcd/etcdserver/api/v2stats"`.
- Move internal package `"github.com/coreos/etcd/error"` to `"github.com/coreos/etcd/etcdserver/api/v2error"`.
- Move internal package `"github.com/coreos/etcd/store"` to `"github.com/coreos/etcd/etcdserver/api/v2store"`.
### Dependency

View File

@ -24,7 +24,7 @@ import (
"strconv"
"time"
"github.com/coreos/etcd/etcdserver/stats"
stats "github.com/coreos/etcd/etcdserver/api/v2stats"
"github.com/coreos/etcd/pkg/fileutil"
"github.com/coreos/etcd/pkg/types"
"github.com/coreos/etcd/raft"

View File

@ -27,10 +27,10 @@ import (
"github.com/coreos/etcd/client"
"github.com/coreos/etcd/etcdserver"
"github.com/coreos/etcd/etcdserver/api"
"github.com/coreos/etcd/etcdserver/api/v2error"
"github.com/coreos/etcd/etcdserver/api/v2store"
pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
"github.com/coreos/etcd/etcdserver/membership"
"github.com/coreos/etcd/etcdserver/v2error"
"github.com/coreos/etcd/etcdserver/v2store"
"github.com/coreos/etcd/mvcc"
"github.com/coreos/etcd/mvcc/backend"
"github.com/coreos/etcd/mvcc/mvccpb"

View File

@ -23,8 +23,8 @@ import (
"github.com/coreos/etcd/etcdserver"
"github.com/coreos/etcd/etcdserver/api"
"github.com/coreos/etcd/etcdserver/api/v2error"
"github.com/coreos/etcd/etcdserver/api/v2http/httptypes"
"github.com/coreos/etcd/etcdserver/v2error"
"github.com/coreos/etcd/pkg/logutil"
"github.com/coreos/etcd/version"

View File

@ -27,8 +27,8 @@ import (
"time"
"github.com/coreos/etcd/etcdserver"
"github.com/coreos/etcd/etcdserver/api/v2error"
"github.com/coreos/etcd/etcdserver/etcdserverpb"
"github.com/coreos/etcd/etcdserver/v2error"
"github.com/coreos/etcd/pkg/types"
"github.com/coreos/pkg/capnslog"

View File

@ -20,8 +20,8 @@ import (
"path"
"github.com/coreos/etcd/etcdserver"
"github.com/coreos/etcd/etcdserver/api/v2error"
"github.com/coreos/etcd/etcdserver/etcdserverpb"
"github.com/coreos/etcd/etcdserver/v2error"
"go.uber.org/zap"
)

View File

@ -21,9 +21,9 @@ import (
"time"
"github.com/coreos/etcd/etcdserver"
"github.com/coreos/etcd/etcdserver/api/v2error"
"github.com/coreos/etcd/etcdserver/api/v2store"
"github.com/coreos/etcd/etcdserver/etcdserverpb"
"github.com/coreos/etcd/etcdserver/v2error"
"github.com/coreos/etcd/etcdserver/v2store"
"go.uber.org/zap"
)

View File

@ -30,13 +30,13 @@ import (
"github.com/coreos/etcd/etcdserver"
"github.com/coreos/etcd/etcdserver/api"
"github.com/coreos/etcd/etcdserver/api/etcdhttp"
"github.com/coreos/etcd/etcdserver/api/v2auth"
"github.com/coreos/etcd/etcdserver/api/v2error"
"github.com/coreos/etcd/etcdserver/api/v2http/httptypes"
stats "github.com/coreos/etcd/etcdserver/api/v2stats"
"github.com/coreos/etcd/etcdserver/api/v2store"
"github.com/coreos/etcd/etcdserver/etcdserverpb"
"github.com/coreos/etcd/etcdserver/membership"
"github.com/coreos/etcd/etcdserver/stats"
"github.com/coreos/etcd/etcdserver/v2auth"
"github.com/coreos/etcd/etcdserver/v2error"
"github.com/coreos/etcd/etcdserver/v2store"
"github.com/coreos/etcd/pkg/types"
"github.com/jonboulle/clockwork"

View File

@ -21,8 +21,8 @@ import (
"strings"
"github.com/coreos/etcd/etcdserver/api"
"github.com/coreos/etcd/etcdserver/api/v2auth"
"github.com/coreos/etcd/etcdserver/api/v2http/httptypes"
"github.com/coreos/etcd/etcdserver/v2auth"
"go.uber.org/zap"
)

View File

@ -31,7 +31,7 @@ import (
"testing"
"github.com/coreos/etcd/etcdserver/api"
"github.com/coreos/etcd/etcdserver/v2auth"
"github.com/coreos/etcd/etcdserver/api/v2auth"
"go.uber.org/zap"
)

View File

@ -31,11 +31,11 @@ import (
"github.com/coreos/etcd/etcdserver"
"github.com/coreos/etcd/etcdserver/api"
"github.com/coreos/etcd/etcdserver/api/v2error"
"github.com/coreos/etcd/etcdserver/api/v2http/httptypes"
"github.com/coreos/etcd/etcdserver/api/v2store"
"github.com/coreos/etcd/etcdserver/etcdserverpb"
"github.com/coreos/etcd/etcdserver/membership"
"github.com/coreos/etcd/etcdserver/v2error"
"github.com/coreos/etcd/etcdserver/v2store"
"github.com/coreos/etcd/pkg/testutil"
"github.com/coreos/etcd/pkg/types"
"github.com/coreos/etcd/raft/raftpb"

View File

@ -21,8 +21,8 @@ import (
"time"
"github.com/coreos/etcd/etcdserver/api/etcdhttp"
"github.com/coreos/etcd/etcdserver/api/v2auth"
"github.com/coreos/etcd/etcdserver/api/v2http/httptypes"
"github.com/coreos/etcd/etcdserver/v2auth"
"github.com/coreos/etcd/pkg/logutil"
"github.com/coreos/pkg/capnslog"

View File

@ -23,9 +23,9 @@ import (
"testing"
"github.com/coreos/etcd/etcdserver"
"github.com/coreos/etcd/etcdserver/api/v2error"
"github.com/coreos/etcd/etcdserver/etcdserverpb"
"github.com/coreos/etcd/etcdserver/membership"
"github.com/coreos/etcd/etcdserver/v2error"
"github.com/coreos/etcd/pkg/types"
"github.com/coreos/etcd/raft/raftpb"

View File

@ -20,9 +20,9 @@ import (
"net/http"
"github.com/coreos/etcd/etcdserver/api/v2error"
"github.com/coreos/etcd/etcdserver/api/v2http/httptypes"
"github.com/coreos/etcd/etcdserver/etcdserverpb"
"github.com/coreos/etcd/etcdserver/v2error"
"github.com/prometheus/client_golang/prometheus"
)

View File

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
package stats
package v2stats
import (
"encoding/json"

View File

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
package stats
package v2stats
import (
"sync"

View File

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
package stats
package v2stats
import (
"encoding/json"

View File

@ -12,14 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
// Package stats defines a standard interface for etcd cluster statistics.
package stats
// Package v2stats defines a standard interface for etcd cluster statistics.
package v2stats
import "github.com/coreos/pkg/capnslog"
var (
plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "etcdserver/stats")
)
var plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "etcdserver/stats")
type Stats interface {
// SelfStats returns the struct representing statistics of this server

View File

@ -20,7 +20,7 @@ import (
"strings"
"sync"
"github.com/coreos/etcd/etcdserver/v2error"
"github.com/coreos/etcd/etcdserver/api/v2error"
)
type EventHistory struct {

View File

@ -17,7 +17,7 @@ package v2store
import (
"testing"
"github.com/coreos/etcd/etcdserver/v2error"
"github.com/coreos/etcd/etcdserver/api/v2error"
)
// TestEventQueue tests a queue with capacity = 100

View File

@ -19,7 +19,7 @@ import (
"sort"
"time"
"github.com/coreos/etcd/etcdserver/v2error"
"github.com/coreos/etcd/etcdserver/api/v2error"
"github.com/jonboulle/clockwork"
)

View File

@ -23,7 +23,7 @@ import (
"sync"
"time"
"github.com/coreos/etcd/etcdserver/v2error"
"github.com/coreos/etcd/etcdserver/api/v2error"
"github.com/coreos/etcd/pkg/types"
"github.com/jonboulle/clockwork"

View File

@ -18,8 +18,8 @@ import (
"testing"
"time"
"github.com/coreos/etcd/etcdserver/v2error"
"github.com/coreos/etcd/etcdserver/v2store"
"github.com/coreos/etcd/etcdserver/api/v2error"
"github.com/coreos/etcd/etcdserver/api/v2store"
"github.com/coreos/etcd/pkg/testutil"
)

View File

@ -18,7 +18,7 @@ import (
"testing"
"time"
"github.com/coreos/etcd/etcdserver/v2error"
"github.com/coreos/etcd/etcdserver/api/v2error"
"github.com/coreos/etcd/pkg/testutil"
"github.com/jonboulle/clockwork"

View File

@ -19,7 +19,7 @@ package v2store_test
import (
"testing"
"github.com/coreos/etcd/etcdserver/v2store"
"github.com/coreos/etcd/etcdserver/api/v2store"
"github.com/coreos/etcd/pkg/testutil"
)

View File

@ -21,8 +21,8 @@ import (
"testing"
"github.com/coreos/etcd/clientv3"
"github.com/coreos/etcd/etcdserver/api/v2store"
"github.com/coreos/etcd/etcdserver/api/v2v3"
"github.com/coreos/etcd/etcdserver/v2store"
"github.com/coreos/etcd/integration"
"google.golang.org/grpc/grpclog"

View File

@ -21,7 +21,7 @@ import (
"sync"
"sync/atomic"
"github.com/coreos/etcd/etcdserver/v2error"
"github.com/coreos/etcd/etcdserver/api/v2error"
)
// A watcherHub contains all subscribed watchers

View File

@ -24,8 +24,8 @@ import (
"github.com/coreos/etcd/clientv3"
"github.com/coreos/etcd/clientv3/concurrency"
"github.com/coreos/etcd/etcdserver/v2error"
"github.com/coreos/etcd/etcdserver/v2store"
"github.com/coreos/etcd/etcdserver/api/v2error"
"github.com/coreos/etcd/etcdserver/api/v2store"
"github.com/coreos/etcd/mvcc/mvccpb"
)

View File

@ -19,8 +19,8 @@ import (
"strings"
"github.com/coreos/etcd/clientv3"
"github.com/coreos/etcd/etcdserver/v2error"
"github.com/coreos/etcd/etcdserver/v2store"
"github.com/coreos/etcd/etcdserver/api/v2error"
"github.com/coreos/etcd/etcdserver/api/v2store"
)
func (s *v2v3Store) Watch(prefix string, recursive, stream bool, sinceIndex uint64) (v2store.Watcher, error) {

View File

@ -20,8 +20,8 @@ import (
"time"
"github.com/coreos/etcd/etcdserver/api"
"github.com/coreos/etcd/etcdserver/api/v2store"
"github.com/coreos/etcd/etcdserver/membership"
"github.com/coreos/etcd/etcdserver/v2store"
"github.com/coreos/etcd/pkg/pbutil"
"github.com/coreos/go-semver/semver"

View File

@ -27,7 +27,7 @@ import (
"sync"
"time"
"github.com/coreos/etcd/etcdserver/v2store"
"github.com/coreos/etcd/etcdserver/api/v2store"
"github.com/coreos/etcd/mvcc/backend"
"github.com/coreos/etcd/pkg/netutil"
"github.com/coreos/etcd/pkg/types"

View File

@ -21,7 +21,7 @@ import (
"reflect"
"testing"
"github.com/coreos/etcd/etcdserver/v2store"
"github.com/coreos/etcd/etcdserver/api/v2store"
"github.com/coreos/etcd/pkg/mock/mockstore"
"github.com/coreos/etcd/pkg/testutil"
"github.com/coreos/etcd/pkg/types"

View File

@ -17,7 +17,7 @@ package membership
import (
"errors"
"github.com/coreos/etcd/etcdserver/v2error"
"github.com/coreos/etcd/etcdserver/api/v2error"
)
var (

View File

@ -19,7 +19,7 @@ import (
"fmt"
"path"
"github.com/coreos/etcd/etcdserver/v2store"
"github.com/coreos/etcd/etcdserver/api/v2store"
"github.com/coreos/etcd/mvcc/backend"
"github.com/coreos/etcd/pkg/types"

View File

@ -35,10 +35,10 @@ import (
"github.com/coreos/etcd/discovery"
"github.com/coreos/etcd/etcdserver/api"
"github.com/coreos/etcd/etcdserver/api/v2http/httptypes"
stats "github.com/coreos/etcd/etcdserver/api/v2stats"
"github.com/coreos/etcd/etcdserver/api/v2store"
pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
"github.com/coreos/etcd/etcdserver/membership"
"github.com/coreos/etcd/etcdserver/stats"
"github.com/coreos/etcd/etcdserver/v2store"
"github.com/coreos/etcd/lease"
"github.com/coreos/etcd/lease/leasehttp"
"github.com/coreos/etcd/mvcc"

View File

@ -29,9 +29,9 @@ import (
"go.uber.org/zap"
"github.com/coreos/etcd/etcdserver/api/v2store"
pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
"github.com/coreos/etcd/etcdserver/membership"
"github.com/coreos/etcd/etcdserver/v2store"
"github.com/coreos/etcd/lease"
"github.com/coreos/etcd/mvcc"
"github.com/coreos/etcd/mvcc/backend"

View File

@ -18,8 +18,8 @@ import (
"context"
"time"
"github.com/coreos/etcd/etcdserver/api/v2store"
pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
"github.com/coreos/etcd/etcdserver/v2store"
)
type RequestV2 pb.Request

View File

@ -17,7 +17,7 @@ package mockstore
import (
"time"
"github.com/coreos/etcd/etcdserver/v2store"
"github.com/coreos/etcd/etcdserver/api/v2store"
"github.com/coreos/etcd/pkg/testutil"
)

View File

@ -21,7 +21,7 @@ import (
"testing"
"time"
"github.com/coreos/etcd/etcdserver/stats"
stats "github.com/coreos/etcd/etcdserver/api/v2stats"
"github.com/coreos/etcd/pkg/types"
"github.com/coreos/etcd/raft"
"github.com/coreos/etcd/raft/raftpb"

View File

@ -20,7 +20,7 @@ import (
"io"
"time"
"github.com/coreos/etcd/etcdserver/stats"
stats "github.com/coreos/etcd/etcdserver/api/v2stats"
"github.com/coreos/etcd/pkg/pbutil"
"github.com/coreos/etcd/pkg/types"
"github.com/coreos/etcd/raft/raftpb"

View File

@ -19,7 +19,7 @@ import (
"reflect"
"testing"
"github.com/coreos/etcd/etcdserver/stats"
stats "github.com/coreos/etcd/etcdserver/api/v2stats"
"github.com/coreos/etcd/pkg/types"
"github.com/coreos/etcd/raft/raftpb"
)

View File

@ -19,7 +19,7 @@ import (
"sync"
"time"
"github.com/coreos/etcd/etcdserver/stats"
stats "github.com/coreos/etcd/etcdserver/api/v2stats"
"github.com/coreos/etcd/pkg/types"
"github.com/coreos/etcd/raft"
"github.com/coreos/etcd/raft/raftpb"

View File

@ -22,7 +22,7 @@ import (
"sync"
"time"
"github.com/coreos/etcd/etcdserver/stats"
stats "github.com/coreos/etcd/etcdserver/api/v2stats"
"github.com/coreos/etcd/pkg/pbutil"
"github.com/coreos/etcd/pkg/types"
"github.com/coreos/etcd/raft"

View File

@ -24,13 +24,13 @@ import (
"testing"
"time"
"go.uber.org/zap"
"github.com/coreos/etcd/etcdserver/stats"
stats "github.com/coreos/etcd/etcdserver/api/v2stats"
"github.com/coreos/etcd/pkg/testutil"
"github.com/coreos/etcd/pkg/types"
"github.com/coreos/etcd/raft/raftpb"
"github.com/coreos/etcd/version"
"go.uber.org/zap"
)
// TestPipelineSend tests that pipeline could send data using roundtripper

View File

@ -25,7 +25,7 @@ import (
"sync"
"time"
"github.com/coreos/etcd/etcdserver/stats"
stats "github.com/coreos/etcd/etcdserver/api/v2stats"
"github.com/coreos/etcd/pkg/httputil"
"github.com/coreos/etcd/pkg/transport"
"github.com/coreos/etcd/pkg/types"

View File

@ -26,7 +26,7 @@ import (
"testing"
"time"
"github.com/coreos/etcd/etcdserver/stats"
stats "github.com/coreos/etcd/etcdserver/api/v2stats"
"github.com/coreos/etcd/pkg/testutil"
"github.com/coreos/etcd/pkg/types"
"github.com/coreos/etcd/raft/raftpb"

View File

@ -20,7 +20,7 @@ import (
"sync"
"time"
"github.com/coreos/etcd/etcdserver/stats"
stats "github.com/coreos/etcd/etcdserver/api/v2stats"
"github.com/coreos/etcd/pkg/logutil"
"github.com/coreos/etcd/pkg/transport"
"github.com/coreos/etcd/pkg/types"

View File

@ -21,7 +21,7 @@ import (
"testing"
"time"
"github.com/coreos/etcd/etcdserver/stats"
stats "github.com/coreos/etcd/etcdserver/api/v2stats"
"github.com/coreos/etcd/pkg/types"
"github.com/coreos/etcd/raft"
"github.com/coreos/etcd/raft/raftpb"

View File

@ -20,10 +20,11 @@ import (
"testing"
"time"
"github.com/coreos/etcd/etcdserver/stats"
stats "github.com/coreos/etcd/etcdserver/api/v2stats"
"github.com/coreos/etcd/pkg/testutil"
"github.com/coreos/etcd/pkg/types"
"github.com/coreos/etcd/raft/raftpb"
"github.com/xiang90/probing"
)

View File

@ -29,9 +29,9 @@ import (
"github.com/coreos/etcd/clientv3"
"github.com/coreos/etcd/etcdserver"
"github.com/coreos/etcd/etcdserver/api/v2store"
"github.com/coreos/etcd/etcdserver/etcdserverpb"
"github.com/coreos/etcd/etcdserver/membership"
"github.com/coreos/etcd/etcdserver/v2store"
"github.com/coreos/etcd/lease"
"github.com/coreos/etcd/mvcc"
"github.com/coreos/etcd/mvcc/backend"