fix(improved_timeout_handling): remove dependency on hits.total property

Author: missinglink

controller/search.js

@@ -60,10 +60,17 @@ function setup( apiConfig, esclient, query, should_execute ){
       const initialTime = debugLog.beginTimer(req, `Attempt ${currentAttempt}`);
       // query elasticsearch
       searchService( esclient, cmd, function( err, docs, meta, data ){
+
+        // keep tally of hit counts - compatible with new/old versions of ES
+        let totalHits = 0;
+        if( _.has(data, 'hits.total') ) {
+          totalHits = _.isPlainObject(data.hits.total) ? data.hits.total.value : data.hits.total;
+        }
+
         const message = {
           controller: 'search',
           queryType: renderedQuery.type,
-          es_hits: _.get(data, 'hits.total'),
+          es_hits: totalHits,
           result_count: (docs || []).length,
           es_took: _.get(data, 'took', undefined),
           response_time: _.get(data, 'response_time', undefined),

helper/type_mapping_discovery.js

@@ -37,12 +37,18 @@ const DISCOVERY_QUERY = {
 module.exports = (tm, done) => {
   const esclient = elasticsearch.Client(_.extend({}, peliasConfig.esclient));
   esclient.search(DISCOVERY_QUERY, (err, res) => {
+
+    // keep tally of hit counts - compatible with new/old versions of ES
+    let totalHits = 0;
+    if( _.has(res, 'hits.total') ) {
+      totalHits =  _.isPlainObject(res.hits.total) ? res.hits.total.value : res.hits.total;
+    }
 
     // query error
     if( err ){ logger.error( err ); }
 
     // invalid response
-    else if( !res || !res.hits || !res.hits.total ){
+    else if ( totalHits < 1 ){
       logger.error( 'no hits for aggregation' );
     }
 
@@ -60,7 +66,7 @@ module.exports = (tm, done) => {
 
       // update type mapping from aggregation data
       if( !!Object.keys( layersBySource ).length ){
-        logger.info( 'total hits', res.hits.total );
+        logger.info( 'total hits', totalHits );
         logger.info( 'total sources', sources.length );
         logger.info( 'successfully discovered type mapping from elasticsearch' );
         tm.setLayersBySource( layersBySource );

service/search.js

@@ -40,12 +40,9 @@ function service( esclient, cmd, cb ){
       scores: []
     };
 
-    if (
-        _.has(data, 'hits') && 
-        _.get(data, 'hits.total', 0) > 0 && 
-        _.isArray(data.hits.hits)
-      ){
-      docs = data.hits.hits.map( function( hit ){
+    const hits = _.get(data, 'hits.hits');
+    if( _.isArray( hits ) && hits.length > 0 ){
+      docs = hits.map(hit => {
 
         meta.scores.push(hit._score);
 

test/unit/service/search.js

@@ -278,69 +278,6 @@ module.exports.tests.success_conditions = (test, common) => {
 
   });
 
-  test('esclient.search returning falsy data.hits.total should return empty docs and meta', (t) => {
-    const errorMessages = [];
-
-    const service = proxyquire('../../../service/search', {
-      'pelias-logger': {
-        get: () => {
-          return {
-            error: (msg) => {
-              errorMessages.push(msg);
-            }
-          };
-        }
-      }
-    });
-
-    const esclient = {
-      search: (cmd, callback) => {
-        t.deepEquals(cmd, 'this is the query');
-
-        const data = {
-          hits: {
-            hits: [
-              {
-                _score: 'score 1',
-                _id: 'doc id 1',
-                matched_queries: 'matched_queries 1',
-                _source: {
-                  random_key: 'value 1'
-                }
-              },
-              {
-                _score: 'score 2',
-                _id: 'doc id 2',
-                matched_queries: 'matched_queries 2',
-                _source: {
-                  random_key: 'value 2'
-                }
-              }
-            ]
-          }
-        };
-
-        callback(undefined, data);
-
-      }
-    };
-
-    const expectedDocs = [];
-    const expectedMeta = { scores: [] };
-
-    const next = (err, docs, meta) => {
-      t.equals(err, null);
-      t.deepEquals(docs, expectedDocs);
-      t.deepEquals(meta, expectedMeta);
-
-      t.equals(errorMessages.length, 0, 'no errors should have been logged');
-      t.end();
-    };
-
-    service(esclient, 'this is the query', next);
-
-  });
-
   test('esclient.search returning non-array data.hits.hits should return empty docs and meta', (t) => {
     const errorMessages = [];