Don't run callbacks on batch 1-n and n-n operations

- [close #2146]

lib/mongoid/relations/embedded/batchable.rb

@@ -262,9 +262,7 @@ def pre_process_batch_insert(docs)
             append(doc)
             if persistable? && !_assigning?
               self.path = doc.atomic_path unless path
-              if doc.valid?(:create)
-                doc.run_before_callbacks(:save, :create)
-              else
+              if doc.invalid?(:create)
                 self.inserts_valid = false
               end
             end
@@ -314,7 +312,6 @@ def pre_process_batch_remove(docs, method)
         def post_process_batch_insert(docs)
           docs.each do |doc|
             doc.new_record = false
-            doc.run_after_callbacks(:create, :save)
             doc.post_persist
           end
         end

lib/mongoid/relations/referenced/many.rb

@@ -50,13 +50,13 @@ def <<(*args)
         #
         # @since 2.4.0
         def concat(documents)
-          inserts = []
+          docs, inserts = [], []
           documents.each do |doc|
             next unless doc
             append(doc)
-            save_or_delay(doc, inserts) if persistable?
+            save_or_delay(doc, docs, inserts) if persistable?
           end
-          persist_delayed(inserts)
+          persist_delayed(docs, inserts)
           self
         end
 
@@ -387,15 +387,15 @@ def method_missing(name, *args, &block)
         # @example Persist the delayed batch inserts.
         #   relation.persist_delayed([ doc ])
         #
-        # @param [ Array<Document> ] inserts The delayed inserts.
+        # @param [ Array<Document> ] docs The delayed inserts.
+        # @param [ Array<Hash> ] inserts The raw insert document.
         #
         # @since 3.0.0
-        def persist_delayed(inserts)
-          if inserts.any?
-            collection.insert(inserts.map(&:as_document))
-            inserts.each do |doc|
+        def persist_delayed(docs, inserts)
+          if docs.any?
+            collection.insert(inserts)
+            docs.each do |doc|
               doc.new_record = false
-              doc.run_after_callbacks(:create, :save)
               doc.post_persist
             end
           end
@@ -478,10 +478,10 @@ def remove_not_in(ids)
         # @param [ Array<Document> ] inserts The inserts.
         #
         # @since 3.0.0
-        def save_or_delay(doc, inserts)
+        def save_or_delay(doc, docs, inserts)
           if doc.new_record? && doc.valid?(:create)
-            inserts.push(doc)
-            doc.run_before_callbacks(:save, :create)
+            docs.push(doc)
+            inserts.push(doc.as_document)
           else
             doc.save
           end

lib/mongoid/relations/referenced/many_to_many.rb

@@ -52,21 +52,21 @@ def <<(*args)
         #
         # @since 2.4.0
         def concat(documents)
-          ids, inserts = [], []
+          ids, docs, inserts = [], [], []
           documents.each do |doc|
             next if doc.nil? || target.include?(doc)
             append(doc)
             if persistable? || _creating?
               ids.push(doc.id)
-              save_or_delay(doc, inserts)
+              save_or_delay(doc, docs, inserts)
             else
               base.send(foreign_key).push(doc.id) and unsynced(base, foreign_key)
             end
           end
           if persistable? || _creating?
             base.push_all(foreign_key, ids)
           end
-          persist_delayed(inserts)
+          persist_delayed(docs, inserts)
           self
         end
 

perf/benchmark.rb

@@ -55,9 +55,9 @@
 
       Person.delete_all
     end
-  end
 
-  GC.start
+    GC.start
+  end
 
   person = Person.create(:birth_date => Date.new(1970, 1, 1))
 
@@ -104,17 +104,31 @@
       person.addresses.clear
       GC.start
 
+      bm.report("#push             ") do
+        i.times do |n|
+          person.addresses.push(
+            Address.new(
+              :street => "Wienerstr. #{n}",
+              :city => "Berlin",
+              :post_code => "10999"
+            )
+          )
+        end
+      end
+
+      person.addresses.clear
+      GC.start
+
       bm.report("#push (batch)     ") do
-        [].tap do |addresses|
-          i.times do |n|
-            addresses << Address.new(
-                :street => "Wienerstr. #{n}",
-                :city => "Berlin",
-                :post_code => "10999"
-              )
-          end
-          person.addresses.push(addresses)
+        addresses = []
+        i.times do |n|
+          addresses << Address.new(
+              :street => "Wienerstr. #{n}",
+              :city => "Berlin",
+              :post_code => "10999"
+            )
         end
+        person.addresses.concat(addresses)
       end
 
       bm.report("#each             ") do
@@ -181,6 +195,8 @@
         end
       end
 
+      GC.start
+
       bm.report("#count            ") do
         person.posts.count
       end
@@ -192,13 +208,21 @@
       Post.delete_all
       GC.start
 
+      bm.report("#push             ") do
+        i.times do |n|
+          person.posts.push(Post.new(:title => "Posting #{n}"))
+        end
+      end
+
+      Post.delete_all
+      GC.start
+
       bm.report("#push (batch)     ") do
-        [].tap do |posts|
-          i.times do |n|
-            posts << Post.new(:title => "Posting #{n}")
-          end
-          person.posts.push(posts)
+        posts = []
+        i.times do |n|
+          posts << Post.new(:title => "Posting #{n}")
         end
+        person.posts.concat(posts)
       end
 
       bm.report("#each             ") do
@@ -274,13 +298,21 @@
       Preference.delete_all
       GC.start
 
+      bm.report("#push             ") do
+        i.times do |n|
+          person.preferences.push(Preference.new(:name => "Preference #{n}"))
+        end
+      end
+
+      Preference.delete_all
+      GC.start
+
       bm.report("#push (batch)     ") do
-        [].tap do |preferences|
-          i.times do |n|
-            preferences << Preference.new(:name => "Preference #{n}")
-          end
-          person.preferences.push(preferences)
+        preferences = []
+        i.times do |n|
+          preferences << Preference.new(:name => "Preference #{n}")
         end
+        person.preferences.concat(preferences)
       end
 
       bm.report("#each             ") do