-
Notifications
You must be signed in to change notification settings - Fork 1.8k
feat(NODE-5988): Provide access to raw results doc after MongoServerError #4016
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
Merged
baileympearson
merged 7 commits into
main
from
NODE-5988/6.x-raw-results-doc-MongoServerError
Mar 7, 2024
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
5f87446
Basic implementation done, need to UTR changes + sync spec tests still
aditi-khare-mongoDB 162c2ef
synced new test files
aditi-khare-mongoDB d0f6364
added support for error response
aditi-khare-mongoDB 8e33665
added api docs
aditi-khare-mongoDB 2b2f64c
made MongoServerError.errorResponse required + casted resulting type …
aditi-khare-mongoDB 5e67ee9
Merge branch 'main' into NODE-5988/6.x-raw-results-doc-MongoServerError
aditi-khare-mongoDB 2bbe020
added TODO(NODE-XXXX)
aditi-khare-mongoDB File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
118 changes: 118 additions & 0 deletions
118
test/spec/collection-management/modifyCollection-errorResponse.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,118 @@ | ||
| { | ||
| "description": "modifyCollection-errorResponse", | ||
| "schemaVersion": "1.12", | ||
| "createEntities": [ | ||
| { | ||
| "client": { | ||
| "id": "client0", | ||
| "observeEvents": [ | ||
| "commandStartedEvent" | ||
| ] | ||
| } | ||
| }, | ||
| { | ||
| "database": { | ||
| "id": "database0", | ||
| "client": "client0", | ||
| "databaseName": "collMod-tests" | ||
| } | ||
| }, | ||
| { | ||
| "collection": { | ||
| "id": "collection0", | ||
| "database": "database0", | ||
| "collectionName": "test" | ||
| } | ||
| } | ||
| ], | ||
| "initialData": [ | ||
| { | ||
| "collectionName": "test", | ||
| "databaseName": "collMod-tests", | ||
| "documents": [ | ||
| { | ||
| "_id": 1, | ||
| "x": 1 | ||
| }, | ||
| { | ||
| "_id": 2, | ||
| "x": 1 | ||
| } | ||
| ] | ||
| } | ||
| ], | ||
| "tests": [ | ||
| { | ||
| "description": "modifyCollection prepareUnique violations are accessible", | ||
| "runOnRequirements": [ | ||
| { | ||
| "minServerVersion": "5.2" | ||
| } | ||
| ], | ||
| "operations": [ | ||
| { | ||
| "name": "createIndex", | ||
| "object": "collection0", | ||
| "arguments": { | ||
| "keys": { | ||
| "x": 1 | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| "name": "modifyCollection", | ||
| "object": "database0", | ||
| "arguments": { | ||
| "collection": "test", | ||
| "index": { | ||
| "keyPattern": { | ||
| "x": 1 | ||
| }, | ||
| "prepareUnique": true | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| "name": "insertOne", | ||
| "object": "collection0", | ||
| "arguments": { | ||
| "document": { | ||
| "_id": 3, | ||
| "x": 1 | ||
| } | ||
| }, | ||
| "expectError": { | ||
| "errorCode": 11000 | ||
| } | ||
| }, | ||
| { | ||
| "name": "modifyCollection", | ||
| "object": "database0", | ||
| "arguments": { | ||
| "collection": "test", | ||
| "index": { | ||
| "keyPattern": { | ||
| "x": 1 | ||
| }, | ||
| "unique": true | ||
| } | ||
| }, | ||
| "expectError": { | ||
| "isClientError": false, | ||
| "errorCode": 359, | ||
| "errorResponse": { | ||
| "violations": [ | ||
| { | ||
| "ids": [ | ||
| 1, | ||
| 2 | ||
| ] | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| } |
59 changes: 59 additions & 0 deletions
59
test/spec/collection-management/modifyCollection-errorResponse.yml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| description: "modifyCollection-errorResponse" | ||
|
|
||
| schemaVersion: "1.12" | ||
|
|
||
| createEntities: | ||
| - client: | ||
| id: &client0 client0 | ||
| observeEvents: [ commandStartedEvent ] | ||
| - database: | ||
| id: &database0 database0 | ||
| client: *client0 | ||
| databaseName: &database0Name collMod-tests | ||
| - collection: | ||
| id: &collection0 collection0 | ||
| database: *database0 | ||
| collectionName: &collection0Name test | ||
|
|
||
| initialData: &initialData | ||
| - collectionName: *collection0Name | ||
| databaseName: *database0Name | ||
| documents: | ||
| - { _id: 1, x: 1 } | ||
| - { _id: 2, x: 1 } | ||
|
|
||
| tests: | ||
| - description: "modifyCollection prepareUnique violations are accessible" | ||
| runOnRequirements: | ||
| - minServerVersion: "5.2" # SERVER-61158 | ||
| operations: | ||
| - name: createIndex | ||
| object: *collection0 | ||
| arguments: | ||
| keys: { x: 1 } | ||
| - name: modifyCollection | ||
| object: *database0 | ||
| arguments: | ||
| collection: *collection0Name | ||
| index: | ||
| keyPattern: { x: 1 } | ||
| prepareUnique: true | ||
| - name: insertOne | ||
| object: *collection0 | ||
| arguments: | ||
| document: { _id: 3, x: 1 } | ||
| expectError: | ||
| errorCode: 11000 # DuplicateKey | ||
| - name: modifyCollection | ||
| object: *database0 | ||
| arguments: | ||
| collection: *collection0Name | ||
| index: | ||
| keyPattern: { x: 1 } | ||
| unique: true | ||
| expectError: | ||
| isClientError: false | ||
| errorCode: 359 # CannotConvertIndexToUnique | ||
| errorResponse: | ||
| violations: | ||
| - { ids: [ 1, 2 ] } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| { | ||
| "description": "aggregate-merge-errorResponse", | ||
| "schemaVersion": "1.12", | ||
| "createEntities": [ | ||
| { | ||
| "client": { | ||
| "id": "client0" | ||
| } | ||
| }, | ||
| { | ||
| "database": { | ||
| "id": "database0", | ||
| "client": "client0", | ||
| "databaseName": "crud-tests" | ||
| } | ||
| }, | ||
| { | ||
| "collection": { | ||
| "id": "collection0", | ||
| "database": "database0", | ||
| "collectionName": "test" | ||
| } | ||
| } | ||
| ], | ||
| "initialData": [ | ||
| { | ||
| "collectionName": "test", | ||
| "databaseName": "crud-tests", | ||
| "documents": [ | ||
| { | ||
| "_id": 1, | ||
| "x": 1 | ||
| }, | ||
| { | ||
| "_id": 2, | ||
| "x": 1 | ||
| } | ||
| ] | ||
| } | ||
| ], | ||
| "tests": [ | ||
| { | ||
| "description": "aggregate $merge DuplicateKey error is accessible", | ||
| "runOnRequirements": [ | ||
| { | ||
| "minServerVersion": "5.1", | ||
| "topologies": [ | ||
| "single", | ||
| "replicaset" | ||
| ] | ||
| } | ||
| ], | ||
| "operations": [ | ||
| { | ||
| "name": "aggregate", | ||
| "object": "database0", | ||
| "arguments": { | ||
| "pipeline": [ | ||
| { | ||
| "$documents": [ | ||
| { | ||
| "_id": 2, | ||
| "x": 1 | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "$merge": { | ||
| "into": "test", | ||
| "whenMatched": "fail" | ||
| } | ||
| } | ||
| ] | ||
| }, | ||
| "expectError": { | ||
| "errorCode": 11000, | ||
| "errorResponse": { | ||
| "keyPattern": { | ||
| "_id": 1 | ||
| }, | ||
| "keyValue": { | ||
| "_id": 2 | ||
| } | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These tests are different from the collection management specs. These tests use the
modifyCollectionoperation to set up the collection for the test, but they're not testing the driver'smodifyCollectionhelper.I think it might make sense to implement a unified test format helper for
modifyCollectionthat usesrunCommandto send acollModto the server (i.e., a new operation inoperations.ts). Then we could unskip this test. We'd still leave themodifyCollectiontests alone though because we don't have a driver helper.what do you think?
(also see https://github.com/mongodb/specifications/pull/1316/files#r994171436)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Perhaps we could merge these changes and make a separate subtask or even ticket for adding in the modifyCollection changes?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sounds good to me - if we file a separate ticket, can we add a
TODO(NODE-XXXX)comment here so we don't forget about it?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sounds good! Just filed the ticket NODE-5998.