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

Fix small issues after rewrite #380

Merged
merged 2 commits into from
Mar 21, 2022
Merged

Fix small issues after rewrite #380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3765d56
Fix small issues after rewrite
AlekSi Mar 21, 2022
49b620c
Merge branch 'main' into small-fixes
AlekSi 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
115 changes: 60 additions & 55 deletions internal/handlers/common/filter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,63 +49,13 @@ func FilterDocument(doc, filter *types.Document) (bool, error) {

// filterDocumentPair handles a single filter element key/value pair {filterKey: filterValue}.
func filterDocumentPair(doc *types.Document, filterKey string, filterValue any) (bool, error) {
// {$operator: [expr1, expr2, ...]}
if strings.HasPrefix(filterKey, "$") {
exprs, ok := filterValue.(*types.Array)
if !ok {
msg := fmt.Sprintf(
`unknown top level operator: %s. `+
`If you have a field name that starts with a '$' symbol, consider using $getField or $setField.`,
filterKey,
)
return false, NewErrorMsg(ErrBadValue, msg)
}

switch filterKey {
case "$and":
// {$and: [{expr1}, {expr2}, ...]}
for i := 0; i < exprs.Len(); i++ {
expr := must.NotFail(exprs.Get(i)).(*types.Document)
matches, err := FilterDocument(doc, expr)
if err != nil {
panic(err)
}
if !matches {
return false, nil
}
}
return true, nil

case "$or":
// {$or: [{expr1}, {expr2}, ...]}
for i := 0; i < exprs.Len(); i++ {
expr := must.NotFail(exprs.Get(i)).(*types.Document)
matches, err := FilterDocument(doc, expr)
if err != nil {
panic(err)
}
if matches {
return true, nil
}
}
return false, nil

case "$nor":
// {$nor: [{expr1}, {expr2}, ...]}
for i := 0; i < exprs.Len(); i++ {
expr := must.NotFail(exprs.Get(i)).(*types.Document)
matches, err := FilterDocument(doc, expr)
if err != nil {
panic(err)
}
if matches {
return false, nil
}
}
return true, nil
// {$operator: [expr1, expr2, ...]}
exprs, err := AssertType[*types.Array](filterValue)
if err != nil {
return false, err
}

panic(fmt.Sprintf("filterDocumentPair: %q %v", filterKey, filterValue))
return filterLala(doc, filterKey, exprs)
}

docValue, err := doc.Get(filterKey)
Expand All @@ -132,6 +82,61 @@ func filterDocumentPair(doc *types.Document, filterKey string, filterValue any)
}
}

// filterLala handles {$operator: [expr1, expr2, ...]} filter.
func filterLala(doc *types.Document, operator string, exprs *types.Array) (bool, error) {
switch operator {
case "$and":
// {$and: [{expr1}, {expr2}, ...]}
for i := 0; i < exprs.Len(); i++ {
expr := must.NotFail(exprs.Get(i)).(*types.Document)
matches, err := FilterDocument(doc, expr)
if err != nil {
panic(err)
}
if !matches {
return false, nil
}
}
return true, nil

case "$or":
// {$or: [{expr1}, {expr2}, ...]}
for i := 0; i < exprs.Len(); i++ {
expr := must.NotFail(exprs.Get(i)).(*types.Document)
matches, err := FilterDocument(doc, expr)
if err != nil {
panic(err)
}
if matches {
return true, nil
}
}
return false, nil

case "$nor":
// {$nor: [{expr1}, {expr2}, ...]}
for i := 0; i < exprs.Len(); i++ {
expr := must.NotFail(exprs.Get(i)).(*types.Document)
matches, err := FilterDocument(doc, expr)
if err != nil {
panic(err)
}
if matches {
return false, nil
}
}
return true, nil

default:
msg := fmt.Sprintf(
`unknown top level operator: %s. `+
`If you have a field name that starts with a '$' symbol, consider using $getField or $setField.`,
operator,
)
return false, NewErrorMsg(ErrBadValue, msg)
}
}

// filterFieldExpr handles {field: {expr}} filter.
func filterFieldExpr(fieldValue any, expr *types.Document) (bool, error) {
for _, exprKey := range expr.Keys() {
Expand Down
2 changes: 1 addition & 1 deletion internal/handlers/handler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -554,7 +554,7 @@ func TestFind(t *testing.T) {
req: must.NotFail(types.NewDocument(
"find", "values",
"filter", must.NotFail(types.NewDocument(
"$size", int32(2),
"$size", types.MustNewArray(int32(2)),
)),
)),
err: common.NewErrorMsg(
Expand Down
27 changes: 3 additions & 24 deletions internal/handlers/jsonb1/msg_count.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ import (
"github.com/FerretDB/FerretDB/internal/wire"
)

// MsgFindOrCount finds documents in a collection or view and returns a cursor to the selected documents
// or count the number of documents that matches the query filter.
// MsgCount counts the number of documents that matches the query filter.
func (s *storage) MsgCount(ctx context.Context, msg *wire.OpMsg) (*wire.OpMsg, error) {
document, err := msg.Document()
if err != nil {
Expand All @@ -33,29 +32,15 @@ func (s *storage) MsgCount(ctx context.Context, msg *wire.OpMsg) (*wire.OpMsg, e

unimplementedFields := []string{
"skip",
"returnKey",
seeforschauer marked this conversation as resolved.
Show resolved Hide resolved
"showRecordId",
"tailable",
"oplogReplay",
"noCursorTimeout",
"awaitData",
"allowPartialResults",
"collation",
"allowDiskUse",
"let",
}
if err := common.Unimplemented(document, unimplementedFields...); err != nil {
return nil, err
}
ignoredFields := []string{
"hint",
"batchSize",
"singleBatch",
"comment",
"maxTimeMS",
"readConcern",
"max",
"min",
"comment",
}
common.Ignored(document, s.l, ignoredFields...)

Expand All @@ -69,14 +54,11 @@ func (s *storage) MsgCount(ctx context.Context, msg *wire.OpMsg) (*wire.OpMsg, e
return nil, err
}

var filter, sort *types.Document
var filter *types.Document
var limit int32
if filter, err = common.GetOptionalParam(document, "query", filter); err != nil {
return nil, err
}
if sort, err = common.GetOptionalParam(document, "sort", sort); err != nil {
return nil, err
}
if limit, err = common.GetOptionalParam(document, "limit", limit); err != nil {
Copy link
Contributor

Choose a reason for hiding this comment

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

limit is not necessary for count, isn't it?

return nil, err
}
Expand All @@ -100,9 +82,6 @@ func (s *storage) MsgCount(ctx context.Context, msg *wire.OpMsg) (*wire.OpMsg, e
resDocs = append(resDocs, doc)
}

if err = common.SortDocuments(resDocs, sort); err != nil {
return nil, err
}
if resDocs, err = common.LimitDocuments(resDocs, limit); err != nil {
return nil, err
}
Expand Down
3 changes: 1 addition & 2 deletions internal/handlers/jsonb1/msg_find.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ import (
"github.com/FerretDB/FerretDB/internal/wire"
)

// MsgFindOrCount finds documents in a collection or view and returns a cursor to the selected documents
// or count the number of documents that matches the query filter.
// MsgFind finds documents in a collection or view and returns a cursor to the selected documents.
func (s *storage) MsgFind(ctx context.Context, msg *wire.OpMsg) (*wire.OpMsg, error) {
document, err := msg.Document()
if err != nil {
Expand Down