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

probably faster to cache farthest() SERVER-1342

Browse Source
This commit is contained in:
Mathias Stearn 2010-08-26 17:28:08 -04:00
parent c6a123f3e8
commit 0acaa65fc7
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
db/geo/2d.cpp
View File

@ -727,7 +727,7 @@ namespace mongo {
typedef multiset<GeoPoint> Holder; typedef multiset<GeoPoint> Holder;
GeoHopper( const Geo2dType * g , unsigned max , const Point& n , const BSONObj& filter = BSONObj() , double maxDistance = numeric_limits<double>::max() , GeoDistType type=GEO_PLAIN) GeoHopper( const Geo2dType * g , unsigned max , const Point& n , const BSONObj& filter = BSONObj() , double maxDistance = numeric_limits<double>::max() , GeoDistType type=GEO_PLAIN)
: GeoAccumulator( g , filter ) , _max( max ) , _near( n ), _maxDistance( maxDistance ), _type( type ) : GeoAccumulator( g , filter ) , _max( max ) , _near( n ), _maxDistance( maxDistance ), _type( type ), _farthest(-1)
{} {}
virtual bool checkDistance( const GeoHash& h , double& d ){ virtual bool checkDistance( const GeoHash& h , double& d ){
@ -752,23 +752,27 @@ namespace mongo {
_points.insert( GeoPoint( node.key , node.recordLoc , d ) ); _points.insert( GeoPoint( node.key , node.recordLoc , d ) );
if ( _points.size() > _max ){ if ( _points.size() > _max ){
_points.erase( --_points.end() ); _points.erase( --_points.end() );
Holder::iterator i = _points.end();
i--;
_farthest = i->_distance;
} else {
if (d > _farthest)
_farthest = d;
} }
} }
double farthest() const { double farthest() const {
if (_points.empty()) return _farthest;
return -1;
Holder::iterator i = _points.end();
i--;
return i->_distance;
} }
unsigned _max; unsigned _max;
Point _near; Point _near;
Holder _points; Holder _points;
double _maxDistance; double _maxDistance;
GeoDistType _type; GeoDistType _type;
double _farthest;
}; };
struct BtreeLocation { struct BtreeLocation {