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

Author: dancannon

CHANGELOG.md

@@ -2,6 +2,11 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## v1.0.0 RC3 - 2015-06-22
+
+### Changed
+ - Reverted change that added sorting to maps when decoding due to performance concerts, instead documented that struct tags should be used. Especially when using a field named `Id`.
+
 ## v1.0.0 RC2 - 2015-06-11
 
 ### Fixed

README.md

@@ -7,7 +7,7 @@
 [Go](http://golang.org/) driver for [RethinkDB](http://www.rethinkdb.com/) 
 
 
-Current version: v1.0.0 RC2 (RethinkDB v2.0) 
+Current version: v1.0.0 RC3 (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).
 
@@ -82,7 +82,7 @@ if err != nil {
 }
 ```
 
-When `DiscoverHosts` is true any nodes are added to the cluster after the initial connection then the new node will be added to the pool of available nodes used by GoRethink.
+When `DiscoverHosts` is true any nodes are added to the cluster after the initial connection then the new node will be added to the pool of available nodes used by GoRethink. Unfortunately the canonical address of each server in the cluster **MUST** be set as otherwise clients will try to connect to the database nodes locally. For more information about how to set a RethinkDB servers canonical address set this page http://www.rethinkdb.com/docs/config-file/.
 
 
 ## Query Functions
@@ -205,6 +205,8 @@ Field int `gorethink:"myName,omitempty"`
 Field int `gorethink:",omitempty"`
 ```
 
+**NOTE:** It is strongly recommended that struct tags are used to explicitly define the mapping between your Go type and how the data is stored by RethinkDB. This is especially important when using an `Id` field as by default RethinkDB will create a field named `id` as the primary key (note that the RethinkDB field is lowercase but the Go version starts with a capital letter).
+
 ## 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. 

doc.go

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

encoding/decoder_types.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"fmt"
 	"reflect"
-	"sort"
 	"strconv"
 )
 
@@ -443,10 +442,7 @@ func (d *mapAsMapDecoder) decode(dv, sv reflect.Value) {
 	keyType := dv.Type().Key()
 	elemType := dv.Type().Elem()
 
-	keys := sv.MapKeys()
-	sort.Sort(valueByString(keys))
-
-	for _, sElemKey := range keys {
+	for _, sElemKey := range sv.MapKeys() {
 		var dElemKey reflect.Value
 		var dElemVal reflect.Value
 
@@ -482,10 +478,7 @@ type mapAsStructDecoder struct {
 }
 
 func (d *mapAsStructDecoder) decode(dv, sv reflect.Value) {
-	keys := sv.MapKeys()
-	sort.Sort(valueByString(keys))
-
-	for _, kv := range keys {
+	for _, kv := range sv.MapKeys() {
 		var f *field
 		var fieldDec decoderFunc
 		key := []byte(kv.String())