mongo 2.1.0.beta → 2.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (342) hide show
  1. checksums.yaml +4 -4
  2. checksums.yaml.gz.sig +0 -0
  3. data/README.md +10 -3
  4. data/Rakefile +1 -7
  5. data/lib/mongo/address/ipv4.rb +6 -1
  6. data/lib/mongo/address/unix.rb +2 -2
  7. data/lib/mongo/address.rb +32 -10
  8. data/lib/mongo/auth/cr/conversation.rb +1 -1
  9. data/lib/mongo/auth/ldap/conversation.rb +7 -3
  10. data/lib/mongo/auth/scram/conversation.rb +9 -3
  11. data/lib/mongo/auth/user/view.rb +23 -2
  12. data/lib/mongo/auth/x509/conversation.rb +1 -1
  13. data/lib/mongo/bulk_write/combineable.rb +51 -0
  14. data/lib/mongo/bulk_write/ordered_combiner.rb +55 -0
  15. data/lib/mongo/bulk_write/result.rb +61 -8
  16. data/lib/mongo/bulk_write/result_combiner.rb +117 -0
  17. data/lib/mongo/bulk_write/transformable.rb +132 -0
  18. data/lib/mongo/bulk_write/unordered_combiner.rb +52 -0
  19. data/lib/mongo/bulk_write/validatable.rb +62 -0
  20. data/lib/mongo/bulk_write.rb +164 -23
  21. data/lib/mongo/client.rb +75 -18
  22. data/lib/mongo/cluster/topology/replica_set.rb +8 -6
  23. data/lib/mongo/cluster/topology/unknown.rb +5 -2
  24. data/lib/mongo/cluster.rb +85 -5
  25. data/lib/mongo/collection/view/aggregation.rb +19 -45
  26. data/lib/mongo/collection/view/builder/aggregation.rb +98 -0
  27. data/lib/mongo/collection/view/builder/find_command.rb +111 -0
  28. data/lib/mongo/collection/view/builder/flags.rb +62 -0
  29. data/lib/mongo/collection/view/builder/map_reduce.rb +134 -0
  30. data/lib/mongo/collection/view/builder/modifiers.rb +80 -0
  31. data/lib/mongo/collection/view/builder/op_query.rb +83 -0
  32. data/lib/mongo/collection/view/builder.rb +20 -0
  33. data/lib/mongo/collection/view/explainable.rb +15 -0
  34. data/lib/mongo/collection/view/immutable.rb +4 -11
  35. data/lib/mongo/collection/view/iterable.rb +40 -5
  36. data/lib/mongo/collection/view/map_reduce.rb +67 -37
  37. data/lib/mongo/collection/view/readable.rb +114 -100
  38. data/lib/mongo/collection/view/writable.rb +46 -22
  39. data/lib/mongo/collection/view.rb +25 -22
  40. data/lib/mongo/collection.rb +130 -12
  41. data/lib/mongo/cursor/builder/get_more_command.rb +71 -0
  42. data/lib/mongo/cursor/builder/kill_cursors_command.rb +62 -0
  43. data/lib/mongo/cursor/builder/op_get_more.rb +61 -0
  44. data/lib/mongo/cursor/builder/op_kill_cursors.rb +56 -0
  45. data/lib/mongo/cursor/builder.rb +18 -0
  46. data/lib/mongo/cursor.rb +76 -21
  47. data/lib/mongo/database/view.rb +11 -6
  48. data/lib/mongo/database.rb +16 -6
  49. data/lib/mongo/dbref.rb +9 -9
  50. data/lib/mongo/{bulk_write/unordered_bulk_write.rb → error/closed_stream.rb} +12 -21
  51. data/lib/mongo/{bulk_write/ordered_bulk_write.rb → error/extra_file_chunk.rb} +13 -27
  52. data/lib/mongo/error/file_not_found.rb +37 -0
  53. data/lib/mongo/error/invalid_file.rb +2 -2
  54. data/lib/mongo/error/invalid_file_revision.rb +37 -0
  55. data/lib/mongo/error/invalid_uri.rb +5 -4
  56. data/lib/mongo/error/invalid_write_concern.rb +35 -0
  57. data/lib/mongo/error/missing_file_chunk.rb +38 -0
  58. data/lib/mongo/error/operation_failure.rb +33 -2
  59. data/lib/mongo/error/unchangeable_collection_option.rb +38 -0
  60. data/lib/mongo/error/unexpected_chunk_length.rb +39 -0
  61. data/lib/mongo/error.rb +8 -0
  62. data/lib/mongo/grid/file/chunk.rb +9 -9
  63. data/lib/mongo/grid/file/{metadata.rb → info.rb} +41 -39
  64. data/lib/mongo/grid/file.rb +12 -9
  65. data/lib/mongo/grid/fs_bucket.rb +448 -0
  66. data/lib/mongo/grid/stream/read.rb +208 -0
  67. data/lib/mongo/grid/stream/write.rb +187 -0
  68. data/lib/mongo/grid/stream.rb +64 -0
  69. data/lib/mongo/grid.rb +2 -1
  70. data/lib/mongo/index/view.rb +7 -4
  71. data/lib/mongo/index.rb +5 -0
  72. data/lib/mongo/loggable.rb +34 -57
  73. data/lib/mongo/logger.rb +16 -78
  74. data/lib/mongo/monitoring/command_log_subscriber.rb +38 -14
  75. data/lib/mongo/monitoring/event/command_started.rb +2 -1
  76. data/lib/mongo/monitoring/event/command_succeeded.rb +24 -2
  77. data/lib/mongo/monitoring/event/secure.rb +58 -0
  78. data/lib/mongo/monitoring/event.rb +1 -0
  79. data/lib/mongo/monitoring/publishable.rb +22 -12
  80. data/lib/mongo/monitoring.rb +1 -5
  81. data/lib/mongo/operation/commands/aggregate/result.rb +89 -0
  82. data/lib/mongo/operation/commands/aggregate.rb +64 -0
  83. data/lib/mongo/operation/commands/collections_info/result.rb +41 -0
  84. data/lib/mongo/operation/{read → commands}/collections_info.rb +5 -3
  85. data/lib/mongo/operation/commands/command.rb +47 -0
  86. data/lib/mongo/operation/commands/find/result.rb +62 -0
  87. data/lib/mongo/operation/commands/find.rb +27 -0
  88. data/lib/mongo/operation/commands/get_more/result.rb +62 -0
  89. data/lib/mongo/operation/commands/get_more.rb +27 -0
  90. data/lib/mongo/operation/{read → commands}/indexes.rb +9 -6
  91. data/lib/mongo/operation/{list_collections → commands/list_collections}/result.rb +1 -21
  92. data/lib/mongo/operation/{read → commands}/list_collections.rb +4 -32
  93. data/lib/mongo/operation/{list_indexes → commands/list_indexes}/result.rb +1 -21
  94. data/lib/mongo/operation/{read → commands}/list_indexes.rb +3 -33
  95. data/lib/mongo/operation/commands/map_reduce/result.rb +119 -0
  96. data/lib/mongo/operation/commands/map_reduce.rb +49 -0
  97. data/lib/mongo/operation/commands/parallel_scan/result.rb +64 -0
  98. data/lib/mongo/operation/commands/parallel_scan.rb +52 -0
  99. data/lib/mongo/operation/commands/user_query.rb +71 -0
  100. data/lib/mongo/operation/commands/users_info/result.rb +38 -0
  101. data/lib/mongo/operation/commands/users_info.rb +48 -0
  102. data/lib/mongo/operation/commands.rb +26 -0
  103. data/lib/mongo/operation/executable.rb +4 -68
  104. data/lib/mongo/operation/kill_cursors.rb +3 -3
  105. data/lib/mongo/operation/object_id_generator.rb +36 -0
  106. data/lib/mongo/operation/read/get_more.rb +2 -22
  107. data/lib/mongo/operation/read/query/result.rb +40 -0
  108. data/lib/mongo/operation/read/query.rb +4 -21
  109. data/lib/mongo/operation/read.rb +0 -4
  110. data/lib/mongo/operation/{read_preferrable.rb → read_preference.rb} +3 -2
  111. data/lib/mongo/operation/result.rb +43 -1
  112. data/lib/mongo/operation/specifiable.rb +59 -1
  113. data/lib/mongo/operation/write/bulk/bulkable.rb +83 -0
  114. data/lib/mongo/operation/write/bulk/delete/result.rb +67 -0
  115. data/lib/mongo/operation/write/bulk/delete.rb +71 -0
  116. data/lib/mongo/operation/write/bulk/insert/result.rb +129 -0
  117. data/lib/mongo/operation/write/bulk/insert.rb +96 -0
  118. data/lib/mongo/operation/write/bulk/legacy_mergable.rb +87 -0
  119. data/lib/mongo/operation/write/bulk/mergable.rb +71 -0
  120. data/lib/mongo/operation/write/bulk/update/result.rb +174 -0
  121. data/lib/mongo/operation/write/bulk/update.rb +81 -0
  122. data/lib/mongo/operation/write/bulk.rb +6 -3
  123. data/lib/mongo/operation/write/command/create_index.rb +0 -1
  124. data/lib/mongo/operation/write/command/create_user.rb +0 -1
  125. data/lib/mongo/operation/write/command/delete.rb +3 -3
  126. data/lib/mongo/operation/write/command/drop_index.rb +0 -1
  127. data/lib/mongo/operation/write/command/insert.rb +4 -3
  128. data/lib/mongo/operation/write/command/remove_user.rb +0 -1
  129. data/lib/mongo/operation/write/command/update.rb +6 -4
  130. data/lib/mongo/operation/write/command/update_user.rb +0 -1
  131. data/lib/mongo/operation/write/command/writable.rb +13 -18
  132. data/lib/mongo/operation/write/create_index.rb +4 -27
  133. data/lib/mongo/operation/write/create_user.rb +4 -30
  134. data/lib/mongo/operation/write/delete.rb +6 -29
  135. data/lib/mongo/operation/write/drop_index.rb +3 -3
  136. data/lib/mongo/operation/write/gle.rb +49 -0
  137. data/lib/mongo/operation/write/idable.rb +24 -2
  138. data/lib/mongo/operation/write/insert.rb +2 -24
  139. data/lib/mongo/operation/write/remove_user.rb +4 -27
  140. data/lib/mongo/operation/write/update.rb +13 -36
  141. data/lib/mongo/operation/write/update_user.rb +4 -30
  142. data/lib/mongo/operation/write/write_command_enabled.rb +53 -0
  143. data/lib/mongo/operation/write.rb +2 -0
  144. data/lib/mongo/operation.rb +33 -5
  145. data/lib/mongo/options/mapper.rb +26 -2
  146. data/lib/mongo/options/redacted.rb +156 -0
  147. data/lib/mongo/options.rb +1 -0
  148. data/lib/mongo/protocol/bit_vector.rb +11 -9
  149. data/lib/mongo/protocol/delete.rb +78 -3
  150. data/lib/mongo/protocol/get_more.rb +59 -2
  151. data/lib/mongo/protocol/insert.rb +73 -1
  152. data/lib/mongo/protocol/kill_cursors.rb +66 -4
  153. data/lib/mongo/protocol/message.rb +44 -20
  154. data/lib/mongo/protocol/query.rb +153 -65
  155. data/lib/mongo/protocol/reply.rb +92 -1
  156. data/lib/mongo/protocol/serializers.rb +49 -40
  157. data/lib/mongo/protocol/update.rb +93 -1
  158. data/lib/mongo/retryable.rb +101 -0
  159. data/lib/mongo/server/connectable.rb +28 -8
  160. data/lib/mongo/server/connection.rb +52 -10
  161. data/lib/mongo/server/connection_pool/queue.rb +15 -0
  162. data/lib/mongo/server/connection_pool.rb +12 -15
  163. data/lib/mongo/server/description/features.rb +4 -2
  164. data/lib/mongo/server/description.rb +39 -3
  165. data/lib/mongo/server/monitor/connection.rb +49 -28
  166. data/lib/mongo/server/monitor.rb +3 -14
  167. data/lib/mongo/server.rb +31 -4
  168. data/lib/mongo/server_selector/selectable.rb +58 -32
  169. data/lib/mongo/server_selector.rb +19 -10
  170. data/lib/mongo/socket/ssl.rb +4 -1
  171. data/lib/mongo/socket/tcp.rb +2 -2
  172. data/lib/mongo/socket/unix.rb +5 -8
  173. data/lib/mongo/socket.rb +11 -4
  174. data/lib/mongo/uri.rb +245 -139
  175. data/lib/mongo/version.rb +1 -1
  176. data/lib/mongo/write_concern.rb +21 -6
  177. data/lib/mongo.rb +4 -4
  178. data/mongo.gemspec +1 -2
  179. data/spec/mongo/address/unix_spec.rb +1 -1
  180. data/spec/mongo/address_spec.rb +25 -0
  181. data/spec/mongo/auth/ldap/conversation_spec.rb +43 -0
  182. data/spec/mongo/auth/user/view_spec.rb +26 -1
  183. data/spec/mongo/bulk_write/ordered_combiner_spec.rb +284 -0
  184. data/spec/mongo/bulk_write/unordered_combiner_spec.rb +239 -0
  185. data/spec/mongo/bulk_write_spec.rb +385 -161
  186. data/spec/mongo/client_spec.rb +193 -23
  187. data/spec/mongo/cluster/topology/replica_set_spec.rb +2 -0
  188. data/spec/mongo/collection/view/aggregation_spec.rb +65 -0
  189. data/spec/mongo/collection/view/builder/find_command_spec.rb +167 -0
  190. data/spec/mongo/collection/view/builder/flags_spec.rb +106 -0
  191. data/spec/mongo/collection/view/builder/modifiers_spec.rb +210 -0
  192. data/spec/mongo/collection/view/builder/op_query_spec.rb +154 -0
  193. data/spec/mongo/collection/view/explainable_spec.rb +1 -2
  194. data/spec/mongo/collection/view/immutable_spec.rb +54 -0
  195. data/spec/mongo/collection/view/map_reduce_spec.rb +104 -9
  196. data/spec/mongo/collection/view/readable_spec.rb +109 -112
  197. data/spec/mongo/collection/view_spec.rb +119 -487
  198. data/spec/mongo/collection_spec.rb +1002 -33
  199. data/spec/mongo/command_monitoring_spec.rb +64 -0
  200. data/spec/mongo/connection_string_spec.rb +115 -0
  201. data/spec/mongo/cursor/builder/get_more_command_spec.rb +160 -0
  202. data/spec/mongo/cursor/builder/op_get_more_spec.rb +52 -0
  203. data/spec/mongo/cursor_spec.rb +10 -60
  204. data/spec/mongo/database_spec.rb +81 -12
  205. data/spec/mongo/dbref_spec.rb +4 -4
  206. data/spec/mongo/grid/file/chunk_spec.rb +6 -6
  207. data/spec/mongo/grid/file/{metadata_spec.rb → info_spec.rb} +29 -17
  208. data/spec/mongo/grid/file_spec.rb +8 -8
  209. data/spec/mongo/grid/fs_bucket_spec.rb +1020 -0
  210. data/spec/mongo/grid/stream/read_spec.rb +275 -0
  211. data/spec/mongo/grid/stream/write_spec.rb +440 -0
  212. data/spec/mongo/grid/stream_spec.rb +48 -0
  213. data/spec/mongo/gridfs_spec.rb +50 -0
  214. data/spec/mongo/index/view_spec.rb +41 -0
  215. data/spec/mongo/logger_spec.rb +0 -40
  216. data/spec/mongo/monitoring/command_log_subscriber_spec.rb +76 -0
  217. data/spec/mongo/monitoring/event/command_started_spec.rb +26 -0
  218. data/spec/mongo/monitoring/event/command_succeeded_spec.rb +26 -0
  219. data/spec/mongo/monitoring/event/secure_spec.rb +57 -0
  220. data/spec/mongo/operation/{aggregate → commands/aggregate}/result_spec.rb +1 -1
  221. data/spec/mongo/operation/commands/aggregate_spec.rb +69 -0
  222. data/spec/mongo/operation/{read → commands}/collections_info_spec.rb +1 -1
  223. data/spec/mongo/operation/{command_spec.rb → commands/command_spec.rb} +1 -19
  224. data/spec/mongo/operation/{read → commands}/indexes_spec.rb +1 -1
  225. data/spec/mongo/operation/{map_reduce_spec.rb → commands/map_reduce_spec.rb} +1 -19
  226. data/spec/mongo/operation/kill_cursors_spec.rb +1 -17
  227. data/spec/mongo/operation/read/get_more_spec.rb +0 -16
  228. data/spec/mongo/operation/read/query_spec.rb +19 -16
  229. data/spec/mongo/operation/{read_preferrable_spec.rb → read_preference_spec.rb} +11 -11
  230. data/spec/mongo/operation/result_spec.rb +19 -0
  231. data/spec/mongo/operation/write/bulk/{bulk_delete_spec.rb → delete_spec.rb} +17 -28
  232. data/spec/mongo/operation/write/bulk/{bulk_insert_spec.rb → insert_spec.rb} +1 -12
  233. data/spec/mongo/operation/write/bulk/{bulk_update_spec.rb → update_spec.rb} +7 -18
  234. data/spec/mongo/operation/write/command/delete_spec.rb +18 -9
  235. data/spec/mongo/operation/write/command/insert_spec.rb +18 -9
  236. data/spec/mongo/operation/write/command/update_spec.rb +18 -9
  237. data/spec/mongo/operation/write/delete_spec.rb +3 -3
  238. data/spec/mongo/operation/write/insert_spec.rb +0 -11
  239. data/spec/mongo/operation/write/update_spec.rb +6 -6
  240. data/spec/mongo/options/redacted_spec.rb +350 -0
  241. data/spec/mongo/protocol/delete_spec.rb +4 -4
  242. data/spec/mongo/protocol/get_more_spec.rb +4 -4
  243. data/spec/mongo/protocol/insert_spec.rb +3 -3
  244. data/spec/mongo/protocol/kill_cursors_spec.rb +8 -6
  245. data/spec/mongo/protocol/query_spec.rb +21 -7
  246. data/spec/mongo/protocol/update_spec.rb +5 -5
  247. data/spec/mongo/retryable_spec.rb +221 -0
  248. data/spec/mongo/server/connection_pool/queue_spec.rb +16 -0
  249. data/spec/mongo/server/connection_pool_spec.rb +42 -6
  250. data/spec/mongo/server/connection_spec.rb +86 -1
  251. data/spec/mongo/server/description/features_spec.rb +25 -0
  252. data/spec/mongo/server/description_spec.rb +42 -0
  253. data/spec/mongo/server/monitor_spec.rb +44 -0
  254. data/spec/mongo/server_discovery_and_monitoring_spec.rb +25 -59
  255. data/spec/mongo/server_selection_rtt_spec.rb +37 -57
  256. data/spec/mongo/server_selection_spec.rb +5 -3
  257. data/spec/mongo/server_selector/nearest_spec.rb +35 -27
  258. data/spec/mongo/server_selector/primary_preferred_spec.rb +32 -30
  259. data/spec/mongo/server_selector/primary_spec.rb +21 -14
  260. data/spec/mongo/server_selector/secondary_preferred_spec.rb +28 -26
  261. data/spec/mongo/server_selector/secondary_spec.rb +24 -22
  262. data/spec/mongo/server_selector_spec.rb +87 -24
  263. data/spec/mongo/server_spec.rb +78 -15
  264. data/spec/mongo/socket/ssl_spec.rb +101 -57
  265. data/spec/mongo/socket/unix_spec.rb +52 -0
  266. data/spec/mongo/uri_spec.rb +271 -59
  267. data/spec/mongo/write_concern_spec.rb +126 -0
  268. data/spec/spec_helper.rb +29 -23
  269. data/spec/support/authorization.rb +4 -5
  270. data/spec/support/command_monitoring/bulkWrite.yml +73 -0
  271. data/spec/support/command_monitoring/command.yml +42 -0
  272. data/spec/support/command_monitoring/deleteMany.yml +55 -0
  273. data/spec/support/command_monitoring/deleteOne.yml +55 -0
  274. data/spec/support/command_monitoring/find.yml +268 -0
  275. data/spec/support/command_monitoring/insertMany.yml +81 -0
  276. data/spec/support/command_monitoring/insertOne.yml +51 -0
  277. data/spec/support/command_monitoring/updateMany.yml +67 -0
  278. data/spec/support/command_monitoring/updateOne.yml +95 -0
  279. data/spec/support/command_monitoring.rb +373 -0
  280. data/spec/support/connection_string.rb +228 -0
  281. data/spec/support/connection_string_tests/invalid-uris.yml +193 -0
  282. data/spec/support/connection_string_tests/valid-auth.yml +256 -0
  283. data/spec/support/connection_string_tests/valid-host_identifiers.yml +121 -0
  284. data/spec/support/connection_string_tests/valid-options.yml +30 -0
  285. data/spec/support/connection_string_tests/valid-unix_socket-absolute.yml +197 -0
  286. data/spec/support/connection_string_tests/valid-unix_socket-relative.yml +213 -0
  287. data/spec/support/connection_string_tests/valid-warnings.yml +55 -0
  288. data/spec/support/crud/read.rb +14 -10
  289. data/spec/support/crud/write.rb +36 -9
  290. data/spec/support/crud.rb +10 -2
  291. data/spec/support/gridfs.rb +637 -0
  292. data/spec/support/gridfs_tests/delete.yml +157 -0
  293. data/spec/support/gridfs_tests/download.yml +210 -0
  294. data/spec/support/gridfs_tests/download_by_name.yml +113 -0
  295. data/spec/support/gridfs_tests/upload.yml +158 -0
  296. data/spec/support/matchers.rb +2 -2
  297. data/spec/support/sdam/rs/equal_electionids.yml +1 -2
  298. data/spec/support/sdam/rs/new_primary_new_electionid.yml +0 -3
  299. data/spec/support/sdam/rs/primary_mismatched_me.yml +37 -0
  300. data/spec/support/sdam/rs/primary_to_no_primary_mismatched_me.yml +75 -0
  301. data/spec/support/sdam/rs/rsother_discovered.yml +24 -3
  302. data/spec/support/sdam/rs/secondary_mismatched_me.yml +37 -0
  303. data/spec/support/sdam/rs/stepdown_change_set_name.yml +59 -0
  304. data/spec/support/sdam/single/direct_connection_rsarbiter.yml +1 -1
  305. data/spec/support/sdam/single/direct_connection_rsprimary.yml +1 -1
  306. data/spec/support/sdam/single/direct_connection_rssecondary.yml +1 -1
  307. data/spec/support/sdam/single/direct_connection_slave.yml +1 -1
  308. data/spec/support/sdam/single/direct_connection_standalone.yml +1 -1
  309. data/spec/support/sdam/single/not_ok_response.yml +0 -1
  310. data/spec/support/server_discovery_and_monitoring.rb +3 -1
  311. data/spec/support/server_selection.rb +3 -1
  312. data/spec/support/shared/bulk_write.rb +192 -0
  313. data/spec/support/shared/protocol.rb +5 -5
  314. data/spec/support/shared/server_selector.rb +78 -13
  315. data/spec/support/travis.rb +1 -1
  316. data.tar.gz.sig +0 -0
  317. metadata +211 -72
  318. metadata.gz.sig +0 -0
  319. data/lib/mongo/bulk_write/bulk_writable.rb +0 -252
  320. data/lib/mongo/bulk_write/deletable.rb +0 -57
  321. data/lib/mongo/bulk_write/insertable.rb +0 -49
  322. data/lib/mongo/bulk_write/replacable.rb +0 -58
  323. data/lib/mongo/bulk_write/updatable.rb +0 -69
  324. data/lib/mongo/grid/fs.rb +0 -146
  325. data/lib/mongo/operation/aggregate/result.rb +0 -103
  326. data/lib/mongo/operation/aggregate.rb +0 -108
  327. data/lib/mongo/operation/command.rb +0 -61
  328. data/lib/mongo/operation/map_reduce/result.rb +0 -122
  329. data/lib/mongo/operation/map_reduce.rb +0 -95
  330. data/lib/mongo/operation/parallel_scan/result.rb +0 -72
  331. data/lib/mongo/operation/parallel_scan.rb +0 -76
  332. data/lib/mongo/operation/write/bulk/bulk_delete/result.rb +0 -75
  333. data/lib/mongo/operation/write/bulk/bulk_delete.rb +0 -145
  334. data/lib/mongo/operation/write/bulk/bulk_insert/result.rb +0 -130
  335. data/lib/mongo/operation/write/bulk/bulk_insert.rb +0 -132
  336. data/lib/mongo/operation/write/bulk/bulk_mergable.rb +0 -67
  337. data/lib/mongo/operation/write/bulk/bulk_update/result.rb +0 -174
  338. data/lib/mongo/operation/write/bulk/bulk_update.rb +0 -154
  339. data/lib/mongo/operation/write/bulk/legacy_bulk_mergable.rb +0 -83
  340. data/spec/mongo/grid/fs_spec.rb +0 -160
  341. data/spec/mongo/loggable_spec.rb +0 -63
  342. data/spec/mongo/operation/aggregate_spec.rb +0 -127
@@ -0,0 +1,129 @@
1
+ # Copyright (C) 2014-2015 MongoDB, Inc.
2
+ #
3
+ # Licensed under the Apache License, Version 2.0 (the "License");
4
+ # you may not use this file except in compliance with the License.
5
+ # You may obtain a copy of the License at
6
+ #
7
+ # http://www.apache.org/licenses/LICENSE-2.0
8
+ #
9
+ # Unless required by applicable law or agreed to in writing, software
10
+ # distributed under the License is distributed on an "AS IS" BASIS,
11
+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12
+ # See the License for the specific language governing permissions and
13
+ # limitations under the License.
14
+
15
+ module Mongo
16
+ module Operation
17
+ module Write
18
+ module Bulk
19
+ class Insert
20
+
21
+ # Defines custom behaviour of results when inserting.
22
+ #
23
+ # @since 2.0.0
24
+ class Result < Operation::Result
25
+ include Mergable
26
+
27
+ # Get the ids of the inserted documents.
28
+ #
29
+ # @since 2.0.0
30
+ attr_reader :inserted_ids
31
+
32
+ # Initialize a new result.
33
+ #
34
+ # @example Instantiate the result.
35
+ # Result.new(replies, inserted_ids)
36
+ #
37
+ # @param [ Protocol::Reply ] replies The wire protocol replies.
38
+ # @param [ Array<Object> ] ids The ids of the inserted documents.
39
+ #
40
+ # @since 2.0.0
41
+ def initialize(replies, ids)
42
+ @replies = replies.is_a?(Protocol::Reply) ? [ replies ] : replies
43
+ @inserted_ids = ids
44
+ end
45
+
46
+ # Gets the number of documents inserted.
47
+ #
48
+ # @example Get the number of documents inserted.
49
+ # result.n_inserted
50
+ #
51
+ # @return [ Integer ] The number of documents inserted.
52
+ #
53
+ # @since 2.0.0
54
+ def n_inserted
55
+ written_count
56
+ end
57
+
58
+ # Gets the id of the document inserted.
59
+ #
60
+ # @example Get id of the document inserted.
61
+ # result.inserted_id
62
+ #
63
+ # @return [ Object ] The id of the document inserted.
64
+ #
65
+ # @since 2.0.0
66
+ def inserted_id
67
+ inserted_ids.first
68
+ end
69
+ end
70
+
71
+ # Defines custom behaviour of results when inserting.
72
+ # For server versions < 2.5.5 (that don't use write commands).
73
+ #
74
+ # @since 2.0.0
75
+ class LegacyResult < Operation::Result
76
+ include LegacyMergable
77
+
78
+ # Get the ids of the inserted documents.
79
+ #
80
+ # @since 2.0.0
81
+ attr_reader :inserted_ids
82
+
83
+ # Initialize a new result.
84
+ #
85
+ # @example Instantiate the result.
86
+ # Result.new(replies, inserted_ids)
87
+ #
88
+ # @param [ Protocol::Reply ] replies The wire protocol replies.
89
+ # @param [ Array<Object> ] ids The ids of the inserted documents.
90
+ #
91
+ # @since 2.0.0
92
+ def initialize(replies, ids)
93
+ @replies = replies.is_a?(Protocol::Reply) ? [ replies ] : replies
94
+ @inserted_ids = ids
95
+ end
96
+
97
+ # Gets the number of documents inserted.
98
+ #
99
+ # @example Get the number of documents inserted.
100
+ # result.n_inserted
101
+ #
102
+ # @return [ Integer ] The number of documents inserted.
103
+ #
104
+ # @since 2.0.0
105
+ def n_inserted
106
+ return 0 unless acknowledged?
107
+ @replies.reduce(0) do |n, reply|
108
+ n += 1 unless reply_write_errors?(reply)
109
+ n
110
+ end
111
+ end
112
+
113
+ # Gets the id of the document inserted.
114
+ #
115
+ # @example Get id of the document inserted.
116
+ # result.inserted_id
117
+ #
118
+ # @return [ Object ] The id of the document inserted.
119
+ #
120
+ # @since 2.0.0
121
+ def inserted_id
122
+ inserted_ids.first
123
+ end
124
+ end
125
+ end
126
+ end
127
+ end
128
+ end
129
+ end
@@ -0,0 +1,96 @@
1
+ # Copyright (C) 2014-2015 MongoDB, Inc.
2
+ #
3
+ # Licensed under the Apache License, Version 2.0 (the "License");
4
+ # you may not use this file except in compliance with the License.
5
+ # You may obtain a copy of the License at
6
+ #
7
+ # http://www.apache.org/licenses/LICENSE-2.0
8
+ #
9
+ # Unless required by applicable law or agreed to in writing, software
10
+ # distributed under the License is distributed on an "AS IS" BASIS,
11
+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12
+ # See the License for the specific language governing permissions and
13
+ # limitations under the License.
14
+
15
+ require 'mongo/operation/write/bulk/insert/result'
16
+
17
+ module Mongo
18
+ module Operation
19
+ module Write
20
+ module Bulk
21
+
22
+ # A MongoDB bulk insert operation.
23
+ # This class should only be used by the Bulk API.
24
+ #
25
+ # @note If a server with version >= 2.5.5 is being used, a write command
26
+ # operation will be created and sent instead.
27
+ #
28
+ # @example Create the new insert operation.
29
+ # Write::BulkInsert.new({
30
+ # :documents => [{ :foo => 1 }],
31
+ # :db_name => 'test',
32
+ # :coll_name => 'test_coll',
33
+ # :write_concern => write_concern,
34
+ # :ordered => false
35
+ # })
36
+ #
37
+ # Initialization:
38
+ # param [ Hash ] spec The specifications for the insert.
39
+ #
40
+ # option spec :documents [ Array ] The documents to insert.
41
+ # option spec :db_name [ String ] The name of the database.
42
+ # option spec :coll_name [ String ] The name of the collection.
43
+ # option spec :write_concern [ Mongo::WriteConcern ] The write concern.
44
+ # option spec :ordered [ true, false ] Whether the operations should be
45
+ # executed in order.
46
+ # option spec :options [ Hash ] Options for the command, if it ends up being a
47
+ # write command.
48
+ #
49
+ # @since 2.0.0
50
+ class Insert
51
+ include Bulkable
52
+ include Specifiable
53
+ include Idable
54
+
55
+ private
56
+
57
+ def execute_write_command(context)
58
+ command_spec = spec.merge(:documents => ensure_ids(documents))
59
+ Result.new(Command::Insert.new(command_spec).execute(context), @ids)
60
+ end
61
+
62
+ def execute_message(context)
63
+ replies = []
64
+ messages.map do |m|
65
+ context.with_connection do |connection|
66
+ result = LegacyResult.new(connection.dispatch([ m, gle ].compact, operation_id), @ids)
67
+ replies << result.reply
68
+ if stop_sending?(result)
69
+ return LegacyResult.new(replies, @ids)
70
+ end
71
+ end
72
+ end
73
+ LegacyResult.new(replies.compact.empty? ? nil : replies, @ids)
74
+ end
75
+
76
+ def messages
77
+ if ordered? || gle
78
+ documents.collect do |doc|
79
+ Protocol::Insert.new(db_name, coll_name, ensure_ids([ doc ]), spec)
80
+ end
81
+ else
82
+ [
83
+ Protocol::Insert.new(
84
+ db_name,
85
+ coll_name,
86
+ ensure_ids(documents),
87
+ spec.merge({ :flags => [:continue_on_error] })
88
+ )
89
+ ]
90
+ end
91
+ end
92
+ end
93
+ end
94
+ end
95
+ end
96
+ end
@@ -0,0 +1,87 @@
1
+ # Copyright (C) 2014-2015 MongoDB, Inc.
2
+ #
3
+ # Licensed under the Apache License, Version 2.0 (the "License");
4
+ # you may not use this file except in compliance with the License.
5
+ # You may obtain a copy of the License at
6
+ #
7
+ # http://www.apache.org/licenses/LICENSE-2.0
8
+ #
9
+ # Unless required by applicable law or agreed to in writing, software
10
+ # distributed under the License is distributed on an "AS IS" BASIS,
11
+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12
+ # See the License for the specific language governing permissions and
13
+ # limitations under the License.
14
+
15
+ module Mongo
16
+ module Operation
17
+ module Write
18
+ module Bulk
19
+
20
+ # This module contains common functionality for merging results from
21
+ # writes during a bulk operation. Used for server versions < 2.6.
22
+ #
23
+ # @since 2.0.0
24
+ module LegacyMergable
25
+
26
+ # Aggregate the write errors returned from this result.
27
+ #
28
+ # @example Aggregate the write errors.
29
+ # result.aggregate_write_errors(0)
30
+ #
31
+ # @param [ Integer ] count The number of documents already executed.
32
+ #
33
+ # @return [ Array ] The aggregate write errors.
34
+ #
35
+ # @since 2.0.0
36
+ def aggregate_write_errors(count)
37
+ @replies.each_with_index.reduce(nil) do |errors, (reply, i)|
38
+ if reply_write_errors?(reply)
39
+ errors ||= []
40
+ errors << { 'errmsg' => reply.documents.first[Error::ERROR],
41
+ 'index' => count + i,
42
+ 'code' => reply.documents.first[Error::CODE] }
43
+ end
44
+ errors
45
+ end if @replies
46
+ end
47
+
48
+ # Aggregate the write concern errors returned from this result.
49
+ #
50
+ # @example Aggregate the write concern errors.
51
+ # result.aggregate_write_concern_errors(4)
52
+ #
53
+ # @param [ Integer ] count The number of documents already executed.
54
+ #
55
+ # @return [ Array ] The aggregate write concern errors.
56
+ #
57
+ # @since 2.0.0
58
+ def aggregate_write_concern_errors(count)
59
+ @replies.each_with_index.reduce(nil) do |errors, (reply, i)|
60
+ if error = reply_write_errors?(reply)
61
+ errors ||= []
62
+ if note = reply.documents.first['wnote'] || reply.documents.first['jnote']
63
+ code = reply.documents.first['code'] || Error::BAD_VALUE
64
+ error_string = "#{code}: #{note}"
65
+ elsif error == 'timeout'
66
+ code = reply.documents.first['code'] || Error::UNKNOWN_ERROR
67
+ error_string = "#{code}: #{error}"
68
+ end
69
+ errors << { 'errmsg' => error_string,
70
+ 'index' => count + i,
71
+ 'code' => code } if error_string
72
+ end
73
+ errors
74
+ end if @replies
75
+ end
76
+
77
+ private
78
+
79
+ def reply_write_errors?(reply)
80
+ reply.documents.first[Error::ERROR] ||
81
+ reply.documents.first[Error::ERRMSG]
82
+ end
83
+ end
84
+ end
85
+ end
86
+ end
87
+ end
@@ -0,0 +1,71 @@
1
+ # Copyright (C) 2014-2015 MongoDB, Inc.
2
+ #
3
+ # Licensed under the Apache License, Version 2.0 (the "License");
4
+ # you may not use this file except in compliance with the License.
5
+ # You may obtain a copy of the License at
6
+ #
7
+ # http://www.apache.org/licenses/LICENSE-2.0
8
+ #
9
+ # Unless required by applicable law or agreed to in writing, software
10
+ # distributed under the License is distributed on an "AS IS" BASIS,
11
+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12
+ # See the License for the specific language governing permissions and
13
+ # limitations under the License.
14
+
15
+ module Mongo
16
+ module Operation
17
+ module Write
18
+ module Bulk
19
+
20
+ # This module contains common functionality for merging results from
21
+ # write commands during a bulk operation. Used for server versions >= 2.6.
22
+ #
23
+ # @since 2.0.0
24
+ module Mergable
25
+
26
+ # Aggregate the write errors returned from this result.
27
+ #
28
+ # @example Aggregate the write errors.
29
+ # result.aggregate_write_errors(0)
30
+ #
31
+ # @param [ Integer ] count The number of documents already executed.
32
+ #
33
+ # @return [ Array ] The aggregate write errors.
34
+ #
35
+ # @since 2.0.0
36
+ def aggregate_write_errors(count)
37
+ @replies.reduce(nil) do |errors, reply|
38
+ if write_errors = reply.documents.first[Error::WRITE_ERRORS]
39
+ wes = write_errors.collect do |we|
40
+ we.merge!('index' => count + we['index'])
41
+ end
42
+ (errors || []) << wes if wes
43
+ end
44
+ end
45
+ end
46
+
47
+ # Aggregate the write concern errors returned from this result.
48
+ #
49
+ # @example Aggregate the write concern errors.
50
+ # result.aggregate_write_concern_errors(100)
51
+ #
52
+ # @param [ Integer ] count The number of documents already executed.
53
+ #
54
+ # @return [ Array ] The aggregate write concern errors.
55
+ #
56
+ # @since 2.0.0
57
+ def aggregate_write_concern_errors(count)
58
+ @replies.each_with_index.reduce(nil) do |errors, (reply, i)|
59
+ if write_concern_errors = reply.documents.first[Error::WRITE_CONCERN_ERRORS]
60
+ (errors || []) << write_concern_errors.reduce(nil) do |errs, wce|
61
+ wce.merge!('index' => count + wce['index'])
62
+ (errs || []) << write_concern_error
63
+ end
64
+ end
65
+ end
66
+ end
67
+ end
68
+ end
69
+ end
70
+ end
71
+ end
@@ -0,0 +1,174 @@
1
+ # Copyright (C) 2014-2015 MongoDB, Inc.
2
+ #
3
+ # Licensed under the Apache License, Version 2.0 (the "License");
4
+ # you may not use this file except in compliance with the License.
5
+ # You may obtain a copy of the License at
6
+ #
7
+ # http://www.apache.org/licenses/LICENSE-2.0
8
+ #
9
+ # Unless required by applicable law or agreed to in writing, software
10
+ # distributed under the License is distributed on an "AS IS" BASIS,
11
+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12
+ # See the License for the specific language governing permissions and
13
+ # limitations under the License.
14
+
15
+ module Mongo
16
+ module Operation
17
+ module Write
18
+ module Bulk
19
+ class Update
20
+
21
+ # Defines custom behaviour of results when updating.
22
+ #
23
+ # @since 2.0.0
24
+ class Result < Operation::Result
25
+ include Mergable
26
+
27
+ # The number of modified docs field in the result.
28
+ #
29
+ # @since 2.0.0
30
+ MODIFIED = 'nModified'.freeze
31
+
32
+ # The upserted docs field in the result.
33
+ #
34
+ # @since 2.0.0
35
+ UPSERTED = 'upserted'.freeze
36
+
37
+ # Gets the number of documents upserted.
38
+ #
39
+ # @example Get the upserted count.
40
+ # result.n_upserted
41
+ #
42
+ # @return [ Integer ] The number of documents upserted.
43
+ #
44
+ # @since 2.0.0
45
+ def n_upserted
46
+ return 0 unless acknowledged?
47
+ @replies.reduce(0) do |n, reply|
48
+ if upsert?(reply)
49
+ n += 1
50
+ else
51
+ n += 0
52
+ end
53
+ end
54
+ end
55
+
56
+ # Gets the number of documents matched.
57
+ #
58
+ # @example Get the matched count.
59
+ # result.n_matched
60
+ #
61
+ # @return [ Integer ] The number of documents matched.
62
+ #
63
+ # @since 2.0.0
64
+ def n_matched
65
+ return 0 unless acknowledged?
66
+ @replies.reduce(0) do |n, reply|
67
+ if upsert?(reply)
68
+ n += 0
69
+ else
70
+ n += reply.documents.first[N]
71
+ end
72
+ end
73
+ end
74
+
75
+ # Gets the number of documents modified.
76
+ #
77
+ # @example Get the modified count.
78
+ # result.n_modified
79
+ #
80
+ # @return [ Integer ] The number of documents modified.
81
+ #
82
+ # @since 2.0.0
83
+ def n_modified
84
+ return 0 unless acknowledged?
85
+ @replies.reduce(0) do |n, reply|
86
+ n += reply.documents.first[MODIFIED] || 0
87
+ end
88
+ end
89
+
90
+ # Get the upserted documents.
91
+ #
92
+ # @example Get upserted documents.
93
+ # result.upserted
94
+ #
95
+ # @return [ Array<BSON::Document> ] The upserted document info
96
+ #
97
+ # @since 2.1.0
98
+ def upserted
99
+ reply.documents.first[UPSERTED] || []
100
+ end
101
+
102
+ private
103
+
104
+ def upsert?(reply)
105
+ upserted.any?
106
+ end
107
+ end
108
+
109
+ # Defines custom behaviour of results when updating.
110
+ # For server versions < 2.5.5 (that don't use write commands).
111
+ #
112
+ # @since 2.0.0
113
+ class LegacyResult < Operation::Result
114
+ include LegacyMergable
115
+
116
+ # The updated existing field in the result.
117
+ #
118
+ # @since 2.0.0
119
+ UPDATED_EXISTING = 'updatedExisting'.freeze
120
+
121
+ # Gets the number of documents upserted.
122
+ #
123
+ # @example Get the upserted count.
124
+ # result.n_upserted
125
+ #
126
+ # @return [ Integer ] The number of documents upserted.
127
+ #
128
+ # @since 2.0.0
129
+ def n_upserted
130
+ return 0 unless acknowledged?
131
+ @replies.reduce(0) do |n, reply|
132
+ if upsert?(reply)
133
+ n += reply.documents.first[N]
134
+ else
135
+ n
136
+ end
137
+ end
138
+ end
139
+
140
+ # Gets the number of documents matched.
141
+ #
142
+ # @example Get the matched count.
143
+ # result.n_matched
144
+ #
145
+ # @return [ Integer ] The number of documents matched.
146
+ #
147
+ # @since 2.0.0
148
+ def n_matched
149
+ return 0 unless acknowledged?
150
+ @replies.reduce(0) do |n, reply|
151
+ if upsert?(reply)
152
+ n
153
+ else
154
+ n += reply.documents.first[N]
155
+ end
156
+ end
157
+ end
158
+ alias :n_modified :n_matched
159
+
160
+ private
161
+
162
+ def upsert?(reply)
163
+ !updated_existing?(reply) && reply.documents.first[N] == 1
164
+ end
165
+
166
+ def updated_existing?(reply)
167
+ reply.documents.first[UPDATED_EXISTING]
168
+ end
169
+ end
170
+ end
171
+ end
172
+ end
173
+ end
174
+ end
@@ -0,0 +1,81 @@
1
+ # Copyright (C) 2014-2015 MongoDB, Inc.
2
+ #
3
+ # Licensed under the Apache License, Version 2.0 (the "License");
4
+ # you may not use this file except in compliance with the License.
5
+ # You may obtain a copy of the License at
6
+ #
7
+ # http://www.apache.org/licenses/LICENSE-2.0
8
+ #
9
+ # Unless required by applicable law or agreed to in writing, software
10
+ # distributed under the License is distributed on an "AS IS" BASIS,
11
+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12
+ # See the License for the specific language governing permissions and
13
+ # limitations under the License.
14
+
15
+ require 'mongo/operation/write/bulk/update/result'
16
+
17
+ module Mongo
18
+ module Operation
19
+ module Write
20
+ module Bulk
21
+
22
+ # A MongoDB bulk update operation.
23
+ #
24
+ # @note If the server version is >= 2.5.5, a write command operation
25
+ # will be created and sent instead.
26
+ #
27
+ # @example Create the update operation.
28
+ # Write::BulkUpdate.new({
29
+ # :updates => [
30
+ # {
31
+ # :q => { :foo => 1 },
32
+ # :u => { :$set => { :bar => 1 }},
33
+ # :multi => true,
34
+ # :upsert => false
35
+ # }
36
+ # ],
37
+ # :db_name => 'test',
38
+ # :coll_name => 'test_coll',
39
+ # :write_concern => write_concern,
40
+ # :ordered => false
41
+ # })
42
+ #
43
+ # Initialization:
44
+ # param [ Hash ] spec The specifications for the update.
45
+ #
46
+ # option spec :updates [ Array ] The update documents.
47
+ # option spec :db_name [ String ] The name of the database on which
48
+ # the query should be run.
49
+ # option spec :coll_name [ String ] The name of the collection on which
50
+ # the query should be run.
51
+ # option spec :write_concern [ Mongo::WriteConcern ] The write concern.
52
+ # option spec :ordered [ true, false ] Whether the operations should be
53
+ # executed in order.
54
+ # option spec :options [ Hash ] Options for the command, if it ends up being a
55
+ # write command.
56
+ #
57
+ # @since 2.0.0
58
+ class Update
59
+ include Bulkable
60
+ include Specifiable
61
+
62
+ private
63
+
64
+ def execute_write_command(context)
65
+ Result.new(Command::Update.new(spec).execute(context))
66
+ end
67
+
68
+
69
+ def messages
70
+ updates.collect do |u|
71
+ opts = { :flags => [] }
72
+ opts[:flags] << :multi_update if !!u[Operation::MULTI]
73
+ opts[:flags] << :upsert if !!u[Operation::UPSERT]
74
+ Protocol::Update.new(db_name, coll_name, u[Operation::Q], u[Operation::U], opts)
75
+ end
76
+ end
77
+ end
78
+ end
79
+ end
80
+ end
81
+ end
@@ -12,6 +12,9 @@
12
12
  # See the License for the specific language governing permissions and
13
13
  # limitations under the License.
14
14
 
15
- require 'mongo/operation/write/bulk/bulk_delete'
16
- require 'mongo/operation/write/bulk/bulk_insert'
17
- require 'mongo/operation/write/bulk/bulk_update'
15
+ require 'mongo/operation/write/bulk/mergable'
16
+ require 'mongo/operation/write/bulk/legacy_mergable'
17
+ require 'mongo/operation/write/bulk/bulkable'
18
+ require 'mongo/operation/write/bulk/delete'
19
+ require 'mongo/operation/write/bulk/insert'
20
+ require 'mongo/operation/write/bulk/update'
@@ -29,7 +29,6 @@ module Mongo
29
29
  # @since 2.0.0
30
30
  class CreateIndex
31
31
  include Specifiable
32
- include Executable
33
32
  include Writable
34
33
 
35
34
  private
@@ -23,7 +23,6 @@ module Mongo
23
23
  # @since 2.0.0
24
24
  class CreateUser
25
25
  include Specifiable
26
- include Executable
27
26
  include Writable
28
27
 
29
28
  private
@@ -31,7 +31,6 @@ module Mongo
31
31
  # @since 2.0.0
32
32
  class Delete
33
33
  include Specifiable
34
- include Executable
35
34
  include Writable
36
35
 
37
36
  private
@@ -44,9 +43,10 @@ module Mongo
44
43
  def selector
45
44
  { delete: coll_name,
46
45
  deletes: deletes,
47
- writeConcern: write_concern.options,
48
46
  ordered: ordered?
49
- }
47
+ }.tap do |cmd|
48
+ cmd.merge!(writeConcern: write_concern.options) if write_concern
49
+ end
50
50
  end
51
51
  end
52
52
  end