Merge branch 'develop'

Author: dancannon

CHANGELOG.md

@@ -2,9 +2,19 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## v1.4.1 - 2016-04-02
+
+### Fixed
+
+ - Fixed panic when closing a connection at the same time as using a changefeed.
+ - Update imports to correctly use gopkg.in
+ - Fixed race condition when using anonymous functions
+ - Fixed IsConflictErr and IsTypeErr panicking when passed nil errors
+ - RunWrite no longer misformats errors with formatting directives in them
+
 ## v1.4.0 - 2016-03-15
 
-## Added
+### Added
 - Added the ability to reference subdocuments when inserting new documents, for more information see the documentation in the readme.
 - Added the `SetTags` function which allows GoRethink to override which tags are used when working with structs. For example to support the `json` add the following call `SetTags("gorethink", "json")`.
 - Added helper functions for checking the error type of a write query, this is useful when calling `RunWrite`.
@@ -14,7 +24,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Added the `NextResponse` function to `Cursor` which will return the next raw JSON response in the result set.
 - Added ability to set the keep alive period by setting the `KeepAlivePeriod` field in `ConnectOpts`.
 
-## Fixed
+### Fixed
 - Fixed an issue that could prevent bad connections from being removed from the connection pool.
 - Fixed certain connection errors not being returned as `RqlConnectionError` when calling `Run`, `Exec` or `RunWrite`. 
 - Fixed potential dead lock in connection code caused when building the query.

README.md

@@ -8,7 +8,7 @@
 
 ![GoRethink Logo](https://raw.github.com/wiki/dancannon/gorethink/gopher-and-thinker-s.png "Golang Gopher and RethinkDB Thinker")
 
-Current version: v1.4.0 (RethinkDB v2.2)
+Current version: v1.4.1 (RethinkDB v2.2)
 
 Please note that this version of the driver only supports versions of RethinkDB using the v0.4 protocol (any versions of the driver older than RethinkDB 2.0 will not work).
 

checkers_test.go

@@ -6,7 +6,7 @@ import (
 
 	test "gopkg.in/check.v1"
 
-	"github.com/dancannon/gorethink/types"
+	"gopkg.in/dancannon/gorethink.v1/types"
 )
 
 type jsonChecker struct {

connection.go

@@ -9,7 +9,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	p "github.com/dancannon/gorethink/ql2"
+	p "gopkg.in/dancannon/gorethink.v1/ql2"
 )
 
 const (
@@ -41,6 +41,7 @@ type Connection struct {
 	token   int64
 	cursors map[int64]*Cursor
 	bad     bool
+	closed  bool
 }
 
 // NewConnection creates a new connection to the database server
@@ -82,14 +83,15 @@ func (c *Connection) Close() error {
 	c.mu.Lock()
 	defer c.mu.Unlock()
 
-	if c.Conn != nil {
-		c.Conn.Close()
-		c.Conn = nil
-	}
+	var err error
 
-	c.cursors = nil
+	if !c.closed {
+		err = c.Conn.Close()
+		c.closed = true
+		c.cursors = make(map[int64]*Cursor)
+	}
 
-	return nil
+	return err
 }
 
 // Query sends a Query to the database, returning both the raw Response and a

connection_helper.go

@@ -7,7 +7,7 @@ import (
 	"io"
 	"strings"
 
-	p "github.com/dancannon/gorethink/ql2"
+	p "gopkg.in/dancannon/gorethink.v1/ql2"
 )
 
 // Write 'data' to conn

cursor.go

@@ -7,8 +7,8 @@ import (
 	"reflect"
 	"sync"
 
-	"github.com/dancannon/gorethink/encoding"
-	p "github.com/dancannon/gorethink/ql2"
+	"gopkg.in/dancannon/gorethink.v1/encoding"
+	p "gopkg.in/dancannon/gorethink.v1/ql2"
 )
 
 var (
@@ -190,9 +190,7 @@ func (c *Cursor) nextLocked(dest interface{}) (bool, error) {
 		}
 
 		if len(c.buffer) == 0 && len(c.responses) == 0 && !c.finished {
-			c.mu.Unlock()
 			err := c.fetchMore()
-			c.mu.Lock()
 			if err != nil {
 				return false, err
 			}
@@ -291,9 +289,7 @@ func (c *Cursor) nextResponseLocked() ([]byte, bool, error) {
 		}
 
 		if len(c.responses) == 0 && !c.finished {
-			c.mu.Unlock()
 			err := c.fetchMore()
-			c.mu.Lock()
 			if err != nil {
 				return nil, false, err
 			}
@@ -467,13 +463,11 @@ func (c *Cursor) IsNil() bool {
 func (c *Cursor) fetchMore() error {
 	var err error
 
-	c.mu.Lock()
 	fetching := c.fetching
 	closed := c.closed
 
 	if !fetching {
 		c.fetching = true
-		c.mu.Unlock()
 
 		if closed {
 			return errCursorClosed
@@ -484,9 +478,9 @@ func (c *Cursor) fetchMore() error {
 			Token: c.token,
 		}
 
-		_, _, err = c.conn.Query(q)
-	} else {
 		c.mu.Unlock()
+		_, _, err = c.conn.Query(q)
+		c.mu.Lock()
 	}
 
 	return err

doc.go

@@ -1,6 +1,6 @@
 // Package gorethink implements a Go driver for RethinkDB
 //
-// Current version: v1.4.0 (RethinkDB v2.2)
+// Current version: v1.4.1 (RethinkDB v2.2)
 // For more in depth information on how to use RethinkDB check out the API docs
 // at http://rethinkdb.com/api
 package gorethink

errors.go

@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"strings"
 
-	p "github.com/dancannon/gorethink/ql2"
+	p "gopkg.in/dancannon/gorethink.v1/ql2"
 )
 
 var (
@@ -164,11 +164,19 @@ func createRuntimeError(errorType p.Response_ErrorType, response *Response, term
 // IsConflictErr returns true if the error is non-nil and the query failed
 // due to a duplicate primary key.
 func IsConflictErr(err error) bool {
+	if err == nil {
+		return false
+	}
+
 	return strings.HasPrefix(err.Error(), "Duplicate primary key")
 }
 
 // IsTypeErr returns true if the error is non-nil and the query failed due
 // to a type error.
 func IsTypeErr(err error) bool {
+	if err == nil {
+		return false
+	}
+
 	return strings.HasPrefix(err.Error(), "Expected type")
 }

gorethink.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/Sirupsen/logrus"
 
-	"github.com/dancannon/gorethink/encoding"
+	"gopkg.in/dancannon/gorethink.v1/encoding"
 )
 
 var (

node.go

@@ -3,8 +3,8 @@ package gorethink
 import (
 	"sync"
 
-	p "github.com/dancannon/gorethink/ql2"
 	"github.com/hailocab/go-hostpool"
+	p "gopkg.in/dancannon/gorethink.v1/ql2"
 )
 
 // Node represents a database server in the cluster