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

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

Merged
merged 11 commits into from
Mar 21, 2022
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
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
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
41 changes: 39 additions & 2 deletions internal/handlers/common/projection.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,47 @@

package common

import "github.com/FerretDB/FerretDB/internal/types"
import (
"github.com/FerretDB/FerretDB/internal/types"
"github.com/FerretDB/FerretDB/internal/util/lazyerrors"
)

// 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 k == "_id" {
Copy link
Member

Choose a reason for hiding this comment

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

_id handing is more complicated than that

continue
}

v, ok := projectionMap[k]
if !ok {
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

continue
}

switch v := v.(type) {
case bool:
if !v {
docs[i].Remove(k)
continue
}
continue
Copy link
Member

Choose a reason for hiding this comment

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

We don't need both those continue statements


case int32, int64, float32, float64:
seeforschauer marked this conversation as resolved.
Show resolved Hide resolved
if compareScalars(v, int32(0)) == equal {
AlekSi marked this conversation as resolved.
Show resolved Hide resolved
docs[i].Remove(k)
continue
Copy link
Member

Choose a reason for hiding this comment

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

We don't need that continue

Copy link
Contributor Author

Choose a reason for hiding this comment

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

removed

}
default:
return lazyerrors.Errorf("unsupported operation {%v %v}", k, v)
}
}
}

return nil
}
9 changes: 6 additions & 3 deletions internal/handlers/handler_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -810,12 +810,14 @@ func TestReadOnlyHandlers(t *testing.T) {
},
},

"FindProjectionActorsFirstAndLastName": {
"FindProjectionField": {
req: types.MustNewDocument(
"find", "actor",
"projection", types.MustNewDocument(
"first_name", int32(1),
"first_name", int32(0),
"last_name", int32(1),
"last_update", true,
"actor_id", false,
),
"filter", types.MustNewDocument(
"actor_id", int32(28),
Expand All @@ -826,8 +828,9 @@ func TestReadOnlyHandlers(t *testing.T) {
"cursor", types.MustNewDocument(
"firstBatch", types.MustNewArray(
types.MustNewDocument(
"first_name", "WOODY",
"_id", types.ObjectID{0x61, 0x2e, 0xc2, 0x80, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x1c},
"last_name", "HOFFMAN",
"last_update", time.Date(2020, 2, 15, 9, 34, 33, 0, time.UTC).Local(),
),
),
"id", int64(0),
Expand Down