CXX-381 Backport server r2.6.5..r2.6.6 changes to 26compat branch

Author: acmorrow

src/mongo/base/owned_pointer_vector.h

@@ -15,6 +15,7 @@
 
 #pragma once
 
+#include <cstring>
 #include <vector>
 
 #include "mongo/base/disallow_copying.h"
@@ -31,8 +32,24 @@ namespace mongo {
         MONGO_DISALLOW_COPYING(OwnedPointerVector);
 
     public:
-        OwnedPointerVector();
-        ~OwnedPointerVector();
+        OwnedPointerVector() {}
+        ~OwnedPointerVector() { clear(); }
+
+        /**
+         * Takes ownership of all pointers contained in 'other'.
+         * NOTE: argument is intentionally taken by value.
+         */
+        OwnedPointerVector(std::vector<T*> other) { _vector.swap(other); }
+
+        /**
+         * Takes ownership of all pointers contained in 'other'.
+         * NOTE: argument is intentionally taken by value.
+         */
+        OwnedPointerVector& operator=(std::vector<T*> other) {
+            clear();
+            _vector.swap(other);
+            return *this;
+        }
 
         typedef typename std::vector<T*>::const_iterator const_iterator;
         typedef typename std::vector<T*>::const_reverse_iterator const_reverse_iterator;
@@ -49,23 +66,69 @@ namespace mongo {
         const_iterator end() const { return _vector.end(); }
         const_reverse_iterator rend() const { return _vector.rend(); }
 
+        T* operator[] (size_t i) const { return _vector[i]; }
+        T* back() const { return _vector.back(); }
+        T* front() const { return _vector.front(); }
+
+        void push_back(T* ptr) { _vector.push_back(ptr); }
+
+        /**
+         * Deletes all pointers in the vector, then sets its size to 0.
+         */
         void clear();
 
+        /**
+         * Deletes the pointer at 'it', then erases it from the vector.
+         */
+        void erase(const_iterator it) {
+            delete *it;
+            // vector::erase(const_iterator) is new in c++11, so converting to non-const iterator.
+            _vector.erase(_vector.begin() + (it - begin()));
+        }
+
+        //
+        // extensions
+        //
+
+        /**
+         * Releases the entire vector to allow you to transfer ownership.
+         *
+         * Leaves the OwnedPointerVector empty.
+         * Named after the similar method and pattern in std::auto_ptr.
+         */
+        std::vector<T*> release() {
+            std::vector<T*> out;
+            out.swap(_vector);
+            return out;
+        }
+
+        /**
+         * Releases ownership of a single element.
+         *
+         * Sets that element to NULL and does not change size().
+         */
+        T* releaseAt(size_t i) {
+            T* out = _vector[i];
+            _vector[i] = NULL;
+            return out;
+        }
+
+        T* popAndReleaseBack() {
+            T* out = _vector.back();
+            _vector.pop_back();
+            return out;
+        }
+
+        void popAndDeleteBack() {
+            delete popAndReleaseBack();
+        }
+
     private:
         std::vector<T*> _vector;
     };
 
     template<class T>
-    OwnedPointerVector<T>::OwnedPointerVector() {
-    }
-
-    template<class T>
-    OwnedPointerVector<T>::~OwnedPointerVector() {
-        clear();
-    }
-
-    template<class T>
-    void OwnedPointerVector<T>::clear() {
+    inline void OwnedPointerVector<T>::clear() {
         for( typename std::vector<T*>::iterator i = _vector.begin(); i != _vector.end(); ++i ) {
             delete *i;
         }

src/mongo/client/connpool.cpp

@@ -102,30 +102,10 @@ namespace mongo {
     }
 
     void PoolForHost::flush() {
-        vector<StoredConnection> all;
-        while ( ! _pool.empty() ) {
+        while (!_pool.empty()) {
             StoredConnection c = _pool.top();
             _pool.pop();
-            bool res;
-            bool alive = false;
-            try {
-                c.conn->isMaster( res );
-                alive = true;
-            } catch ( const DBException e ) {
-                // There's something wrong with this connection, swallow the exception and do not
-                // put the connection back in the pool.
-                LOG(1) << "Exception thrown when checking pooled connection to " <<
-                    c.conn->getServerAddress() << ": " << causedBy(e) << endl;
-                delete c.conn;
-                c.conn = NULL;
-            }
-            if ( alive ) {
-                all.push_back( c );
-            }
-        }
-
-        for ( vector<StoredConnection>::iterator i=all.begin(); i != all.end(); ++i ) {
-            _pool.push( *i );
+            delete c.conn;
         }
     }
 

src/mongo/client/dbclient.cpp

@@ -835,7 +835,10 @@ namespace mongo {
 
     list<string> DBClientWithCommands::getDatabaseNames() {
         BSONObj info;
-        uassert( 10005 ,  "listdatabases failed" , runCommand( "admin" , BSON( "listDatabases" << 1 ) , info ) );
+        uassert(10005, "listdatabases failed", runCommand("admin",
+                                                          BSON("listDatabases" << 1),
+                                                          info,
+                                                          QueryOption_SlaveOk));
         uassert( 10006 ,  "listDatabases.databases not array" , info["databases"].type() == Array );
 
         list<string> names;

src/mongo/client/dbclientinterface.h

@@ -85,8 +85,13 @@ namespace mongo {
          */
         QueryOption_PartialResults = 1 << 7 ,
 
-        QueryOption_AllSupported = QueryOption_CursorTailable | QueryOption_SlaveOk | QueryOption_OplogReplay | QueryOption_NoCursorTimeout | QueryOption_AwaitData | QueryOption_Exhaust | QueryOption_PartialResults
-
+        QueryOption_AllSupported = QueryOption_CursorTailable |
+            QueryOption_SlaveOk |
+            QueryOption_OplogReplay |
+            QueryOption_NoCursorTimeout |
+            QueryOption_AwaitData |
+            QueryOption_Exhaust |
+            QueryOption_PartialResults,
     };
 
     enum MONGO_CLIENT_API UpdateOptions {

src/mongo/util/mongoutils/str.h

@@ -17,20 +17,16 @@
 
 #pragma once
 
-/* Things in the mongoutils namespace
-   (1) are not database specific, rather, true utilities
-   (2) are cross platform
-   (3) may require boost headers, but not libs
-   (4) are clean and easy to use in any c++ project without pulling in lots of other stuff
-
-   Note: within this module, we use int for all offsets -- there are no unsigned offsets
-   and no size_t's.  If you need 3 gigabyte long strings, don't use this module.
-*/
+/**
+ * String utilities.
+ *
+ * TODO: De-inline.
+ * TODO: Retire the mongoutils namespace, and move str under the mongo namespace.
+ */
 
 #include <string>
 #include <sstream>
 
-// this violates the README rules for mongoutils:
 #include "mongo/bson/util/builder.h"
 
 namespace mongoutils {
@@ -214,6 +210,10 @@ namespace mongoutils {
             }
         }
 
-    }
+    }  // namespace str
+
+}  // namespace mongoutils
 
-}
+namespace mongo {
+    using namespace mongoutils;
+}  // namespace mongo

src/mongo/util/net/ssl_manager.cpp

@@ -532,8 +532,9 @@ namespace mongo {
                 context);
 
         // SSL_OP_ALL - Activate all bug workaround options, to support buggy client SSL's.
-        // SSL_OP_NO_SSLv2 - Disable SSL v2 support 
-        SSL_CTX_set_options(*context, SSL_OP_ALL|SSL_OP_NO_SSLv2);
+        // SSL_OP_NO_SSLv2 - Disable SSL v2 support
+        // SSL_OP_NO_SSLv3 - Disable SSL v3 support
+        SSL_CTX_set_options(*context, SSL_OP_ALL|SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3);
 
         // HIGH - Enable strong ciphers
         // !EXPORT - Disable export ciphers (40/56 bit) 

src/mongo/util/version.cpp

@@ -31,7 +31,7 @@ namespace mongo {
      *      1.2.3-rc4-pre-
      * If you really need to do something else you'll need to fix _versionArray()
      */
-    const char versionString[] = "2.6.5";
+    const char versionString[] = "2.6.6";
 
     // See unit test for example outputs
     BSONArray toVersionArray(const char* version){