Move the Doc type family outside of stable

Change-Id: I6ec8f06f91db1d8450d20a8cfe1d08c77aa019f1

Author: skriptble

benchmark/bson.go

@@ -12,6 +12,7 @@ import (
 	"path/filepath"
 
 	"github.com/mongodb/mongo-go-driver/bson"
+	"github.com/mongodb/mongo-go-driver/x/bsonx"
 )
 
 const (
@@ -24,12 +25,12 @@ const (
 
 // utility functions for the bson benchmarks
 
-func loadSourceDocument(pathParts ...string) (bson.Doc, error) {
+func loadSourceDocument(pathParts ...string) (bsonx.Doc, error) {
 	data, err := ioutil.ReadFile(filepath.Join(pathParts...))
 	if err != nil {
 		return nil, err
 	}
-	doc := bson.Doc{}
+	doc := bsonx.Doc{}
 	err = bson.UnmarshalExtJSON(data, true, &doc)
 	if err != nil {
 		return nil, err

benchmark/bson_document.go

@@ -10,7 +10,7 @@ import (
 	"context"
 	"errors"
 
-	"github.com/mongodb/mongo-go-driver/bson"
+	"github.com/mongodb/mongo-go-driver/x/bsonx"
 )
 
 func bsonDocumentEncoding(ctx context.Context, tm TimerManager, iters int, source string) error {
@@ -48,7 +48,7 @@ func bsonDocumentDecodingLazy(ctx context.Context, tm TimerManager, iters int, s
 	tm.ResetTimer()
 
 	for i := 0; i < iters; i++ {
-		out, err := bson.ReadDoc(raw)
+		out, err := bsonx.ReadDoc(raw)
 		if err != nil {
 			return err
 		}
@@ -73,7 +73,7 @@ func bsonDocumentDecoding(ctx context.Context, tm TimerManager, iters, numKeys i
 	tm.ResetTimer()
 
 	for i := 0; i < iters; i++ {
-		out, err := bson.ReadDoc(raw)
+		out, err := bsonx.ReadDoc(raw)
 		if err != nil {
 			return err
 		}

benchmark/multi.go

@@ -11,6 +11,7 @@ import (
 	"errors"
 
 	"github.com/mongodb/mongo-go-driver/bson"
+	"github.com/mongodb/mongo-go-driver/x/bsonx"
 )
 
 func MultiFindMany(ctx context.Context, tm TimerManager, iters int) error {
@@ -46,7 +47,7 @@ func MultiFindMany(ctx context.Context, tm TimerManager, iters int) error {
 
 	tm.ResetTimer()
 
-	cursor, err := coll.Find(ctx, bson.Doc{})
+	cursor, err := coll.Find(ctx, bsonx.Doc{})
 	if err != nil {
 		return err
 	}
@@ -108,7 +109,7 @@ func multiInsertCase(ctx context.Context, tm TimerManager, iters int, data strin
 		return err
 	}
 
-	_, err = db.RunCommand(ctx, bson.Doc{{"create", bson.String("corpus")}})
+	_, err = db.RunCommand(ctx, bsonx.Doc{{"create", bsonx.String("corpus")}})
 	if err != nil {
 		return err
 	}

benchmark/single.go

@@ -10,9 +10,9 @@ import (
 	"context"
 	"errors"
 
-	"github.com/mongodb/mongo-go-driver/bson"
 	"github.com/mongodb/mongo-go-driver/internal/testutil"
 	"github.com/mongodb/mongo-go-driver/mongo"
+	"github.com/mongodb/mongo-go-driver/x/bsonx"
 )
 
 const (
@@ -49,7 +49,7 @@ func SingleRunCommand(ctx context.Context, tm TimerManager, iters int) error {
 	}
 	defer db.Client().Disconnect(ctx)
 
-	cmd := bson.Doc{{"ismaster", bson.Boolean(true)}}
+	cmd := bsonx.Doc{{"ismaster", bsonx.Boolean(true)}}
 
 	tm.ResetTimer()
 	for i := 0; i < iters; i++ {
@@ -88,7 +88,7 @@ func SingleFindOneByID(ctx context.Context, tm TimerManager, iters int) error {
 	coll := db.Collection("corpus")
 	for i := 0; i < iters; i++ {
 		id := int32(i)
-		res, err := coll.InsertOne(ctx, doc.Set("_id", bson.Int32(id)))
+		res, err := coll.InsertOne(ctx, doc.Set("_id", bsonx.Int32(id)))
 		if err != nil {
 			return err
 		}
@@ -100,7 +100,7 @@ func SingleFindOneByID(ctx context.Context, tm TimerManager, iters int) error {
 	tm.ResetTimer()
 
 	for i := 0; i < iters; i++ {
-		res := coll.FindOne(ctx, bson.Doc{{"_id", bson.Int32(int32(i))}})
+		res := coll.FindOne(ctx, bsonx.Doc{{"_id", bsonx.Int32(int32(i))}})
 		if res == nil {
 			return errors.New("find one query produced nil result")
 		}
@@ -135,7 +135,7 @@ func singleInsertCase(ctx context.Context, tm TimerManager, iters int, data stri
 		return err
 	}
 
-	_, err = db.RunCommand(ctx, bson.Doc{{"create", bson.String("corpus")}})
+	_, err = db.RunCommand(ctx, bsonx.Doc{{"create", bsonx.String("corpus")}})
 	if err != nil {
 		return err
 	}

bson/bson_corpus_spec_test.go

@@ -22,6 +22,7 @@ import (
 	"github.com/google/go-cmp/cmp"
 	"github.com/mongodb/mongo-go-driver/bson/bsoncodec"
 	"github.com/mongodb/mongo-go-driver/bson/bsonrw"
+	"github.com/mongodb/mongo-go-driver/x/bsonx"
 	"github.com/stretchr/testify/require"
 	"github.com/tidwall/pretty"
 )
@@ -161,20 +162,20 @@ func normalizeRelaxedDouble(t *testing.T, key string, rEJ string) string {
 }
 
 // bsonToNative decodes the BSON bytes (b) into a native Document
-func bsonToNative(t *testing.T, b []byte, bType, testDesc string) Doc {
-	var doc Doc
-	err := pc.DocumentDecodeValue(dc, bsonrw.NewBSONDocumentReader(b), &doc)
+func bsonToNative(t *testing.T, b []byte, bType, testDesc string) bsonx.Doc {
+	var doc bsonx.Doc
+	err := pc.x.DocumentDecodeValue(dc, bsonrw.NewBSONDocumentReader(b), &doc)
 	expectNoError(t, err, fmt.Sprintf("%s: decoding %s BSON", testDesc, bType))
 	return doc
 }
 
 // nativeToBSON encodes the native Document (doc) into canonical BSON and compares it to the expected
 // canonical BSON (cB)
-func nativeToBSON(t *testing.T, cB []byte, doc Doc, testDesc, bType, docSrcDesc string) {
+func nativeToBSON(t *testing.T, cB []byte, doc bsonx.Doc, testDesc, bType, docSrcDesc string) {
 	actualB := new(bytes.Buffer)
 	vw, err := bsonrw.NewBSONValueWriter(actualB)
 	expectNoError(t, err, fmt.Sprintf("%s: creating ValueWriter", testDesc))
-	err = pc.DocumentEncodeValue(ec, vw, doc)
+	err = pc.x.DocumentEncodeValue(ec, vw, doc)
 	expectNoError(t, err, fmt.Sprintf("%s: encoding %s BSON", testDesc, bType))
 
 	if diff := cmp.Diff(cB, actualB.Bytes()); diff != "" {
@@ -185,15 +186,15 @@ func nativeToBSON(t *testing.T, cB []byte, doc Doc, testDesc, bType, docSrcDesc
 }
 
 // jsonToNative decodes the extended JSON string (ej) into a native Document
-func jsonToNative(t *testing.T, ej, ejType, testDesc string) Doc {
-	var doc Doc
+func jsonToNative(t *testing.T, ej, ejType, testDesc string) bsonx.Doc {
+	var doc bsonx.Doc
 	err := UnmarshalExtJSON([]byte(ej), ejType != "relaxed", &doc)
 	expectNoError(t, err, fmt.Sprintf("%s: decoding %s extended JSON", testDesc, ejType))
 	return doc
 }
 
 // nativeToJSON encodes the native Document (doc) into an extended JSON string
-func nativeToJSON(t *testing.T, ej string, doc Doc, testDesc, ejType, ejShortName, docSrcDesc string) {
+func nativeToJSON(t *testing.T, ej string, doc bsonx.Doc, testDesc, ejType, ejShortName, docSrcDesc string) {
 	actualEJ, err := MarshalExtJSON(doc, ejType != "relaxed", true)
 	expectNoError(t, err, fmt.Sprintf("%s: encoding %s extended JSON", testDesc, ejType))
 
@@ -298,8 +299,8 @@ func runTest(t *testing.T, file string) {
 			b, err := hex.DecodeString(d.Bson)
 			expectNoError(t, err, d.Description)
 
-			var doc Doc
-			err = pc.DocumentDecodeValue(dc, bsonrw.NewBSONDocumentReader(b), &doc)
+			var doc bsonx.Doc
+			err = pc.x.DocumentDecodeValue(dc, bsonrw.NewBSONDocumentReader(b), &doc)
 			expectError(t, err, fmt.Sprintf("%s: expected decode error", d.Description))
 		}
 
@@ -316,7 +317,7 @@ func runTest(t *testing.T, file string) {
 
 			switch test.BsonType {
 			case "0x00":
-				var doc Doc
+				var doc bsonx.Doc
 				err := UnmarshalExtJSON([]byte(s), true, &doc)
 				expectError(t, err, fmt.Sprintf("%s: expected parse error", p.Description))
 			case "0x13":

bson/bson_test.go

@@ -13,6 +13,7 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/mongodb/mongo-go-driver/bson/bsoncore"
+	"github.com/mongodb/mongo-go-driver/x/bsonx"
 	"github.com/stretchr/testify/require"
 )
 
@@ -26,7 +27,7 @@ func noerr(t *testing.T, err error) {
 
 func requireErrEqual(t *testing.T, err1 error, err2 error) { require.True(t, compareErrors(err1, err2)) }
 
-func elementSliceEqual(t *testing.T, e1 []Elem, e2 []Elem) {
+func elementSliceEqual(t *testing.T, e1 []bsonx.Elem, e2 []bsonx.Elem) {
 	require.Equal(t, len(e1), len(e2))
 
 	for i := range e1 {

bson/encoder_test.go

@@ -15,6 +15,7 @@ import (
 	"github.com/mongodb/mongo-go-driver/bson/bsoncodec"
 	"github.com/mongodb/mongo-go-driver/bson/bsonrw"
 	"github.com/mongodb/mongo-go-driver/bson/bsonrw/bsonrwtest"
+	"github.com/mongodb/mongo-go-driver/x/bsonx"
 )
 
 func TestBasicEncode(t *testing.T) {
@@ -128,15 +129,15 @@ type testMarshaler struct {
 
 func (tm testMarshaler) MarshalBSON() ([]byte, error) { return tm.buf, tm.err }
 
-func docToBytes(d Doc) []byte {
+func docToBytes(d bsonx.Doc) []byte {
 	b, err := d.MarshalBSON()
 	if err != nil {
 		panic(err)
 	}
 	return b
 }
 
-func arrToBytes(a Arr) []byte {
+func arrToBytes(a bsonx.Arr) []byte {
 	_, b, err := a.MarshalBSONValue()
 	if err != nil {
 		panic(err)

bson/marshal_test.go

@@ -11,6 +11,7 @@ import (
 	"testing"
 
 	"github.com/mongodb/mongo-go-driver/bson/bsoncodec"
+	"github.com/mongodb/mongo-go-driver/x/bsonx"
 	"github.com/stretchr/testify/require"
 )
 
@@ -105,7 +106,7 @@ func TestMarshal_roundtripFromBytes(t *testing.T) {
 		0x0,
 	}
 
-	var doc Doc
+	var doc bsonx.Doc
 	require.NoError(t, Unmarshal(before, &doc))
 
 	after, err := Marshal(doc)
@@ -115,16 +116,16 @@ func TestMarshal_roundtripFromBytes(t *testing.T) {
 }
 
 func TestMarshal_roundtripFromDoc(t *testing.T) {
-	before := Doc{
-		{"foo", String("bar")},
-		{"baz", Int32(-27)},
-		{"bing", Array(Arr{Null(), Regex("word", "i")})},
+	before := bsonx.Doc{
+		{"foo", bsonx.String("bar")},
+		{"baz", bsonx.Int32(-27)},
+		{"bing", bsonx.Array(bsonx.Arr{bsonx.Null(), bsonx.Regex("word", "i")})},
 	}
 
 	b, err := Marshal(before)
 	require.NoError(t, err)
 
-	var after Doc
+	var after bsonx.Doc
 	require.NoError(t, Unmarshal(b, &after))
 
 	require.True(t, before.Equal(after))

bson/marshaling_cases_test.go

@@ -8,6 +8,7 @@ package bson
 
 import (
 	"github.com/mongodb/mongo-go-driver/bson/bsoncodec"
+	"github.com/mongodb/mongo-go-driver/x/bsonx"
 )
 
 type marshalingTestCase struct {
@@ -24,6 +25,6 @@ var marshalingTestCases = []marshalingTestCase{
 		struct {
 			Foo bool
 		}{Foo: true},
-		docToBytes(Doc{{"foo", Boolean(true)}}),
+		docToBytes(bsonx.Doc{{"foo", bsonx.Boolean(true)}}),
 	},
 }