MONGOID-4889 Optimize batch assignment of embedded documents

Author: jamis

lib/mongoid/association/embedded/batchable.rb

@@ -313,18 +313,19 @@ def selector
         #
         # @return [ Array<Hash> ] The documents as an array of hashes.
         def pre_process_batch_insert(docs)
-          docs.map do |doc|
-            next unless doc
-            append(doc)
-            if persistable? && !_assigning?
-              self.path = doc.atomic_path unless path
-              if doc.valid?(:create)
-                doc.run_before_callbacks(:save, :create)
-              else
-                self.inserts_valid = false
+          [].tap do |results|
+            append_many(docs) do |doc|
+              if persistable? && !_assigning?
+                self.path = doc.atomic_path unless path
+                if doc.valid?(:create)
+                  doc.run_before_callbacks(:save, :create)
+                else
+                  self.inserts_valid = false
+                end
               end
+
+              results << doc.send(:as_attributes)
             end
-            doc.send(:as_attributes)
           end
         end
 

lib/mongoid/association/embedded/embeds_many/proxy.rb

@@ -443,6 +443,36 @@ def append(document)
             execute_callback :after_add, document
           end
 
+          # Optimized version of #append that handles multiple documents
+          # in a more efficient way.
+          def append_many(documents, &block)
+            id_of = ->(doc){ doc._id || doc.object_id }
+
+            visited_docs = Set.new(_target.map(&id_of))
+            next_index = _unscoped.size
+
+            unique_set = documents.select do |doc|
+              next unless doc
+              next if visited_docs.include?(id_of[doc])
+
+              execute_callback :before_add, doc
+
+              visited_docs.add(id_of[doc])
+              integrate(doc)
+
+              doc._index = next_index
+              next_index += 1
+
+              block.call(doc) if block
+            end
+
+            _unscoped.concat(unique_set)
+            _target.push(*scope(unique_set))
+            update_attributes_hash
+
+            unique_set.each { |doc| execute_callback :after_add, doc }
+          end
+
           # Instantiate the binding associated with this association.
           #
           # @example Create the binding.

spec/integration/associations/embeds_many_spec.rb

@@ -201,6 +201,47 @@
         include_examples 'persists correctly'
       end
     end
+
+    context 'including duplicates in the assignment' do
+      let(:canvas) do
+        Canvas.create!(shapes: [Shape.new])
+      end
+
+      shared_examples 'persists correctly' do
+        it 'persists correctly' do
+          canvas.shapes.length.should eq 2
+          _canvas = Canvas.find(canvas.id)
+          _canvas.shapes.length.should eq 2
+        end
+      end
+
+      context 'via assignment operator' do
+        before do
+          canvas.shapes = [ canvas.shapes.first, Shape.new, canvas.shapes.first ]
+          canvas.save!
+        end
+
+        include_examples 'persists correctly'
+      end
+
+      context 'via attributes=' do
+        before do
+          canvas.attributes = { shapes: [ canvas.shapes.first, Shape.new, canvas.shapes.first ] }
+          canvas.save!
+        end
+
+        include_examples 'persists correctly'
+      end
+
+      context 'via assign_attributes' do
+        before do
+          canvas.assign_attributes(shapes: [ canvas.shapes.first, Shape.new, canvas.shapes.first ])
+          canvas.save!
+        end
+
+        include_examples 'persists correctly'
+      end
+    end
   end
 
   context 'when an anonymous class defines an embeds_many association' do