fixed #212

Author: anidotnet

nitrite/src/main/java/org/dizitart/no2/internals/NitriteService.java

@@ -102,12 +102,7 @@ public boolean hasIndex(String field) {
      */
     public Set<NitriteId> findEqualWithIndex(String field, Object value) {
         notNull(field, errorMessage("field can not be null", VE_FIND_EQUAL_INDEX_NULL_FIELD));
-        try {
-            readLock.lock();
-            return indexedSearchService.findEqual(field, value);
-        } finally {
-            readLock.unlock();
-        }
+        return indexedSearchService.findEqual(field, value);
     }
 
     /**
@@ -120,12 +115,7 @@ public Set<NitriteId> findEqualWithIndex(String field, Object value) {
     public Set<NitriteId> findGreaterThanWithIndex(String field, Comparable value) {
         notNull(field, errorMessage("field can not be null", VE_FIND_GT_INDEX_NULL_FIELD));
         notNull(value, errorMessage("value can not be null", VE_FIND_GT_INDEX_NULL_VALUE));
-        try {
-            readLock.lock();
-            return indexedSearchService.findGreaterThan(field, value);
-        } finally {
-            readLock.unlock();
-        }
+        return indexedSearchService.findGreaterThan(field, value);
     }
 
     /**
@@ -138,12 +128,7 @@ public Set<NitriteId> findGreaterThanWithIndex(String field, Comparable value) {
     public Set<NitriteId> findGreaterEqualWithIndex(String field, Comparable value) {
         notNull(field, errorMessage("field can not be null", VE_FIND_GTE_INDEX_NULL_FIELD));
         notNull(value, errorMessage("value can not be null", VE_FIND_GTE_INDEX_NULL_VALUE));
-        try {
-            readLock.lock();
-            return indexedSearchService.findGreaterEqual(field, value);
-        } finally {
-            readLock.unlock();
-        }
+        return indexedSearchService.findGreaterEqual(field, value);
     }
 
     /**
@@ -156,12 +141,7 @@ public Set<NitriteId> findGreaterEqualWithIndex(String field, Comparable value)
     public Set<NitriteId> findLesserThanWithIndex(String field, Comparable value) {
         notNull(field, errorMessage("field can not be null", VE_FIND_LT_INDEX_NULL_FIELD));
         notNull(value, errorMessage("value can not be null", VE_FIND_LT_INDEX_NULL_VALUE));
-        try {
-            readLock.lock();
-            return indexedSearchService.findLesserThan(field, value);
-        } finally {
-            readLock.unlock();
-        }
+        return indexedSearchService.findLesserThan(field, value);
     }
 
     /**
@@ -174,12 +154,7 @@ public Set<NitriteId> findLesserThanWithIndex(String field, Comparable value) {
     public Set<NitriteId> findLesserEqualWithIndex(String field, Comparable value) {
         notNull(field, errorMessage("field can not be null", VE_FIND_LTE_INDEX_NULL_FIELD));
         notNull(value, errorMessage("value can not be null", VE_FIND_LTE_INDEX_NULL_VALUE));
-        try {
-            readLock.lock();
-            return indexedSearchService.findLesserEqual(field, value);
-        } finally {
-            readLock.unlock();
-        }
+        return indexedSearchService.findLesserEqual(field, value);
     }
 
     /**
@@ -192,12 +167,7 @@ public Set<NitriteId> findLesserEqualWithIndex(String field, Comparable value) {
     public Set<NitriteId> findInWithIndex(String field, Collection<Object> values) {
         notNull(field, errorMessage("field can not be null", VE_FIND_IN_INDEX_NULL_FIELD));
         notNull(values, errorMessage("values can not be null", VE_FIND_IN_INDEX_NULL_VALUE));
-        try {
-            readLock.lock();
-            return indexedSearchService.findIn(field, values);
-        } finally {
-            readLock.unlock();
-        }
+        return indexedSearchService.findIn(field, values);
     }
 
     /**
@@ -210,12 +180,7 @@ public Set<NitriteId> findInWithIndex(String field, Collection<Object> values) {
     public Set<NitriteId> findNotInWithIndex(String field, Collection<Object> values) {
         notNull(field, errorMessage("field can not be null", VE_FIND_NOT_IN_INDEX_NULL_FIELD));
         notNull(values, errorMessage("values can not be null", VE_FIND_NOT_IN_INDEX_NULL_VALUE));
-        try {
-            readLock.lock();
-            return indexedSearchService.findNotIn(field, values);
-        } finally {
-            readLock.unlock();
-        }
+        return indexedSearchService.findNotIn(field, values);
     }
 
     /**
@@ -228,12 +193,7 @@ public Set<NitriteId> findNotInWithIndex(String field, Collection<Object> values
     public Set<NitriteId> findTextWithIndex(String field, String value) {
         notNull(field, errorMessage("field can not be null", VE_FIND_TEXT_INDEX_NULL_FIELD));
         notNull(value, errorMessage("value can not be null", VE_FIND_TEXT_INDEX_NULL_VALUE));
-        try {
-            readLock.lock();
-            return indexedSearchService.findText(field, value);
-        } finally {
-            readLock.unlock();
-        }
+        return indexedSearchService.findText(field, value);
     }
 
     /**

nitrite/src/test/java/org/dizitart/no2/NitriteTest.java

@@ -22,6 +22,7 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.dizitart.no2.exceptions.NitriteIOException;
+import org.dizitart.no2.filters.Filters;
 import org.dizitart.no2.objects.Id;
 import org.dizitart.no2.objects.Index;
 import org.dizitart.no2.objects.Indices;
@@ -359,6 +360,30 @@ public void run() {
         assertTrue(repository.find().size() <= 5);
     }
 
+    @Test
+    public void testIssue212() {
+        NitriteCollection collection = db.getCollection("test");
+        Document doc1 = createDocument("key", "key").put("second_key", "second_key").put("third_key", "third_key");
+        Document doc2 = createDocument("key", "key").put("second_key", "second_key").put("fourth_key", "fourth_key");
+        Document doc = createDocument("fifth_key", "fifth_key");
+
+        if(!collection.hasIndex("key")){
+            collection.createIndex("key", IndexOptions.indexOptions(IndexType.NonUnique));
+        }
+        if(!collection.hasIndex("second_key")){
+            collection.createIndex("second_key", IndexOptions.indexOptions(IndexType.NonUnique));
+        }
+
+        collection.insert(doc1, doc2);
+        collection.update(Filters.and(Filters.eq("key", "key"),
+            Filters.eq("second_key", "second_key")), doc, UpdateOptions.updateOptions(true));
+
+        for (Document document : collection.find()) {
+            System.out.println(document);
+        }
+    }
+
+
     @Data
     @NoArgsConstructor
     @AllArgsConstructor