summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEliot Horowitz <eliot@10gen.com>2010-03-22 13:10:06 -0400
committerEliot Horowitz <eliot@10gen.com>2010-03-22 13:10:06 -0400
commitfd7616631bbbd8317449b5e093890b326d026492 (patch)
treefe4d4356a3aca1d3a22f4880df183513c83aedbe
parent1e6780f8444e2477ad6317a4edc62b43b6ad35cc (diff)
downloadmongo-fd7616631bbbd8317449b5e093890b326d026492.tar.gz
cleaning un-used option
-rw-r--r--db/jsobj.cpp12
-rw-r--r--db/jsobj.h2
2 files changed, 2 insertions, 12 deletions
diff --git a/db/jsobj.cpp b/db/jsobj.cpp
index fa3e93a231b..938492cacc5 100644
--- a/db/jsobj.cpp
+++ b/db/jsobj.cpp
@@ -844,13 +844,7 @@ namespace mongo {
return e;
}
- /* jul09 : 'deep' and this function will be going away in the future - kept only for backward compatibility of datafiles for now. */
- void trueDat( bool *deep ) {
- if( deep )
- *deep = true;
- }
-
- void BSONObj::getFieldsDotted(const char *name, BSONElementSet &ret, bool *deep ) const {
+ void BSONObj::getFieldsDotted(const char *name, BSONElementSet &ret ) const {
BSONElement e = getField( name );
if ( e.eoo() ) {
const char *p = strchr(name, '.');
@@ -858,7 +852,6 @@ namespace mongo {
string left(name, p-name);
BSONElement e = getField( left );
if ( e.type() == Array ) {
- trueDat( deep );
BSONObjIterator i( e.embeddedObject() );
while( i.moreWithEOO() ) {
BSONElement f = i.next();
@@ -873,7 +866,6 @@ namespace mongo {
}
} else {
if ( e.type() == Array ) {
- trueDat( deep );
BSONObjIterator i( e.embeddedObject() );
while( i.moreWithEOO() ) {
BSONElement f = i.next();
@@ -885,8 +877,6 @@ namespace mongo {
ret.insert( e );
}
}
- if ( ret.empty() && deep )
- *deep = false;
}
BSONElement BSONObj::getFieldDottedOrArray(const char *&name) const {
diff --git a/db/jsobj.h b/db/jsobj.h
index 033a637976f..aaf059b6ff7 100644
--- a/db/jsobj.h
+++ b/db/jsobj.h
@@ -780,7 +780,7 @@ namespace mongo {
BSONElement getFieldDotted(const char *name) const;
/** Like getFieldDotted(), but expands multikey arrays and returns all matching objects
*/
- void getFieldsDotted(const char *name, BSONElementSet &ret, bool *deep = 0) const;
+ void getFieldsDotted(const char *name, BSONElementSet &ret ) const;
/** Like getFieldDotted(), but returns first array encountered while traversing the
dotted fields of name. The name variable is updated to represent field
names with respect to the returned element. */