Skip to content

fix(shell-api): Add support for running aggregate database with a single stage MONGOSH-1868 #2218

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

Merged
merged 8 commits into from
Oct 18, 2024
Merged

fix(shell-api): Add support for running aggregate database with a single stage MONGOSH-1868 #2218

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
30355c5
Add error on throw
gagik Oct 14, 2024
bf52c7f
add single stage support instead
gagik Oct 15, 2024
f896fbd
remove array check
gagik Oct 15, 2024
27fd15d
Merge branch 'main' into gagik/aggregate-error
gagik Oct 15, 2024
d24305c
revert collection.ts changes
gagik Oct 17, 2024
180ba6c
Merge branch 'main' into gagik/aggregate-error
gagik Oct 17, 2024
344de42
Merge branch 'main' into gagik/aggregate-error
gagik Oct 17, 2024
5bde533
Update packages/shell-api/src/database.ts
gagik Oct 17, 2024
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
10 changes: 10 additions & 0 deletions packages/shell-api/src/database.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,6 +400,16 @@ describe('Database', function () {
);
});

it('supports a single aggregation stage', async function () {
await database.aggregate({ $piplelineStage: {} }, { options: true });

expect(serviceProvider.aggregateDb).to.have.been.calledWith(
database._name,
[{ $piplelineStage: {} }],
{ options: true }
);
});

it('calls serviceProvider.aggregateDb with explicit batchSize', async function () {
await database.aggregate([{ $piplelineStage: {} }], {
options: true,
Expand Down
16 changes: 15 additions & 1 deletion packages/shell-api/src/database.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,6 +412,14 @@ export default class Database extends ShellApiWithMongoClass {
return await this._runAdminCommand(cmd, {});
}

async aggregate(
singleStage: Document,
options?: Document
): Promise<AggregationCursor>;
async aggregate(
pipeline: Document[],
options?: Document
): Promise<AggregationCursor>;
/**
* Run an aggregation against the db.
*
Expand All @@ -423,15 +431,20 @@ export default class Database extends ShellApiWithMongoClass {
@returnType('AggregationCursor')
@apiVersions([1])
async aggregate(
pipeline: Document[],
pipelineOrSingleStage: Document | Document[],
options?: Document
): Promise<AggregationCursor> {
if ('background' in (options ?? {})) {
await this._instanceState.printWarning(
aggregateBackgroundOptionNotSupportedHelp
);
}
const pipeline: Document[] = Array.isArray(pipelineOrSingleStage)
? pipelineOrSingleStage
: [pipelineOrSingleStage];

assertArgsDefinedType([pipeline], [true], 'Database.aggregate');

this._emitDatabaseApiCall('aggregate', { options, pipeline });

const { aggOptions, dbOptions, explain } = adaptAggregateOptions(options);
Expand Down Expand Up @@ -1429,6 +1442,7 @@ export default class Database extends ShellApiWithMongoClass {
CommonErrors.CommandFailed
);
}
// eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
for (const cmdDescription of Object.values(result.commands) as Document[]) {
if ('slaveOk' in cmdDescription) {
cmdDescription.secondaryOk = cmdDescription.slaveOk;
Expand Down
Loading