xuemingqiang/mongo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SERVER-2031: setSlaveOk at each level in shell

Browse Source
This commit is contained in:
agirbal
2011-09-20 22:58:58 -07:00
parent 55351e6fc8
commit b9d4ce580e
8 changed files with 77 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
scripting/v8_db.cpp
View File

@@ -314,9 +314,6 @@ namespace mongo {
fields = scope->v8ToMongo( args[2]->ToObject() );
Local<v8::Object> mongo = args.This();
Local<v8::Value> slaveOkVal = mongo->Get( scope->getV8Str( "slaveOk" ) );
jsassert( slaveOkVal->IsBoolean(), "slaveOk member invalid" );
bool slaveOk = slaveOkVal->BooleanValue();
try {
auto_ptr<mongo::DBClientCursor> cursor;
@@ -326,7 +323,7 @@ namespace mongo {
int options = (int)(args[6]->ToNumber()->Value());
{
V8Unlock u;
cursor = conn->query( ns, q , nToReturn , nToSkip , haveFields ? &fields : 0, options | ( slaveOk ? QueryOption_SlaveOk : 0 ) , batchSize );
cursor = conn->query( ns, q , nToReturn , nToSkip , haveFields ? &fields : 0, options , batchSize );
if ( ! cursor.get() )
return v8::ThrowException( v8::String::New( "error doing query: failed" ) );
}