Skip to content

Commit

Permalink
feat(NODE-3325): support 'let' option for aggregate command (#2828)
Browse files Browse the repository at this point in the history
  • Loading branch information
addaleax authored Jun 4, 2021
1 parent 579119f commit e38838e
Show file tree
Hide file tree
Showing 4 changed files with 283 additions and 0 deletions.
6 changes: 6 additions & 0 deletions src/operations/aggregate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ export interface AggregateOptions extends CommandOperationOptions {
collation?: CollationOptions;
/** Add an index selection hint to an aggregation command */
hint?: Hint;
/** Map of parameter names and values that can be accessed using $$var (requires MongoDB 5.0). */
let?: Document;
out?: string;
}

Expand Down Expand Up @@ -116,6 +118,10 @@ export class AggregateOperation<T = Document> extends CommandOperation<T> {
command.hint = options.hint;
}

if (options.let) {
command.let = options.let;
}

command.cursor = options.cursor || {};
if (options.batchSize && !this.hasWriteStage) {
command.cursor.batchSize = options.batchSize;
Expand Down
1 change: 1 addition & 0 deletions test/functional/unified-spec-runner/operations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ operations.set('aggregate', async ({ entities, operation }) => {
maxAwaitTimeMS: operation.arguments.maxAwaitTimeMS,
collation: operation.arguments.collation,
hint: operation.arguments.hint,
let: operation.arguments.let,
out: operation.arguments.out
})
.toArray();
Expand Down
195 changes: 195 additions & 0 deletions test/spec/crud/unified/aggregate-let.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,195 @@
{
"description": "aggregate-let",
"schemaVersion": "1.0",
"createEntities": [
{
"client": {
"id": "client0",
"observeEvents": [
"commandStartedEvent"
]
}
},
{
"database": {
"id": "database0",
"client": "client0",
"databaseName": "crud-tests"
}
},
{
"collection": {
"id": "collection0",
"database": "database0",
"collectionName": "coll0"
}
}
],
"initialData": [
{
"collectionName": "coll0",
"databaseName": "crud-tests",
"documents": [
{
"_id": 1
}
]
}
],
"tests": [
{
"description": "Aggregate with let option",
"runOnRequirements": [
{
"minServerVersion": "5.0"
}
],
"operations": [
{
"name": "aggregate",
"object": "collection0",
"arguments": {
"pipeline": [
{
"$match": {
"$expr": {
"$eq": [
"$_id",
"$$id"
]
}
}
},
{
"$project": {
"_id": 0,
"x": "$$x",
"y": "$$y",
"rand": "$$rand"
}
}
],
"let": {
"id": 1,
"x": "foo",
"y": {
"$literal": "$bar"
},
"rand": {
"$rand": {}
}
}
},
"expectResult": [
{
"x": "foo",
"y": "$bar",
"rand": {
"$$type": "double"
}
}
]
}
],
"expectEvents": [
{
"client": "client0",
"events": [
{
"commandStartedEvent": {
"command": {
"aggregate": "coll0",
"pipeline": [
{
"$match": {
"$expr": {
"$eq": [
"$_id",
"$$id"
]
}
}
},
{
"$project": {
"_id": 0,
"x": "$$x",
"y": "$$y",
"rand": "$$rand"
}
}
],
"let": {
"id": 1,
"x": "foo",
"y": {
"$literal": "$bar"
},
"rand": {
"$rand": {}
}
}
}
}
}
]
}
]
},
{
"description": "Aggregate with let option unsupported (server-side error)",
"runOnRequirements": [
{
"minServerVersion": "2.6.0",
"maxServerVersion": "4.4.99"
}
],
"operations": [
{
"name": "aggregate",
"object": "collection0",
"arguments": {
"pipeline": [
{
"$match": {
"_id": 1
}
}
],
"let": {
"x": "foo"
}
},
"expectError": {
"errorContains": "unrecognized field 'let'",
"isClientError": false
}
}
],
"expectEvents": [
{
"client": "client0",
"events": [
{
"commandStartedEvent": {
"command": {
"aggregate": "coll0",
"pipeline": [
{
"$match": {
"_id": 1
}
}
],
"let": {
"x": "foo"
}
}
}
}
]
}
]
}
]
}
81 changes: 81 additions & 0 deletions test/spec/crud/unified/aggregate-let.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
description: "aggregate-let"

schemaVersion: "1.0"

createEntities:
- client:
id: &client0 client0
observeEvents: [ commandStartedEvent ]
- database:
id: &database0 database0
client: *client0
databaseName: &database0Name crud-tests
- collection:
id: &collection0 collection0
database: *database0
collectionName: &collection0Name coll0

initialData: &initialData
- collectionName: *collection0Name
databaseName: *database0Name
documents:
- { _id: 1 }

tests:
- description: "Aggregate with let option"
runOnRequirements:
- minServerVersion: "5.0"
operations:
- name: aggregate
object: *collection0
arguments:
pipeline: &pipeline0
# $match takes a query expression, so $expr is necessary to utilize
# an aggregate expression context and access "let" variables.
- $match: { $expr: { $eq: ["$_id", "$$id"] } }
- $project: { _id: 0, x: "$$x", y: "$$y", rand: "$$rand" }
# Values in "let" must be constant or closed expressions that do not
# depend on document values. This test demonstrates a basic constant
# value, a value wrapped with $literal (to avoid expression parsing),
# and a closed expression (e.g. $rand).
let: &let0
id: 1
x: foo
y: { $literal: "$bar" }
rand: { $rand: {} }
expectResult:
- { x: "foo", y: "$bar", rand: { $$type: "double" } }
expectEvents:
- client: *client0
events:
- commandStartedEvent:
command:
aggregate: *collection0Name
pipeline: *pipeline0
let: *let0

- description: "Aggregate with let option unsupported (server-side error)"
runOnRequirements:
- minServerVersion: "2.6.0"
maxServerVersion: "4.4.99"
operations:
- name: aggregate
object: *collection0
arguments:
pipeline: &pipeline1
- $match: { _id: 1 }
let: &let1
x: foo
expectError:
# Older server versions may not report an error code, but the error
# message is consistent between 2.6.x and 4.4.x server versions.
errorContains: "unrecognized field 'let'"
isClientError: false
expectEvents:
- client: *client0
events:
- commandStartedEvent:
command:
aggregate: *collection0Name
pipeline: *pipeline1
let: *let1

0 comments on commit e38838e

Please sign in to comment.