etcdserver: move protobuf to etcdserverpb

etcdserver2/etcdhttp/http.go

@@ -13,6 +13,7 @@ import (
 	"code.google.com/p/go.net/context"
 	"github.com/coreos/etcd/elog"
 	etcdserver "github.com/coreos/etcd/etcdserver2"
+	"github.com/coreos/etcd/etcdserver2/etcdserverpb"
 	"github.com/coreos/etcd/raft/raftpb"
 	"github.com/coreos/etcd/store"
 )
@@ -79,9 +80,9 @@ func genId() int64 {
 	panic("implement me")
 }
 
-func parseRequest(r *http.Request) etcdserver.Request {
+func parseRequest(r *http.Request) etcdserverpb.Request {
 	q := r.URL.Query()
-	rr := etcdserver.Request{
+	rr := etcdserverpb.Request{
 		Id:        genId(),
 		Method:    r.Method,
 		Path:      r.URL.Path[len("/keys/"):],

etcdserver2/request.pb.go → etcdserver2/etcdserverpb/etcdserver.pb.go

@@ -1,17 +1,17 @@
 // Code generated by protoc-gen-gogo.
-// source: request.proto
+// source: etcdserver.proto
 // DO NOT EDIT!
 
 /*
-	Package etcdserver is a generated protocol buffer package.
+	Package etcdserverpb is a generated protocol buffer package.
 
 	It is generated from these files:
-		request.proto
+		etcdserver.proto
 
 	It has these top-level messages:
 		Request
 */
-package etcdserver
+package etcdserverpb
 
 import proto "code.google.com/p/gogoprotobuf/proto"
 import json "encoding/json"
@@ -329,23 +329,23 @@ func (m *Request) Unmarshal(data []byte) error {
 func (m *Request) Size() (n int) {
 	var l int
 	_ = l
-	n += 1 + sovRequest(uint64(m.Id))
+	n += 1 + sovEtcdserver(uint64(m.Id))
 	l = len(m.Method)
-	n += 1 + l + sovRequest(uint64(l))
+	n += 1 + l + sovEtcdserver(uint64(l))
 	l = len(m.Path)
-	n += 1 + l + sovRequest(uint64(l))
+	n += 1 + l + sovEtcdserver(uint64(l))
 	l = len(m.Val)
-	n += 1 + l + sovRequest(uint64(l))
+	n += 1 + l + sovEtcdserver(uint64(l))
 	n += 2
 	l = len(m.PrevValue)
-	n += 1 + l + sovRequest(uint64(l))
-	n += 1 + sovRequest(uint64(m.PrevIndex))
+	n += 1 + l + sovEtcdserver(uint64(l))
+	n += 1 + sovEtcdserver(uint64(m.PrevIndex))
 	if m.PrevExists != nil {
 		n += 2
 	}
-	n += 1 + sovRequest(uint64(m.Expiration))
+	n += 1 + sovEtcdserver(uint64(m.Expiration))
 	n += 2
-	n += 1 + sovRequest(uint64(m.Since))
+	n += 1 + sovEtcdserver(uint64(m.Since))
 	n += 2
 	n += 2
 	if m.XXX_unrecognized != nil {
@@ -354,7 +354,7 @@ func (m *Request) Size() (n int) {
 	return n
 }
 
-func sovRequest(x uint64) (n int) {
+func sovEtcdserver(x uint64) (n int) {
 	for {
 		n++
 		x >>= 7
@@ -364,8 +364,8 @@ func sovRequest(x uint64) (n int) {
 	}
 	return n
 }
-func sozRequest(x uint64) (n int) {
-	return sovRequest(uint64((x << 1) ^ uint64((int64(x) >> 63))))
+func sozEtcdserver(x uint64) (n int) {
+	return sovEtcdserver(uint64((x << 1) ^ uint64((int64(x) >> 63))))
 }
 func (m *Request) Marshal() (data []byte, err error) {
 	size := m.Size()
@@ -384,18 +384,18 @@ func (m *Request) MarshalTo(data []byte) (n int, err error) {
 	_ = l
 	data[i] = 0x8
 	i++
-	i = encodeVarintRequest(data, i, uint64(m.Id))
+	i = encodeVarintEtcdserver(data, i, uint64(m.Id))
 	data[i] = 0x12
 	i++
-	i = encodeVarintRequest(data, i, uint64(len(m.Method)))
+	i = encodeVarintEtcdserver(data, i, uint64(len(m.Method)))
 	i += copy(data[i:], m.Method)
 	data[i] = 0x1a
 	i++
-	i = encodeVarintRequest(data, i, uint64(len(m.Path)))
+	i = encodeVarintEtcdserver(data, i, uint64(len(m.Path)))
 	i += copy(data[i:], m.Path)
 	data[i] = 0x22
 	i++
-	i = encodeVarintRequest(data, i, uint64(len(m.Val)))
+	i = encodeVarintEtcdserver(data, i, uint64(len(m.Val)))
 	i += copy(data[i:], m.Val)
 	data[i] = 0x28
 	i++
@@ -407,11 +407,11 @@ func (m *Request) MarshalTo(data []byte) (n int, err error) {
 	i++
 	data[i] = 0x32
 	i++
-	i = encodeVarintRequest(data, i, uint64(len(m.PrevValue)))
+	i = encodeVarintEtcdserver(data, i, uint64(len(m.PrevValue)))
 	i += copy(data[i:], m.PrevValue)
 	data[i] = 0x38
 	i++
-	i = encodeVarintRequest(data, i, uint64(m.PrevIndex))
+	i = encodeVarintEtcdserver(data, i, uint64(m.PrevIndex))
 	if m.PrevExists != nil {
 		data[i] = 0x40
 		i++
@@ -424,7 +424,7 @@ func (m *Request) MarshalTo(data []byte) (n int, err error) {
 	}
 	data[i] = 0x48
 	i++
-	i = encodeVarintRequest(data, i, uint64(m.Expiration))
+	i = encodeVarintEtcdserver(data, i, uint64(m.Expiration))
 	data[i] = 0x50
 	i++
 	if m.Wait {
@@ -435,7 +435,7 @@ func (m *Request) MarshalTo(data []byte) (n int, err error) {
 	i++
 	data[i] = 0x58
 	i++
-	i = encodeVarintRequest(data, i, uint64(m.Since))
+	i = encodeVarintEtcdserver(data, i, uint64(m.Since))
 	data[i] = 0x60
 	i++
 	if m.Recursive {
@@ -457,7 +457,7 @@ func (m *Request) MarshalTo(data []byte) (n int, err error) {
 	}
 	return i, nil
 }
-func encodeFixed64Request(data []byte, offset int, v uint64) int {
+func encodeFixed64Etcdserver(data []byte, offset int, v uint64) int {
 	data[offset] = uint8(v)
 	data[offset+1] = uint8(v >> 8)
 	data[offset+2] = uint8(v >> 16)
@@ -468,14 +468,14 @@ func encodeFixed64Request(data []byte, offset int, v uint64) int {
 	data[offset+7] = uint8(v >> 56)
 	return offset + 8
 }
-func encodeFixed32Request(data []byte, offset int, v uint32) int {
+func encodeFixed32Etcdserver(data []byte, offset int, v uint32) int {
 	data[offset] = uint8(v)
 	data[offset+1] = uint8(v >> 8)
 	data[offset+2] = uint8(v >> 16)
 	data[offset+3] = uint8(v >> 24)
 	return offset + 4
 }
-func encodeVarintRequest(data []byte, offset int, v uint64) int {
+func encodeVarintEtcdserver(data []byte, offset int, v uint64) int {
 	for v >= 1<<7 {
 		data[offset] = uint8(v&0x7f | 0x80)
 		v >>= 7

etcdserver2/request.proto → etcdserver2/etcdserverpb/etcdserver.proto

@@ -1,4 +1,4 @@
-package etcdserver;
+package etcdserverpb;
 
 import "code.google.com/p/gogoprotobuf/gogoproto/gogo.proto";
 

etcdserver2/server.go

@@ -10,6 +10,7 @@ import (
 	"github.com/coreos/etcd/raft/raftpb"
 	"github.com/coreos/etcd/store"
 	"github.com/coreos/etcd/wait"
+	pb "github.com/coreos/etcd/etcdserver2/etcdserverpb"
 )
 
 var ErrUnknownMethod = errors.New("etcdserver: unknown method")
@@ -75,7 +76,7 @@ func (s *Server) Run(ctx context.Context) {
 	}
 }
 
-func (s *Server) Do(ctx context.Context, r Request) (Response, error) {
+func (s *Server) Do(ctx context.Context, r pb.Request) (Response, error) {
 	s.once.Do(s.init)
 	if r.Id == 0 {
 		panic("r.Id cannot be 0")
@@ -118,7 +119,7 @@ func (s *Server) Do(ctx context.Context, r Request) (Response, error) {
 
 // apply interprets r as a call to store.X and returns an Response interpreted from store.Event
 func (s *Server) apply(ctx context.Context, e raftpb.Entry) (*store.Event, error) {
-	var r Request
+	var r pb.Request
 	if err := r.Unmarshal(e.Data); err != nil {
 		return nil, err
 	}