refactor: change delay marker to -1

taskforcesh · Nov 12, 2024 · f1f5f7f · f1f5f7f
1 parent 29e07ae
commit f1f5f7f
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/src/commands/addPrioritizedJob-8.lua b/src/commands/addPrioritizedJob-8.lua
@@ -105,8 +105,8 @@ local delay, priority = storeJob(eventsKey, jobIdKey, jobId, args[3], ARGV[2],
 
 -- Add the job to the prioritized set
 local isPausedOrMaxed = isQueuePausedOrMaxed(metaKey, activeKey)
-local markerScore = jobCounter % (markerCount or 1)
-addJobWithPriority( KEYS[1], priorityKey, priority, jobId, priorityCounterKey, isPausedOrMaxed, markerScore)
+local markerMember = jobCounter % (markerCount or 1)
+addJobWithPriority( KEYS[1], priorityKey, priority, jobId, priorityCounterKey, isPausedOrMaxed, markerMember)
 
 -- Emit waiting event
 rcall("XADD", eventsKey, "MAXLEN", "~", maxEvents, "*", "event", "waiting",

diff --git a/src/commands/addStandardJob-8.lua b/src/commands/addStandardJob-8.lua
@@ -110,8 +110,8 @@ local target, isPausedOrMaxed = getTargetQueueList(metaKey, KEYS[6], KEYS[1], KE
 
 -- LIFO or FIFO
 local pushCmd = opts['lifo'] and 'RPUSH' or 'LPUSH'
-local markerScore = jobCounter % (markerCount or 1)
-addJobInTargetList(target, KEYS[8], pushCmd, isPausedOrMaxed, jobId, markerScore)
+local markerMember = jobCounter % (markerCount or 1)
+addJobInTargetList(target, KEYS[8], pushCmd, isPausedOrMaxed, jobId, markerMember)
 
 -- Emit waiting event
 rcall("XADD", eventsKey, "MAXLEN", "~", maxEvents, "*", "event", "waiting",

diff --git a/src/commands/includes/addBaseMarkerIfNeeded.lua b/src/commands/includes/addBaseMarkerIfNeeded.lua
@@ -2,8 +2,8 @@
   Add marker if needed when a job is available.
 ]]
 
-local function addBaseMarkerIfNeeded(markerKey, isPausedOrMaxed, markerScore)
+local function addBaseMarkerIfNeeded(markerKey, isPausedOrMaxed, markerMember)
   if not isPausedOrMaxed then
-    rcall("ZADD", markerKey, markerScore, "0")
+    rcall("ZADD", markerKey, 0, markerMember)
   end  
 end
diff --git a/src/commands/includes/addDelayMarkerIfNeeded.lua b/src/commands/includes/addDelayMarkerIfNeeded.lua
@@ -10,6 +10,6 @@ local function addDelayMarkerIfNeeded(markerKey, delayedKey)
   if nextTimestamp ~= nil then
     -- Replace the score of the marker with the newest known
     -- next timestamp.
-    rcall("ZADD", markerKey, nextTimestamp, "1")
+    rcall("ZADD", markerKey, nextTimestamp, "-1")
   end
 end
diff --git a/src/commands/includes/addJobInTargetList.lua b/src/commands/includes/addJobInTargetList.lua
@@ -5,7 +5,7 @@
 -- Includes
 --- @include "addBaseMarkerIfNeeded"
 
-local function addJobInTargetList(targetKey, markerKey, pushCmd, isPausedOrMaxed, jobId, markerScore)
+local function addJobInTargetList(targetKey, markerKey, pushCmd, isPausedOrMaxed, jobId, markerMember)
   rcall(pushCmd, targetKey, jobId)
-  addBaseMarkerIfNeeded(markerKey, isPausedOrMaxed, markerScore)
+  addBaseMarkerIfNeeded(markerKey, isPausedOrMaxed, markerMember)
 end
diff --git a/src/commands/includes/addJobWithPriority.lua b/src/commands/includes/addJobWithPriority.lua
@@ -6,9 +6,9 @@
 --- @include "addBaseMarkerIfNeeded"
 
 local function addJobWithPriority(markerKey, prioritizedKey, priority, jobId, priorityCounterKey,
-  isPausedOrMaxed, markerScore)
+  isPausedOrMaxed, markerMember)
   local prioCounter = rcall("INCR", priorityCounterKey)
   local score = priority * 0x100000000 + prioCounter % 0x100000000
   rcall("ZADD", prioritizedKey, score, jobId)
-  addBaseMarkerIfNeeded(markerKey, isPausedOrMaxed, markerScore)
+  addBaseMarkerIfNeeded(markerKey, isPausedOrMaxed, markerMember)
 end