Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make our own low-level driver for testing #4193

Merged
merged 49 commits into from Mar 22, 2024
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
e469531
wip
noisersup Mar 14, 2024
1fb8e35
wip
noisersup Mar 14, 2024
e922efa
wip
noisersup Mar 18, 2024
392a1c7
wip
noisersup Mar 18, 2024
dfbf30e
wip
noisersup Mar 18, 2024
73280d8
wip
noisersup Mar 18, 2024
4763c05
wip
noisersup Mar 19, 2024
038ffd0
fix bug
noisersup Mar 20, 2024
63812b6
wip
noisersup Mar 20, 2024
0cd7038
wip
noisersup Mar 20, 2024
970d801
wip
noisersup Mar 20, 2024
023c31b
dbname
noisersup Mar 20, 2024
18aef6c
dbname
noisersup Mar 20, 2024
cff1a98
parsing
noisersup Mar 20, 2024
377c4ec
wip
noisersup Mar 20, 2024
556c25a
wip
noisersup Mar 20, 2024
27d7dad
wip
noisersup Mar 20, 2024
d15e69f
wip
noisersup Mar 21, 2024
65c23a9
wip
noisersup Mar 21, 2024
b5e2c86
validate request response_id
noisersup Mar 21, 2024
48bccc2
wip
noisersup Mar 21, 2024
a68f867
wip
noisersup Mar 21, 2024
9034641
wip
noisersup Mar 21, 2024
8e50292
fully functional test, but ugly
noisersup Mar 21, 2024
00ba4e2
cmnt
noisersup Mar 21, 2024
0715c9e
default msg len
noisersup Mar 21, 2024
627a607
sort
noisersup Mar 21, 2024
f59fce7
default opcode
noisersup Mar 21, 2024
35929ba
default id
noisersup Mar 21, 2024
638c32e
remove helper
noisersup Mar 21, 2024
744b0cc
wip
noisersup Mar 22, 2024
04c9ed7
wip
noisersup Mar 22, 2024
eb33ee1
wip
noisersup Mar 22, 2024
508fedc
wip
noisersup Mar 22, 2024
2fbeb6e
wip
noisersup Mar 22, 2024
bcac9dd
Merge branch 'main' into driver-4146
noisersup Mar 22, 2024
de165ce
wip
noisersup Mar 22, 2024
5e384fd
Apply suggestions from code review
noisersup Mar 22, 2024
2799f4a
wip
noisersup Mar 22, 2024
bcd93f1
wip
noisersup Mar 22, 2024
9055859
wip
noisersup Mar 22, 2024
926b579
wip
noisersup Mar 22, 2024
4d854e6
wip
noisersup Mar 22, 2024
5d46ce4
wip
noisersup Mar 22, 2024
e1abbb4
wip
noisersup Mar 22, 2024
fe5c0c5
wip
noisersup Mar 22, 2024
464d821
wip
noisersup Mar 22, 2024
591cd77
wip
noisersup Mar 22, 2024
79d4319
Merge branch 'main' into driver-4146
AlekSi Mar 22, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 10 additions & 2 deletions internal/driver/driver.go
Expand Up @@ -166,6 +166,14 @@

// Request sends the given request to the connection and returns the response.
func (c *Conn) Request(ctx context.Context, header *wire.MsgHeader, body wire.MsgBody) (*wire.MsgHeader, wire.MsgBody, error) {
AlekSi marked this conversation as resolved.
Show resolved Hide resolved
AlekSi marked this conversation as resolved.
Show resolved Hide resolved
// TODO https://github.com/FerretDB/FerretDB/issues/4146
panic("not implemented")
if err := c.Write(header, body); err != nil {
return nil, nil, lazyerrors.Error(err)

Check warning on line 170 in internal/driver/driver.go

View check run for this annotation

Codecov / codecov/patch

internal/driver/driver.go#L169-L170

Added lines #L169 - L170 were not covered by tests
}

header, body, err := c.Read()
if err != nil {
return nil, nil, lazyerrors.Error(err)

Check warning on line 175 in internal/driver/driver.go

View check run for this annotation

Codecov / codecov/patch

internal/driver/driver.go#L173-L175

Added lines #L173 - L175 were not covered by tests
}

AlekSi marked this conversation as resolved.
Show resolved Hide resolved
return header, body, nil

Check warning on line 178 in internal/driver/driver.go

View check run for this annotation

Codecov / codecov/patch

internal/driver/driver.go#L178

Added line #L178 was not covered by tests
}
82 changes: 80 additions & 2 deletions internal/driver/driver_test.go
Expand Up @@ -19,7 +19,10 @@

"github.com/stretchr/testify/require"

"github.com/FerretDB/FerretDB/internal/bson"
"github.com/FerretDB/FerretDB/internal/util/must"
"github.com/FerretDB/FerretDB/internal/util/testutil"
"github.com/FerretDB/FerretDB/internal/wire"
)

func TestDriver(t *testing.T) {
Expand All @@ -33,6 +36,81 @@
require.NoError(t, err)
t.Cleanup(func() { require.NoError(t, c.Close()) })

// TODO https://github.com/FerretDB/FerretDB/issues/4146
_ = c
t.Run("Insert", func(t *testing.T) {
doc := must.NotFail(bson.NewDocument(
"insert", "values",
"documents", must.NotFail(bson.NewArray(
must.NotFail(bson.NewDocument("v", int32(1), "_id", bson.ObjectID([]byte("65f83bddef2048e47170b641")))),
must.NotFail(bson.NewDocument("v", int32(2), "_id", bson.ObjectID([]byte("65f83bddef2048e47170b642")))),
)),
"ordered", true,
"lsid", int32(0),
"txnNumber", int64(1),
"$db", "test",
))

section, err := must.NotFail(bson.NewDocument(
"Kind", int32(0),
"Document", doc,
)).Encode()

require.NoError(t, err)

body, err := wire.NewOpMsg(section)
require.NoError(t, err)

msgBin, err := body.MarshalBinary()
require.NoError(t, err)

// TODO verify header
header := wire.MsgHeader{
MessageLength: int32(len(msgBin) + wire.MsgHeaderLen),
RequestID: 13,
OpCode: wire.OpCodeMsg,
}
AlekSi marked this conversation as resolved.
Show resolved Hide resolved

//resHeader, resBody, err := c.Request(ctx, &header, body)
_, _, err = c.Request(ctx, &header, body)
require.NoError(t, err)

// assert.Equal(t, wire.MsgHeader{
// RequestID: 368,
// ResponseTo: 13,
// OpCode: 2013,
// MessageLength: 252,
// }, *resHeader)
// assert.Equal(t, wire.OpMsg{}, resBody)
})

t.Run("Find", func(t *testing.T) {
doc := must.NotFail(bson.NewDocument(
"find", "values",
"filter", must.NotFail(bson.NewDocument()),
"lsid", int32(0),
"$db", "test",
))

section, err := must.NotFail(bson.NewDocument(
"Kind", int32(0),
"Document", doc,
)).Encode()
require.NoError(t, err)

body, err := wire.NewOpMsg(section)
require.NoError(t, err)

msgBin, err := body.MarshalBinary()
require.NoError(t, err)

// TODO verify header
header := wire.MsgHeader{
MessageLength: int32(len(msgBin) + wire.MsgHeaderLen),
RequestID: 13,
OpCode: wire.OpCodeMsg,
}

_, resBody, err := c.Request(ctx, &header, body)

Check failure on line 112 in internal/driver/driver_test.go

View workflow job for this annotation

GitHub Actions / Security scan

resBody declared and not used

Check failure on line 112 in internal/driver/driver_test.go

View workflow job for this annotation

GitHub Actions / Short test

resBody declared and not used

Check failure on line 112 in internal/driver/driver_test.go

View workflow job for this annotation

GitHub Actions / Test

resBody declared and not used
AlekSi marked this conversation as resolved.
Show resolved Hide resolved
require.NoError(t, err)

})
}