Merge pull request #10375 from johncming/redundant-parentheses

etcdserver: remove redundant parentheses.
etcd-io · Jan 8, 2019 · b04633f · b04633f
2 parents 8945fec + 802e2aa
commit b04633f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/etcdserver/api/v2store/event_history.go b/etcdserver/api/v2store/event_history.go
@@ -79,7 +79,7 @@ func (eh *EventHistory) scan(key string, recursive bool, index uint64) (*Event,
 		e := eh.Queue.Events[i]
 
 		if !e.Refresh {
-			ok := (e.Node.Key == key)
+			ok := e.Node.Key == key
 
 			if recursive {
 				// add tailing slash

diff --git a/etcdserver/api/v2store/node.go b/etcdserver/api/v2store/node.go
@@ -338,8 +338,8 @@ func (n *node) UpdateTTL(expireTime time.Time) {
 // Compare function compares node index and value with provided ones.
 // second result value explains result and equals to one of Compare.. constants
 func (n *node) Compare(prevValue string, prevIndex uint64) (ok bool, which int) {
-	indexMatch := (prevIndex == 0 || n.ModifiedIndex == prevIndex)
-	valueMatch := (prevValue == "" || n.Value == prevValue)
+	indexMatch := prevIndex == 0 || n.ModifiedIndex == prevIndex
+	valueMatch := prevValue == "" || n.Value == prevValue
 	ok = valueMatch && indexMatch
 	switch {
 	case valueMatch && indexMatch:

diff --git a/etcdserver/api/v2store/watcher_hub.go b/etcdserver/api/v2store/watcher_hub.go
@@ -151,7 +151,7 @@ func (wh *watcherHub) notifyWatchers(e *Event, nodePath string, deleted bool) {
 
 			w, _ := curr.Value.(*watcher)
 
-			originalPath := (e.Node.Key == nodePath)
+			originalPath := e.Node.Key == nodePath
 			if (originalPath || !isHidden(nodePath, e.Node.Key)) && w.notify(e, originalPath, deleted) {
 				if !w.stream { // do not remove the stream watcher
 					// if we successfully notify a watcher

diff --git a/etcdserver/api/v2v3/store.go b/etcdserver/api/v2v3/store.go
@@ -531,8 +531,8 @@ func compareFail(nodePath, prevValue string, prevIndex uint64, resp *clientv3.Tx
 		return v2error.NewError(v2error.EcodeKeyNotFound, nodePath, mkV2Rev(resp.Header.Revision))
 	}
 	kv := kvs[0]
-	indexMatch := (prevIndex == 0 || kv.ModRevision == int64(prevIndex))
-	valueMatch := (prevValue == "" || string(kv.Value) == prevValue)
+	indexMatch := prevIndex == 0 || kv.ModRevision == int64(prevIndex)
+	valueMatch := prevValue == "" || string(kv.Value) == prevValue
 	var cause string
 	switch {
 	case indexMatch && !valueMatch: