Skip to content

Commit bb96e7b

Browse files
skriptbleskriptble
committed
Rearrange BSON library packages
Removed builder, parser, parser/ast, and elements packages. Moved unstable packages under x/bsonx. Change-Id: I8cb68a4e1839dd4efc3e4f32073213a0f6512e9d
1 parent 6fd340f commit bb96e7b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+34
-4959
lines changed

‎Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@ MONGO_PKGS = $(shell ./etc/find_pkgs.sh ./mongo)
44
MONGO_TEST_PKGS = $(shell ./etc/find_pkgs.sh ./mongo _test)
55
CORE_PKGS = $(shell ./etc/find_pkgs.sh ./core)
66
CORE_TEST_PKGS = $(shell ./etc/find_pkgs.sh ./core _test)
7-
PKGS = $(BSON_PKGS) $(MONGO_PKGS) $(CORE_PKGS)
8-
TEST_PKGS = $(BSON_TEST_PKGS) $(MONGO_TEST_PKGS) $(CORE_TEST_PKGS)
7+
UNSTABLE_PKGS = $(shell ./etc/find_pkgs.sh ./x)
8+
UNSTABLE_TEST_PKGS = $(shell ./etc/find_pkgs.sh ./x _test)
9+
PKGS = $(BSON_PKGS) $(MONGO_PKGS) $(CORE_PKGS) $(UNSTABLE_PKGS)
10+
TEST_PKGS = $(BSON_TEST_PKGS) $(MONGO_TEST_PKGS) $(CORE_TEST_PKGS) $(UNSTABLE_TEST_PKGS)
911

1012
TEST_TIMEOUT = 600
1113

‎bson/bson_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import (
1212
"time"
1313

1414
"github.com/google/go-cmp/cmp"
15-
"github.com/mongodb/mongo-go-driver/bson/bsoncore"
1615
"github.com/mongodb/mongo-go-driver/x/bsonx"
16+
"github.com/mongodb/mongo-go-driver/x/bsonx/bsoncore"
1717
"github.com/stretchr/testify/require"
1818
)
1919

‎bson/bsoncodec/default_value_decoders_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ import (
1818
"time"
1919

2020
"github.com/google/go-cmp/cmp"
21-
"github.com/mongodb/mongo-go-driver/bson/bsoncore"
2221
"github.com/mongodb/mongo-go-driver/bson/bsonrw"
2322
"github.com/mongodb/mongo-go-driver/bson/bsonrw/bsonrwtest"
2423
"github.com/mongodb/mongo-go-driver/bson/bsontype"
2524
"github.com/mongodb/mongo-go-driver/bson/decimal"
2625
"github.com/mongodb/mongo-go-driver/bson/objectid"
26+
"github.com/mongodb/mongo-go-driver/x/bsonx/bsoncore"
2727
)
2828

2929
func TestDefaultValueDecoders(t *testing.T) {

‎bson/bsoncodec/default_value_encoders_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ import (
1616
"time"
1717

1818
"github.com/google/go-cmp/cmp"
19-
"github.com/mongodb/mongo-go-driver/bson/bsoncore"
2019
"github.com/mongodb/mongo-go-driver/bson/bsonrw"
2120
"github.com/mongodb/mongo-go-driver/bson/bsonrw/bsonrwtest"
2221
"github.com/mongodb/mongo-go-driver/bson/bsontype"
2322
"github.com/mongodb/mongo-go-driver/bson/decimal"
2423
"github.com/mongodb/mongo-go-driver/bson/objectid"
24+
"github.com/mongodb/mongo-go-driver/x/bsonx/bsoncore"
2525
)
2626

2727
func TestDefaultValueEncoders(t *testing.T) {

‎bson/bsonrw/bsonrwtest/bsonrwtest.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ package bsonrwtest
99
import (
1010
"testing"
1111

12-
"github.com/mongodb/mongo-go-driver/bson/bsoncore"
1312
"github.com/mongodb/mongo-go-driver/bson/bsonrw"
1413
"github.com/mongodb/mongo-go-driver/bson/bsontype"
1514
"github.com/mongodb/mongo-go-driver/bson/decimal"
1615
"github.com/mongodb/mongo-go-driver/bson/objectid"
16+
"github.com/mongodb/mongo-go-driver/x/bsonx/bsoncore"
1717
)
1818

1919
var _ bsonrw.ValueReader = (*ValueReaderWriter)(nil)

‎bson/bsonrw/copier.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ import (
1010
"fmt"
1111
"io"
1212

13-
"github.com/mongodb/mongo-go-driver/bson/bsoncore"
1413
"github.com/mongodb/mongo-go-driver/bson/bsontype"
1514
"github.com/mongodb/mongo-go-driver/bson/decimal"
1615
"github.com/mongodb/mongo-go-driver/bson/objectid"
16+
"github.com/mongodb/mongo-go-driver/x/bsonx/bsoncore"
1717
)
1818

1919
// Copier is a type that allows copying between ValueReaders, ValueWriters, and

‎bson/bsonrw/copier_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ import (
1212
"fmt"
1313
"testing"
1414

15-
"github.com/mongodb/mongo-go-driver/bson/bsoncore"
1615
"github.com/mongodb/mongo-go-driver/bson/bsontype"
1716
"github.com/mongodb/mongo-go-driver/bson/decimal"
1817
"github.com/mongodb/mongo-go-driver/bson/objectid"
18+
"github.com/mongodb/mongo-go-driver/x/bsonx/bsoncore"
1919
)
2020

2121
func TestCopier(t *testing.T) {

‎bson/bsonrw/value_reader_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ import (
1414
"testing"
1515

1616
"github.com/google/go-cmp/cmp"
17-
"github.com/mongodb/mongo-go-driver/bson/bsoncore"
1817
"github.com/mongodb/mongo-go-driver/bson/bsontype"
1918
"github.com/mongodb/mongo-go-driver/bson/decimal"
2019
"github.com/mongodb/mongo-go-driver/bson/objectid"
20+
"github.com/mongodb/mongo-go-driver/x/bsonx/bsoncore"
2121
)
2222

2323
func TestValueReader(t *testing.T) {

‎bson/bsonrw/value_reader_writer_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ package bsonrw
99
import (
1010
"testing"
1111

12-
"github.com/mongodb/mongo-go-driver/bson/bsoncore"
1312
"github.com/mongodb/mongo-go-driver/bson/bsontype"
1413
"github.com/mongodb/mongo-go-driver/bson/decimal"
1514
"github.com/mongodb/mongo-go-driver/bson/objectid"
15+
"github.com/mongodb/mongo-go-driver/x/bsonx/bsoncore"
1616
)
1717

1818
type VRWInvoked byte

‎bson/bsonrw/value_writer.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ import (
1414
"strconv"
1515
"sync"
1616

17-
"github.com/mongodb/mongo-go-driver/bson/bsoncore"
1817
"github.com/mongodb/mongo-go-driver/bson/bsontype"
1918
"github.com/mongodb/mongo-go-driver/bson/decimal"
2019
"github.com/mongodb/mongo-go-driver/bson/objectid"
20+
"github.com/mongodb/mongo-go-driver/x/bsonx/bsoncore"
2121
)
2222

2323
var _ ValueWriter = (*valueWriter)(nil)

0 commit comments

Comments
 (0)