Merge branch 'v2' into v2-unstable.

niemeyer · niemeyer · commit 7446a0344b78 · 2018-07-05T08:37:38.000-03:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 language: go
 
-go_import_path: gopkg.in/mgo.v2-unstable
+go_import_path: gopkg.in/mgo.v2
 
 addons:
     apt:
diff --git a/auth.go b/auth.go
@@ -34,8 +34,8 @@ import (
 	"fmt"
 	"sync"
 
-	"gopkg.in/mgo.v2-unstable/bson"
-	"gopkg.in/mgo.v2-unstable/internal/scram"
+	"gopkg.in/mgo.v2/bson"
+	"gopkg.in/mgo.v2/internal/scram"
 )
 
 type authCmd struct {
diff --git a/auth_test.go b/auth_test.go
@@ -39,7 +39,7 @@ import (
 	"time"
 
 	. "gopkg.in/check.v1"
-	"gopkg.in/mgo.v2-unstable"
+	"gopkg.in/mgo.v2"
 )
 
 func (s *S) TestAuthLoginDatabase(c *C) {
diff --git a/bson/bson.go b/bson/bson.go
@@ -35,13 +35,11 @@ package bson
 import (
 	"bytes"
 	"crypto/md5"
-	"crypto/rand"
 	"encoding/binary"
 	"encoding/hex"
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io"
 	"os"
 	"reflect"
 	"runtime"
@@ -194,12 +192,10 @@ var objectIdCounter uint32 = readRandomUint32()
 
 // readRandomUint32 returns a random objectIdCounter.
 func readRandomUint32() uint32 {
-	var b [4]byte
-	_, err := io.ReadFull(rand.Reader, b[:])
-	if err != nil {
-		panic(fmt.Errorf("cannot read random object id: %v", err))
-	}
-	return uint32((uint32(b[0]) << 0) | (uint32(b[1]) << 8) | (uint32(b[2]) << 16) | (uint32(b[3]) << 24))
+	// We've found systems hanging in this function due to lack of entropy.
+	// The randomness of these bytes is just preventing nearby clashes, so
+	// just look at the time.
+	return uint32(time.Now().UnixNano())
 }
 
 // machineId stores machine id generated once and used in subsequent calls
@@ -214,10 +210,10 @@ func readMachineId() []byte {
 	id := sum[:]
 	hostname, err1 := os.Hostname()
 	if err1 != nil {
-		_, err2 := io.ReadFull(rand.Reader, id)
-		if err2 != nil {
-			panic(fmt.Errorf("cannot get hostname: %v; %v", err1, err2))
-		}
+		n := uint32(time.Now().UnixNano())
+		sum[0] = byte(n >> 0)
+		sum[1] = byte(n >> 8)
+		sum[2] = byte(n >> 16)
 		return id
 	}
 	hw := md5.New()
@@ -279,7 +275,7 @@ var nullBytes = []byte("null")
 func (id *ObjectId) UnmarshalJSON(data []byte) error {
 	if len(data) > 0 && (data[0] == '{' || data[0] == 'O') {
 		var v struct {
-			Id json.RawMessage `json:"$oid"`
+			Id   json.RawMessage `json:"$oid"`
 			Func struct {
 				Id json.RawMessage
 			} `json:"$oidFunc"`
diff --git a/bson/bson_test.go b/bson/bson_test.go
@@ -40,7 +40,7 @@ import (
 	"time"
 
 	. "gopkg.in/check.v1"
-	"gopkg.in/mgo.v2-unstable/bson"
+	"gopkg.in/mgo.v2/bson"
 	"gopkg.in/yaml.v2"
 )
 
diff --git a/bson/decimal_test.go b/bson/decimal_test.go
@@ -33,7 +33,7 @@ import (
 	"regexp"
 	"strings"
 
-	"gopkg.in/mgo.v2-unstable/bson"
+	"gopkg.in/mgo.v2/bson"
 
 	. "gopkg.in/check.v1"
 )
diff --git a/bson/json.go b/bson/json.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"encoding/base64"
 	"fmt"
-	"gopkg.in/mgo.v2-unstable/internal/json"
+	"gopkg.in/mgo.v2/internal/json"
 	"strconv"
 	"time"
 )
@@ -317,7 +317,7 @@ func jencNumberLong(v interface{}) ([]byte, error) {
 func jencInt(v interface{}) ([]byte, error) {
 	n := v.(int)
 	f := `{"$numberLong":"%d"}`
-	if n <= 1<<53 {
+	if int64(n) <= 1<<53 {
 		f = `%d`
 	}
 	return fbytes(f, n), nil
diff --git a/bson/json_test.go b/bson/json_test.go
@@ -1,7 +1,7 @@
 package bson_test
 
 import (
-	"gopkg.in/mgo.v2-unstable/bson"
+	"gopkg.in/mgo.v2/bson"
 
 	. "gopkg.in/check.v1"
 	"reflect"
diff --git a/bulk.go b/bulk.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"sort"
 
-	"gopkg.in/mgo.v2-unstable/bson"
+	"gopkg.in/mgo.v2/bson"
 )
 
 // Bulk represents an operation that can be prepared with several
diff --git a/bulk_test.go b/bulk_test.go
@@ -28,7 +28,7 @@ package mgo_test
 
 import (
 	. "gopkg.in/check.v1"
-	"gopkg.in/mgo.v2-unstable"
+	"gopkg.in/mgo.v2"
 )
 
 func (s *S) TestBulkInsert(c *C) {
diff --git a/cluster.go b/cluster.go
@@ -30,12 +30,12 @@ import (
 	"errors"
 	"fmt"
 	"net"
+	"strconv"
+	"strings"
 	"sync"
 	"time"
 
-	"gopkg.in/mgo.v2-unstable/bson"
-	"strconv"
-	"strings"
+	"gopkg.in/mgo.v2/bson"
 )
 
 // ---------------------------------------------------------------------------
diff --git a/cluster_test.go b/cluster_test.go
@@ -35,8 +35,8 @@ import (
 	"time"
 
 	. "gopkg.in/check.v1"
-	"gopkg.in/mgo.v2-unstable"
-	"gopkg.in/mgo.v2-unstable/bson"
+	"gopkg.in/mgo.v2"
+	"gopkg.in/mgo.v2/bson"
 )
 
 func (s *S) TestNewSession(c *C) {
diff --git a/dbtest/dbserver.go b/dbtest/dbserver.go
@@ -9,7 +9,7 @@ import (
 	"strconv"
 	"time"
 
-	"gopkg.in/mgo.v2-unstable"
+	"gopkg.in/mgo.v2"
 	"gopkg.in/tomb.v2"
 )
 
diff --git a/dbtest/dbserver_test.go b/dbtest/dbserver_test.go
@@ -7,8 +7,8 @@ import (
 
 	. "gopkg.in/check.v1"
 
-	"gopkg.in/mgo.v2-unstable"
-	"gopkg.in/mgo.v2-unstable/dbtest"
+	"gopkg.in/mgo.v2"
+	"gopkg.in/mgo.v2/dbtest"
 )
 
 type M map[string]interface{}
diff --git a/doc.go b/doc.go
@@ -1,9 +1,12 @@
 // Package mgo offers a rich MongoDB driver for Go.
 //
-// Details about the mgo project (pronounced as "mango") are found
-// in its web page:
+// #########################################################
 //
-//     http://labix.org/mgo
+// THIS DRIVER IS UNMAINTAINED! See here for details:
+//
+// https://github.com/go-mgo/mgo/blob/v2-unstable/README.md
+//
+// #########################################################
 //
 // Usage of the driver revolves around the concept of sessions.  To
 // get started, obtain a session using the Dial function:
diff --git a/gridfs.go b/gridfs.go
@@ -36,7 +36,7 @@ import (
 	"sync"
 	"time"
 
-	"gopkg.in/mgo.v2-unstable/bson"
+	"gopkg.in/mgo.v2/bson"
 )
 
 type GridFS struct {
@@ -131,7 +131,7 @@ func finalizeFile(file *GridFile) {
 //     }
 //     file, err := db.GridFS("fs").Create("myfile.txt")
 //     check(err)
-//     n, err := file.Write([]byte("Hello world!")
+//     n, err := file.Write([]byte("Hello world!"))
 //     check(err)
 //     err = file.Close()
 //     check(err)
diff --git a/gridfs_test.go b/gridfs_test.go
@@ -32,8 +32,8 @@ import (
 	"time"
 
 	. "gopkg.in/check.v1"
-	"gopkg.in/mgo.v2-unstable"
-	"gopkg.in/mgo.v2-unstable/bson"
+	"gopkg.in/mgo.v2"
+	"gopkg.in/mgo.v2/bson"
 )
 
 func (s *S) TestGridFSCreate(c *C) {
diff --git a/internal/scram/scram_test.go b/internal/scram/scram_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	. "gopkg.in/check.v1"
-	"gopkg.in/mgo.v2-unstable/internal/scram"
+	"gopkg.in/mgo.v2/internal/scram"
 	"strings"
 )
 
diff --git a/saslimpl.go b/saslimpl.go
@@ -3,7 +3,7 @@
 package mgo
 
 import (
-	"gopkg.in/mgo.v2-unstable/internal/sasl"
+	"gopkg.in/mgo.v2/internal/sasl"
 )
 
 func saslNew(cred Credential, host string) (saslStepper, error) {
diff --git a/server.go b/server.go
@@ -33,7 +33,7 @@ import (
 	"sync"
 	"time"
 
-	"gopkg.in/mgo.v2-unstable/bson"
+	"gopkg.in/mgo.v2/bson"
 )
 
 // ---------------------------------------------------------------------------
diff --git a/session.go b/session.go
@@ -41,7 +41,7 @@ import (
 	"sync"
 	"time"
 
-	"gopkg.in/mgo.v2-unstable/bson"
+	"gopkg.in/mgo.v2/bson"
 )
 
 type Mode int
@@ -3078,7 +3078,7 @@ Error:
 // unmarshalled into by gobson.  This function blocks until either a result
 // is available or an error happens.  For example:
 //
-//     err := collection.Find(bson.M{"a", 1}).One(&result)
+//     err := collection.Find(bson.M{"a": 1}).One(&result)
 //
 // In case the resulting document includes a field named $err or errmsg, which
 // are standard ways for MongoDB to return query errors, the returned err will
@@ -4314,11 +4314,10 @@ func (q *Query) Apply(change Change, result interface{}) (info *ChangeInfo, err
 	var doc valueResult
 	for i := 0; i < maxUpsertRetries; i++ {
 		err = session.DB(dbname).Run(&cmd, &doc)
-
 		if err == nil {
 			break
 		}
-		if change.Upsert && IsDup(err) {
+		if change.Upsert && IsDup(err) && i+1 < maxUpsertRetries {
 			// Retry duplicate key errors on upserts.
 			// https://docs.mongodb.com/v3.2/reference/method/db.collection.update/#use-unique-indexes
 			continue
diff --git a/session_test.go b/session_test.go
@@ -38,8 +38,8 @@ import (
 	"time"
 
 	. "gopkg.in/check.v1"
-	"gopkg.in/mgo.v2-unstable"
-	"gopkg.in/mgo.v2-unstable/bson"
+	"gopkg.in/mgo.v2"
+	"gopkg.in/mgo.v2/bson"
 )
 
 func (s *S) TestRunString(c *C) {
@@ -1001,6 +1001,26 @@ func (s *S) TestIsDupFindAndModify(c *C) {
 	c.Assert(mgo.IsDup(err), Equals, true)
 }
 
+func (s *S) TestIsDupRetryUpsert(c *C) {
+	session, err := mgo.Dial("localhost:40001")
+	c.Assert(err, IsNil)
+	defer session.Close()
+
+	coll := session.DB("mydb").C("mycoll")
+
+	err = coll.Insert(bson.M{"_id": 1, "x": 1})
+	c.Assert(err, IsNil)
+
+	_, err = coll.Upsert(bson.M{"_id": 1, "x": 2}, bson.M{"$set": bson.M{"x": 3}})
+	c.Assert(mgo.IsDup(err), Equals, true)
+
+	_, err = coll.Find(bson.M{"_id": 1, "x": 2}).Apply(mgo.Change{
+		Update: bson.M{"$set": bson.M{"x": 3}},
+		Upsert: true,
+	}, nil)
+	c.Assert(mgo.IsDup(err), Equals, true)
+}
+
 func (s *S) TestFindAndModify(c *C) {
 	session, err := mgo.Dial("localhost:40011")
 	c.Assert(err, IsNil)
@@ -4159,11 +4179,11 @@ func (s *S) TestBypassValidation(c *C) {
 
 func (s *S) TestVersionAtLeast(c *C) {
 	tests := [][][]int{
-		{{3,2,1}, {3,2,0}},
-		{{3,2,1}, {3,2}},
-		{{3,2,1}, {2,5,5,5}},
-		{{3,2,1}, {2,5,5}},
-		{{3,2,1}, {2,5}},
+		{{3, 2, 1}, {3, 2, 0}},
+		{{3, 2, 1}, {3, 2}},
+		{{3, 2, 1}, {2, 5, 5, 5}},
+		{{3, 2, 1}, {2, 5, 5}},
+		{{3, 2, 1}, {2, 5}},
 	}
 	for _, pair := range tests {
 		bi := mgo.BuildInfo{VersionArray: pair[0]}
diff --git a/socket.go b/socket.go
@@ -33,7 +33,7 @@ import (
 	"sync"
 	"time"
 
-	"gopkg.in/mgo.v2-unstable/bson"
+	"gopkg.in/mgo.v2/bson"
 )
 
 type replyFunc func(err error, reply *replyOp, docNum int, docData []byte)
diff --git a/suite_test.go b/suite_test.go
@@ -39,8 +39,8 @@ import (
 	"time"
 
 	. "gopkg.in/check.v1"
-	"gopkg.in/mgo.v2-unstable"
-	"gopkg.in/mgo.v2-unstable/bson"
+	"gopkg.in/mgo.v2"
+	"gopkg.in/mgo.v2/bson"
 )
 
 var fast = flag.Bool("fast", false, "Skip slow tests")
diff --git a/txn/debug.go b/txn/debug.go
@@ -6,7 +6,7 @@ import (
 	"sort"
 	"sync/atomic"
 
-	"gopkg.in/mgo.v2-unstable/bson"
+	"gopkg.in/mgo.v2/bson"
 )
 
 var (
diff --git a/txn/flusher.go b/txn/flusher.go
@@ -3,8 +3,8 @@ package txn
 import (
 	"fmt"
 
-	"gopkg.in/mgo.v2-unstable"
-	"gopkg.in/mgo.v2-unstable/bson"
+	"gopkg.in/mgo.v2"
+	"gopkg.in/mgo.v2/bson"
 )
 
 func flush(r *Runner, t *transaction) error {
diff --git a/txn/output.txt b/txn/output.txt
diff --git a/txn/sim_test.go b/txn/sim_test.go
diff --git a/txn/tarjan.go b/txn/tarjan.go
diff --git a/txn/tarjan_test.go b/txn/tarjan_test.go
diff --git a/txn/txn.go b/txn/txn.go
diff --git a/txn/txn_test.go b/txn/txn_test.go

Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,8 @@ import (`
`34`	`34`	`"fmt"`
`35`	`35`	`"sync"`
`36`	`36`
`37`		`- "gopkg.in/mgo.v2-unstable/bson"`
`38`		`- "gopkg.in/mgo.v2-unstable/internal/scram"`
	`37`	`+ "gopkg.in/mgo.v2/bson"`
	`38`	`+ "gopkg.in/mgo.v2/internal/scram"`
`39`	`39`	`)`
`40`	`40`
`41`	`41`	`type authCmd struct {`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ import (`
`39`	`39`	`"time"`
`40`	`40`
`41`	`41`	`. "gopkg.in/check.v1"`
`42`		`- "gopkg.in/mgo.v2-unstable"`
	`42`	`+ "gopkg.in/mgo.v2"`
`43`	`43`	`)`
`44`	`44`
`45`	`45`	`func (s S) TestAuthLoginDatabase(c C) {`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ import (`
`40`	`40`	`"time"`
`41`	`41`
`42`	`42`	`. "gopkg.in/check.v1"`
`43`		`- "gopkg.in/mgo.v2-unstable/bson"`
	`43`	`+ "gopkg.in/mgo.v2/bson"`
`44`	`44`	`"gopkg.in/yaml.v2"`
`45`	`45`	`)`
`46`	`46`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ import (`
`33`	`33`	`"regexp"`
`34`	`34`	`"strings"`
`35`	`35`
`36`		`- "gopkg.in/mgo.v2-unstable/bson"`
	`36`	`+ "gopkg.in/mgo.v2/bson"`
`37`	`37`
`38`	`38`	`. "gopkg.in/check.v1"`
`39`	`39`	`)`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"bytes"`
`5`	`5`	`"sort"`
`6`	`6`
`7`		`- "gopkg.in/mgo.v2-unstable/bson"`
	`7`	`+ "gopkg.in/mgo.v2/bson"`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`// Bulk represents an operation that can be prepared with several`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ package mgo_test`
`28`	`28`
`29`	`29`	`import (`
`30`	`30`	`. "gopkg.in/check.v1"`
`31`		`- "gopkg.in/mgo.v2-unstable"`
	`31`	`+ "gopkg.in/mgo.v2"`
`32`	`32`	`)`
`33`	`33`
`34`	`34`	`func (s S) TestBulkInsert(c C) {`