mirrors/mongodb
mirrors/mongodb
0
0
Fork 0
mirror of https://github.com/mongodb/mongo.git synced 2024-11-30 00:56:44 +01:00
Code Issues Releases Activity

mod checkpoint

Browse Source
This commit is contained in:
Aaron 2009-03-24 14:33:36 -04:00
parent a6c9d60843
commit 55a170aaa5
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db/query.cpp
View File

@ -1035,6 +1035,7 @@ namespace mongo {
int queryOptions = q.queryOptions;
Timer t;
cout << "query obj: " << jsobj << endl;
log(2) << "runQuery: " << ns << jsobj << endl;
@ -1100,6 +1101,7 @@ namespace mongo {
{
BSONElement e = jsobj.findElement("orderby");
if ( !e.eoo() ) {
cout << "e type: " << e.type() << endl;
order = e.embeddedObjectUserCheck();
if ( e.type() == Array )
order = transformOrderFromArrayFormat(order);

26
dbtests/updatetests.cpp
View File

@ -153,7 +153,7 @@ namespace UpdateTests {
public:
void run() {
client().insert( ns(), BSON( "a" << "b" ) );
client().update( ns(), BSONObj(), BSON( "$set" << BSON( "a" << 5 ) ) );
client().update( ns(), Query(), BSON( "$set" << BSON( "a" << 5 ) ) );
ASSERT( !client().findOne( ns(), BSON( "a" << 5 ) ).isEmpty() );
}
};
@ -162,7 +162,7 @@ namespace UpdateTests {
public:
void run() {
client().insert( ns(), BSON( "a" << "bcd" ) );
client().update( ns(), BSONObj(), BSON( "$set" << BSON( "a" << 5.0 ) ) );
client().update( ns(), Query(), BSON( "$set" << BSON( "a" << 5.0 ) ) );
ASSERT( !client().findOne( ns(), BSON( "a" << 5.0 ) ).isEmpty() );
}
};
@ -171,9 +171,9 @@ namespace UpdateTests {
public:
void run() {
client().insert( ns(), fromjson( "{a:{b:4}}" ) );
client().update( ns(), BSONObj(), BSON( "$inc" << BSON( "a.b" << 10 ) ) );
client().update( ns(), Query(), BSON( "$inc" << BSON( "a.b" << 10 ) ) );
ASSERT( !client().findOne( ns(), BSON( "a.b" << 14 ) ).isEmpty() );
client().update( ns(), BSONObj(), BSON( "$set" << BSON( "a.b" << 55 ) ) );
client().update( ns(), Query(), BSON( "$set" << BSON( "a.b" << 55 ) ) );
ASSERT( !client().findOne( ns(), BSON( "a.b" << 55 ) ).isEmpty() );
}
};
@ -182,7 +182,7 @@ namespace UpdateTests {
public:
void run() {
client().insert( ns(), fromjson( "{a:{b:'cdef'}}" ) );
client().update( ns(), BSONObj(), BSON( "$set" << BSON( "a.b" << "llll" ) ) );
client().update( ns(), Query(), BSON( "$set" << BSON( "a.b" << "llll" ) ) );
ASSERT( !client().findOne( ns(), BSON( "a.b" << "llll" ) ).isEmpty() );
}
};
@ -191,7 +191,7 @@ namespace UpdateTests {
public:
void run() {
client().insert( ns(), fromjson( "{'_id':0,a:{b:'cdef'}}" ) );
client().update( ns(), BSONObj(), BSON( "$set" << BSON( "a.b" << "lllll" ) ) );
client().update( ns(), Query(), BSON( "$set" << BSON( "a.b" << "lllll" ) ) );
ASSERT( client().findOne( ns(), BSON( "a.b" << "lllll" ) ).woCompare( fromjson( "{'_id':0,a:{b:'lllll'}}" ) ) == 0 );
}
};
@ -209,7 +209,7 @@ namespace UpdateTests {
public:
void run() {
client().insert( ns(), fromjson( "{'_id':0,a:{c:4}}" ) );
client().update( ns(), BSONObj(), BSON( "$set" << BSON( "a.b" << "lllll" ) ) );
client().update( ns(), Query(), BSON( "$set" << BSON( "a.b" << "lllll" ) ) );
ASSERT( client().findOne( ns(), BSON( "a.b" << "lllll" ) ).woCompare( fromjson( "{'_id':0,a:{b:'lllll',c:4}}" ) ) == 0 );
}
};
@ -218,7 +218,7 @@ namespace UpdateTests {
public:
void run() {
client().insert( ns(), fromjson( "{'_id':0}" ) );
client().update( ns(), BSONObj(), BSON( "$inc" << BSON( "f" << 3.0 ) ) );
client().update( ns(), Query(), BSON( "$inc" << BSON( "f" << 3.0 ) ) );
ASSERT( client().findOne( ns(), Query() ).woCompare( fromjson( "{'_id':0,f:3}" ) ) == 0 );
}
};
@ -227,7 +227,7 @@ namespace UpdateTests {
public:
void run() {
client().insert( ns(), fromjson( "{'_id':0}" ) );
client().update( ns(), BSONObj(), BSON( "$set" << BSON( "f.g.h" << 3.0 << "f.g.a" << 2.0 ) ) );
client().update( ns(), Query(), BSON( "$set" << BSON( "f.g.h" << 3.0 << "f.g.a" << 2.0 ) ) );
ASSERT( client().findOne( ns(), Query() ).woCompare( fromjson( "{'_id':0,f:{g:{a:2,h:3}}}" ) ) == 0 );
}
};
@ -245,8 +245,7 @@ namespace UpdateTests {
public:
void run() {
client().insert( ns(), fromjson( "{'_id':0,z:[4,'b']}" ) );
client().update( ns(), BSONObj(), BSON( "$set" << BSON( "z.0" << "a" ) ) );
out() << "one: " << client().findOne( ns(), Query() ) << endl;
client().update( ns(), Query(), BSON( "$set" << BSON( "z.0" << "a" ) ) );
ASSERT( client().findOne( ns(), Query() ).woCompare( fromjson( "{'_id':0,z:[4,'b']}" ) ) == 0 );
}
};
@ -255,9 +254,10 @@ namespace UpdateTests {
public:
void run() {
client().insert( ns(), fromjson( "{'_id':0,a:1}" ) );
client().update( ns(), BSONObj(), BSON( "$set" << BSON( "a.b" << 1 ) ) );
client().update( ns(), Query(), BSON( "$set" << BSON( "a.b" << 1 ) ) );
out() << "one: " << client().findOne( ns(), Query() ) << endl;
ASSERT( client().findOne( ns(), Query() ).woCompare( fromjson( "{'_id':0,a:1}" ) ) == 0 );
// ASSERT( client().findOne( ns(), Query() ).woCompare( fromjson( "{'_id':0,a:1}" ) ) == 0 );
cout << "BSONElement(): " << BSONElement() << endl;
}
};