Feat/optimize opts properties

src/classes/job.ts

@@ -39,6 +39,16 @@ const logger = debuglog('bull');
 const optsDecodeMap = {
   fpof: 'failParentOnFailure',
   kl: 'keepLogs',
+  roc: 'removeOnComplete',
+  rof: 'removeOnFail',
+  i: 'jobId',
+  p: 'priority',
+  d: 'delay',
+  a: 'attempts',
+  b: 'backoff',
+  l: 'lifo',
+  stl: 'stackTraceLimit',
+  sl: 'sizeLimit',
 };
 
 const optsEncodeMap = invert(optsDecodeMap);

src/classes/scripts.ts

@@ -812,10 +812,6 @@ export class Scripts {
       }),
     ];
 
-    if (opts.limiter) {
-      args.push(opts.limiter.max, opts.limiter.duration);
-    }
-
     const result = await (<any>client).moveToActive(
       (<(string | number | boolean | Buffer)[]>keys).concat(args),
     );

src/commands/addJob-8.lua

@@ -106,8 +106,8 @@ end
 
 -- Store the job.
 local jsonOpts = cjson.encode(opts)
-local delay = opts['delay'] or 0
-local priority = opts['priority'] or 0
+local delay = opts['d'] or 0
+local priority = opts['p'] or 0
 
 local optionalValues = {}
 if parentKey ~= nil then
@@ -150,7 +150,7 @@ else
   -- Standard or priority add
   if priority == 0 then
     -- LIFO or FIFO
-    local pushCmd = opts['lifo'] and 'RPUSH' or 'LPUSH';
+    local pushCmd = opts['l'] and 'RPUSH' or 'LPUSH';
     rcall(pushCmd, target, jobId)
   else
     -- Priority add

src/commands/includes/checkStalledJobs.lua

@@ -71,7 +71,10 @@ local function checkStalledJobs(stalledKey, waitKey, activeKey, failedKey,
                         if (stalledCount > MAX_STALLED_JOB_COUNT) then
                             local rawOpts = rcall("HGET", jobKey, "opts")
                             local opts = cjson.decode(rawOpts)
-                            local removeOnFailType = type(opts["removeOnFail"])
+
+                            local removeOnFail = opts["rof"] or opts["removeOnFail"]
+
+                            local removeOnFailType = type(removeOnFail)
                             rcall("ZADD", failedKey, timestamp, jobId)
                             local failedReason =
                                 "job stalled more than allowable limit"
@@ -82,16 +85,16 @@ local function checkStalledJobs(stalledKey, waitKey, activeKey, failedKey,
                                   'failedReason', failedReason)
 
                             if removeOnFailType == "number" then
-                                removeJobsByMaxCount(opts["removeOnFail"],
+                                removeJobsByMaxCount(removeOnFail,
                                                      failedKey, queueKeyPrefix)
                             elseif removeOnFailType == "boolean" then
-                                if opts["removeOnFail"] then
+                                if removeOnFail then
                                     removeJob(jobId, false, queueKeyPrefix)
                                     rcall("ZREM", failedKey, jobId)
                                 end
                             elseif removeOnFailType ~= "nil" then
-                                local maxAge = opts["removeOnFail"]["age"]
-                                local maxCount = opts["removeOnFail"]["count"]
+                                local maxAge = removeOnFail["age"]
+                                local maxCount = removeOnFail["count"]
 
                                 if maxAge ~= nil then
                                     removeJobsByMaxAge(timestamp, maxAge,

tests/test_job.ts

@@ -255,8 +255,8 @@ describe('Job', function () {
       await removeAllQueueData(new IORedis(), parentQueueName);
     });
 
-    it('removes 4000 jobs in time rage of 4000ms', async function () {
-      this.timeout(4000);
+    it('removes 4000 jobs in time rage of 8000ms', async function () {
+      this.timeout(8000);
       const numJobs = 4000;
 
       // Create waiting jobs
@@ -279,8 +279,10 @@ describe('Job', function () {
       const delayedJobs = await queue.addBulk(jobsDataWithDelay);
 
       // Remove all jobs
-      await Promise.all(delayedJobs.map(job => job.remove()));
-      await Promise.all(waitingJobs.map(job => job.remove()));
+      await Promise.all([
+        Promise.all(delayedJobs.map(job => job.remove())),
+        Promise.all(waitingJobs.map(job => job.remove())),
+      ]);
 
       const countJobs = await queue.getJobCountByTypes('waiting', 'delayed');
       expect(countJobs).to.be.equal(0);