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

Merge branch 'master' into main

Browse Source 
Conflicts:
	SConstruct
	db/btree.h
	db/db.vcxproj.filters
	db/dbcommands_admin.cpp
	db/geo/2d.cpp
	db/pdfile.cpp
	dbtests/test.vcxproj.filters
This commit is contained in:
Dwight
2011-05-03 15:53:27 -04:00
parent 18dc400e68 4382278e82
commit a3cd52048a
45 changed files with 3765 additions and 2597 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
db/queryoptimizer.cpp
View File

@@ -209,13 +209,13 @@ doneCheckOrder:
if ( _startOrEndSpec ) {
// we are sure to spec _endKeyInclusive
return shared_ptr<Cursor>( new BtreeCursor( _d, _idxNo, *_index, _startKey, _endKey, _endKeyInclusive, _direction >= 0 ? 1 : -1 ) );
return shared_ptr<Cursor>( BtreeCursor::make( _d, _idxNo, *_index, _startKey, _endKey, _endKeyInclusive, _direction >= 0 ? 1 : -1 ) );
}
else if ( _index->getSpec().getType() ) {
return shared_ptr<Cursor>( new BtreeCursor( _d, _idxNo, *_index, _frv->startKey(), _frv->endKey(), true, _direction >= 0 ? 1 : -1 ) );
return shared_ptr<Cursor>( BtreeCursor::make( _d, _idxNo, *_index, _frv->startKey(), _frv->endKey(), true, _direction >= 0 ? 1 : -1 ) );
}
else {
return shared_ptr<Cursor>( new BtreeCursor( _d, _idxNo, *_index, _frv, _direction >= 0 ? 1 : -1 ) );
return shared_ptr<Cursor>( BtreeCursor::make( _d, _idxNo, *_index, _frv, _direction >= 0 ? 1 : -1 ) );
}
}