Merge branch 'develop' into TASK-7353

Author: pfurio

commons-datastore/commons-datastore-core/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.opencb.commons</groupId>
         <artifactId>commons-datastore</artifactId>
-        <version>7.0.0-SNAPSHOT</version>
+        <version>8.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

commons-datastore/commons-datastore-mongodb/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.opencb.commons</groupId>
         <artifactId>commons-datastore</artifactId>
-        <version>7.0.0-SNAPSHOT</version>
+        <version>8.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

commons-datastore/commons-datastore-mongodb/src/main/java/org/opencb/commons/datastore/mongodb/MongoDBCollection.java

@@ -133,6 +133,12 @@ public DataResult<Long> count(ClientSession clientSession, Bson query) {
         return endQuery(Collections.emptyList(), l, start);
     }
 
+    public DataResult<Long> estimatedCount() {
+        long start = startQuery();
+        long l = mongoDBNativeQuery.estimatedCount();
+        return endQuery(Collections.emptyList(), l, start);
+    }
+
     public DataResult<?> distinct(String key, Bson query) {
         long start = startQuery();
         List l = new ArrayList<>();

commons-datastore/commons-datastore-mongodb/src/main/java/org/opencb/commons/datastore/mongodb/MongoDBNativeQuery.java

@@ -64,6 +64,10 @@ public long count(ClientSession clientSession, Bson query) {
         }
     }
 
+    public long estimatedCount() {
+        return dbCollection.estimatedDocumentCount();
+    }
+
     public DistinctIterable<Document> distinct(String key) {
         return distinct(key, null, Document.class);
     }
@@ -235,7 +239,11 @@ public <T> MongoDBIterator<T> find(ClientSession clientSession, Bson query, Bson
         Future<Long> countFuture = null;
         if (options != null && options.getBoolean(QueryOptions.COUNT)) {
             ExecutorService executor = Executors.newSingleThreadExecutor();
-            countFuture = executor.submit(() -> count(clientSession, query));
+            if (clientSession == null && (query == null || query.equals(Filters.empty()) || query.toBsonDocument().isEmpty())) {
+                countFuture = executor.submit(this::estimatedCount);
+            } else {
+                countFuture = executor.submit(() -> count(clientSession, query));
+            }
         }
 
         FindIterable<Document> findIterable = null;

commons-datastore/commons-datastore-mongodb/src/test/java/org/opencb/commons/datastore/mongodb/MongoDBCollectionTest.java

@@ -333,6 +333,12 @@ public void testCount1() throws Exception {
         assertEquals("The number must be equals", N, queryResult.getNumMatches());
     }
 
+    @Test
+    public void testEstimatedCount() {
+        DataResult<Long> queryResult = mongoDBCollection.estimatedCount();
+        assertEquals("The number of documents must be equals", N, queryResult.getNumMatches());
+    }
+
     @Test
     public void testDistinct1() throws Exception {
         DataResult<Integer> queryResult = mongoDBCollection.distinct("age", null, Integer.class);

commons-datastore/commons-datastore-solr/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.opencb.commons</groupId>
         <artifactId>commons-datastore</artifactId>
-        <version>7.0.0-SNAPSHOT</version>
+        <version>8.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

commons-datastore/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.opencb.commons</groupId>
         <artifactId>commons</artifactId>
-        <version>7.0.0-SNAPSHOT</version>
+        <version>8.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

commons-lib/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.opencb.commons</groupId>
         <artifactId>commons</artifactId>
-        <version>7.0.0-SNAPSHOT</version>
+        <version>8.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.opencb.commons</groupId>
     <artifactId>commons</artifactId>
-    <version>7.0.0-SNAPSHOT</version>
+    <version>8.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>OpenCB commons project</name>