CXX-175 check for double executed, convert wc error to soft

Author: TylerBrock

src/mongo/client/bulk_operation_builder.cpp

@@ -35,6 +35,7 @@ namespace mongo {
         : _client(client)
         , _ns(ns)
         , _ordered(ordered)
+        , _executed(false)
         {}
 
     BulkOperationBuilder::~BulkOperationBuilder() {
@@ -53,9 +54,13 @@ namespace mongo {
     }
 
     void BulkOperationBuilder::execute(const WriteConcern* wc, std::vector<BSONObj>* results) {
+        uassert(0, "Bulk operations cannot be executed twice", !_executed);
+
         if (!_ordered)
             std::sort(_write_operations.begin(), _write_operations.end(), compare);
+
         _client->_write(_ns, _write_operations, _ordered, wc, results);
+        _executed = true;
     }
 
     void BulkOperationBuilder::enqueue(WriteOperation* operation) {

src/mongo/client/bulk_operation_builder.h

@@ -103,6 +103,7 @@ namespace mongo {
         DBClientBase* const _client;
         const std::string _ns;
         const bool _ordered;
+        bool _executed;
         std::vector<WriteOperation*> _write_operations;
 
         void enqueue(WriteOperation* const operation);

src/mongo/client/command_writer.cpp

@@ -110,8 +110,7 @@ namespace mongo {
         BSONObj result;
         bool commandWorked = _client->runCommand(nsToDatabase(ns), command->obj(), result);
 
-        // TODO: writeConcernError should be a soft error
-        if (!commandWorked || result.hasField("writeErrors") || result.hasField("writeConcernError")) {
+        if (!commandWorked || result.hasField("writeErrors")) {
             throw OperationException(result);
         }