SERVER-4556 remove concept of a 'nontrivial' range in FieldRange; use 'universal' range instead

1 files changed, 2 insertions, 23 deletions

diff --git a/src/mongo/db/queryutil-inl.h b/src/mongo/db/queryutil-inl.h
index 08d3b1fac52..215cf775440 100644
--- a/src/mongo/db/queryutil-inl.h
+++ b/src/mongo/db/queryutil-inl.h
@@ -44,43 +44,22 @@ namespace mongo {
         return true;
     }
 
-    /**
-     * TODO Assumes intervals are contiguous and minKey/maxKey will not be
-     * matched against.
-     */
-    inline bool FieldRange::nontrivial() const {
-        return
-            ! empty() &&
-            ( _intervals.size() != 1 ||
-              minKey.firstElement().woCompare( min(), false ) != 0 ||
-              maxKey.firstElement().woCompare( max(), false ) != 0 );
-    }
-
     inline const FieldRange &FieldRangeSet::range( const char *fieldName ) const {
         map<string,FieldRange>::const_iterator f = _ranges.find( fieldName );
         if ( f == _ranges.end() )
-            return trivialRange();
+            return universalRange();
         return f->second;
     }
 
     inline FieldRange &FieldRangeSet::range( const char *fieldName ) {
         map<string,FieldRange>::iterator f = _ranges.find( fieldName );
         if ( f == _ranges.end() ) {
-            _ranges.insert( make_pair( string( fieldName ), trivialRange() ) );
+            _ranges.insert( make_pair( string( fieldName ), universalRange() ) );
             return _ranges.find( fieldName )->second;
         }
         return f->second;
     }
 
-    inline int FieldRangeSet::nNontrivialRanges() const {
-        int count = 0;
-        for( map<string,FieldRange>::const_iterator i = _ranges.begin(); i != _ranges.end(); ++i ) {
-            if ( i->second.nontrivial() )
-                ++count;
-        }
-        return count;
-    }
-
     inline bool FieldRangeSet::matchPossible() const {
         for( map<string,FieldRange>::const_iterator i = _ranges.begin(); i != _ranges.end(); ++i ) {
             if ( i->second.empty() ) {