SERVER-6400: fix $in with nested arrays

2 files changed, 24 insertions, 4 deletions

diff --git a/src/mongo/db/matcher/expression_leaf.cpp b/src/mongo/db/matcher/expression_leaf.cpp
index df697fd38e1..938bc2f8b4c 100644
--- a/src/mongo/db/matcher/expression_leaf.cpp
+++ b/src/mongo/db/matcher/expression_leaf.cpp
@@ -477,18 +477,35 @@ namespace mongo {
         _allHaveToMatch = false;
     }
 
+    bool InMatchExpression::_matchesRealElement( const BSONElement& e ) const {
+        if ( _arrayEntries.contains( e ) )
+            return true;
+
+        for ( unsigned i = 0; i < _arrayEntries.numRegexes(); i++ ) {
+            if ( _arrayEntries.regex(i)->matchesSingleElement( e ) )
+                return true;
+        }
+
+        return false;
+    }
 
     bool InMatchExpression::matchesSingleElement( const BSONElement& e ) const {
         if ( _arrayEntries.hasNull() && e.eoo() )
             return true;
 
-        if ( _arrayEntries.contains( e ) )
+        if ( _matchesRealElement( e ) )
             return true;
 
-        for ( unsigned i = 0; i < _arrayEntries.numRegexes(); i++ ) {
-            if ( _arrayEntries.regex(i)->matchesSingleElement( e ) )
-                return true;
+        /*
+        if ( e.type() == Array ) {
+            BSONObjIterator i( e.Obj() );
+            while ( i.more() ) {
+                BSONElement sub = i.next();
+                if ( _matchesRealElement( sub ) )
+                    return true;
+            }
         }
+        */
 
         return false;
     }
diff --git a/src/mongo/db/matcher/expression_leaf.h b/src/mongo/db/matcher/expression_leaf.h
index 3f846e0bf18..9bf86c73091 100644
--- a/src/mongo/db/matcher/expression_leaf.h
+++ b/src/mongo/db/matcher/expression_leaf.h
@@ -48,6 +48,8 @@ namespace mongo {
     protected:
         void initPath( const StringData& path );
 
+        bool _matchesElementExpandArray( const BSONElement& e ) const;
+
         bool _allHaveToMatch;
 
     private:
@@ -304,6 +306,7 @@ namespace mongo {
         void copyTo( InMatchExpression* toFillIn ) const;
 
     private:
+        bool _matchesRealElement( const BSONElement& e ) const;
         ArrayFilterEntries _arrayEntries;
     };