Skip to content

RUBY-2911 Support let option in BulkWriteOptions #2423

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
merged 1 commit into from
Feb 25, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion lib/mongo/bulk_write.rb
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,8 @@ def base_spec(operation_id, session)
:options => options,
:id_generator => client.options[:id_generator],
:session => session,
:comment => options[:comment]
:comment => options[:comment],
:let => options[:let],
}
end

Expand Down
2 changes: 2 additions & 0 deletions lib/mongo/collection.rb
Original file line number Diff line number Diff line change
Expand Up @@ -662,6 +662,8 @@ def insert_many(documents, options = {})
# @option options [ true, false ] :bypass_document_validation Whether or
# not to skip document level validation.
# @option options [ Session ] :session The session to use for the set of operations.
# @option options [ Hash ] :let Mapping of variables to use in the command.
# See the server documentation for details.
#
# @return [ BulkWrite::Result ] The result of the operation.
#
Expand Down
3 changes: 3 additions & 0 deletions spec/runners/unified/crud_operations.rb
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,9 @@ def bulk_write(op)
if comment = args.use('comment')
opts[:comment] = comment
end
if let = args.use('let')
opts[:let] = let
end
collection.bulk_write(requests, **opts)
end
end
Expand Down
86 changes: 86 additions & 0 deletions spec/spec_tests/data/crud_unified/bulkWrite-deleteMany-let.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
description: "BulkWrite deleteMany-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:
- collectionName: *collection0Name
databaseName: *database0Name
documents:
- { _id: 1 }
- { _id: 2 }

tests:
- description: "BulkWrite deleteMany with let option"
runOnRequirements:
- minServerVersion: "5.0"
operations:
- object: *collection0
name: bulkWrite
arguments:
requests:
- deleteMany:
filter: &filter
$expr:
$eq: [ "$_id", "$$id" ]
let: &let
id: 1
expectEvents:
- client: *client0
events:
- commandStartedEvent:
command:
delete: *collection0Name
deletes:
- q: *filter
limit: 0
let: *let
outcome:
- collectionName: *collection0Name
databaseName: *database0Name
documents:
- { _id: 2 }

- description: "BulkWrite deleteMany with let option unsupported (server-side error)"
runOnRequirements:
- minServerVersion: "3.6.0"
maxServerVersion: "4.4.99"
operations:
- object: *collection0
name: bulkWrite
arguments:
requests:
- deleteOne:
filter: *filter
let: *let
expectError:
errorContains: "'delete.let' is an unknown field"
isClientError: false
expectEvents:
- client: *client0
events:
- commandStartedEvent:
command:
delete: *collection0Name
deletes:
- q: *filter
limit: 1
let: *let
outcome:
- collectionName: *collection0Name
databaseName: *database0Name
documents:
- { _id: 1 }
- { _id: 2 }
86 changes: 86 additions & 0 deletions spec/spec_tests/data/crud_unified/bulkWrite-deleteOne-let.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
description: "BulkWrite deleteOne-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:
- collectionName: *collection0Name
databaseName: *database0Name
documents:
- { _id: 1 }
- { _id: 2 }

tests:
- description: "BulkWrite deleteOne with let option"
runOnRequirements:
- minServerVersion: "5.0"
operations:
- object: *collection0
name: bulkWrite
arguments:
requests:
- deleteOne:
filter: &filter
$expr:
$eq: [ "$_id", "$$id" ]
let: &let
id: 1
expectEvents:
- client: *client0
events:
- commandStartedEvent:
command:
delete: *collection0Name
deletes:
- q: *filter
limit: 1
let: *let
outcome:
- collectionName: *collection0Name
databaseName: *database0Name
documents:
- { _id: 2 }

- description: "BulkWrite deleteOne with let option unsupported (server-side error)"
runOnRequirements:
- minServerVersion: "3.6.0"
maxServerVersion: "4.9"
operations:
- object: *collection0
name: bulkWrite
arguments:
requests:
- deleteOne:
filter: *filter
let: *let
expectError:
errorContains: "'delete.let' is an unknown field"
isClientError: false
expectEvents:
- client: *client0
events:
- commandStartedEvent:
command:
delete: *collection0Name
deletes:
- q: *filter
limit: 1
let: *let
outcome:
- collectionName: *collection0Name
databaseName: *database0Name
documents:
- { _id: 1 }
- { _id: 2 }
89 changes: 89 additions & 0 deletions spec/spec_tests/data/crud_unified/bulkWrite-replaceOne-let.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
description: "BulkWrite replaceOne-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:
- collectionName: *collection0Name
databaseName: *database0Name
documents:
- { _id: 1 }
- { _id: 2 }

tests:
- description: "BulkWrite replaceOne with let option"
runOnRequirements:
- minServerVersion: "5.0"
operations:
- object: *collection0
name: bulkWrite
arguments:
requests:
- replaceOne:
filter: &filter
$expr:
$eq: [ "$_id", "$$id" ]
replacement: &replacement {"x": 3}
let: &let
id: 1
expectEvents:
- client: *client0
events:
- commandStartedEvent:
command:
update: *collection0Name
updates:
- q: *filter
u: *replacement
let: *let
outcome:
- collectionName: *collection0Name
databaseName: *database0Name
documents:
- { _id: 1, x: 3 }
- { _id: 2 }

- description: "BulkWrite replaceOne with let option unsupported (server-side error)"
runOnRequirements:
- minServerVersion: "4.2"
maxServerVersion: "4.9"
operations:
- object: *collection0
name: bulkWrite
arguments:
requests:
- replaceOne:
filter: *filter
replacement: *replacement
let: *let
expectError:
errorContains: "'update.let' is an unknown field"
isClientError: false
expectEvents:
- client: *client0
events:
- commandStartedEvent:
command:
update: *collection0Name
updates:
- q: *filter
u: *replacement
let: *let
outcome:
- collectionName: *collection0Name
databaseName: *database0Name
documents:
- { _id: 1 }
- { _id: 2 }
97 changes: 97 additions & 0 deletions spec/spec_tests/data/crud_unified/bulkWrite-updateMany-let.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
description: "BulkWrite updateMany-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:
- collectionName: *collection0Name
databaseName: *database0Name
documents:
- { _id: 1, x: 20 }
- { _id: 2, x: 21 }

tests:
- description: "BulkWrite updateMany with let option"
runOnRequirements:
- minServerVersion: "5.0"
operations:
- object: *collection0
name: bulkWrite
arguments:
requests:
- updateMany:
filter: &filter
$expr:
$eq: [ "$_id", "$$id" ]
update: &update
- $set:
x: 21
let: &let
id: 1
expectEvents:
- client: *client0
events:
- commandStartedEvent:
command:
update: *collection0Name
updates:
- q: *filter
u: *update
multi: true
upsert: { $$unsetOrMatches: false }
let: *let
outcome:
- collectionName: *collection0Name
databaseName: *database0Name
documents:
- { _id: 1, x: 21 }
- { _id: 2, x: 21 }

- description: "BulkWrite updateMany with let option unsupported (server-side error)"
runOnRequirements:
- minServerVersion: "3.6.0"
maxServerVersion: "4.9"
operations:
- object: *collection0
name: bulkWrite
arguments:
requests:
- updateMany:
filter: *filter
update: *update
let: *let
expectError:
errorContains: "'update.let' is an unknown field"
isClientError: false
expectEvents:
- client: *client0
events:
- commandStartedEvent:
command:
update: *collection0Name
updates:
- q: *filter
u: *update
multi: true
upsert:
$$unsetOrMatches: false
let: *let

outcome:
- collectionName: *collection0Name
databaseName: *database0Name
documents:
- { _id: 1, x: 20 }
- { _id: 2, x: 21 }
Loading