Merge remote-tracking branch 'mongodb/master' into fixed-bson-ec-time

Author: TheHett

.errcheck-excludes

@@ -3,6 +3,7 @@
 (*github.com/mongodb/mongo-go-driver/core/topology.Subscription).Unsubscribe
 (*github.com/mongodb/mongo-go-driver/core/topology.Server).Close
 (*github.com/mongodb/mongo-go-driver/core/connection.pool).closeConnection
+(github.com/mongodb/mongo-go-driver/core/wiremessage.ReadWriteCloser).Close
 (net.Conn).Close
 encoding/pem.Encode
 fmt.Fprintf

.evergreen/config.yml

@@ -401,14 +401,14 @@ tasks:
       commands:
         - func: bootstrap-mongo-orchestration
           vars:
-            topology: "server"
-            auth: "auth"
-            ssl: "ssl"
+            TOPOLOGY: "server"
+            AUTH: "auth"
+            SSL: "ssl"
         - func: run-tests
           vars:
-            topology: "server"
-            auth: "auth"
-            ssl: "ssl"
+            TOPOLOGY: "server"
+            AUTH: "auth"
+            SSL: "ssl"
             MONGO_GO_DRIVER_COMPRESSOR: "snappy"
 
     - name: test-replicaset-noauth-nossl
@@ -585,6 +585,10 @@ axes:
   - id: version
     display_name: MongoDB Version
     values:
+      - id: "4.0"
+        display_name: "4.0"
+        variables:
+           VERSION: "4.0"
       - id: "3.6"
         display_name: "3.6"
         variables:

THIRD-PARTY-NOTICES

@@ -60,6 +60,32 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+----------------------------------------------------------------------
+License notice for github.com/buger/jsonparser
+----------------------------------------------------------------------
+
+MIT License
+
+Copyright (c) 2016 Leonid Bugaev
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
 ----------------------------------------------------------------------
 License notice for github.com/davecgh/go-spew
 ----------------------------------------------------------------------
@@ -279,6 +305,31 @@ DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
 OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
 OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+----------------------------------------------------------------------
+License notice for github.com/tidwall/pretty
+----------------------------------------------------------------------
+
+The MIT License (MIT)
+
+Copyright (c) 2017 Josh Baker
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
 ----------------------------------------------------------------------
 License notice for golang.org/x/crypto
 ----------------------------------------------------------------------

bson/array_test.go

@@ -34,7 +34,7 @@ func TestArray(t *testing.T) {
 				defer func() {
 					r := recover()
 					if r != nil {
-						t.Errorf("Recieved unexpected panic from nil insert. got %#v; want %#v", r, nil)
+						t.Errorf("Received unexpected panic from nil insert. got %#v; want %#v", r, nil)
 					}
 				}()
 				want := NewArray()

bson/decimal/decimal.go

@@ -1,28 +1,11 @@
-// BSON library for Go
+// Copyright (C) MongoDB, Inc. 2017-present.
 //
-// Copyright (c) 2010-2012 - Gustavo Niemeyer <[email protected]>
+// Licensed under the Apache License, Version 2.0 (the "License"); you may
+// not use this file except in compliance with the License. You may obtain
+// a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
 //
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice, this
-//    list of conditions and the following disclaimer.
-// 2. Redistributions in binary form must reproduce the above copyright notice,
-//    this list of conditions and the following disclaimer in the documentation
-//    and/or other materials provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-// ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+// Based on gopkg.in/mgo.v2/bson by Gustavo Niemeyer
+// See THIRD-PARTY-NOTICES for original license terms.
 
 package decimal
 

bson/document.go

@@ -90,6 +90,24 @@ func ReadDocument(b []byte) (*Document, error) {
 	return doc, nil
 }
 
+// Copy makes a shallow copy of this document.
+func (d *Document) Copy() *Document {
+	if d == nil {
+		return nil
+	}
+
+	doc := &Document{
+		IgnoreNilInsert: d.IgnoreNilInsert,
+		elems:           make([]*Element, len(d.elems), cap(d.elems)),
+		index:           make([]uint32, len(d.index), cap(d.index)),
+	}
+
+	copy(doc.elems, d.elems)
+	copy(doc.index, d.index)
+
+	return doc
+}
+
 // Len returns the number of elements in the document.
 func (d *Document) Len() int {
 	if d == nil {

bson/document_test.go

@@ -106,7 +106,7 @@ func TestDocument(t *testing.T) {
 				defer func() {
 					r := recover()
 					if r != nil {
-						t.Errorf("Recieved unexpected panic from nil insert. got %#v; want %#v", r, nil)
+						t.Errorf("Received unexpected panic from nil insert. got %#v; want %#v", r, nil)
 					}
 				}()
 				want := NewDocument()
@@ -964,7 +964,7 @@ func TestDocument(t *testing.T) {
 				t.Errorf("Unexpected error while converting document to extended json: %v", err)
 			}
 			if got != want {
-				t.Errorf("Did not recieve expected result. got %s; want %s", got, want)
+				t.Errorf("Did not receive expected result. got %s; want %s", got, want)
 			}
 		})
 		t.Run("Relaxed", func(t *testing.T) {
@@ -975,7 +975,7 @@ func TestDocument(t *testing.T) {
 				t.Errorf("Unexpected error while converting document to extended json: %v", err)
 			}
 			if got != want {
-				t.Errorf("Did not recieve expected result. got %s; want %s", got, want)
+				t.Errorf("Did not receive expected result. got %s; want %s", got, want)
 			}
 		})
 	})

bson/encode.go

@@ -445,7 +445,11 @@ func (e *encoder) encodeSliceAsArray(rval reflect.Value, minsize bool) ([]*Value
 			vals = append(vals, VC.DateTime(convertTimeToInt64(t)))
 			continue
 		case *time.Time:
-			vals = append(vals, VC.DateTime(convertTimeToInt64(*t)))
+			if t == nil {
+				vals = append(vals, VC.Null())
+			} else {
+				vals = append(vals, VC.DateTime(convertTimeToInt64(*t)))
+			}
 			continue
 		}
 
@@ -531,7 +535,11 @@ func (e *encoder) encodeStruct(val reflect.Value) ([]*Element, error) {
 			elems = append(elems, EC.DateTime(key, convertTimeToInt64(t)))
 			continue
 		case *time.Time:
-			elems = append(elems, EC.DateTime(key, convertTimeToInt64(*t)))
+			if t == nil {
+				elems = append(elems, EC.Null(key))
+			} else {
+				elems = append(elems, EC.DateTime(key, convertTimeToInt64(*t)))
+			}
 			continue
 		}
 		field = e.underlyingVal(field)

bson/encode_test.go

@@ -1100,6 +1100,24 @@ func TestZeoerInterfaceUsedByDecoder(t *testing.T) {
 
 }
 
+type timePrtStruct struct{ TimePtrField *time.Time }
+
+func TestRegressionNoDereferenceNilTimePtr(t *testing.T) {
+	enc := &encoder{}
+
+	assert.NotPanics(t, func() {
+		res, err := enc.encodeStruct(reflect.ValueOf(timePrtStruct{}))
+		assert.Len(t, res, 1)
+		assert.Nil(t, err)
+	})
+
+	assert.NotPanics(t, func() {
+		res, err := enc.encodeSliceAsArray(reflect.ValueOf([]*time.Time{nil, nil, nil}), false)
+		assert.Len(t, res, 3)
+		assert.Nil(t, err)
+	})
+}
+
 func docToBytes(d *Document) []byte {
 	b, err := d.MarshalBSON()
 	if err != nil {

bson/extjson_bson_corpus_spec_test.go

@@ -17,8 +17,8 @@ import (
 	"testing"
 	"unicode"
 
-	"github.com/mongodb/mongo-go-driver/bson/internal/jsonpretty"
 	"github.com/stretchr/testify/require"
+	"github.com/tidwall/pretty"
 )
 
 type testCase struct {

bson/extjson_builder.go

@@ -11,12 +11,12 @@ import (
 	"fmt"
 	"strconv"
 
+	"github.com/buger/jsonparser"
 	"github.com/mongodb/mongo-go-driver/bson/builder"
-	"github.com/mongodb/mongo-go-driver/bson/internal/jsonparser"
 )
 
 type docElementParser func([]byte, []byte, jsonparser.ValueType, int) error
-type arrayElementParser func(int, []byte, jsonparser.ValueType, int) error
+type arrayElementParser func([]byte, jsonparser.ValueType, int, error)
 
 // ParseExtJSONObject parses a JSON object string into a *Document.
 func ParseExtJSONObject(s string) (*Document, error) {
@@ -180,9 +180,11 @@ func parseDocElement(b *builder.DocumentBuilder, ext bool) docElementParser {
 }
 
 func parseArrayElement(b *builder.ArrayBuilder, ext bool) arrayElementParser {
-	return func(index int, value []byte, dataType jsonparser.ValueType, offset int) error {
-		name := strconv.FormatInt(int64(index), 10)
+	var index int64
+	return func(value []byte, dataType jsonparser.ValueType, offset int, _ error) {
+		name := strconv.FormatInt(index, 10)
+		index++
 
-		return parseDocElement(&b.DocumentBuilder, ext)([]byte(name), value, dataType, offset)
+		_ = parseDocElement(&b.DocumentBuilder, ext)([]byte(name), value, dataType, offset)
 	}
 }

bson/extjson_parse.go

@@ -10,8 +10,8 @@ import (
 	"errors"
 	"fmt"
 
+	"github.com/buger/jsonparser"
 	"github.com/mongodb/mongo-go-driver/bson/builder"
-	"github.com/mongodb/mongo-go-driver/bson/internal/jsonparser"
 )
 
 type parseState struct {

bson/extjson_wrappers.go

@@ -14,9 +14,9 @@ import (
 	"strconv"
 	"time"
 
+	"github.com/buger/jsonparser"
 	"github.com/mongodb/mongo-go-driver/bson/builder"
 	"github.com/mongodb/mongo-go-driver/bson/decimal"
-	"github.com/mongodb/mongo-go-driver/bson/internal/jsonparser"
 )
 
 type wrapperType byte