added slicer recursing event for id_slicer resolves #611

terascope · Mar 26, 2018 · d9527a8 · d9527a8
1 parent 83e729a
commit d9527a8
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/lib/readers/elasticsearch_date_range/slicer.js b/lib/readers/elasticsearch_date_range/slicer.js
@@ -280,7 +280,7 @@ function newSlicer(context, opConfig, executionContext, retryData, logger, clien
 
     function makeKeyList(opConfig, data) {
         const idConfig = Object.assign({}, opConfig, { starting_key_depth: 0 });
-        const idSlicer = require('../id_slicer')(client, executionContext, idConfig, logger, null, data);
+        const idSlicer = require('../id_slicer')(context, client, executionContext, idConfig, logger, null, data);
         return getIdData(idSlicer);
     }
 

diff --git a/lib/readers/id_reader.js b/lib/readers/id_reader.js
@@ -9,7 +9,7 @@ function newSlicer(context, executionContext, retryData, logger) {
     const opConfig = getOpConfig(executionContext.config, 'id_reader');
     const client = getClient(context, opConfig, 'elasticsearch');
 
-    return require('./id_slicer')(client, executionContext, opConfig, logger, retryData);
+    return require('./id_slicer')(context, client, executionContext, opConfig, logger, retryData);
 }
 
 

diff --git a/lib/readers/id_slicer.js b/lib/readers/id_slicer.js
@@ -13,14 +13,16 @@ const hexadecimal = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b',
 const HEXADECIMAL = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'];
 
 
-module.exports = function (client, executionContext, opConfig, logger, retryData, range) {
+module.exports = function (context, client, executionContext, opConfig, logger, retryData, range) {
     const keyRange = opConfig.key_range;
     const baseKeyArray = getKeyArray(opConfig);
     const keyArray = opConfig.key_range ? opConfig.key_range : baseKeyArray.slice();
     const startingKeyDepth = opConfig.starting_key_depth;
     const elasticsearch = require('elasticsearch_api')(client, logger, opConfig);
     const executionConfig = executionContext.config;
     const retryError = retryModule(logger, executionConfig.max_retries);
+    const events = context.apis.foundation.getSystemEvents();
+
 
     function getCountForKey(query) {
         return elasticsearch.count(query);
@@ -70,6 +72,7 @@ module.exports = function (client, executionContext, opConfig, logger, retryData
             return getCountForKey(query)
                 .then((count) => {
                     if (count >= opConfig.size) {
+                        events.emit('slicer:slice:recursion');
                         return determineKeySlice(generator, false, rangeObj);
                     }
 

diff --git a/spec/readers/id_slicer-spec.js b/spec/readers/id_slicer-spec.js
@@ -53,6 +53,11 @@ describe('id_reader', () => {
             error() {},
             info() {},
             warn() {}
+        },
+        apis: {
+            foundation: {
+                getSystemEvents: () => eventEmitter
+            }
         }
     };