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

SERVER-366 don't drop referenced key

Browse Source
This commit is contained in:
Aaron 2010-07-07 22:25:09 -07:00
parent 85b901c703
commit ec28a6971b
2 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
db/btree.cpp
View File

@ -310,13 +310,13 @@ namespace mongo {
topSize = 0;
int i = 0;
for ( int j = 0; j < n; j++ ) {
if( j > 0 && k( j ).isUnused() && k( j ).prevChildBucket.isNull() ) {
if ( i < refPos ) {
--refPos;
}
if( j > 0 && ( j != refPos ) && k( j ).isUnused() && k( j ).prevChildBucket.isNull() ) {
continue; // key is unused and has no children - drop it
}
if( i != j ) {
if ( j == refPos ) {
refPos = i; // i < j so j will never be refPos again
}
k( i ) = k( j );
}
short ofsold = k(i).keyDataOfs();

33
dbtests/btreetests.cpp
View File

@ -322,7 +322,7 @@ namespace BtreeTests {
ASSERT( unused2 < unused );
}
private:
protected:
void insert( long long n ) {
string val( 800, ' ' );
for( int i = 0; i < 800; i += 8 ) {
@ -337,6 +337,36 @@ namespace BtreeTests {
}
};
class DontDropReferenceKey : public PackUnused {
public:
void run() {
// with 80 root node is full
for ( long long i = 0; i < 80; i += 1 ) {
insert( i );
}
BSONObjBuilder start;
start.appendMinKey( "a" );
BSONObjBuilder end;
end.appendMaxKey( "a" );
BSONObj l = bt()->keyNode( 0 ).key;
string toInsert;
auto_ptr< BtreeCursor > c( new BtreeCursor( nsdetails( ns() ), 1, id(), start.done(), end.done(), false, 1 ) );
while( c->ok() ) {
if ( c->currKey().woCompare( l ) > 0 ) {
toInsert = c->currKey().firstElement().valuestr();
break;
}
c->advance();
}
// too much work to try to make this happen through inserts and deletes
const_cast< DiskLoc& >( bt()->keyNode( 1 ).prevChildBucket ) = DiskLoc();
const_cast< DiskLoc& >( bt()->keyNode( 1 ).recordLoc ).GETOFS() |= 1; // make unused
BSONObj k = BSON( "a" << toInsert );
Base::insert( k );
}
};
class All : public Suite {
public:
All() : Suite( "btree" ){
@ -352,6 +382,7 @@ namespace BtreeTests {
add< SERVER983 >();
add< ReuseUnused >();
add< PackUnused >();
add< DontDropReferenceKey >();
}
} myall;
}