issue1808: cleanup code

query_executor.go

@@ -169,33 +169,35 @@ func (q *queryExecutor) do(ctx context.Context, qry ExecutableQuery, hostIter Ne
 		if iter.err == nil || rt == nil {
 			return iter
 		}
-		// Exit if error is ignored or retry attempts were reached
+
 		retryType := rt.GetRetryType(iter.err)
-		if retryType == Ignore {
-			iter.err = nil
-			return iter
-		}
-		if !rt.Attempt(qry) {
-			return iter
-		}
+		attemptsReached := !rt.Attempt(qry)
 
-		lastErr = iter.err
+		var stopRetries bool
 
 		// If query is unsuccessful, check the error with RetryPolicy to retry
-		switch rt.GetRetryType(iter.err) {
+		switch retryType {
 		case Retry:
 			// retry on the same host
-			continue
-		case Rethrow:
-			return iter
 		case RetryNextHost:
 			// retry on the next host
 			selectedHost = hostIter()
-			continue
+		case Ignore:
+			iter.err = nil
+			stopRetries = true
+		case Rethrow:
+			stopRetries = true
 		default:
 			// Undefined? Return nil and error, this will panic in the requester
 			return &Iter{err: ErrUnknownRetryType}
 		}
+
+		if stopRetries || attemptsReached {
+			return iter
+		}
+
+		lastErr = iter.err
+		continue
 	}
 
 	if lastErr != nil {