fixed total counts and percents when limit or query applied

test/src/test/java/com/github/variety/test/LimitResultsAnalysisTest.java

@@ -32,7 +32,6 @@ public class LimitResultsAnalysisTest {
         analysis.verifyResult("_id", 5, 100, "ObjectId");
         analysis.verifyResult("name", 5, 100, "String");
 
-        // TODO: there is only one document with 'someBinData'. Why variety returns 5/100% instead of 1/20% ?
-        // FIXME: analysis.verifyResult("someBinData", 1, 20, "BinData-old");
+        analysis.verifyResult("someBinData", 1, 20, "BinData-old");
     }
 }

test/src/test/java/com/github/variety/test/QueryLimitedAnalysisTest.java

@@ -27,9 +27,9 @@ public class QueryLimitedAnalysisTest {
         final VarietyAnalysis analysis = variety.withQuery("{someBinData:{$exists: true}}").runAnalysis();
         Assert.assertEquals(3, analysis.getResultsCollection().count());
 
-        // TODO: are those percentContaining numbers correct? Should percents be limited to all data or query data?
-        analysis.verifyResult("_id", 1, 20, "ObjectId");
-        analysis.verifyResult("name", 1, 20, "String");
+        // we analyzed only the keys of objects defined by query. But total counts and percents are computed from the complete collection
+        analysis.verifyResult("_id", 5, 100, "ObjectId");
+        analysis.verifyResult("name", 5, 100, "String");
         analysis.verifyResult("someBinData", 1, 20, "BinData-old");
 
     }

test/src/test/java/com/github/variety/test/SortedAnalysisTest.java

@@ -49,14 +49,11 @@ public class SortedAnalysisTest {
 
         Assert.assertEquals(5, analysis.getResultsCollection().count());
 
-        // TODO: are those percentContaining numbers correct? Should percents be limited to all data or query data?
-        // Why total counts are always 5, when 'someWeirdLegacyKey' has only one object?
-        // Keys and types are correct, total count and percents seems not right.
         analysis.verifyResult("_id", 5, 100, "ObjectId");
         analysis.verifyResult("name", 5, 100, "String");
-        analysis.verifyResult("bio", 5, 100, "String");
-        analysis.verifyResult("pets", 5, 100, "Array");
-        analysis.verifyResult("someWeirdLegacyKey", 5, 100, "String");
+        analysis.verifyResult("bio", 3, 60, "String");
+        analysis.verifyResult("pets", 2, 40, "Array");
+        analysis.verifyResult("someWeirdLegacyKey", 1, 20, "String");
 
     }
 }

variety.js

@@ -209,7 +209,7 @@ resultsDB[resultsCollectionName].find({}).forEach(function(key) {
   if(limit < numDocuments) {
     var existsQuery = {};
     existsQuery[keyName] = {$exists: true};
-    key.totalOccurrences = db[collection].find(query).count(existsQuery);
+    key.totalOccurrences = db[collection].count(existsQuery);
   }  
   key.percentContaining = (key.totalOccurrences / numDocuments) * 100.0;
   resultsDB[resultsCollectionName].save(key);