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

Merge pull request #8047 from heyitsanthony/extra-cov

Browse Source 
mvcc, v3rpc: minor coverage improvements
This commit is contained in:
Anthony Romano 2017-06-07 10:50:30 -07:00 committed by GitHub
commit 09abea5784
3 changed files with 3 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
etcdserver/api/v3rpc/header.go
View File

@ -37,6 +37,9 @@ func newHeader(s *etcdserver.EtcdServer) header {
// fill populates pb.ResponseHeader using etcdserver information // fill populates pb.ResponseHeader using etcdserver information
func (h *header) fill(rh *pb.ResponseHeader) { func (h *header) fill(rh *pb.ResponseHeader) {
if rh == nil {
plog.Panic("unexpected nil resp.Header")
}
rh.ClusterId = uint64(h.clusterID) rh.ClusterId = uint64(h.clusterID)
rh.MemberId = uint64(h.memberID) rh.MemberId = uint64(h.memberID)
rh.RaftTerm = h.raftTimer.Term() rh.RaftTerm = h.raftTimer.Term()

15
etcdserver/api/v3rpc/key.go
View File

@ -53,9 +53,6 @@ func (s *kvServer) Range(ctx context.Context, r *pb.RangeRequest) (*pb.RangeResp
return nil, togRPCError(err) return nil, togRPCError(err)
} }
if resp.Header == nil {
plog.Panic("unexpected nil resp.Header")
}
s.hdr.fill(resp.Header) s.hdr.fill(resp.Header)
return resp, nil return resp, nil
} }
@ -70,9 +67,6 @@ func (s *kvServer) Put(ctx context.Context, r *pb.PutRequest) (*pb.PutResponse,
return nil, togRPCError(err) return nil, togRPCError(err)
} }
if resp.Header == nil {
plog.Panic("unexpected nil resp.Header")
}
s.hdr.fill(resp.Header) s.hdr.fill(resp.Header)
return resp, nil return resp, nil
} }
@ -87,9 +81,6 @@ func (s *kvServer) DeleteRange(ctx context.Context, r *pb.DeleteRangeRequest) (*
return nil, togRPCError(err) return nil, togRPCError(err)
} }
if resp.Header == nil {
plog.Panic("unexpected nil resp.Header")
}
s.hdr.fill(resp.Header) s.hdr.fill(resp.Header)
return resp, nil return resp, nil
} }
@ -104,9 +95,6 @@ func (s *kvServer) Txn(ctx context.Context, r *pb.TxnRequest) (*pb.TxnResponse,
return nil, togRPCError(err) return nil, togRPCError(err)
} }
if resp.Header == nil {
plog.Panic("unexpected nil resp.Header")
}
s.hdr.fill(resp.Header) s.hdr.fill(resp.Header)
return resp, nil return resp, nil
} }
@ -117,9 +105,6 @@ func (s *kvServer) Compact(ctx context.Context, r *pb.CompactionRequest) (*pb.Co
return nil, togRPCError(err) return nil, togRPCError(err)
} }
if resp.Header == nil {
plog.Panic("unexpected nil resp.Header")
}
s.hdr.fill(resp.Header) s.hdr.fill(resp.Header)
return resp, nil return resp, nil
} }

10
mvcc/kvstore.go
View File

@ -371,16 +371,6 @@ func (s *store) Close() error {
return nil return nil
} }
func (a *store) Equal(b *store) bool {
if a.currentRev != b.currentRev {
return false
}
if a.compactMainRev != b.compactMainRev {
return false
}
return a.kvindex.Equal(b.kvindex)
}
func (s *store) saveIndex(tx backend.BatchTx) { func (s *store) saveIndex(tx backend.BatchTx) {
if s.ig == nil { if s.ig == nil {
return return