mongo 2.0.0.beta → 2.0.0.rc

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongo
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta
+  version: 2.0.0.rc
 platform: ruby
 authors:
 - Tyler Brock
@@ -32,7 +32,7 @@ cert_chain:
   o2UXDbWtz5PqoFd8EgNJAn3+BG1pwC9S9pVFG3WPucfAx/bE8iq/vvchHei5Y/Vo
   aAz5f/hY4zFeYWvGDBHYEXE1rTN2hhMSyJscPcFbmz0=
   -----END CERTIFICATE-----
-date: 2015-02-24 00:00:00.000000000 Z
+date: 2015-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson
@@ -77,8 +77,14 @@ files:
 - lib/mongo/auth/user/view.rb
 - lib/mongo/auth/x509.rb
 - lib/mongo/auth/x509/conversation.rb
-- lib/mongo/bulk.rb
-- lib/mongo/bulk/bulk_write.rb
+- lib/mongo/bulk_write.rb
+- lib/mongo/bulk_write/bulk_writable.rb
+- lib/mongo/bulk_write/deletable.rb
+- lib/mongo/bulk_write/insertable.rb
+- lib/mongo/bulk_write/ordered_bulk_write.rb
+- lib/mongo/bulk_write/replacable.rb
+- lib/mongo/bulk_write/unordered_bulk_write.rb
+- lib/mongo/bulk_write/updatable.rb
 - lib/mongo/client.rb
 - lib/mongo/cluster.rb
 - lib/mongo/cluster/topology.rb
@@ -99,9 +105,9 @@ files:
 - lib/mongo/database.rb
 - lib/mongo/database/view.rb
 - lib/mongo/error.rb
-- lib/mongo/error/bulk_write_failure.rb
-- lib/mongo/error/empty_batch.rb
+- lib/mongo/error/bulk_write_error.rb
 - lib/mongo/error/invalid_bulk_operation.rb
+- lib/mongo/error/invalid_bulk_operation_type.rb
 - lib/mongo/error/invalid_collection_name.rb
 - lib/mongo/error/invalid_database_name.rb
 - lib/mongo/error/invalid_document.rb
@@ -112,6 +118,7 @@ files:
 - lib/mongo/error/invalid_update_document.rb
 - lib/mongo/error/max_bson_size.rb
 - lib/mongo/error/max_message_size.rb
+- lib/mongo/error/multi_index_drop.rb
 - lib/mongo/error/need_primary_server.rb
 - lib/mongo/error/operation_failure.rb
 - lib/mongo/error/parser.rb
@@ -137,7 +144,6 @@ files:
 - lib/mongo/operation.rb
 - lib/mongo/operation/aggregate.rb
 - lib/mongo/operation/aggregate/result.rb
-- lib/mongo/operation/batchable.rb
 - lib/mongo/operation/bulk_delete/result.rb
 - lib/mongo/operation/bulk_insert/result.rb
 - lib/mongo/operation/bulk_update/result.rb
@@ -162,12 +168,13 @@ files:
 - lib/mongo/operation/write.rb
 - lib/mongo/operation/write/bulk_delete.rb
 - lib/mongo/operation/write/bulk_insert.rb
+- lib/mongo/operation/write/bulk_mergable.rb
 - lib/mongo/operation/write/bulk_update.rb
 - lib/mongo/operation/write/command.rb
+- lib/mongo/operation/write/command/create_index.rb
 - lib/mongo/operation/write/command/create_user.rb
 - lib/mongo/operation/write/command/delete.rb
 - lib/mongo/operation/write/command/drop_index.rb
-- lib/mongo/operation/write/command/ensure_index.rb
 - lib/mongo/operation/write/command/insert.rb
 - lib/mongo/operation/write/command/remove_user.rb
 - lib/mongo/operation/write/command/update.rb
@@ -177,8 +184,11 @@ files:
 - lib/mongo/operation/write/delete.rb
 - lib/mongo/operation/write/drop_index.rb
 - lib/mongo/operation/write/insert.rb
+- lib/mongo/operation/write/legacy_bulk_mergable.rb
 - lib/mongo/operation/write/remove_user.rb
 - lib/mongo/operation/write/update.rb
+- lib/mongo/options.rb
+- lib/mongo/options/mapper.rb
 - lib/mongo/protocol.rb
 - lib/mongo/protocol/bit_vector.rb
 - lib/mongo/protocol/delete.rb
@@ -278,10 +288,10 @@ files:
 - spec/mongo/operation/write/command/delete_spec.rb
 - spec/mongo/operation/write/command/insert_spec.rb
 - spec/mongo/operation/write/command/update_spec.rb
+- spec/mongo/operation/write/create_index_spec.rb
 - spec/mongo/operation/write/create_user_spec.rb
 - spec/mongo/operation/write/delete_spec.rb
 - spec/mongo/operation/write/drop_index_spec.rb
-- spec/mongo/operation/write/ensure_index_spec.rb
 - spec/mongo/operation/write/insert_spec.rb
 - spec/mongo/operation/write/remove_user_spec.rb
 - spec/mongo/operation/write/response_spec.rb
@@ -383,6 +393,10 @@ files:
 - spec/support/server_selection/selection/ReplicaSetWithPrimary/read/Primary.yml
 - spec/support/server_selection/selection/ReplicaSetWithPrimary/read/PrimaryPreferred.yml
 - spec/support/server_selection/selection/ReplicaSetWithPrimary/read/PrimaryPreferred_non_matching.yml
+- spec/support/server_selection/selection/ReplicaSetWithPrimary/read/Secondary.yml
+- spec/support/server_selection/selection/ReplicaSetWithPrimary/read/SecondaryPreferred.yml
+- spec/support/server_selection/selection/ReplicaSetWithPrimary/read/SecondaryPreferred_non_matching.yml
+- spec/support/server_selection/selection/ReplicaSetWithPrimary/read/Secondary_non_matching.yml
 - spec/support/server_selection/selection/Sharded/read/SecondaryPreferred.yml
 - spec/support/server_selection/selection/Single/read/SecondaryPreferred.yml
 - spec/support/server_selection/selection/Unknown/read/SecondaryPreferred.yml
@@ -475,10 +489,10 @@ test_files:
 - spec/mongo/operation/write/command/delete_spec.rb
 - spec/mongo/operation/write/command/insert_spec.rb
 - spec/mongo/operation/write/command/update_spec.rb
+- spec/mongo/operation/write/create_index_spec.rb
 - spec/mongo/operation/write/create_user_spec.rb
 - spec/mongo/operation/write/delete_spec.rb
 - spec/mongo/operation/write/drop_index_spec.rb
-- spec/mongo/operation/write/ensure_index_spec.rb
 - spec/mongo/operation/write/insert_spec.rb
 - spec/mongo/operation/write/remove_user_spec.rb
 - spec/mongo/operation/write/response_spec.rb
@@ -579,6 +593,10 @@ test_files:
 - spec/support/server_selection/selection/ReplicaSetWithPrimary/read/Primary.yml
 - spec/support/server_selection/selection/ReplicaSetWithPrimary/read/PrimaryPreferred.yml
 - spec/support/server_selection/selection/ReplicaSetWithPrimary/read/PrimaryPreferred_non_matching.yml
+- spec/support/server_selection/selection/ReplicaSetWithPrimary/read/Secondary.yml
+- spec/support/server_selection/selection/ReplicaSetWithPrimary/read/Secondary_non_matching.yml
+- spec/support/server_selection/selection/ReplicaSetWithPrimary/read/SecondaryPreferred.yml
+- spec/support/server_selection/selection/ReplicaSetWithPrimary/read/SecondaryPreferred_non_matching.yml
 - spec/support/server_selection/selection/Sharded/read/SecondaryPreferred.yml
 - spec/support/server_selection/selection/Single/read/SecondaryPreferred.yml
 - spec/support/server_selection/selection/Unknown/read/SecondaryPreferred.yml
@@ -591,3 +609,4 @@ test_files:
 - spec/support/shared/server_selector.rb
 - spec/support/shared/socket.rb
 - spec/support/travis.rb
+has_rdoc: yard

data/lib/mongo/bulk/bulk_write.rb

@@ -1,307 +0,0 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-module Mongo
-
-  # This semi-public class handles the logic for executing a batch of
-  # operations.
-  #
-  # @since 2.0.0
-  class BulkWrite
-
-    # @return [ Mongo::Collection ] The collection on which this bulk write
-    #   operation will be executed.
-    attr_reader :collection
-
-    # @return [ Array<Hash> ] operations The list of operations.
-    attr_reader :operations
-
-    # @return [ Hash ] options The options.
-    attr_reader :options
-
-    # @return [ Acknowledged, Unacknowledged ] write_concern The write concern.
-    attr_reader :write_concern
-
-    # Initialize the BulkWrite object.
-    #
-    # @example Create an ordered bulk write object.
-    #   BulkWrite.new([
-    #       { insert_one: { x: 1 }},
-    #       { update_one: [{ x: 1 }, { '$set' => { x: 2 }}]}
-    #     ],
-    #     { ordered: true },
-    #     collection
-    #   )
-    #
-    # @example Create an unordered bulk write object.
-    #   BulkWrite.new([
-    #       { insert_one: { x: 1 }},
-    #       { update_one: [{ x: 1 }, { '$set' => { x: 2 }}]}
-    #     ],
-    #     { ordered: false },
-    #     collection
-    #   )
-    #
-    # @param [ Array<Hash> ] operations The operations to execute.
-    # @param [ Hash ] options The options for executing the operations.
-    # @param [ Collection ] collection The collection on which the
-    #   operations will be executed.
-    #
-    # @option options [ String ] :ordered Whether the operations should
-    #   be executed in order.
-    # @option options [ Hash ] :write_concern The write concern to use when
-    #   executing the operations.
-    #
-    # @since 2.0.0
-    def initialize(operations, options, collection)
-      @operations = operations
-      @options = options
-      @collection = collection
-      if options[:write_concern]
-        @write_concern = WriteConcern.get(options[:write_concern])
-      else
-        @write_concern = collection.write_concern
-      end
-    end
-
-    # Is the bulk write operation ordered?
-    #
-    # @example Is the bulk write operation ordered?
-    #   bulk_write.ordered?
-    #
-    # @return [ true, false ] If the bulk write is ordered.
-    #
-    # @since 2.0.0
-    def ordered?
-      @ordered ||= !!options[:ordered]
-    end
-
-    # Execute the bulk write.
-    #
-    # @example execute the bulk write operations.
-    #   bulk.execute
-    #
-    # @return [ Hash ] The result of doing the bulk write.
-    def execute
-      raise Error::EmptyBatch.new if operations.empty?
-
-      @index = -1
-      @ops = []
-
-      operations.each do |operation|
-        operation.each do |name, document|
-          if respond_to?(name, true)
-            send(name, document)
-          else
-            raise Error::InvalidBulkOperation.new(name)
-          end
-        end
-      end
-
-      ops = merge_ops
-
-      replies = []
-      until ops.empty?
-        op = ops.shift
-
-        until op.valid_batch_size?(collection.next_primary.context.max_write_batch_size)
-          ops = op.batch(2) + ops
-          op = ops.shift
-        end
-
-        begin
-          replies << op.execute(collection.next_primary.context)
-          # @todo: No test for max message size.
-        rescue Error::MaxBSONSize, Error::MaxMessageSize => ex
-          raise ex unless op.batchable?
-          ops = op.batch(2) + ops
-        end
-        return make_response!(replies) if stop_executing?(replies.last)
-      end
-      make_response!(replies) if op.write_concern.get_last_error
-    end
-
-    private
-
-    def increment_index
-      @index += 1
-    end
-
-    def valid_doc?(doc)
-      doc.respond_to?(:keys)
-    end
-
-    def update_doc?(doc)
-      !doc.empty? &&
-        doc.respond_to?(:keys) &&
-        doc.keys.first.to_s =~ /^\$/
-    end
-
-    def replacement_doc?(doc)
-      doc.respond_to?(:keys) && doc.keys.all?{|key| key !~ /^\$/}
-    end
-
-    def insert_one(doc)
-      raise Error::InvalidDocument.new unless valid_doc?(doc)
-      spec = { documents: [ doc ],
-               db_name: db_name,
-               coll_name: collection.name,
-               ordered: ordered?,
-               write_concern: write_concern }
-
-      push_op(Mongo::Operation::Write::BulkInsert, spec)
-    end
-
-    def delete_one(selector)
-      raise Error::InvalidDocument.new unless valid_doc?(selector)
-      spec = { deletes: [{ q: selector, limit: 1 }],
-               db_name:   db_name,
-               coll_name: collection.name,
-               ordered: ordered?,
-               write_concern: write_concern }
-
-      push_op(Mongo::Operation::Write::BulkDelete, spec)
-    end
-
-    def delete_many(selector)
-      raise Error::InvalidDocument.new unless valid_doc?(selector)
-      spec = { deletes: [{ q: selector, limit: 0 }],
-               db_name:   db_name,
-               coll_name: collection.name,
-               ordered: ordered?,
-               write_concern: write_concern }
-
-      push_op(Mongo::Operation::Write::BulkDelete, spec)
-    end
-
-    def replace_one(docs)
-      selector = docs[0]
-      replacement = docs[1]
-      upsert = (docs[2] || {})[:upsert]
-      raise ArgumentError unless selector && replacement
-      raise Error::InvalidReplacementDocument.new unless replacement_doc?(replacement)
-      upsert = !!upsert
-      spec = { updates: [{ q: selector,
-                           u: replacement,
-                           multi: false,
-                           upsert: upsert }],
-               db_name:   db_name,
-               coll_name: collection.name,
-               ordered: ordered?,
-               write_concern: write_concern }
-
-      push_op(Mongo::Operation::Write::BulkUpdate, spec)
-    end
-
-    def update_one(docs)
-      upsert = (docs[2] || {})[:upsert]
-      update_one_or_many(docs[0], docs[1], upsert, false)
-    end
-
-    def update_many(docs)
-      upsert = (docs[2] || {})[:upsert]
-      update_one_or_many(docs[0], docs[1], upsert, true)
-    end
-
-    def update_one_or_many(selector, update, upsert, multi)
-      raise ArgumentError unless selector && update
-      raise Error::InvalidUpdateDocument.new unless update_doc?(update)
-      upsert = !!upsert
-      spec = { updates: [{ q: selector,
-                           u: update,
-                           multi: multi,
-                           upsert: upsert }],
-               db_name:   db_name,
-               coll_name: collection.name,
-               ordered: ordered?,
-               write_concern: write_concern }
-
-      push_op(Mongo::Operation::Write::BulkUpdate, spec)
-    end
-
-    def push_op(op_class, spec)
-      spec.merge!(indexes: [ increment_index ])
-      @ops << op_class.send(:new, spec)
-    end
-
-    def merge_ops
-      if ordered?
-        merge_consecutive_ops(@ops)
-      else
-        merge_ops_by_type(@ops)
-      end
-    end
-
-    def merge_consecutive_ops(operations)
-      operations.inject([]) do |merged_ops, op|
-        previous_op = merged_ops.last
-        if previous_op.class == op.class
-          merged_ops.tap do |m|
-            m[m.size - 1] = previous_op.merge!(op)
-          end
-        else
-          merged_ops << op
-        end
-      end
-    end
-
-    def merge_ops_by_type(operations)
-      ops_by_type = operations.inject({}) do |merged_ops, op|
-        if merged_ops[op.class]
-          merged_ops.tap do |m|
-            m[op.class] << op
-          end
-        else
-          merged_ops.tap do |m|
-            m[op.class] = [ op ]
-          end
-        end
-      end
-
-      ops_by_type.keys.inject([]) do |merged_ops, type|
-        merged_ops << merge_consecutive_ops( ops_by_type[ type ] )
-      end.flatten
-    end
-
-    def stop_executing?(result)
-      result && ordered? && !result.successful?
-    end
-
-    def make_response!(results)
-      response = results.reduce({}) do |response, result|
-        write_errors = result.aggregate_write_errors
-        write_concern_errors = result.aggregate_write_concern_errors
-        response.tap do |r|
-          r['nInserted'] = ( r['nInserted'] || 0 ) + result.n_inserted if result.respond_to?(:n_inserted)
-          r['nMatched'] = ( r['nMatched'] || 0 ) + result.n_matched if result.respond_to?(:n_matched)
-          r['nModified'] = ( r['nModified'] || 0 ) + result.n_modified if result.respond_to?(:n_modified) && result.n_modified
-          r['nUpserted'] = ( r['nUpserted'] || 0 ) + result.n_upserted if result.respond_to?(:n_upserted)
-          r['nRemoved'] = ( r['nRemoved'] || 0 ) + result.n_removed if result.respond_to?(:n_removed)
-          r['writeErrors'] = ( r['writeErrors'] || [] ) + write_errors if write_errors
-          r['writeConcernErrors'] = ( r['writeConcernErrors'] || [] ) + write_concern_errors if write_concern_errors
-        end
-      end
-
-      if response['writeErrors'] || response['writeConcernErrors']
-        response.merge!('errmsg' => 'batch item errors occurred')
-        raise Error::BulkWriteFailure.new(response)
-      end
-      response
-    end
-
-    def db_name
-      collection.database.name
-    end
-  end
-end

data/lib/mongo/operation/batchable.rb

@@ -1,103 +0,0 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-module Mongo
-
-  module Operation
-
-    # This module contains common functionality for splitting an operation
-    # into the specified number of children operations.
-    # An operation including this module must provide a method called
-    # #batch_key. It specifies the key of the spec array element to split.
-    #
-    # @since 2.0.0
-    module Batchable
-
-      # Slices this operation into the specified number of children operations.
-      #
-      # @params [ Integer ] n_batches The number of children operations to split
-      #   this one into.
-      #
-      # @return [ Array ] An array of children operations.
-      #
-      # @since 2.0.0
-      def batch(n_batches)
-        items = spec[batch_key]
-        raise Exception, "Cannot batch" unless items.size >= n_batches
-
-        items_per_batch = items.size / n_batches
-        batches  = items.each_slice(items_per_batch).to_a
-        index_batches = indexes.each_slice(items_per_batch).to_a
-
-        # #each_slice makes groups containing exactly items_per_batch number of items.
-        # You could therefore end up with more groups than n_batches, so put the
-        # remaining items in the last group.
-        if batches.size > n_batches
-          batches[n_batches - 1] << batches.pop(batches.size - n_batches)
-          batches[-1].flatten!
-        end
-
-        if index_batches.size > n_batches
-          index_batches[n_batches - 1] << index_batches.pop(index_batches.size - n_batches)
-          index_batches[-1].flatten!
-        end
-
-        batches.each_with_index.inject([]) do |children, (batch, i)|
-          spec_copy = spec.dup
-          spec_copy[:indexes] = index_batches[i]
-          spec_copy[batch_key] = batch
-          children << self.class.new(spec_copy)
-        end
-      end
-
-      # Merge another operation with this one.
-      # Requires that the collection and database of the two ops are the same.
-      #
-      # @params[ Mongo::Operation ] The other operation.
-      #
-      # @return [ self ] This operation merged with the other one.
-      #
-      # @since 2.0.0
-      def merge!(other)
-        # @todo: use specific exception
-        raise Exception, "Cannot merge" unless self.class == other.class &&
-            coll_name == other.coll_name &&
-            db_name == other.db_name
-        @spec[batch_key] += other.spec[batch_key]
-        @spec[:indexes] = indexes + other.indexes
-        self
-      end
-
-      # Determine if the batch size exceeds a given maximum.
-      #
-      # @params[ Integer ] The max batch size.
-      #
-      # @return [ true, false ] If this operation exceeds the given batch size.
-      #
-      # @since 2.0.0
-      def valid_batch_size?(max)
-        spec[batch_key].size < max
-      end
-
-      # Whether this operation can be split into batches.
-      #
-      # @return [ true, false ] If this operation can be split into batches.
-      #
-      # @since 2.0.0
-      def batchable?
-        spec[batch_key].size > 1
-      end
-    end
-  end
-end