CXX-281 Merge upstream changes for SERVER-5668

SERVER-14482 Add add missing appendX methods to BSONArrayBuilder

Conflicts:
	src/mongo/bson/bsonobjbuilder.h
	src/mongo/bson/mutable/document.cpp
	src/mongo/dbtests/jsobjtests.cpp

Author: TylerBrock

src/mongo/bson/bsonobjbuilder.h

@@ -747,31 +747,6 @@ namespace mongo {
 
         void doneFast() { _b.doneFast(); }
 
-        BSONArrayBuilder& append(const StringData& name, int n) {
-            fill( name );
-            append( n );
-            return *this;
-        }
-
-        BSONArrayBuilder& append(const StringData& name, long long n) {
-            fill( name );
-            append( n );
-            return *this;
-        }
-
-        BSONArrayBuilder& append(const StringData& name, double n) {
-            fill( name );
-            append( n );
-            return *this;
-        }
-
-        template <typename T>
-        BSONArrayBuilder& append(const StringData& name, const T& x) {
-            fill( name );
-            append( x );
-            return *this;
-        }
-
         template < class T >
         BSONArrayBuilder& append( const std::list< T >& vals );
 
@@ -782,57 +757,48 @@ namespace mongo {
         BufBuilder &subobjStart() { return _b.subobjStart( num() ); }
         BufBuilder &subarrayStart() { return _b.subarrayStart( num() ); }
 
-        // These fill missing entries up to pos. if pos is < next pos is ignored
-        BufBuilder &subobjStart(int pos) {
-            fill(pos);
-            return _b.subobjStart( num() );
-        }
-        BufBuilder &subarrayStart(int pos) {
-            fill(pos);
-            return _b.subarrayStart( num() );
+        BSONArrayBuilder& appendTimestamp(unsigned int sec, unsigned int inc) {
+            _b.appendTimestamp(num(), sec, inc);
+            return *this;
         }
 
-        // These should only be used where you really need interface compatibility with BSONObjBuilder
-        // Currently they are only used by update.cpp and it should probably stay that way
-        BufBuilder &subobjStart( const StringData& name ) {
-            fill( name );
-            return _b.subobjStart( num() );
+        BSONArrayBuilder& appendRegex(const StringData& regex, const StringData& options = "") {
+            _b.appendRegex(num(), regex, options);
+            return *this;
         }
 
-        BufBuilder &subarrayStart( const StringData& name ) {
-            fill( name );
-            return _b.subarrayStart( num() );
+        BSONArrayBuilder& appendBinData(int len, BinDataType type, const void* data) {
+            _b.appendBinData(num(), len, type, data);
+            return *this;
         }
 
-        BSONArrayBuilder& appendArray( const StringData& name, const BSONObj& subObj ) {
-            fill( name );
-            _b.appendArray( num(), subObj );
+        BSONArrayBuilder& appendCode(const StringData& code) {
+            _b.appendCode(num(), code);
             return *this;
         }
 
-        BSONArrayBuilder& appendAs( const BSONElement &e, const StringData& name) {
-            fill( name );
-            append( e );
+        BSONArrayBuilder& appendCodeWScope(const StringData& code, const BSONObj& scope) {
+            _b.appendCodeWScope(num(), code, scope);
             return *this;
         }
 
-        BSONArrayBuilder& appendTimestamp(unsigned int sec, unsigned int inc) {
-            _b.appendTimestamp(num(), sec, inc);
+        BSONArrayBuilder& appendTimeT(time_t dt) {
+            _b.appendTimeT(num(), dt);
             return *this;
         }
 
-        BSONArrayBuilder& appendRegex(const StringData& regex, const StringData& options = "") {
-            _b.appendRegex(num(), regex, options);
+        BSONArrayBuilder& appendDate(Date_t dt) {
+            _b.appendDate(num(), dt);
             return *this;
         }
 
-        BSONArrayBuilder& appendTimestamp(unsigned long long ts) {
-            _b.appendTimestamp(num(), ts);
+        BSONArrayBuilder& appendBool(bool val) {
+            _b.appendBool(num(), val);
             return *this;
         }
 
-        BSONArrayBuilder& append(const StringData& s) {
-            _b.append(num(), s);
+        BSONArrayBuilder& appendTimestamp(unsigned long long ts) {
+            _b.appendTimestamp(num(), ts);
             return *this;
         }
 
@@ -846,29 +812,6 @@ namespace mongo {
         BufBuilder& bb() { return _b.bb(); }
 
     private:
-        // These two are undefined privates to prevent their accidental
-        // use as we don't support unsigned ints in BSON
-        BSONObjBuilder& append(const StringData& fieldName, unsigned int val);
-        BSONObjBuilder& append(const StringData& fieldName, unsigned long long val);
-
-        void fill( const StringData& name ) {
-            long int n;
-            Status status = parseNumberFromStringWithBase( name, 10, &n );
-            uassert( 13048,
-                     (std::string)"can't append to array using string field name: " + name.toString(),
-                     status.isOK() );
-            fill(n);
-        }
-
-        void fill (int upTo){
-            // if this is changed make sure to update error message and jstests/set7.js
-            const int maxElems = 1500000;
-            BOOST_STATIC_ASSERT(maxElems < (BSONObjMaxUserSize/10));
-            uassert(15891, "can't backfill array to larger than 1,500,000 elements", upTo <= maxElems);
-
-            while( _i < upTo )
-                appendNull();
-        }
 
         std::string num() { return _b.numStr(_i++); }
         int _i;

src/mongo/dbtests/jsobjtests.cpp

@@ -777,21 +777,6 @@ namespace JsobjTests {
             }
         }; DBTEST_SHIM_TEST(AppendAs);
 
-        class ArrayAppendAs {
-        public:
-            void run() {
-                BSONArrayBuilder b;
-                {
-                    BSONObj foo = BSON( "foo" << 1 );
-                    b.appendAs( foo.firstElement(), "3" );
-                }
-                BSONArray a = b.arr();
-                BSONObj expected = BSON( "3" << 1 );
-                ASSERT_EQUALS( expected.firstElement(), a[ 3 ] );
-                ASSERT_EQUALS( 4, a.nFields() );
-            }
-        }; DBTEST_SHIM_TEST(ArrayAppendAs);
-
         class GetField {
         public:
             void run(){
@@ -1719,6 +1704,23 @@ namespace JsobjTests {
             objb.appendRegex(objb.numStr(i++), "test", "imx");
             arrb.appendRegex("test", "imx");
 
+            objb.appendBinData(objb.numStr(i++), 4, BinDataGeneral, "wow");
+            arrb.appendBinData(4, BinDataGeneral, "wow");
+
+            objb.appendCode(objb.numStr(i++), "function(){ return 1; }");
+            arrb.appendCode("function(){ return 1; }");
+
+            objb.appendCodeWScope(objb.numStr(i++), "function(){ return a; }", BSON("a" << 1));
+            arrb.appendCodeWScope("function(){ return a; }", BSON("a" << 1));
+
+            time_t dt(0);
+            objb.appendTimeT(objb.numStr(i++), dt);
+            arrb.appendTimeT(dt);
+
+            Date_t date(0);
+            objb.appendDate(objb.numStr(i++), date);
+            arrb.appendDate(date);
+
             objb.append(objb.numStr(i++), BSONRegEx("test2", "s"));
             arrb.append(BSONRegEx("test2", "s"));