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

Support _id aggregation operators for $group stage #3096

Merged
merged 19 commits into from
Jul 26, 2023
Merged

Support _id aggregation operators for $group stage #3096

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
5d30c49
init
noisersup Jul 20, 2023
5317550
wip
noisersup Jul 21, 2023
4bd252e
lint
noisersup Jul 21, 2023
1626f3f
lint
noisersup Jul 21, 2023
3606f16
fix
noisersup Jul 24, 2023
91e489c
fix
noisersup Jul 24, 2023
8a49af4
implement helper
noisersup Jul 24, 2023
acd3046
tests
noisersup Jul 24, 2023
e3a14da
msg fix
noisersup Jul 25, 2023
f9011b1
wip
noisersup Jul 25, 2023
dfce23a
wip
noisersup Jul 25, 2023
34ac369
rm code
noisersup Jul 25, 2023
e02bb2a
wip
noisersup Jul 25, 2023
df2d2db
wip
noisersup Jul 25, 2023
cc7ae16
fix
noisersup Jul 25, 2023
88114de
lint
noisersup Jul 25, 2023
27a65eb
remove unreachable code
noisersup Jul 25, 2023
360c368
cleanup
noisersup Jul 25, 2023
afe96e7
Merge branch 'main' into aggregation-group-id-operators-2964
mergify[bot] Jul 26, 2023
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
Next Next commit
init
  • Loading branch information
@noisersup
noisersup committed Jul 20, 2023
commit 5d30c49879be75f3aa7d3c82d0cd6c12db5c3c97
6 changes: 2 additions & 4 deletions integration/aggregate_documents_compat_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,25 +618,23 @@ func TestAggregateCompatGroup(t *testing.T) {
},
"IDType": {
pipeline: bson.A{bson.D{{"$group", bson.D{
{"_id", bson.D{{"$type", "_id"}}},
{"_id", bson.D{{"$type", "$v"}}},
{"count", bson.D{{"$count", bson.D{}}}},
}}}},
skip: "https://github.com/FerretDB/FerretDB/issues/2679",
},
"IDSum": {
pipeline: bson.A{
bson.D{{"$sort", bson.D{{"_id", 1}}}},
bson.D{{"$group", bson.D{{"_id", bson.D{{"$sum", "$v"}}}}}},
bson.D{{"$sort", bson.D{{"_id", 1}}}},
},
skip: "https://github.com/FerretDB/FerretDB/issues/2694",
},
"IDSumNonExistentField": {
pipeline: bson.A{
bson.D{{"$sort", bson.D{{"_id", 1}}}},
bson.D{{"$group", bson.D{{"_id", bson.D{{"$sum", "$non-existent"}}}}}},
bson.D{{"$sort", bson.D{{"_id", 1}}}},
},
skip: "https://github.com/FerretDB/FerretDB/issues/2694",
},
}

Expand Down
145 changes: 87 additions & 58 deletions internal/handlers/common/aggregations/stages/group.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (

"github.com/FerretDB/FerretDB/internal/handlers/common"
"github.com/FerretDB/FerretDB/internal/handlers/common/aggregations"
"github.com/FerretDB/FerretDB/internal/handlers/common/aggregations/operators"
"github.com/FerretDB/FerretDB/internal/handlers/common/aggregations/operators/accumulators"
"github.com/FerretDB/FerretDB/internal/handlers/commonerrors"
"github.com/FerretDB/FerretDB/internal/types"
Expand Down Expand Up @@ -82,8 +83,10 @@ func newGroup(stage *types.Document) (aggregations.Stage, error) {

if field == "_id" {
if doc, ok := v.(*types.Document); ok {
if err = validateExpression("$group", doc); err != nil {
return nil, err
if !operators.IsOperator(doc) {
if err = validateExpression("$group", doc); err != nil {
return nil, err
}
}
}
groupKey = v
Expand Down Expand Up @@ -165,73 +168,99 @@ func (g *group) Process(ctx context.Context, iter types.DocumentsIterator, close

// groupDocuments groups documents by group expression.
func (g *group) groupDocuments(ctx context.Context, in []*types.Document) ([]groupedDocuments, error) {
groupKey, ok := g.groupExpression.(string)
if !ok {
// non-string key aggregates values of all `in` documents into one aggregated document.
return []groupedDocuments{{
groupID: g.groupExpression,
documents: in,
}}, nil
}
switch groupKey := g.groupExpression.(type) {
case string:
expression, err := aggregations.NewExpression(groupKey)
if err != nil {
var exprErr *aggregations.ExpressionError
if !errors.As(err, &exprErr) {
return nil, lazyerrors.Error(err)
}

expression, err := aggregations.NewExpression(groupKey)
if err != nil {
var exprErr *aggregations.ExpressionError
if !errors.As(err, &exprErr) {
return nil, lazyerrors.Error(err)
switch exprErr.Code() {
case aggregations.ErrNotExpression:
// constant value aggregates values of all `in` documents into one aggregated document.
return []groupedDocuments{{
groupID: groupKey,
documents: in,
}}, nil
case aggregations.ErrEmptyFieldPath:
return nil, commonerrors.NewCommandErrorMsgWithArgument(
// TODO
commonerrors.ErrGroupInvalidFieldPath,
"'$' by itself is not a valid Expression",
"$group (stage)",
)
case aggregations.ErrInvalidExpression:
return nil, commonerrors.NewCommandErrorMsgWithArgument(
commonerrors.ErrFailedToParse,
fmt.Sprintf("'%s' starts with an invalid character for a user variable name", types.FormatAnyValue(groupKey)),
"$group (stage)",
)
case aggregations.ErrEmptyVariable:
return nil, commonerrors.NewCommandErrorMsgWithArgument(
commonerrors.ErrFailedToParse,
"empty variable names are not allowed",
"$group (stage)",
)
// TODO https://github.com/FerretDB/FerretDB/issues/2275
case aggregations.ErrUndefinedVariable:
return nil, commonerrors.NewCommandErrorMsgWithArgument(
commonerrors.ErrGroupUndefinedVariable,
fmt.Sprintf("Use of undefined variable: %s", types.FormatAnyValue(groupKey)),
"$group (stage)",
)
default:
panic(fmt.Sprintf("unhandled field path error %s", exprErr.Error()))
}
}

switch exprErr.Code() {
case aggregations.ErrNotExpression:
// constant value aggregates values of all `in` documents into one aggregated document.
return []groupedDocuments{{
groupID: groupKey,
documents: in,
}}, nil
case aggregations.ErrEmptyFieldPath:
return nil, commonerrors.NewCommandErrorMsgWithArgument(
// TODO
commonerrors.ErrGroupInvalidFieldPath,
"'$' by itself is not a valid Expression",
"$group (stage)",
)
case aggregations.ErrInvalidExpression:
return nil, commonerrors.NewCommandErrorMsgWithArgument(
commonerrors.ErrFailedToParse,
fmt.Sprintf("'%s' starts with an invalid character for a user variable name", types.FormatAnyValue(groupKey)),
"$group (stage)",
)
case aggregations.ErrEmptyVariable:
return nil, commonerrors.NewCommandErrorMsgWithArgument(
commonerrors.ErrFailedToParse,
"empty variable names are not allowed",
"$group (stage)",
)
// TODO https://github.com/FerretDB/FerretDB/issues/2275
case aggregations.ErrUndefinedVariable:
return nil, commonerrors.NewCommandErrorMsgWithArgument(
commonerrors.ErrGroupUndefinedVariable,
fmt.Sprintf("Use of undefined variable: %s", types.FormatAnyValue(groupKey)),
"$group (stage)",
)
default:
panic(fmt.Sprintf("unhandled field path error %s", exprErr.Error()))
var group groupMap

for _, doc := range in {
val, err := expression.Evaluate(doc)
if err != nil {
// $group treats non-existent fields as nulls
val = types.Null
}

group.addOrAppend(val, doc)
}
}
return group.docs, nil

var group groupMap
case *types.Document:
if !operators.IsOperator(groupKey) {
break
}

for _, doc := range in {
val, err := expression.Evaluate(doc)
op, err := operators.NewOperator(groupKey)
if err != nil {
// $group treats non-existent fields as nulls
val = types.Null
return nil, err
}

group.addOrAppend(val, doc)
var group groupMap

for _, doc := range in {
val, err := op.Process(doc)
if err != nil {
return nil, err
}

group.addOrAppend(val, doc)
}

return group.docs, nil

default:
}

return group.docs, nil
// non-string key aggregates values of all `in` documents into one aggregated document.
return []groupedDocuments{{
groupID: g.groupExpression,
documents: in,
}}, nil

//return group.docs, nil
}

// groupedDocuments contains group key and the documents for that group.
Expand Down