perf(db): little faster cycles over small requests

DEgITx · Jun 15, 2018 · 3f76d11 · 3f76d11
1 parent a9ebef7
commit 3f76d11
Showing 1 changed file with 13 additions and 8 deletions.
diff --git a/src/background/forBigTable.js b/src/background/forBigTable.js
@@ -1,18 +1,23 @@
-module.exports = (sphinx, table, callback, doneCallback, max = 1000) => new Promise((done) => {
+module.exports = (sphinx, table, callback, doneCallback, max = 1000, where = '') => new Promise((done) => {
     const checker = (index = 0) => {
-        sphinx.query(`SELECT * FROM ${table} WHERE id > ${index} LIMIT ${max}`, (err, torrents) => {
-            if(err || torrents.length == 0)
-            {
+        sphinx.query(`SELECT * FROM ${table} WHERE id > ${index} ${where} LIMIT ${max}`, (err, torrents) => {
+            const finish = () => {
                 if(err)
                     console.log('big table parse error', err)
                 if(doneCallback)
                     doneCallback(true)
                 done(true)
-                return
             }
-            Promise.all(torrents.map(callback)).then(() => {
-                checker(torrents[torrents.length - 1].id)
-            })
+
+            if(!err && torrents.length > 0)
+                Promise.all(torrents.map(callback)).then(() => {
+                    if(torrents.length === max)
+                        checker(torrents[torrents.length - 1].id)
+                    else
+                        finish()
+                })
+            else
+                finish()
         });
     }
     checker()