CXX-175 restore some things, add MONGO_CLIENT_API

Author: TylerBrock

src/mongo/client/bulk_operation_builder.cpp

@@ -37,23 +37,29 @@ namespace mongo {
         , _ordered(ordered)
         {}
 
+    BulkOperationBuilder::~BulkOperationBuilder() {
+        std::vector<WriteOperation*>::iterator it;
+        for (it = _write_operations.begin(); it != _write_operations.end(); ++it)
+            delete *it;
+    }
+
     BulkWriteOperation BulkOperationBuilder::find(const BSONObj& selector) {
         return BulkWriteOperation(this, selector);
     }
 
     void BulkOperationBuilder::insert(const BSONObj& doc) {
         InsertWriteOperation* insert_op = new InsertWriteOperation(doc);
-        _write_operations.enqueue(insert_op);
+        enqueue(insert_op);
     }
 
     void BulkOperationBuilder::execute(const WriteConcern* wc, std::vector<BSONObj>* results) {
         if (!_ordered)
-            std::sort(_write_operations.ops.begin(), _write_operations.ops.end(), compare);
-        _client->_write(_ns, _write_operations.ops, _ordered, wc, results);
+            std::sort(_write_operations.begin(), _write_operations.end(), compare);
+        _client->_write(_ns, _write_operations, _ordered, wc, results);
     }
 
-    void BulkOperationBuilder::enqueue(WriteOperation* const operation) {
-        _write_operations.enqueue(operation);
+    void BulkOperationBuilder::enqueue(WriteOperation* operation) {
+        _write_operations.push_back(operation);
     }
 
 } // namespace mongo

src/mongo/client/bulk_operation_builder.h

@@ -19,12 +19,12 @@
 
 #include "mongo/bson/bsonobj.h"
 #include "mongo/client/bulk_write_operation.h"
-#include "mongo/client/write_operation.h"
 
 namespace mongo {
 
     class DBClientBase;
     class WriteConcern;
+    class WriteOperation;
 
     /**
      * Class for constructing and executing bulk operations against MongoDB via a
@@ -50,7 +50,7 @@ namespace mongo {
      * into batches instead of sending them individually to the server. This means
      * that unordered writes are non-deterministic. This is by design.
      */
-    class BulkOperationBuilder {
+    class MONGO_CLIENT_API BulkOperationBuilder {
 
         /* Enable operations of this type to append themselves to _write_operations */
         friend class BulkWriteOperation;
@@ -71,6 +71,9 @@ namespace mongo {
          */
         BulkOperationBuilder(DBClientBase* const client, const std::string& ns, bool ordered);
 
+        /* Deletes all of the WriteOperations that were created during the Builder's lifetime */
+        ~BulkOperationBuilder();
+
         /**
          * Supplies a filter to select a subset of documents on which to apply an operation.
          * The operation that is ultimately enqueued as part of this bulk operation depends on
@@ -100,7 +103,7 @@ namespace mongo {
         DBClientBase* const _client;
         const std::string _ns;
         const bool _ordered;
-        ScopedWriteOperations _write_operations;
+        std::vector<WriteOperation*> _write_operations;
 
         void enqueue(WriteOperation* const operation);
     };

src/mongo/client/bulk_upsert_operation.h

@@ -28,7 +28,7 @@ namespace mongo {
      * Not to be instantiated directly. Comes into being via the upsert() method on
      * BulkWriteOperation.
      */
-    class BulkUpsertOperation {
+    class MONGO_CLIENT_API BulkUpsertOperation {
 
         friend class BulkWriteOperation;
 

src/mongo/client/bulk_write_operation.h

@@ -28,7 +28,7 @@ namespace mongo {
      * Not to be instantiated directly. Comes into being via the find() method on
      * BulkOperationBuilder.
      */
-    class BulkWriteOperation {
+    class MONGO_CLIENT_API BulkWriteOperation {
 
         friend class BulkOperationBuilder;
 

src/mongo/client/dbclient.cpp

@@ -1220,6 +1220,19 @@ namespace mongo {
 
     }
 
+    namespace {
+        struct ScopedWriteOperations {
+            ScopedWriteOperations() { }
+            ~ScopedWriteOperations() {
+                vector<WriteOperation*>::const_iterator it;
+                for ( it = ops.begin(); it != ops.end(); ++it )
+                    delete *it;
+            }
+            void enqueue(WriteOperation* op) { ops.push_back(op); }
+            std::vector<WriteOperation*> ops;
+        };
+    }
+
     void DBClientBase::insert( const string & ns , BSONObj obj , int flags, const WriteConcern* wc ) {
         vector<BSONObj> toInsert;
         toInsert.push_back( obj );

src/mongo/client/write_operation.h

@@ -97,21 +97,4 @@ namespace mongo {
         virtual void appendSelfToCommand(BSONArrayBuilder* batch) const = 0;
     };
 
-    /**
-     * Helper struct to hold and clean up enqueued write operations.
-     */
-    struct ScopedWriteOperations {
-        ScopedWriteOperations() { }
-
-        ~ScopedWriteOperations() {
-            std::vector<WriteOperation*>::const_iterator it;
-            for (it = ops.begin(); it != ops.end(); ++it)
-                delete *it;
-        }
-
-        void enqueue(WriteOperation* op) { ops.push_back(op); }
-
-        std::vector<WriteOperation*> ops;
-    };
-
 } // namespace mongo