SERVER-109 parse field ranges of or fields-

mongodb · May 10, 2010 · 34a9c96 · 34a9c96
1 parent b042060
commit 34a9c96
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/db/queryutil.cpp b/db/queryutil.cpp
@@ -507,6 +507,17 @@ namespace mongo {
 
             if ( strcmp( e.fieldName(), "$where" ) == 0 )
                 continue;
+
+            if ( strcmp( e.fieldName(), "$or" ) == 0 ) {                                                                                                                                                        
+                massert( 13142, "$or requires nonempty array", e.type() == Array && e.embeddedObject().nFields() > 0 );                                                                                         
+                BSONObjIterator j( e.embeddedObject() );                                                                                                                                                        
+                while( j.more() ) {                                                                                                                                                                             
+                    BSONElement f = j.next();                                                                                                                                                                   
+                    massert( 13143, "$or array must contain objects", f.type() == Object );                                                                                                                     
+                    _orSets.push_back( FieldRangeSet( ns, f.embeddedObject(), optimize ) );
+                }
+                continue;
+            }
 
             bool equality = ( getGtLtOp( e ) == BSONObj::Equality );
             if ( equality && e.type() == Object ) {

diff --git a/db/queryutil.h b/db/queryutil.h
@@ -187,6 +187,7 @@ namespace mongo {
         static FieldRange *trivialRange_;
         static FieldRange &trivialRange();
         mutable map< string, FieldRange > ranges_;
+        vector< FieldRangeSet > _orSets;
         const char *ns_;
         BSONObj query_;
     };