CXX-175 no empty batches!

TylerBrock · TylerBrock · commit 0c41a351354e · 2014-05-21T19:46:14.000-04:00
diff --git a/src/mongo/client/bulk_operation_builder.cpp b/src/mongo/client/bulk_operation_builder.cpp
@@ -54,7 +54,9 @@ namespace mongo {
     }
 
     void BulkOperationBuilder::execute(const WriteConcern* wc, std::vector<BSONObj>* results) {
-        uassert(0, "Bulk operations cannot be executed twice", !_executed);
+        uassert(0, "Bulk operations cannot be re-executed", !_executed);
+        uassert(0, "Bulk operations cannot be executed without any operations",
+            !_write_operations.empty());
 
         if (!_ordered)
             std::sort(_write_operations.begin(), _write_operations.end(), compare);

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,9 @@ namespace mongo {`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`void BulkOperationBuilder::execute(const WriteConcern* wc, std::vector<BSONObj>* results) {`
`57`		`- uassert(0, "Bulk operations cannot be executed twice", !_executed);`
	`57`	`+ uassert(0, "Bulk operations cannot be re-executed", !_executed);`
	`58`	`+ uassert(0, "Bulk operations cannot be executed without any operations",`
	`59`	`+ !_write_operations.empty());`
`58`	`60`
`59`	`61`	`if (!_ordered)`
`60`	`62`	`std::sort(_write_operations.begin(), _write_operations.end(), compare);`