Merge pull request #77 from nitram509/issue-76

FIX: issue #76 (Querying indexed field in subdocument does not work, but works without index)

Author: twillouer

src/main/java/com/github/fakemongo/impl/index/IndexAbstract.java

@@ -3,17 +3,14 @@
 import com.github.fakemongo.impl.ExpressionParser;
 import com.github.fakemongo.impl.Filter;
 import com.github.fakemongo.impl.Util;
+import com.mongodb.BasicDBList;
 import com.mongodb.DBObject;
 import com.mongodb.FongoDBCollection;
 import com.mongodb.MongoException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
 import org.bson.types.Binary;
 
+import java.util.*;
+
 /**
  * An index for the MongoDB.
  * <p/>
@@ -263,42 +260,43 @@ public void clear() {
    * @return true if index can be used.
    */
   public boolean canHandle(final DBObject queryFields) {
-      if(queryFields == null) {
-          return false;
-      }
+    if (queryFields == null) {
+      return false;
+    }
 
-      //get keys including embedded indexes
-      for (String field : fields) {
-          if (!queryFields.containsField(field) && !keyEmbeddedFieldMatch(field, queryFields)) {
-               return false;
-          }
+    //get keys including embedded indexes
+    for (String field : fields) {
+      if (!queryFields.containsField(field) && !keyEmbeddedFieldMatch(field, queryFields)) {
+        return false;
       }
+    }
     return true;
- //   return queryFields.containsAll(fields);
   }
 
-    public boolean keyEmbeddedFieldMatch(String field, DBObject queryFields)
-    {
-        //if field embedded field type
-        String[] fieldParts = field.split("\\.");
-        if(fieldParts.length == 0) {
-            return false;
-        }
-
-        DBObject searchQueryFields = queryFields;
-        int count = 0;
-        for(String fieldPart : fieldParts) {
-            count++;
-            if(!searchQueryFields.containsField(fieldPart)) {
-                return false;
-            } else if (searchQueryFields.get(fieldPart) instanceof DBObject) {
-                searchQueryFields = (DBObject)searchQueryFields.get(fieldPart);
-            }
-        }
+  private boolean keyEmbeddedFieldMatch(String field, DBObject queryFields) {
+    //if field embedded field type
+    String[] fieldParts = field.split("\\.");
+    if (fieldParts.length == 0) {
+      return false;
+    }
 
-        return fieldParts.length == count;
+    DBObject searchQueryFields = queryFields;
+    int count = 0;
+    for (String fieldPart : fieldParts) {
+      count++;
+      if (searchQueryFields instanceof BasicDBList) {
+        // when it's a list, there's no need to investigate nested documents
+        return true;
+      } else if (!searchQueryFields.containsField(fieldPart)) {
+        return false;
+      } else if (searchQueryFields.get(fieldPart) instanceof DBObject) {
+        searchQueryFields = (DBObject) searchQueryFields.get(fieldPart);
+      }
     }
 
+    return fieldParts.length == count;
+  }
+
   @Override
   public String toString() {
     return "Index{" +

src/test/java/com/github/fakemongo/FongoTest.java

@@ -174,6 +174,34 @@ public void testFindOneIn() {
     assertEquals(new BasicDBObject("date", 1), result);
   }
 
+  /**
+   * @see <a href="https://github.com/fakemongo/fongo/issues/76">
+   *   Querying indexed field in subdocument does not work, but works without index
+   *   </a>
+   */
+  @Test
+  public void testFindOneIn_within_array_and_given_index_set() {
+    DBCollection collection = newCollection();
+    // prepare documents
+    collection.insert(
+        new BasicDBObject("_id", 1)
+            .append("animals", new BasicDBObject[]{
+                new BasicDBObject("name", "dolphin").append("type", "mammal"),
+            }),
+        new BasicDBObject("_id", 2)
+            .append("animals", new BasicDBObject[]{
+                new BasicDBObject("name", "horse").append("type", "mammal"),
+                new BasicDBObject("name", "shark").append("type", "fish")
+            }));
+    // prepare index
+    collection.createIndex(new BasicDBObject("animals.type", "text"));
+
+    DBObject result = collection.findOne(new BasicDBObject("animals.type", new BasicDBObject("$in", new String[]{"fish"})));
+
+    assertNotNull(result);
+    assertEquals(2, result.get("_id"));
+  }
+
   @Test
   public void testFindOneInWithArray() {
     DBCollection collection = newCollection();