Skip to content

Commit d3f54c4

Browse files
committed
RUBY-1279 Move shared modules to shared directory
1 parent 19bb2d9 commit d3f54c4

File tree

4 files changed

+6
-7
lines changed

4 files changed

+6
-7
lines changed

lib/mongo/bulk_write.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,8 @@ def execute_operation(name, values, server, operation_id, combiner, session, txn
175175
if values.size > server.max_write_batch_size
176176
split_execute(name, values, server, operation_id, combiner, session, txn_num)
177177
else
178-
r = send(name, values, server, operation_id, session, txn_num)
179-
combiner.combine!(r, values.size)
178+
result = send(name, values, server, operation_id, session, txn_num)
179+
combiner.combine!(result, values.size)
180180
end
181181
rescue Error::MaxBSONSize, Error::MaxMessageSize => e
182182
raise e if values.size <= 1

lib/mongo/operation.rb

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
require 'forwardable'
22
require 'mongo/operation/result'
3+
34
require 'mongo/operation/shared/executable'
4-
require 'mongo/operation/object_id_generator'
55
require 'mongo/operation/shared/read_preference_supported'
66
require 'mongo/operation/shared/bypass_document_validation'
77
require 'mongo/operation/shared/write_concern_supported'
@@ -10,7 +10,9 @@
1010
require 'mongo/operation/shared/causal_consistency_supported'
1111
require 'mongo/operation/shared/write'
1212
require 'mongo/operation/shared/idable'
13-
require 'mongo/operation/specifiable'
13+
require 'mongo/operation/shared/specifiable'
14+
require 'mongo/operation/shared/object_id_generator'
15+
1416
require 'mongo/operation/command'
1517
require 'mongo/operation/aggregate'
1618
require 'mongo/operation/result'
@@ -38,9 +40,6 @@
3840
require 'mongo/operation/create_index'
3941
require 'mongo/operation/drop_index'
4042

41-
42-
43-
4443
module Mongo
4544
module Operation
4645

File renamed without changes.

0 commit comments

Comments
 (0)