summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorDwight <dmerriman@gmail.com>2010-01-03 16:37:38 -0500
committerDwight <dmerriman@gmail.com>2010-01-03 16:37:38 -0500
commit7d265530618f209bae0bf2fd4da8f223b614e66b (patch)
treea641aa140b9868e69bf44ceec588b38b51f94679 /tools
parentbf939ef98543c077a70cc1a57994972c7e702853 (diff)
downloadmongo-7d265530618f209bae0bf2fd4da8f223b614e66b.tar.gz
a little code cleanup / renameing
Diffstat (limited to 'tools')
-rw-r--r--tools/dump.cpp6
-rw-r--r--tools/export.cpp2
2 files changed, 4 insertions, 4 deletions
diff --git a/tools/dump.cpp b/tools/dump.cpp
index 201cfc93ead..4cbd2e12f3f 100644
--- a/tools/dump.cpp
+++ b/tools/dump.cpp
@@ -41,9 +41,9 @@ public:
out.open( outputFile.string().c_str() , ios_base::out | ios_base::binary );
uassert( 10262 , "couldn't open file" , out.good() );
- ProgressMeter m( conn( true ).count( coll.c_str() , BSONObj() , Option_SlaveOk ) );
+ ProgressMeter m( conn( true ).count( coll.c_str() , BSONObj() , QueryOption_SlaveOk ) );
- auto_ptr<DBClientCursor> cursor = conn( true ).query( coll.c_str() , Query().snapshot() , 0 , 0 , 0 , Option_SlaveOk | Option_NoCursorTimeout );
+ auto_ptr<DBClientCursor> cursor = conn( true ).query( coll.c_str() , Query().snapshot() , 0 , 0 , 0 , QueryOption_SlaveOk | QueryOption_NoCursorTimeout );
while ( cursor->more() ) {
BSONObj obj = cursor->next();
@@ -63,7 +63,7 @@ public:
string sns = db + ".system.namespaces";
- auto_ptr<DBClientCursor> cursor = conn( true ).query( sns.c_str() , Query() , 0 , 0 , 0 , Option_SlaveOk | Option_NoCursorTimeout );
+ auto_ptr<DBClientCursor> cursor = conn( true ).query( sns.c_str() , Query() , 0 , 0 , 0 , QueryOption_SlaveOk | QueryOption_NoCursorTimeout );
while ( cursor->more() ) {
BSONObj obj = cursor->next();
if ( obj.toString().find( ".$" ) != string::npos )
diff --git a/tools/export.cpp b/tools/export.cpp
index 16b1cd8baa3..ad27f277d63 100644
--- a/tools/export.cpp
+++ b/tools/export.cpp
@@ -88,7 +88,7 @@ public:
}
- auto_ptr<DBClientCursor> cursor = conn().query( ns.c_str() , ((Query)(getParam( "query" , "" ))).snapshot() , 0 , 0 , fieldsToReturn , Option_SlaveOk | Option_NoCursorTimeout );
+ auto_ptr<DBClientCursor> cursor = conn().query( ns.c_str() , ((Query)(getParam( "query" , "" ))).snapshot() , 0 , 0 , fieldsToReturn , QueryOption_SlaveOk | QueryOption_NoCursorTimeout );
if ( csv ){
for ( vector<string>::iterator i=_fields.begin(); i != _fields.end(); i++ ){