mirrors/mongodb
mirrors/mongodb
0
0
Fork 0
mirror of https://github.com/mongodb/mongo.git synced 2024-12-01 09:32:32 +01:00
Code Issues Releases Activity

fix error codes

Browse Source
This commit is contained in:
agirbal 2011-06-21 22:31:02 -07:00
parent 6391c98326
commit ab47d8d34b
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
s/strategy_shard.cpp
View File

@ -352,13 +352,13 @@ namespace mongo {
bool multi = flags & UpdateOption_Multi;
if (upsert) {
uassert(14851, "can't upsert something without shard key",
uassert(14854, "can't upsert something without shard key",
(manager->hasShardKey(toupdate) ||
(toupdate.firstElementFieldName()[0] == '$' && manager->hasShardKey(query))));
BSONObj key = manager->getShardKey().extractKey(query);
BSONForEach(e, key) {
uassert(14852, "shard key in upsert query must be an exact match", getGtLtOp(e) == BSONObj::Equality);
uassert(14855, "shard key in upsert query must be an exact match", getGtLtOp(e) == BSONObj::Equality);
}
}
@ -386,7 +386,7 @@ namespace mongo {
BSONObjIterator fields(op.embeddedObject());
while(fields.more()) {
const string field = fields.next().fieldName();
uassert(14846,
uassert(14851,
str::stream() << "Can't modify shard key's value field" << field
<< " for collection: " << manager->getns(),
! manager->getShardKey().partOfShardKey(field));
@ -394,12 +394,12 @@ namespace mongo {
}
}
else if ( manager->hasShardKey( toupdate ) ) {
uassert( 14847,
uassert( 14856,
str::stream() << "cannot modify shard key for collection: " << manager->getns(),
manager->getShardKey().compare( query , toupdate ) == 0 );
}
else {
uasserted(14848,
uasserted(14857,
str::stream() << "shard key must be in update object for collection: " << manager->getns() );
}
}

2
shell/mongo_vstudio.cpp
View File

@ -3124,7 +3124,7 @@ const StringData _jscode_raw_collection =
"throw \"can't save a DBQuery object\";\n"
"}\n"
"\n"
"DBCollection._allowedFields = { $id : 1 , $ref : 1 };\n"
"DBCollection._allowedFields = { $id : 1 , $ref : 1 , $db : 1 };\n"
"\n"
"DBCollection.prototype._validateForStorage = function( o ){\n"
"this._validateObject( o );\n"