Merge branch 'release/v1.0.0-rc.1'

Author: dancannon

CHANGELOG.md

@@ -2,6 +2,40 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## v1.0.0-RC.1 - 2015-06-07
+In an attempt to make this library more "idiomatic" some functions have been renamed, for the full list of changes see below.
+
+### Added
+ - Added more documentation.
+ - Added `Shards`, `Replicas` and `PrimaryReplicaTag` optional arguments in `TableCreateOpts`.
+ - Added `MultiGroup` and `MultiGroupByIndex` which are equivalent to the running `group` with the `multi` optional argument set to true.
+
+### Changed 
+ - Renamed `Db` to `DB`.
+ - Renamed `DbCreate` to `DBCreate`.
+ - Renamed `DbDrop` to `DBDrop`.
+ - Renamed `RqlConnectionError` to `RQLConnectionError`.
+ - Renamed `RqlDriverError` to `RQLDriverError`.
+ - Renamed `RqlClientError` to `RQLClientError`.
+ - Renamed `RqlRuntimeError` to `RQLRuntimeError`.
+ - Renamed `RqlCompileError` to `RQLCompileError`.
+ - Renamed `Js` to `JS`.
+ - Renamed `Json` to `JSON`.
+ - Renamed `Http` to `HTTP`.
+ - Renamed `GeoJson` to `GeoJSON`.
+ - Renamed `ToGeoJson` to `ToGeoJSON`.
+ - Renamed `WriteChanges` to `ChangeResponse`, this is now a general type and can be used when dealing with changefeeds.
+ - Removed depth limit when encoding values using `Expr`
+
+### Fixed
+ - Fixed issue causing inconsistent results when unmarshaling query response into structs (#192)
+ - Fixed issue causing errors when closing a changefeed cursor (#191)
+ - Fixed issue causing nodes to remain unhealthy when host discovery is disabled (#195)
+
+### Removed
+ - Removed `CacheSize` and `DataCenter` optional arguments in `TableCreateOpts`.
+ - Removed `CacheSize` optional argument from `InsertOpts`
+
 ## v0.7.2 - 2015-05-05
 ### Added
  - Added support for connecting to a server using TLS (#179)
@@ -133,7 +167,7 @@ Internal Changes
 
 - Updated the driver to support RethinkDB v1.14 (#116)
 - Added the Binary data type
-- Added the Binary command which takes a `[]byte`, `io.Reader` or `bytes.Buffer{}` as an argument.
+- Added the Binary command which takes a `[]byte` or `bytes.Buffer{}` as an argument.
 - Added the `BinaryFormat` optional argument to `RunOpts` 
 - Added the `GroupFormat` optional argument to `RunOpts` 
 - Added the `ArrayLimit` optional argument to `RunOpts` 

README.md

@@ -7,7 +7,7 @@
 [Go](http://golang.org/) driver for [RethinkDB](http://www.rethinkdb.com/) 
 
 
-Current version: v0.7.2 (RethinkDB v2.0) 
+Current version: v1.0.0-RC.1 (RethinkDB v2.0) 
 
 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).
 
@@ -89,7 +89,7 @@ When `DiscoverHosts` is true any nodes are added to the cluster after the initia
 
 This library is based on the official drivers so the code on the [API](http://www.rethinkdb.com/api/) page should require very few changes to work.
 
-To view full documentation for the query functions check the [GoDoc](http://godoc.org/github.com/dancannon/gorethink#Term)
+To view full documentation for the query functions check the [API reference](https://github.com/dancannon/gorethink/wiki/Go-ReQL-command-reference) or [GoDoc](http://godoc.org/github.com/dancannon/gorethink#Term)
 
 Slice Expr Example
 ```go
@@ -205,20 +205,6 @@ Field int `gorethink:"myName,omitempty"`
 Field int `gorethink:",omitempty"`
 ```
 
-Alternatively you can implement the FieldMapper interface  by providing the FieldMap function which returns a map of strings in the form of `"FieldName": "NewName"`. For example:
-
-```go
-type A struct {
-    Field int
-}
-
-func (a A) FieldMap() map[string]string {
-    return map[string]string{
-        "Field": "myName",
-    }
-}
-```
-
 ## Benchmarks
 
 Everyone wants their project's benchmarks to be speedy. And while we know that rethinkDb and the gorethink driver are quite fast, our primary goal is for our benchmarks to be correct. They are designed to give you, the user, an accurate picture of writes per second (w/s). If you come up with a accurate test that meets this aim, submit a pull request please. 
@@ -253,7 +239,7 @@ BenchmarkSequentialSoftWritesParallel10      10000                           263
 
 ## Examples
 
-View other examples on the [wiki](https://github.com/dancannon/gorethink/wiki/Examples).
+Many functions have examples and are viewable in the godoc, alternatively view some more full features examples on the [wiki](https://github.com/dancannon/gorethink/wiki/Examples).
 
 ## License
 

benchmarks_test.go

@@ -8,10 +8,6 @@ import (
 	"time"
 )
 
-var bSess *Session
-var bDbName string
-var bTableName string
-
 func BenchmarkBatch200RandomWrites(b *testing.B) {
 
 	var term Term
@@ -28,10 +24,10 @@ func BenchmarkBatch200RandomWrites(b *testing.B) {
 		}
 
 		// Insert the new item into the database
-		term = Table(bTableName).Insert(data)
+		term = DB("benchmarks").Table("benchmarks").Insert(data)
 
 		// Insert the new item into the database
-		_, err := term.RunWrite(bSess, RunOpts{
+		_, err := term.RunWrite(session, RunOpts{
 			MinBatchRows: 200,
 			MaxBatchRows: 200,
 		})
@@ -61,10 +57,10 @@ func BenchmarkBatch200RandomWritesParallel10(b *testing.B) {
 			}
 
 			// Insert the new item into the database
-			term = Table(bTableName).Insert(data)
+			term = DB("benchmarks").Table("benchmarks").Insert(data)
 
 			// Insert the new item into the database
-			_, err := term.RunWrite(bSess, RunOpts{
+			_, err := term.RunWrite(session, RunOpts{
 				MinBatchRows: 200,
 				MaxBatchRows: 200,
 			})
@@ -98,10 +94,10 @@ func BenchmarkBatch200SoftRandomWritesParallel10(b *testing.B) {
 			}
 
 			// Insert the new item into the database
-			term = Table(bTableName).Insert(data, opts)
+			term = DB("benchmarks").Table("benchmarks").Insert(data, opts)
 
 			// Insert the new item into the database
-			_, err := term.RunWrite(bSess, RunOpts{
+			_, err := term.RunWrite(session, RunOpts{
 				MinBatchRows: 200,
 				MaxBatchRows: 200,
 			})
@@ -121,7 +117,7 @@ func BenchmarkRandomWrites(b *testing.B) {
 			"customer_id": strconv.FormatInt(r.Int63(), 10),
 		}
 		// Insert the new item into the database
-		_, err := Table(bTableName).Insert(data).RunWrite(bSess)
+		_, err := DB("benchmarks").Table("benchmarks").Insert(data).RunWrite(session)
 		if err != nil {
 			b.Errorf("insert failed [%s] ", err)
 		}
@@ -141,7 +137,7 @@ func BenchmarkRandomWritesParallel10(b *testing.B) {
 				"customer_id": strconv.FormatInt(r.Int63(), 10),
 			}
 			// Insert the new item into the database
-			_, err := Table(bTableName).Insert(data).RunWrite(bSess)
+			_, err := DB("benchmarks").Table("benchmarks").Insert(data).RunWrite(session)
 			if err != nil {
 				b.Errorf("insert failed [%s] ", err)
 			}
@@ -158,7 +154,7 @@ func BenchmarkRandomSoftWrites(b *testing.B) {
 		}
 		// Insert the new item into the database
 		opts := InsertOpts{Durability: "soft"}
-		_, err := Table(bTableName).Insert(data, opts).RunWrite(bSess)
+		_, err := DB("benchmarks").Table("benchmarks").Insert(data, opts).RunWrite(session)
 		if err != nil {
 			b.Errorf("insert failed [%s] ", err)
 		}
@@ -180,7 +176,7 @@ func BenchmarkRandomSoftWritesParallel10(b *testing.B) {
 
 			// Insert the new item into the database
 			opts := InsertOpts{Durability: "soft"}
-			_, err := Table(bTableName).Insert(data, opts).RunWrite(bSess)
+			_, err := DB("benchmarks").Table("benchmarks").Insert(data, opts).RunWrite(session)
 			if err != nil {
 				b.Errorf("insert failed [%s] ", err)
 			}
@@ -199,7 +195,7 @@ func BenchmarkSequentialWrites(b *testing.B) {
 		}
 
 		// Insert the new item into the database
-		_, err := Table(bTableName).Insert(data).RunWrite(bSess)
+		_, err := DB("benchmarks").Table("benchmarks").Insert(data).RunWrite(session)
 		if err != nil {
 			b.Errorf("insert failed [%s] ", err)
 			return
@@ -226,7 +222,7 @@ func BenchmarkSequentialWritesParallel10(b *testing.B) {
 			}
 
 			// Insert the new item into the database
-			_, err := Table(bTableName).Insert(data).RunWrite(bSess)
+			_, err := DB("benchmarks").Table("benchmarks").Insert(data).RunWrite(session)
 			if err != nil {
 				b.Errorf("insert failed [%s] ", err)
 				return
@@ -248,7 +244,7 @@ func BenchmarkSequentialSoftWrites(b *testing.B) {
 		}
 
 		// Insert the new item into the database
-		_, err := Table(bTableName).Insert(data, opts).RunWrite(bSess)
+		_, err := Table("benchmarks").Insert(data, opts).RunWrite(session)
 		if err != nil {
 			b.Errorf("insert failed [%s] ", err)
 			return
@@ -277,7 +273,7 @@ func BenchmarkSequentialSoftWritesParallel10(b *testing.B) {
 			opts := InsertOpts{Durability: "soft"}
 
 			// Insert the new item into the database
-			_, err := Table(bTableName).Insert(data, opts).RunWrite(bSess)
+			_, err := Table("benchmarks").Insert(data, opts).RunWrite(session)
 			if err != nil {
 				b.Errorf("insert failed [%s] ", err)
 				return

cluster.go

@@ -135,7 +135,7 @@ func (c *Cluster) listenForNodeChanges() error {
 	}
 
 	cursor, err := node.Query(newQuery(
-		Db("rethinkdb").Table("server_status").Changes(),
+		DB("rethinkdb").Table("server_status").Changes(),
 		map[string]interface{}{},
 		c.opts,
 	))
@@ -197,7 +197,7 @@ func (c *Cluster) connectNodes(hosts []Host) {
 		defer conn.Close()
 
 		_, cursor, err := conn.Query(newQuery(
-			Db("rethinkdb").Table("server_status"),
+			DB("rethinkdb").Table("server_status"),
 			map[string]interface{}{},
 			c.opts,
 		))
@@ -206,27 +206,14 @@ func (c *Cluster) connectNodes(hosts []Host) {
 			continue
 		}
 
-		if c.opts.DiscoverHosts {
-			var results []nodeStatus
-			err = cursor.All(&results)
-			if err != nil {
-				continue
-			}
+		var results []nodeStatus
+		err = cursor.All(&results)
+		if err != nil {
+			continue
+		}
 
-			for _, result := range results {
-				node, err := c.connectNodeWithStatus(result)
-				if err == nil {
-					if _, ok := nodeSet[node.ID]; !ok {
-						log.WithFields(logrus.Fields{
-							"id":   node.ID,
-							"host": node.Host.String(),
-						}).Debug("Connected to node")
-						nodeSet[node.ID] = node
-					}
-				}
-			}
-		} else {
-			node, err := c.connectNode(host.String(), []Host{host})
+		for _, result := range results {
+			node, err := c.connectNodeWithStatus(result)
 			if err == nil {
 				if _, ok := nodeSet[node.ID]; !ok {
 					log.WithFields(logrus.Fields{

cluster_integration_test.go

@@ -11,9 +11,10 @@ import (
 
 func (s *RethinkSuite) TestClusterDetectNewNode(c *test.C) {
 	session, err := Connect(ConnectOpts{
+		Addresses:           []string{url, url2},
 		DiscoverHosts:       true,
 		NodeRefreshInterval: time.Second,
-	}, url, url2)
+	})
 	c.Assert(err, test.IsNil)
 
 	t := time.NewTimer(time.Second * 30)
@@ -31,13 +32,43 @@ func (s *RethinkSuite) TestClusterDetectNewNode(c *test.C) {
 	}
 }
 
+func (s *RethinkSuite) TestClusterRecoverAfterNoNodes(c *test.C) {
+	session, err := Connect(ConnectOpts{
+		Addresses:           []string{url, url2},
+		DiscoverHosts:       true,
+		NodeRefreshInterval: time.Second,
+	})
+	c.Assert(err, test.IsNil)
+
+	t := time.NewTimer(time.Second * 30)
+	hasHadZeroNodes := false
+	for {
+		select {
+		// Fail if deadline has passed
+		case <-t.C:
+			c.Fatal("No node was added to the cluster")
+		default:
+			// Check if there are no nodes
+			if len(session.cluster.GetNodes()) == 0 {
+				hasHadZeroNodes = true
+			}
+
+			// Pass if another node was added
+			if len(session.cluster.GetNodes()) >= 1 && hasHadZeroNodes {
+				return
+			}
+		}
+	}
+}
+
 func (s *RethinkSuite) TestClusterNodeHealth(c *test.C) {
 	session, err := Connect(ConnectOpts{
+		Addresses:           []string{url, url2, url3},
 		DiscoverHosts:       true,
 		NodeRefreshInterval: time.Second,
 		MaxIdle:             50,
 		MaxOpen:             200,
-	}, url, url2, url3)
+	})
 	c.Assert(err, test.IsNil)
 
 	attempts := 0