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.

Sign up for GitHub

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

Jump to bottom

Projection: <field>: <1 or true> and <field>: <0 or false> #377

Merged
merged 11 commits into from
Mar 21, 2022
Merged

Projection: <field>: <1 or true> and <field>: <0 or false> #377

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9101afa
projection simplest
seeforschauer Mar 21, 2022
ae262c1
lint
seeforschauer Mar 21, 2022
69ab62c
WIP
seeforschauer Mar 21, 2022
544bbfd
WIP
seeforschauer Mar 21, 2022
b6643c4
lint
seeforschauer Mar 21, 2022
3bd4edd
remove sort revert
seeforschauer Mar 21, 2022
fd8a27f
wip
seeforschauer Mar 21, 2022
92c4994
updated tests
seeforschauer Mar 21, 2022
9d2ae05
err
seeforschauer Mar 21, 2022
3a899c1
space
seeforschauer Mar 21, 2022
4dd9957
upd
seeforschauer Mar 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
/bin/
/vendor/
cover.txt
cover.html
old.txt
new.txt

Expand Down
13 changes: 12 additions & 1 deletion internal/handlers/common/projection.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,17 @@ import "github.com/FerretDB/FerretDB/internal/types"

// ProjectDocuments modifies given documents in places according to the given projection.
func ProjectDocuments(docs []*types.Document, projection *types.Document) error {
// TODO
if projection.Len() == 0 {
return nil
}
projectionMap := projection.Map()
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it can be done w/o creation of new variable..

for i := 0; i < len(docs); i++ {
for k := range docs[i].Map() {
if _, ok := projectionMap[k]; !ok {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should check the value too. For example, 0 or false should remove the field.

Or the plan is to do that in a different PR?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Then I'd add new tests for it too.

Copy link
Contributor Author

@seeforschauer seeforschauer Mar 21, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd rather add tests and add code

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this PR, or in different one?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this PR

docs[i].Remove(k)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we have a dance test for that? It is not clear from documentation how MongoDB behaves there

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no, dance has no tests for it at all,
can it be merged to not to stop Dmitry?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure

}
}
}

return nil
}
5 changes: 1 addition & 4 deletions internal/handlers/jsonb1/msg_count.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ func (s *storage) MsgCount(ctx context.Context, msg *wire.OpMsg) (*wire.OpMsg, e
"let",
}
if err := common.Unimplemented(document, unimplementedFields...); err != nil {
return nil, err
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, Unimplemented returns protocol error that we should return as-is to the client

return nil, lazyerrors.Error(err)
}
ignoredFields := []string{
"hint",
Expand Down Expand Up @@ -100,9 +100,6 @@ func (s *storage) MsgCount(ctx context.Context, msg *wire.OpMsg) (*wire.OpMsg, e
resDocs = append(resDocs, doc)
}

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's keep a blank line there to separate that block

if err = common.SortDocuments(resDocs, sort); err != nil {
return nil, err
}
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If count has limit (i.e. "no more than", then sort makes sense..)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd better won't change it here.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, sorting is really not required. But that's not for that PR

if resDocs, err = common.LimitDocuments(resDocs, limit); err != nil {
return nil, err
}
Expand Down