cancellation small refactoring

Author: Aleksander Mogilko

connection.go

@@ -177,7 +177,7 @@ func (c *Connection) Query(ctx context.Context, q Query) (*Response, *Cursor, er
 		return response, cursor, err
 	case <-ctx.Done():
 		if q.Type != p.Query_STOP {
-			stopQuery := formStopQuery(q.Token)
+			stopQuery := newStopQuery(q.Token)
 			c.Query(c.contextFromConnectionOpts(), stopQuery)
 		}
 		return nil, nil, ErrQueryTimeout

cursor.go

@@ -148,7 +148,7 @@ func (c *Cursor) Close() error {
 
 	// Stop any unfinished queries
 	if !c.finished {
-		_, _, err = conn.Query(c.ctx, formStopQuery(c.token))
+		_, _, err = conn.Query(c.ctx, newStopQuery(c.token))
 	}
 
 	if c.releaseConn != nil {

query.go

@@ -338,9 +338,7 @@ func (t Term) Run(s QueryExecutor, optArgs ...RunOpts) (*Cursor, error) {
 	var ctx context.Context = nil // if it's nil connection will form context from connection opts
 	if len(optArgs) >= 1 {
 		opts = optArgs[0].toMap()
-		if optArgs[0].Context != nil {
-			ctx = optArgs[0].Context
-		}
+		ctx = optArgs[0].Context
 	}
 
 	if s == nil || !s.IsConnected() {
@@ -450,9 +448,7 @@ func (t Term) Exec(s QueryExecutor, optArgs ...ExecOpts) error {
 	var ctx context.Context = nil // if it's nil connection will form context from connection opts
 	if len(optArgs) >= 1 {
 		opts = optArgs[0].toMap()
-		if optArgs[0].Context != nil {
-			ctx = optArgs[0].Context
-		}
+		ctx = optArgs[0].Context
 	}
 
 	if s == nil || !s.IsConnected() {

query_helpers.go

@@ -4,7 +4,7 @@ import (
 	p "gopkg.in/gorethink/gorethink.v3/ql2"
 )
 
-func formStopQuery(token int64) Query {
+func newStopQuery(token int64) Query {
 	return Query{
 		Type:  p.Query_STOP,
 		Token: token,