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

Merge branch 'master' of git@github.com:mongodb/mongo

Browse Source
This commit is contained in:
Eliot Horowitz 2009-06-22 09:31:48 -04:00
commit 51d0bcd38b
11 changed files with 314 additions and 240 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
db/btree.h
View File

@ -163,6 +163,12 @@ namespace mongo {
public:
void dump();
/* @return true if key exists in index
order - indicates order of keys in the index. this is basically the index's key pattern, e.g.:
BSONObj order = ((IndexDetails&)idx).keyPattern();
likewise below in bt_insert() etc.
*/
bool exists(const IndexDetails& idx, DiskLoc thisLoc, const BSONObj& key, BSONObj order);
static DiskLoc addHead(IndexDetails&); /* start a new index off, empty */
@ -298,4 +304,8 @@ namespace mongo {
#pragma pack()
inline bool IndexDetails::hasKey(const BSONObj& key) {
return head.btree()->exists(*this, head, key, keyPattern());
}
} // namespace mongo;

6
db/instance.cpp
View File

@ -152,7 +152,7 @@ namespace mongo {
database = 0;
int ms;
bool log = false;
bool log = logLevel >= 1;
currentOp.op = curOp = m.data->operation();
#if 0
@ -523,7 +523,7 @@ namespace mongo {
{
Timer t;
bool log = false;
bool log = logLevel >= 1;
curOp = m.data->operation();
if ( m.data->operation() == dbQuery ) {
@ -575,7 +575,7 @@ namespace mongo {
log = log || ctr++ % 128 == 0;
if ( log || ms > 100 ) {
ss << ' ' << t.millis() << "ms";
mongo::out() << ss.str().c_str() << endl;
mongo::out() << ss.str().c_str() << endl;
}
if ( database && database->profile >= 1 ) {
if ( database->profile >= 2 || ms >= 100 ) {

3
db/namespace.h
View File

@ -162,6 +162,9 @@ namespace mongo {
return info.obj().getObjectField("key");
}
/* true if the specified key is in the index */
bool hasKey(const BSONObj& key);
// returns name of this index's storage area
// database.table.$index
string indexNamespace() const {

129
db/pdfile.cpp
View File

@ -846,11 +846,18 @@ assert( !eloc.isNull() );
}
}
struct IndexChanges {
struct IndexChanges/*on an update*/ {
BSONObjSetDefaultOrder oldkeys;
BSONObjSetDefaultOrder newkeys;
vector<BSONObj*> removed; // these keys were removed as part of the change
vector<BSONObj*> added; // these keys were added as part of the change
void dupCheck(IndexDetails& idx) {
if( added.empty() || !idx.unique() )
return;
for( vector<BSONObj*>::iterator i = added.begin(); i != added.end(); i++ )
uassert("E11001 duplicate key on update", !idx.hasKey(**i));
}
};
inline void getIndexChanges(vector<IndexChanges>& v, NamespaceDetails& d, BSONObj newObj, BSONObj oldObj) {
@ -866,61 +873,59 @@ assert( !eloc.isNull() );
}
}
inline void dupCheck(vector<IndexChanges>& v, NamespaceDetails& d) {
for ( int i = 0; i < d.nIndexes; i++ ) {
IndexDetails& idx = d.indexes[i];
v[i].dupCheck(idx);
}
}
/** Note: if the object shrinks a lot, we don't free up space, we leave extra at end of the record.
*/
void DataFileMgr::update(
const char *ns,
Record *toupdate, const DiskLoc& dl,
const char *buf, int len, stringstream& ss)
const char *_buf, int _len, stringstream& ss)
{
dassert( toupdate == dl.rec() );
NamespaceDetails *d = nsdetails(ns);
BSONObj objOld(toupdate);
BSONObj objNew(buf);
BSONElement idOld;
int addID = 0;
{
/* xxx duplicate _id check... */
BSONObj objNew(_buf);
assert( objNew.objsize() == _len );
assert( objNew.objdata() == _buf );
BSONElement idNew;
objOld.getObjectID(idOld);
if( objNew.getObjectID(idNew) ) {
if( idOld == idNew )
;
else {
/* check if idNew would be a duplicate. very unusual that an _id would change,
so not worried about the bit of extra work here.
*/
if( d->findIdIndex() >= 0 ) {
BSONObj result;
BSONObjBuilder b;
b.append(idNew);
uassert("duplicate _id key on update",
!Helpers::findOne(ns, b.done(), result));
}
}
} else {
if ( !idOld.eoo() ) {
/* if the old copy had the _id, force it back into the updated version. insert() adds
one so old should have it unless this is a special table like system.* or
local.oplog.*
*/
addID = len;
len += idOld.size();
}
}
if( !objNew.hasElement("_id") && objOld.hasElement("_id") ) {
/* add back the old _id value if the update removes it. Note this implementation is slow
(copies entire object multiple times), but this shouldn't happen often, so going for simple
code, not speed.
*/
BSONObjBuilder b;
BSONElement e;
assert( objOld.getObjectID(e) );
b.append(e); // put _id first, for best performance
b.appendElements(objNew);
objNew = b.obj();
}
if ( toupdate->netLength() < len ) {
/* duplicate key check. we descend the btree twice - once for this check, and once for the actual inserts, further
below. that is suboptimal, but it's pretty complicated to do it the other way without rollbacks...
*/
vector<IndexChanges> changes;
getIndexChanges(changes, *d, objNew, objOld);
dupCheck(changes, *d);
if ( toupdate->netLength() < objNew.objsize() ) {
// doesn't fit. reallocate -----------------------------------------------------
uassert("E10003 failing update: objects in a capped ns cannot grow", !(d && d->capped));
d->paddingTooSmall();
if ( database->profile )
ss << " moved ";
// xxx TODO fix dup key error - old copy should not be deleted
deleteRecord(ns, toupdate, dl);
insert(ns, buf, len, false, idOld);
insert(ns, objNew.objdata(), objNew.objsize(), false);
return;
}
@ -929,12 +934,8 @@ assert( !eloc.isNull() );
/* have any index keys changed? */
if( d->nIndexes ) {
vector<IndexChanges> changes;
getIndexChanges(changes, *d, objNew, objOld);
for ( int x = 0; x < d->nIndexes; x++ ) {
IndexDetails& idx = d->indexes[x];
if ( addID && idx.isIdIndex() )
continue;
for ( unsigned i = 0; i < changes[x].removed.size(); i++ ) {
try {
idx.head.btree()->unindex(idx.head, idx, *changes[x].removed[i], dl);
@ -965,55 +966,13 @@ assert( !eloc.isNull() );
}
}
/*
BSONObj idxKey = idx.info.obj().getObjectField("key");
BSONObjSetDefaultOrder oldkeys;
BSONObjSetDefaultOrder newkeys;
idx.getKeysFromObject(oldObj, oldkeys);
idx.getKeysFromObject(newObj, newkeys);
vector<BSONObj*> removed;
setDifference(oldkeys, newkeys, removed);
string idxns = idx.indexNamespace();
for ( unsigned i = 0; i < removed.size(); i++ ) {
try {
idx.head.btree()->unindex(idx.head, idx, *removed[i], dl);
}
catch (AssertionException&) {
ss << " exception update unindex ";
problem() << " caught assertion update unindex " << idxns.c_str() << endl;
}
}
vector<BSONObj*> added;
setDifference(newkeys, oldkeys, added);
assert( !dl.isNull() );
for ( unsigned i = 0; i < added.size(); i++ ) {
try {
** TODO xxx dup keys handle **
idx.head.btree()->bt_insert(
idx.head,
dl, *added[i], idxKey, **dupsAllowed**true, idx);
}
catch (AssertionException&) {
ss << " exception update index ";
out() << " caught assertion update index " << idxns.c_str() << '\n';
problem() << " caught assertion update index " << idxns.c_str() << endl;
}
}
if ( database->profile )
ss << '\n' << added.size() << " key updates ";
}
}
}
*/
// update in place
if ( addID ) {
/*if ( addID ) {
((int&)*toupdate->data) = *((int*) buf) + idOld.size();
memcpy(toupdate->data+4, idOld.rawdata(), idOld.size());
memcpy(toupdate->data+4+idOld.size(), ((char *)buf)+4, addID-4);
} else {
memcpy(toupdate->data, buf, len);
}
} else {*/
memcpy(toupdate->data, objNew.objdata(), objNew.objsize());
}
int followupExtentSize(int len, int lastExtentLen) {

35
db/scanandorder.h
View File

@ -50,19 +50,36 @@ namespace mongo {
_ response size limit from runquery; push it up a bit.
*/
inline bool fillQueryResultFromObj(BufBuilder& b, set<string> *filter, BSONObj& js) {
inline bool fillQueryResultFromObj(BufBuilder& bb, set<string> *filter, BSONObj& js) {
if ( filter ) {
BSONObj x;
bool ok = x.addFields(js, *filter) > 0;
if ( ok )
b.append((void*) x.objdata(), x.objsize());
return ok;
BSONObjBuilder b( bb );
BSONObjIterator i( js );
int N = filter->size();
int n=0;
bool gotId = false;
while ( i.more() ){
BSONElement e = i.next();
const char * fname = e.fieldName();
if ( strcmp( fname , "_id" ) == 0 ){
b.append( e );
gotId = true;
}
else if ( filter->count( fname ) ){
b.append( e );
n++;
if ( n == N && gotId )
break;
}
}
b.done();
return n;
}
b.append((void*) js.objdata(), js.objsize());
bb.append((void*) js.objdata(), js.objsize());
return true;
}
typedef multimap<BSONObj,BSONObj,BSONObjCmp> BestMap;
class ScanAndOrder {
BestMap best; // key -> full object

26
jstests/find4.js Normal file
View File

@ -0,0 +1,26 @@
t = db.find4;
t.drop();
t.save( { a : 1123 , b : 54332 } );
o = t.find( {} , {} )[0];
assert.eq( 1123 , o.a , "A" );
assert.eq( 54332 , o.b , "B" );
assert( o._id.str , "C" );
o = t.find( {} , { a : 1 } )[0];
assert.eq( 1123 , o.a , "D" );
assert( o._id.str , "E" );
assert( ! o.b , "F" );
o = t.find( {} , { b : 1 } )[0];
assert.eq( 54332 , o.b , "G" );
assert( o._id.str , "H" );
assert( ! o.a , "I" );
t.drop();
t.save( { a : 1 , b : 1 } );
t.save( { a : 2 , b : 2 } );
assert.eq( "1-1,2-2" , t.find().map( function(z){ return z.a + "-" + z.b } ).toString() );
assert.eq( "1-undefined,2-undefined" , t.find( {} , { a : 1 }).map( function(z){ return z.a + "-" + z.b } ).toString() );

7
jstests/indexa.js
View File

@ -1,3 +1,5 @@
// unique index constraint test for updates
// case where object doesn't grow tested here
t = db.indexa;
t.drop();
@ -8,12 +10,13 @@ t.insert( { 'x':'A' } );
t.insert( { 'x':'B' } );
t.insert( { 'x':'A' } );
assert.eq( 2 , t.count() , "A" );
assert.eq( 2 , t.count() , "indexa 1" );
t.update( {x:'B'}, { x:'A' } );
a = t.find().toArray();
u = a.map( function(z){ return z.x } ).unique();
assert.eq( 2 , t.count() , "indexa 2" );
//assert( a.length == u.length , "unique index update is broken" );
assert( a.length == u.length , "unique index update is broken" );

30
jstests/indexb.js Normal file
View File

@ -0,0 +1,30 @@
// unique index test for a case where the object grows
// and must move
// see indexa.js for the test case for an update with dup id check
// when it doesn't move
t = db.indexb;t = db.indexb;
db.dropDatabase();
t.drop();
t.ensureIndex({a:1},true);
t.insert({a:1});
x = { a : 2 };
t.save(x);
{
assert( t.count() == 2, "count wrong B");
x.a = 1;
x.filler = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
t.save(x); // should fail, not unique.
assert( t.count() == 2,"count wrong" );
assert( t.find({a:1}).count() == 1,"bfail1" );
assert( t.find({a:2}).count() == 1,"bfail2" );
}

17
jstests/uniqueness.js
View File

@ -21,10 +21,25 @@ t.update( { _id : 4 } , { _id : 3, x : 99 } );
assert( db.getLastError() , 4);
assert( t.findOne( {_id:4} ), 5 );
/* Check for an error message when we index and there are dups */
// Check for an error message when we index and there are dups
db.bar.drop();
db.bar.insert({a:3});
db.bar.insert({a:3});
assert( db.bar.count() == 2 , 6) ;
db.bar.ensureIndex({a:1}, true);
assert( db.getLastError() , 7);
/* Check that if we update and remove _id, it gets added back by the DB */
/* - test when object grows */
t.drop();
t.save( { _id : 'Z' } );
t.update( {}, { k : 2 } );
assert( t.findOne()._id == 'Z', "uniqueness.js problem with adding back _id" );
/* - test when doesn't grow */
t.drop();
t.save( { _id : 'Z', k : 3 } );
t.update( {}, { k : 2 } );
assert( t.findOne()._id == 'Z', "uniqueness.js problem with adding back _id (2)" );

284
scripting/engine_spidermonkey.cpp
View File

@ -12,17 +12,17 @@ namespace mongo {
#define GETHOLDER(x,o) ((BSONHolder*)JS_GetPrivate( x , o ))
class BSONFieldIterator;
class BSONHolder {
public:
BSONHolder( BSONObj obj ){
_obj = obj.getOwned();
_inResolve = false;
_modified = false;
_magic = 17;
}
void check(){
uassert( "holder magic value is wrong" , _magic == 17 );
}
@ -38,7 +38,7 @@ namespace mongo {
class BSONFieldIterator {
public:
BSONFieldIterator( BSONHolder * holder ){
BSONObjIterator it( holder->_obj );
@ -46,12 +46,12 @@ namespace mongo {
BSONElement e = it.next();
_names.push_back( e.fieldName() );
}
_names.merge( holder->_extra );
_it = _names.begin();
}
bool more(){
return _it != _names.end();
}
@ -61,7 +61,7 @@ namespace mongo {
_it++;
return s;
}
private:
list<string> _names;
list<string>::iterator _it;
@ -77,16 +77,16 @@ namespace mongo {
Convertor( JSContext * cx ){
_context = cx;
}
string toString( JSString * so ){
jschar * s = JS_GetStringChars( so );
size_t srclen = JS_GetStringLength( so );
if( srclen == 0 )
return "";
size_t len = srclen * 6; // we only need *3, but see note on len below
char * dst = (char*)malloc( len );
len /= 2;
// doc re weird JS_EncodeCharacters api claims len expected in 16bit
// units, but experiments suggest 8bit units expected. We allocate
@ -103,7 +103,7 @@ namespace mongo {
}
string toString( jsval v ){
return toString( JS_ValueToString( _context , v ) );
return toString( JS_ValueToString( _context , v ) );
}
double toNumber( jsval v ){
@ -127,11 +127,11 @@ namespace mongo {
oid.init( getString( o , "str" ) );
return oid;
}
BSONObj toObject( JSObject * o ){
if ( ! o )
return BSONObj();
if ( JS_InstanceOf( _context , o , &bson_ro_class , 0 ) ){
return GETHOLDER( _context , o )->_obj.getOwned();
}
@ -143,14 +143,14 @@ namespace mongo {
return holder->_obj;
orig = holder->_obj;
}
BSONObjBuilder b;
jsval theid = getProperty( o , "_id" );
if ( ! JSVAL_IS_VOID( theid ) ){
append( b , "_id" , theid );
}
JSIdArray * properties = JS_Enumerate( _context , o );
assert( properties );
@ -161,24 +161,24 @@ namespace mongo {
string name = toString( nameval );
if ( name == "_id" )
continue;
append( b , name , getProperty( o , name.c_str() ) , orig[name].type() );
}
JS_DestroyIdArray( _context , properties );
return b.obj();
}
BSONObj toObject( jsval v ){
if ( JSVAL_IS_NULL( v ) ||
if ( JSVAL_IS_NULL( v ) ||
JSVAL_IS_VOID( v ) )
return BSONObj();
uassert( "not an object" , JSVAL_IS_OBJECT( v ) );
return toObject( JSVAL_TO_OBJECT( v ) );
}
string getFunctionCode( JSFunction * func ){
return toString( JS_DecompileFunction( _context , func , 0 ) );
}
@ -191,10 +191,10 @@ namespace mongo {
void append( BSONObjBuilder& b , string name , jsval val , BSONType oldType = EOO ){
//cout << "name: " << name << "\t" << typeString( val ) << " oldType: " << oldType << endl;
switch ( JS_TypeOfValue( _context , val ) ){
case JSTYPE_VOID: b.appendUndefined( name.c_str() ); break;
case JSTYPE_NULL: b.appendNull( name.c_str() ); break;
case JSTYPE_NUMBER: {
double d = toNumber( val );
if ( oldType == NumberInt && ((int)d) == d )
@ -231,21 +231,21 @@ namespace mongo {
b.appendRegex( name.c_str() , s.substr( 0 , end ).c_str() , s.substr( end + 1 ).c_str() );
}
else {
b.appendCode( name.c_str() , getFunctionCode( val ).c_str() );
b.appendCode( name.c_str() , getFunctionCode( val ).c_str() );
}
break;
}
default: uassert( (string)"can't append field. name:" + name + " type: " + typeString( val ) , 0 );
}
}
// ---------- to spider monkey ---------
bool hasFunctionIdentifier( const string& code ){
if ( code.size() < 9 || code.find( "function" ) != 0 )
return false;
return code[8] == ' ' || code[8] == '(';
}
@ -273,8 +273,12 @@ namespace mongo {
addRoot( f );
return f;
}
JSFunction * _compileFunction( const char * code, JSObject * assoc ){
while (isspace(*code)) {
code++;
}
if ( ! hasFunctionIdentifier( code ) ){
string s = code;
if ( isSimpleStatement( s ) ){
@ -282,7 +286,7 @@ namespace mongo {
}
return JS_CompileFunction( _context , assoc , "anonymous" , 0 , 0 , s.c_str() , strlen( s.c_str() ) , "nofile_a" , 0 );
}
// TODO: there must be a way in spider monkey to do this - this is a total hack
string s = "return ";
@ -294,7 +298,7 @@ namespace mongo {
cerr << "compile for hack failed" << endl;
return 0;
}
jsval ret;
if ( ! JS_CallFunction( _context , 0 , func , 0 , 0 , &ret ) ){
cerr << "call function for hack failed" << endl;
@ -307,7 +311,7 @@ namespace mongo {
return JS_ValueToFunction( _context , ret );
}
jsval toval( double d ){
jsval val;
assert( JS_NewNumberValue( _context, d , &val ) );
@ -326,14 +330,14 @@ namespace mongo {
assert( JS_SetPrivate( _context , o , (void*)(new BSONHolder( obj->getOwned() ) ) ) );
return o;
}
jsval toval( const BSONObj* obj , bool readOnly=false ){
JSObject * o = toJSObject( obj , readOnly );
return OBJECT_TO_JSVAL( o );
}
jsval toval( const BSONElement& e ){
switch( e.type() ){
case EOO:
case jstNULL:
@ -352,9 +356,9 @@ namespace mongo {
return toval( &embed );
}
case Array:{
BSONObj embed = e.embeddedObject().getOwned();
if ( embed.isEmpty() ){
return OBJECT_TO_JSVAL( JS_NewArrayObject( _context , 0 , 0 ) );
}
@ -364,14 +368,14 @@ namespace mongo {
JSObject * array = JS_NewArrayObject( _context , embed.nFields() , 0 );
assert( array );
jsval myarray = OBJECT_TO_JSVAL( array );
for ( int i=0; i<n; i++ ){
jsval v = toval( embed[i] );
assert( JS_SetElement( _context , array , i , &v ) );
}
return myarray;
}
case jstOID:{
@ -393,7 +397,7 @@ namespace mongo {
}
flags++;
}
JSObject * r = JS_NewRegExpObject( _context , (char*)e.regex() , strlen( e.regex() ) , flagNumber );
assert( r );
return OBJECT_TO_JSVAL( r );
@ -404,7 +408,7 @@ namespace mongo {
}
case CodeWScope:{
JSFunction * func = compileFunction( e.codeWScopeCode() );
BSONObj extraScope = e.codeWScopeObject();
if ( ! extraScope.isEmpty() ){
log() << "warning: CodeWScope doesn't transfer to db.eval" << endl;
@ -412,9 +416,9 @@ namespace mongo {
return OBJECT_TO_JSVAL( JS_GetFunctionObject( func ) );
}
case Date:
case Date:
return OBJECT_TO_JSVAL( js_NewDateObjectMsec( _context , (jsdouble) e.date() ) );
case MinKey:
return OBJECT_TO_JSVAL( JS_NewObject( _context , &minkey_class , 0 , 0 ) );
@ -434,7 +438,7 @@ namespace mongo {
JSObject * oid = JS_NewObject( _context , &object_id_class , 0 , 0 );
setProperty( oid , "str" , toval( e.dbrefOID().str().c_str() ) );
setProperty( o , "id" , OBJECT_TO_JSVAL( oid ) );
return OBJECT_TO_JSVAL( o );
}
@ -443,17 +447,17 @@ namespace mongo {
int len;
void * data = (void*)e.binData( len );
assert( JS_SetPrivate( _context , o , data ) );
setProperty( o , "len" , toval( len ) );
setProperty( o , "type" , toval( (int)e.binDataType() ) );
return OBJECT_TO_JSVAL( o );
}
}
uassert( "not done: toval" , 0 );
return 0;
}
// ------- object helpers ------
JSObject * getJSObject( JSObject * o , const char * name ){
@ -461,7 +465,7 @@ namespace mongo {
assert( JS_GetProperty( _context , o , name , &v ) );
return JSVAL_TO_OBJECT( v );
}
JSObject * getGlobalObject( const char * name ){
return getJSObject( JS_GetGlobalObject( _context ) , name );
}
@ -469,7 +473,7 @@ namespace mongo {
JSObject * getGlobalPrototype( const char * name ){
return getJSObject( getGlobalObject( name ) , "prototype" );
}
bool hasProperty( JSObject * o , const char * name ){
JSBool res;
assert( JS_HasProperty( _context , o , name , & res ) );
@ -486,12 +490,12 @@ namespace mongo {
void setProperty( JSObject * o , const char * field , jsval v ){
assert( JS_SetProperty( _context , o , field , &v ) );
}
string typeString( jsval v ){
JSType t = JS_TypeOfValue( _context , v );
return JS_GetTypeName( _context , t );
}
bool getBoolean( JSObject * o , const char * field ){
return toBoolean( getProperty( o , field ) );
}
@ -499,7 +503,7 @@ namespace mongo {
double getNumber( JSObject * o , const char * field ){
return toNumber( getProperty( o , field ) );
}
string getString( JSObject * o , const char * field ){
return toString( getProperty( o , field ) );
}
@ -525,9 +529,9 @@ namespace mongo {
*idp = JSVAL_ZERO;
return JS_TRUE;
}
BSONFieldIterator * it = (BSONFieldIterator*)JSVAL_TO_PRIVATE( *statep );
if ( enum_op == JSENUMERATE_NEXT ){
if ( it->more() ){
string name = it->next();
@ -540,17 +544,17 @@ namespace mongo {
}
return JS_TRUE;
}
if ( enum_op == JSENUMERATE_DESTROY ){
if ( it )
if ( it )
delete it;
return JS_TRUE;
}
uassert( "don't know what to do with this op" , 0 );
return JS_FALSE;
}
JSBool noaccess( JSContext *cx, JSObject *obj, jsval idval, jsval *vp){
BSONHolder * holder = GETHOLDER( cx , obj );
if ( holder->_inResolve )
@ -558,9 +562,9 @@ namespace mongo {
JS_ReportError( cx , "doing write op on read only operation" );
return JS_FALSE;
}
JSClass bson_ro_class = {
"bson_ro_object" , JSCLASS_HAS_PRIVATE | JSCLASS_NEW_RESOLVE | JSCLASS_NEW_ENUMERATE ,
"bson_ro_object" , JSCLASS_HAS_PRIVATE | JSCLASS_NEW_RESOLVE | JSCLASS_NEW_ENUMERATE ,
noaccess, noaccess, JS_PropertyStub, noaccess,
(JSEnumerateOp)bson_enumerate, (JSResolveOp)(&resolveBSONField) , JS_ConvertStub, bson_finalize ,
JSCLASS_NO_OPTIONAL_MEMBERS
@ -576,7 +580,7 @@ namespace mongo {
return JS_TRUE;
}
JSBool mark_modified( JSContext *cx, JSObject *obj, jsval idval, jsval *vp){
BSONHolder * holder = GETHOLDER( cx , obj );
if ( holder->_inResolve )
@ -586,7 +590,7 @@ namespace mongo {
}
JSClass bson_class = {
"bson_object" , JSCLASS_HAS_PRIVATE | JSCLASS_NEW_RESOLVE | JSCLASS_NEW_ENUMERATE ,
"bson_object" , JSCLASS_HAS_PRIVATE | JSCLASS_NEW_RESOLVE | JSCLASS_NEW_ENUMERATE ,
bson_add_prop, mark_modified, JS_PropertyStub, mark_modified,
(JSEnumerateOp)bson_enumerate, (JSResolveOp)(&resolveBSONField) , JS_ConvertStub, bson_finalize ,
JSCLASS_NO_OPTIONAL_MEMBERS
@ -597,7 +601,7 @@ namespace mongo {
JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,
JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, JS_FinalizeStub,
JSCLASS_NO_OPTIONAL_MEMBERS
};
};
// --- global helpers ---
@ -624,7 +628,7 @@ namespace mongo {
}
BSONObj out = func( args.obj() );
if ( out.isEmpty() ){
*rval = JSVAL_VOID;
}
@ -642,27 +646,27 @@ namespace mongo {
return JS_TRUE;
}
JSFunctionSpec globalHelpers[] = {
{ "print" , &native_print , 0 , 0 , 0 } ,
{ "nativeHelper" , &native_helper , 1 , 0 , 0 } ,
{ "load" , &native_load , 1 , 0 , 0 } ,
{ "gc" , &native_gc , 1 , 0 , 0 } ,
{ 0 , 0 , 0 , 0 , 0 }
JSFunctionSpec globalHelpers[] = {
{ "print" , &native_print , 0 , 0 , 0 } ,
{ "nativeHelper" , &native_helper , 1 , 0 , 0 } ,
{ "load" , &native_load , 1 , 0 , 0 } ,
{ "gc" , &native_gc , 1 , 0 , 0 } ,
{ 0 , 0 , 0 , 0 , 0 }
};
// ----END global helpers ----
JSBool resolveBSONField( JSContext *cx, JSObject *obj, jsval id, uintN flags, JSObject **objp ){
assert( JS_EnterLocalRootScope( cx ) );
Convertor c( cx );
BSONHolder * holder = GETHOLDER( cx , obj );
holder->check();
string s = c.toString( id );
BSONElement e = holder->_obj[ s.c_str() ];
if ( e.type() == EOO ){
@ -670,7 +674,7 @@ namespace mongo {
JS_LeaveLocalRootScope( cx );
return JS_TRUE;
}
jsval val = c.toval( e );
assert( ! holder->_inResolve );
@ -682,13 +686,13 @@ namespace mongo {
JS_LeaveLocalRootScope( cx );
return JS_TRUE;
}
class SMScope;
class SMEngine : public ScriptEngine {
public:
SMEngine(){
_runtime = JS_NewRuntime(8L * 1024L * 1024L);
uassert( "JS_NewRuntime failed" , _runtime );
@ -703,16 +707,16 @@ namespace mongo {
}
Scope * createScope();
void runTest();
virtual bool utf8Ok() const { return JS_CStringsAreUTF8(); }
private:
JSRuntime * _runtime;
friend class SMScope;
};
SMEngine * globalSMEngine;
@ -723,58 +727,58 @@ namespace mongo {
// ------ special helpers -------
JSBool object_keyset(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval){
JSIdArray * properties = JS_Enumerate( cx , obj );
assert( properties );
JSObject * array = JS_NewArrayObject( cx , properties->length , 0 );
assert( array );
for ( jsint i=0; i<properties->length; i++ ){
jsid id = properties->vector[i];
jsval idval;
assert( JS_IdToValue( cx , id , &idval ) );
assert( JS_SetElement( cx , array , i , &idval ) );
}
JS_DestroyIdArray( cx , properties );
*rval = OBJECT_TO_JSVAL( array );
return JS_TRUE;
}
// ------ scope ------
JSBool no_gc(JSContext *cx, JSGCStatus status){
return JS_FALSE;
}
class SMScope : public Scope {
public:
SMScope(){
_context = JS_NewContext( globalSMEngine->_runtime , 8192 );
_convertor = new Convertor( _context );
massert( "JS_NewContext failed" , _context );
JS_SetOptions( _context , JSOPTION_VAROBJFIX);
//JS_SetVersion( _context , JSVERSION_LATEST); TODO
JS_SetErrorReporter( _context , errorReporter );
_global = JS_NewObject( _context , &global_class, NULL, NULL);
massert( "JS_NewObject failed for global" , _global );
JS_SetGlobalObject( _context , _global );
massert( "js init failed" , JS_InitStandardClasses( _context , _global ) );
JS_SetOptions( _context , JS_GetOptions( _context ) | JSOPTION_VAROBJFIX );
JS_DefineFunctions( _context , _global , globalHelpers );
// install my special helpers
assert( JS_DefineFunction( _context , _convertor->getGlobalPrototype( "Object" ) ,
assert( JS_DefineFunction( _context , _convertor->getGlobalPrototype( "Object" ) ,
"keySet" , object_keyset , 0 , JSPROP_READONLY ) );
_this = 0;
@ -787,7 +791,7 @@ namespace mongo {
for ( list<void*>::iterator i=_roots.begin(); i != _roots.end(); i++ ){
JS_RemoveRoot( _context , *i );
}
if ( _this )
JS_RemoveRoot( _context , &_this );
@ -801,20 +805,20 @@ namespace mongo {
_context = 0;
}
}
void reset(){
massert( "SMScope::reset() not implemented yet" , 0 );
}
void addRoot( void * root , const char * name ){
JS_AddNamedRoot( _context , root , name );
_roots.push_back( root );
}
void init( BSONObj * data ){
if ( ! data )
return;
BSONObjIterator i( *data );
while ( i.more() ){
BSONElement e = i.next();
@ -829,18 +833,18 @@ namespace mongo {
void localConnect( const char * dbName ){
initMongoJS( this , _context , _global , true );
exec( "_mongo = new Mongo();" );
exec( ((string)"db = _mongo.getDB( \"" + dbName + "\" ); ").c_str() );
}
// ----- getters ------
double getNumber( const char *field ){
jsval val;
assert( JS_GetProperty( _context , _global , field , &val ) );
return _convertor->toNumber( val );
}
string getString( const char *field ){
jsval val;
assert( JS_GetProperty( _context , _global , field , &val ) );
@ -851,7 +855,7 @@ namespace mongo {
bool getBoolean( const char *field ){
return _convertor->getBoolean( _global , field );
}
BSONObj getObject( const char *field ){
return _convertor->toObject( _convertor->getProperty( _global , field ) );
}
@ -863,11 +867,11 @@ namespace mongo {
int type( const char *field ){
jsval val;
assert( JS_GetProperty( _context , _global , field , &val ) );
switch ( JS_TypeOfValue( _context , val ) ){
case JSTYPE_VOID: return Undefined;
case JSTYPE_NULL: return jstNULL;
case JSTYPE_OBJECT: {
case JSTYPE_OBJECT: {
JSObject * o = JSVAL_TO_OBJECT( val );
if ( JS_IsArrayObject( _context , o ) )
return Array;
@ -884,7 +888,7 @@ namespace mongo {
}
// ----- setters ------
void setNumber( const char *field , double val ){
jsval v = _convertor->toval( val );
assert( JS_SetProperty( _context , _global , field , &v ) );
@ -902,20 +906,20 @@ namespace mongo {
void setBoolean( const char *field , bool val ){
jsval v = BOOLEAN_TO_JSVAL( val );
assert( JS_SetProperty( _context , _global , field , &v ) );
assert( JS_SetProperty( _context , _global , field , &v ) );
}
void setThis( const BSONObj * obj ){
if ( _this )
JS_RemoveRoot( _context , &_this );
_this = _convertor->toJSObject( obj );
JS_AddNamedRoot( _context , &_this , "scope this" );
}
// ---- functions -----
ScriptingFunction createFunction( const char * code ){
precall();
return (ScriptingFunction)_convertor->compileFunction( code );
@ -926,7 +930,7 @@ namespace mongo {
boost::posix_time::time_duration timeout;
int count;
};
static JSBool checkTimeout( JSContext *cx, JSScript *script ) {
TimeoutSpec &spec = *(TimeoutSpec *)( JS_GetContextPrivate( cx ) );
if ( ++spec.count % 1000 != 0 )
@ -947,7 +951,7 @@ namespace mongo {
spec->count = 0;
JS_SetContextPrivate( _context, (void*)spec );
JS_SetBranchCallback( _context, checkTimeout );
}
}
}
void uninstallCheckTimeout( int timeoutMs ) {
@ -957,32 +961,32 @@ namespace mongo {
JS_SetContextPrivate( _context, 0 );
}
}
void precall(){
_error = "";
currentScope.reset( this );
}
bool exec( const string& code , const string& name = "(anon)" , bool printResult = false , bool reportError = true , bool assertOnError = true, int timeoutMs = 0 ){
precall();
jsval ret = JSVAL_VOID;
installCheckTimeout( timeoutMs );
JSBool worked = JS_EvaluateScript( _context , _global , code.c_str() , strlen( code.c_str() ) , name.c_str() , 0 , &ret );
uninstallCheckTimeout( timeoutMs );
if ( assertOnError )
uassert( name + " exec failed" , worked );
if ( reportError && ! _error.empty() ){
// cout << "exec error: " << _error << endl;
// already printed in reportError, so... TODO
}
if ( worked )
_convertor->setProperty( _global , "__lastres__" , ret );
if ( worked && printResult && ! JSVAL_IS_VOID( ret ) )
cout << _convertor->toString( ret ) << endl;
@ -992,7 +996,7 @@ namespace mongo {
int invoke( JSFunction * func , const BSONObj& args, int timeoutMs ){
precall();
jsval rval;
int nargs = args.nFields();
auto_ptr<jsval> smargsPtr( new jsval[nargs] );
jsval* smargs = smargsPtr.get();
@ -1000,13 +1004,13 @@ namespace mongo {
BSONObjIterator it( args );
for ( int i=0; i<nargs; i++ )
smargs[i] = _convertor->toval( it.next() );
setObject( "args" , args , true ); // this is for backwards compatability
installCheckTimeout( timeoutMs );
JSBool ret = JS_CallFunction( _context , _this , func , nargs , smargs , &rval );
uninstallCheckTimeout( timeoutMs );
if ( !ret ) {
return -3;
}
@ -1022,7 +1026,7 @@ namespace mongo {
void gotError( string s ){
_error = s;
}
string getError(){
return _error;
}
@ -1030,11 +1034,11 @@ namespace mongo {
void injectNative( const char *field, NativeFunction func ){
string name = field;
_convertor->setProperty( _global , (name + "_").c_str() , PRIVATE_TO_JSVAL( func ) );
stringstream code;
code << field << " = function(){ var a = [ " << field << "_ ]; for ( var i=0; i<arguments.length; i++ ){ a.push( arguments[i] ); } return nativeHelper.apply( null , a ); }";
exec( code.str().c_str() );
}
virtual void gc(){
@ -1042,7 +1046,7 @@ namespace mongo {
}
JSContext *context() const { return _context; }
private:
JSContext * _context;
Convertor * _convertor;
@ -1057,11 +1061,11 @@ namespace mongo {
void errorReporter( JSContext *cx, const char *message, JSErrorReport *report ){
stringstream ss;
ss << "JS Error: " << message;
if ( report ){
ss << " " << report->filename << ":" << report->lineno;
}
log() << ss.str() << endl;
if ( currentScope.get() ){
@ -1077,21 +1081,21 @@ namespace mongo {
for ( uintN i=0; i<argc; i++ ){
string filename = c.toString( argv[i] );
cout << "should load [" << filename << "]" << endl;
if ( ! s->execFile( filename , false , true , false ) ){
JS_ReportError( cx , ((string)"error loading file: " + filename ).c_str() );
return JS_FALSE;
}
}
return JS_TRUE;
}
void SMEngine::runTest(){
SMScope s;
s.localConnect( "foo" );
s.exec( "assert( db.getMongo() )" );
@ -1120,13 +1124,13 @@ namespace mongo {
void Convertor::addRoot( JSFunction * f ){
if ( ! f )
return;
SMScope * scope = currentScope.get();
uassert( "need a scope" , scope );
scope->addRoot( f , "cf" );
}
}
}
#include "sm_db.cpp"

7
shell/query.js
View File

@ -173,6 +173,13 @@ DBQuery.prototype.forEach = function( func ){
func( this.next() );
}
DBQuery.prototype.map = function( func ){
var a = [];
while ( this.hasNext() )
a.push( func( this.next() ) );
return a;
}
DBQuery.prototype.arrayAccess = function( idx ){
return this.toArray()[idx];
}