Merge pull request #633 from estolfo/RUBY-946-gridfs

RUBY-946 Account for max bson size when inserting GridFS file chunks

Author: estolfo

lib/mongo/bulk_write/bulk_writable.rb

@@ -85,6 +85,11 @@ def execute
 
       private
 
+      def valid_doc?(doc)
+        doc.respond_to?(:keys) ||
+          doc.respond_to?(:document)
+      end
+
       def write_concern
         @write_concern ||= WriteConcern.get(@options[:write_concern]) ||
                             @collection.write_concern

lib/mongo/bulk_write/deletable.rb

@@ -22,10 +22,6 @@ module Deletable
 
       private
 
-      def valid_doc?(doc)
-        doc.respond_to?(:keys)
-      end
-
       def validate_delete_op!(type, d)
         raise Error::InvalidBulkOperation.new(type, d) unless valid_doc?(d)
       end

lib/mongo/bulk_write/insertable.rb

@@ -22,10 +22,6 @@ module Insertable
 
       private
 
-      def valid_doc?(doc)
-        doc.respond_to?(:keys)
-      end
-
       def validate_insert_ops!(type, inserts)
         if inserts.empty?
           raise Error::InvalidBulkOperation.new(type, inserts)

lib/mongo/grid/fs.rb

@@ -75,12 +75,12 @@ def find_one(selector = nil)
       # @since 2.0.0
       def insert_one(file)
         files_collection.insert_one(file.metadata)
-        result = chunks_collection.insert_many(file.chunks)
-        if write_concern.get_last_error
-          validate_md5!(file)
-        else
-          result
+        inserts = file.chunks.reduce([]) do |ops, chunk|
+          ops << { :insert_one => chunk }
         end
+        result = chunks_collection.bulk_write(inserts, ordered: true)
+        validate_md5!(file) if write_concern.get_last_error
+        file.id
       end
 
       # Create the GridFS.

spec/mongo/grid/fs_spec.rb

@@ -65,7 +65,7 @@
 
     context 'when inserting the file once' do
 
-      before do
+      let!(:result) do
         fs.insert_one(file)
       end
 
@@ -85,6 +85,10 @@
       it 'includes the chunks and data with the file' do
         expect(from_db.data).to eq('Hello!')
       end
+
+      it 'returns the file id' do
+        expect(result).to eq(file.id)
+      end
     end
 
     context 'when inserting the file more than once' do
@@ -101,6 +105,33 @@
         }.to raise_error(Mongo::Error::OperationFailure)
       end
     end
+
+    context 'when the file exceeds the max bson size' do
+
+      let(:fs) do
+        described_class.new(authorized_client.database)
+      end
+
+      let(:file) do
+        str = 'y' * 16777216
+        Mongo::Grid::File.new(str, :filename => 'large-file.txt')
+      end
+
+      before do
+        fs.insert_one(file)
+      end
+
+      after do
+        fs.files_collection.find.delete_many
+        fs.chunks_collection.find.delete_many
+      end
+
+      it 'successfully inserts the file' do
+        expect(
+          fs.find_one(:filename => 'large-file.txt').chunks
+        ).to eq(file.chunks)
+      end
+    end
   end
 
   describe '#delete_one' do