rename exactCount to hasExactCount

Author: rubensworks

lib/datasources/CompositeDatasource.js

@@ -89,16 +89,16 @@ CompositeDatasource.prototype._getDatasourceInfo = function(query, absoluteOffse
   };
   return findRecursive(0, absoluteOffset, -1, -1, 0, cb, true);
 
-  function findRecursive(datasourceIndex, offset, chosenDatasource, chosenOffset, totalCount, exactCount) {
+  function findRecursive(datasourceIndex, offset, chosenDatasource, chosenOffset, totalCount, hasExactCount) {
     if (datasourceIndex >= self._datasourceNames.length) {
       // We checked all datasources, return our accumulated information
-      cb(chosenDatasource, chosenOffset, totalCount, exactCount);
+      cb(chosenDatasource, chosenOffset, totalCount, hasExactCount);
     } else {
       var emptyTripleStream = { push: noop };
       var datasource = self._getDatasourceById(datasourceIndex);
       datasource._executeQuery(emptyQuery, emptyTripleStream, function (metadata) {
         var count = metadata.totalCount;
-        var exact = metadata.exactCount;
+        var exact = metadata.hasExactCount;
         // If we are still looking for an appropriate datasource, we need exact counts!
         if (offset > 0 && !exact) {
           self._getExactCount(datasource, query, function(exactCount) {
@@ -115,13 +115,13 @@ CompositeDatasource.prototype._getDatasourceInfo = function(query, absoluteOffse
             // We can start querying from this datasource
             setImmediate(function () {
               findRecursive(datasourceIndex + 1, offset - count, datasourceIndex, offset,
-                  totalCount + count, exactCount && exact);
+                  totalCount + count, hasExactCount && exact);
             });
           } else {
             // We forward our accumulated information and go check the next datasource
             setImmediate(function () {
               findRecursive(datasourceIndex + 1, offset - count, chosenDatasource, chosenOffset,
-                  totalCount + count, exactCount && exact);
+                  totalCount + count, hasExactCount && exact);
             });
           }
         }
@@ -136,14 +136,14 @@ function noop() {}
 CompositeDatasource.prototype._executeQuery = function (query, tripleStream, metadataCallback) {
   var offset =  query.offset || 0, limit = query.limit || Infinity;
   var self = this;
-  this._getDatasourceInfo(query, offset, function(datasourceIndex, relativeOffset, totalCount, exactCount) {
+  this._getDatasourceInfo(query, offset, function(datasourceIndex, relativeOffset, totalCount, hasExactCount) {
     if (datasourceIndex < 0) {
       // No valid datasource has been found
-      metadataCallback({ totalCount: totalCount, exactCount: exactCount });
+      metadataCallback({ totalCount: totalCount, hasExactCount: hasExactCount });
       tripleStream.push(null);
     } else {
       // Send query to first applicable datasource and optionally emit triples from consecutive datasources
-      metadataCallback({ totalCount: totalCount, exactCount: exactCount });
+      metadataCallback({ totalCount: totalCount, hasExactCount: hasExactCount });
       var emitted = 0;
 
       // Modify our triple stream so that if all results from one datasource have arrived,

lib/datasources/ExternalHdtDatasource.js

@@ -43,7 +43,7 @@ ExternalHdtDatasource.prototype._executeQuery = function (query, tripleStream, m
                                '--', hdtFile], { stdio: ['ignore', 'pipe', 'ignore'] });
   // Parse the result triples
   hdt.stdout.setEncoding('utf8');
-  var parser = new N3Parser(), tripleCount = 0, estimatedTotalCount = 0, exactCount = true;
+  var parser = new N3Parser(), tripleCount = 0, estimatedTotalCount = 0, hasExactCount = true;
   parser.parse(hdt.stdout, function (error, triple) {
     if (error)
       tripleStream.emit('error', new Error('Invalid query result: ' + error.message));
@@ -53,7 +53,7 @@ ExternalHdtDatasource.prototype._executeQuery = function (query, tripleStream, m
       // Ensure the estimated total count is as least as large as the number of triples
       if (tripleCount && estimatedTotalCount < offset + tripleCount)
         estimatedTotalCount = offset + (tripleCount < query.limit ? tripleCount : 2 * tripleCount);
-      metadataCallback({ totalCount: estimatedTotalCount, exactCount: exactCount });
+      metadataCallback({ totalCount: estimatedTotalCount, hasExactCount: hasExactCount });
       tripleStream.push(null);
     }
   });
@@ -62,7 +62,7 @@ ExternalHdtDatasource.prototype._executeQuery = function (query, tripleStream, m
   // Extract the estimated number of total matches from the first (comment) line
   hdt.stdout.once('data', function (header) {
     estimatedTotalCount = parseInt(header.match(/\d+/), 10) || 0;
-    exactCount = header.indexOf("Exact") > -1;
+    hasExactCount = header.indexOf("estimated") < 0;
   });
 
   // Report query errors

lib/datasources/HdtDatasource.js

@@ -33,13 +33,13 @@ HdtDatasource.prototype._initialize = function (done) {
 HdtDatasource.prototype._executeQuery = function (query, tripleStream, metadataCallback) {
   this._hdtDocument.search(query.subject, query.predicate, query.object,
                            { limit: query.limit, offset: query.offset },
-    function (error, triples, estimatedTotalCount, exactCount) {
+    function (error, triples, estimatedTotalCount, hasExactCount) {
       if (error) return tripleStream.emit('error', error);
       // Ensure the estimated total count is as least as large as the number of triples
       var tripleCount = triples.length, offset = query.offset || 0;
       if (tripleCount && estimatedTotalCount < offset + tripleCount)
         estimatedTotalCount = offset + (tripleCount < query.limit ? tripleCount : 2 * tripleCount);
-      metadataCallback({ totalCount: estimatedTotalCount, exactCount: exactCount });
+      metadataCallback({ totalCount: estimatedTotalCount, hasExactCount: hasExactCount });
       // Add the triples to the stream
       for (var i = 0; i < tripleCount; i++)
         tripleStream.push(triples[i]);

lib/datasources/MemoryDatasource.js

@@ -29,7 +29,7 @@ MemoryDatasource.prototype._executeQuery = function (query, tripleStream, metada
   var offset =  query.offset || 0, limit = query.limit || Infinity,
       triples = this._tripleStore.findByIRI(query.subject, query.predicate, query.object);
   // Send the metadata
-  metadataCallback({ totalCount: triples.length, exactCount: true });
+  metadataCallback({ totalCount: triples.length, hasExactCount: true });
   // Send the requested subset of triples
   for (var i = offset, l = Math.min(offset + limit, triples.length); i < l; i++)
     tripleStream.push(triples[i]);

lib/datasources/SparqlDatasource.js

@@ -55,7 +55,7 @@ SparqlDatasource.prototype._executeQuery = function (query, tripleStream, metada
   // Determine the total number of matching triples
   this._getPatternCount(sparqlPattern, function (error, totalCount) {
     if (error) emitError(error);
-    else if (typeof totalCount === 'number') metadataCallback({ totalCount: totalCount, exactCount: true });
+    else if (typeof totalCount === 'number') metadataCallback({ totalCount: totalCount, hasExactCount: true });
   });
 
   // Emits an error on the triple stream