From 9108af90461ce168f05053ce064d2bff4985976b Mon Sep 17 00:00:00 2001 From: Gyu-Ho Lee Date: Sun, 10 Apr 2016 23:16:56 -0700 Subject: [PATCH] *: clean up from go vet, misspell --- clientv3/txn.go | 18 ++++++++++-------- compactor/compactor_test.go | 2 +- etcdmain/etcd.go | 4 ++-- integration/v3_watch_test.go | 6 +++--- raft/raft.go | 2 +- raft/raft_test.go | 8 ++++---- storage/index.go | 2 +- 7 files changed, 22 insertions(+), 20 deletions(-) diff --git a/clientv3/txn.go b/clientv3/txn.go index f664ee639..14607f21a 100644 --- a/clientv3/txn.go +++ b/clientv3/txn.go @@ -21,15 +21,17 @@ import ( "golang.org/x/net/context" ) +// Txn is the interface that wraps mini-transactions. +// +// Tx.If( +// Compare(Value(k1), ">", v1), +// Compare(Version(k1), "=", 2) +// ).Then( +// OpPut(k2,v2), OpPut(k3,v3) +// ).Else( +// OpPut(k4,v4), OpPut(k5,v5) +// ).Commit() // -// Tx.If( -// Compare(Value(k1), ">", v1), -// Compare(Version(k1), "=", 2) -// ).Then( -// OpPut(k2,v2), OpPut(k3,v3) -// ).Else( -// OpPut(k4,v4), OpPut(k5,v5) -// ).Commit() type Txn interface { // If takes a list of comparison. If all comparisons passed in succeed, // the operations passed into Then() will be executed. Or the operations diff --git a/compactor/compactor_test.go b/compactor/compactor_test.go index f6ded9607..ec0af4146 100644 --- a/compactor/compactor_test.go +++ b/compactor/compactor_test.go @@ -76,7 +76,7 @@ func TestPeriodicPause(t *testing.T) { select { case a := <-compactable.Chan(): - t.Fatal("unexpected action %v", a) + t.Fatalf("unexpected action %v", a) case <-time.After(10 * time.Millisecond): } diff --git a/etcdmain/etcd.go b/etcdmain/etcd.go index c46cca57f..0eb83afd6 100644 --- a/etcdmain/etcd.go +++ b/etcdmain/etcd.go @@ -203,7 +203,7 @@ func startEtcd(cfg *config) (<-chan struct{}, error) { } if cfg.peerAutoTLS && cfg.peerTLSInfo.Empty() { - phosts := make([]string, 0) + var phosts []string for _, u := range cfg.lpurls { phosts = append(phosts, u.Host) } @@ -218,7 +218,7 @@ func startEtcd(cfg *config) (<-chan struct{}, error) { if !cfg.peerTLSInfo.Empty() { plog.Infof("peerTLS: %s", cfg.peerTLSInfo) } - plns := make([]net.Listener, 0) + var plns []net.Listener for _, u := range cfg.lpurls { if u.Scheme == "http" { if !cfg.peerTLSInfo.Empty() { diff --git a/integration/v3_watch_test.go b/integration/v3_watch_test.go index 50f6cab3a..28657e258 100644 --- a/integration/v3_watch_test.go +++ b/integration/v3_watch_test.go @@ -226,11 +226,11 @@ func TestV3WatchFromCurrentRevision(t *testing.T) { continue } if !cresp.Created { - t.Errorf("#%d: did not create watchid, got +%v", i, cresp) + t.Errorf("#%d: did not create watchid, got %+v", i, cresp) continue } if cresp.Canceled { - t.Errorf("#%d: canceled watcher on create", i, cresp) + t.Errorf("#%d: canceled watcher on create %+v", i, cresp) continue } @@ -317,7 +317,7 @@ func TestV3WatchFutureRevision(t *testing.T) { t.Fatalf("wStream.Recv error: %v", err) } if !cresp.Created { - t.Fatal("create = %v, want %v", cresp.Created, true) + t.Fatalf("create %v, want %v", cresp.Created, true) } kvc := toGRPC(clus.RandClient()).KV diff --git a/raft/raft.go b/raft/raft.go index baf03ea8f..a236b8241 100644 --- a/raft/raft.go +++ b/raft/raft.go @@ -903,7 +903,7 @@ func (r *raft) removeNode(id uint64) { if r.maybeCommit() { r.bcastAppend() } - // If the removed node is the leadTransferee, then abort the leadership transfering. + // If the removed node is the leadTransferee, then abort the leadership transferring. if r.state == StateLeader && r.leadTransferee == id { r.abortLeaderTransfer() } diff --git a/raft/raft_test.go b/raft/raft_test.go index ab8ec2446..4c7a48150 100644 --- a/raft/raft_test.go +++ b/raft/raft_test.go @@ -1911,7 +1911,7 @@ func TestCommitAfterRemoveNode(t *testing.T) { } } -// TestLeaderTransferToUpToDateNode verifies transfering should succeed +// TestLeaderTransferToUpToDateNode verifies transferring should succeed // if the transferee has the most up-to-date log entires when transfer starts. func TestLeaderTransferToUpToDateNode(t *testing.T) { nt := newNetwork(nil, nil, nil) @@ -2077,7 +2077,7 @@ func TestLeaderTransferRemoveNode(t *testing.T) { lead := nt.peers[1].(*raft) - // The leadTransferee is removed when leadship transfering. + // The leadTransferee is removed when leadship transferring. nt.send(pb.Message{From: 3, To: 1, Type: pb.MsgTransferLeader}) if lead.leadTransferee != 3 { t.Fatalf("wait transferring, leadTransferee = %v, want %v", lead.leadTransferee, 3) @@ -2159,10 +2159,10 @@ func TestLeaderTransferSecondTransferToSameNode(t *testing.T) { func checkLeaderTransferState(t *testing.T, r *raft, state StateType, lead uint64) { if r.state != state || r.lead != lead { - t.Fatalf("after transfering, node has state %v lead %v, want state %v lead %v", r.state, r.lead, state, lead) + t.Fatalf("after transferring, node has state %v lead %v, want state %v lead %v", r.state, r.lead, state, lead) } if r.leadTransferee != None { - t.Fatalf("after transfering, node has leadTransferee %v, want leadTransferee %v", r.leadTransferee, None) + t.Fatalf("after transferring, node has leadTransferee %v, want leadTransferee %v", r.leadTransferee, None) } } diff --git a/storage/index.go b/storage/index.go index 3b52f97b3..b9212a28e 100644 --- a/storage/index.go +++ b/storage/index.go @@ -168,7 +168,7 @@ func (ti *treeIndex) RangeSince(key, end []byte, rev int64) []revision { func (ti *treeIndex) Compact(rev int64) map[revision]struct{} { available := make(map[revision]struct{}) - emptyki := make([]*keyIndex, 0) + var emptyki []*keyIndex log.Printf("store.index: compact %d", rev) // TODO: do not hold the lock for long time? // This is probably OK. Compacting 10M keys takes O(10ms).