keuss 1.6.4 → 1.6.8

package/test/backends_reserve-commit-rollback.js

@@ -56,7 +56,10 @@ var factory = null;
         if (err) return done (err);
         results.should.eql([{
           get: 0,
-          put: 0
+          put: 0,
+          reserve: 0,
+          commit: 0,
+          rollback: 0
         }, 0, 0, 0, null]);
         done();
       });
@@ -66,82 +69,66 @@ var factory = null;
       var q = factory.queue('test_queue_2');
 
       async.series([
-        function (cb) {
-          q.push({
-            elem: 1,
-            pl: 'twetrwte'
-          }, cb)
-        },
-        function (cb) {
-          q.push({
-            elem: 2,
-            pl: 'twetrwte'
-          }, cb)
-        },
-        function (cb) {
-          q.size(function (err, size) {
+        cb => q.push({elem: 1, pl: 'twetrwte'}, cb),
+        cb => q.push({elem: 2, pl: 'twetrwte'}, cb),
+        cb => {
+          q.size ((err, size) => {
             size.should.equal(2);
             cb();
           })
         },
-        function (cb) {
-          q.stats(function (err, res) {
-            res.should.eql({
-              get: 0,
-              put: 2
-            });
-            cb();
-          })
-        },
-        function (cb) {
-          q.next_t(function (err, res) {
-            res.getTime().should.be.approximately(new Date().getTime(), 500);
-            cb();
-          })
-        },
-        function (cb) {
-          q.pop('c1', cb)
-        },
-        function (cb) {
-          q.size(function (err, size) {
-            size.should.equal(1);
-            cb();
-          })
-        },
-        function (cb) {
-          q.stats(function (err, res) {
-            res.should.eql({
-              get: 1,
-              put: 2
-            });
-            cb();
-          })
-        },
-        function (cb) {
-          q.pop('c2', cb)
-        },
+        cb => q.stats((err, res) => {
+          res.should.eql({
+            get: 0,
+            put: 2,
+            reserve: 0,
+            commit: 0,
+            rollback: 0
+          });
+          cb();
+        }),
+        cb=> q.next_t((err, res) => {
+          res.getTime().should.be.approximately(new Date().getTime(), 500);
+          cb();
+        }),
+        cb => q.pop('c1', cb),
+        cb => q.size((err, size) => {
+          size.should.equal(1);
+          cb();
+        }),
+        cb => q.stats((err, res) => {
+          res.should.eql({
+            get: 1,
+            put: 2,
+            reserve: 0,
+            commit: 0,
+            rollback: 0
+          });
+          cb();
+        }),
+        cb => q.pop('c2', cb),
         function (cb) {
           q.size(function (err, size) {
             size.should.equal(0);
             cb();
           })
         },
-        function (cb) {
-          q.stats(function (err, res) {
-            res.should.eql({
-              get: 2,
-              put: 2
-            });
-            cb();
-          })
-        },
-        function (cb) {
-          q.next_t(function (err, res) {
-            should.equal(res, null);
-            cb();
-          })
-        }
-      ], function (err, results) {
+        cb => setTimeout (cb, 1000),
+        cb => q.stats((err, res) => {
+          res.should.eql({
+            get: 2,
+            put: 2,
+            reserve: 0,
+            commit: 0,
+            rollback: 0
+          });
+          cb();
+        }),
+        cb => q.next_t((err, res) => {
+          should.equal(res, null);
+          cb();
+        })
+      ], (err, results) => {
         done();
       });
     });
@@ -181,7 +168,10 @@ var factory = null;
           q.stats(function (err, res) {
             res.should.eql({
               get: 0,
-              put: 2
+              put: 2,
+              reserve: 0,
+              commit: 0,
+              rollback: 0
             });
             cb();
           })
@@ -211,10 +201,13 @@ var factory = null;
           q.stats(function (err, res) {
             res.should.eql({
               get: 1,
-              put: 2
+              put: 2,
+              reserve: 0,
+              commit: 0,
+              rollback: 0
             });
             cb();
-          })
+          });
         },
         function (cb) {
           q.next_t(function (err, res) {
@@ -241,7 +234,10 @@ var factory = null;
           q.stats(function (err, res) {
             res.should.eql({
               get: 2,
-              put: 2
+              put: 2,
+              reserve: 0,
+              commit: 0,
+              rollback: 0
             });
             cb();
           })
@@ -250,7 +246,7 @@ var factory = null;
           q.next_t(function (err, res) {
             should.equal(res, null);
             cb();
-          })
+          });
         }
       ], function (err, results) {
         done();
@@ -292,7 +288,10 @@ var factory = null;
           q.stats(function (err, res) {
             res.should.eql({
               get: 0,
-              put: 2
+              put: 2,
+              reserve: 0,
+              commit: 0,
+              rollback: 0
             });
             cb();
           })
@@ -315,7 +314,10 @@ var factory = null;
           q.stats(function (err, res) {
             res.should.eql({
               get: 0,
-              put: 2
+              put: 2,
+              reserve: 0,
+              commit: 0,
+              rollback: 0
             });
             cb();
           })
@@ -338,7 +340,10 @@ var factory = null;
           q.stats(function (err, res) {
             res.should.eql({
               get: 0,
-              put: 2
+              put: 2,
+              reserve: 0,
+              commit: 0,
+              rollback: 0
             });
             cb();
           })
@@ -375,7 +380,10 @@ var factory = null;
           q.stats(function (err, res) {
             res.should.eql({
               get: 2,
-              put: 2
+              put: 2,
+              reserve: 0,
+              commit: 0,
+              rollback: 0
             });
             cb();
           })
@@ -452,7 +460,10 @@ var factory = null;
           q.stats(function (err, res) {
             res.should.eql({
               get: 2,
-              put: 2
+              put: 2,
+              reserve: 0,
+              commit: 0,
+              rollback: 0
             });
             cb();
           })
@@ -505,7 +516,10 @@ var factory = null;
           q.stats(function (err, res) {
             res.should.eql({
               get: 0,
-              put: 3
+              put: 3,
+              reserve: 0,
+              commit: 0,
+              rollback: 0
             });
             cb();
           })
@@ -559,7 +573,10 @@ var factory = null;
           q.stats(function (err, res) {
             res.should.eql({
               get: 3,
-              put: 3
+              put: 3,
+              reserve: 0,
+              commit: 0,
+              rollback: 0
             });
             cb();
           })
@@ -574,78 +591,53 @@ var factory = null;
       var id = null;
 
       async.series([
-        function (cb) {
-          q.push({
+        cb => q.push({elem: 1, pl: 'twetrwte'}, cb),
+        cb => q.size((err, size) => {
+          size.should.equal(1);
+          cb();
+        }),
+        cb => q.next_t((err, res) => {
+          res.getTime().should.be.approximately(new Date().getTime(), 500);
+          cb();
+        }),
+        cb => q.reserve((err, res) => {
+          id = res._id;
+          res.payload.should.eql({
             elem: 1,
             pl: 'twetrwte'
-          }, cb)
-        },
-        function (cb) {
-          q.size(function (err, size) {
-            size.should.equal(1);
-            cb();
-          })
-        },
-        function (cb) {
-          q.next_t(function (err, res) {
-            res.getTime().should.be.approximately(new Date().getTime(), 500);
-            cb();
-          })
-        },
-        function (cb) {
-          q.reserve(function (err, res) {
-            id = res._id;
-            res.payload.should.eql({
-              elem: 1,
-              pl: 'twetrwte'
-            });
-            res.tries.should.equal(0);
-            cb();
-          })
-        },
-        function (cb) {
-          q.size(function (err, size) {
-            size.should.equal(0);
-            cb();
-          })
-        },
-        function (cb) {
-          q.totalSize(function (err, size) {
-            size.should.equal(1);
-            cb();
-          })
-        },
-        function (cb) {
-          q.next_t(function (err, res) {
-            res.getTime().should.be.approximately(new Date().getTime() + 120000, 500);
-            cb();
-          })
-        },
-        function (cb) {
-          q.commit(id, function (err, res) {
-            res.should.equal(true);
-            cb();
-          })
-        },
-        function (cb) {
-          q.size(function (err, size) {
-            size.should.equal(0);
-            cb();
-          })
-        },
-        function (cb) {
-          q.totalSize(function (err, size) {
-            size.should.equal(0);
-            cb();
-          })
-        },
-        function (cb) {
-          q.next_t(function (err, res) {
-            should.equal(res, null);
-            cb();
-          })
-        }
-      ], function (err, results) {
+          });
+          res.tries.should.equal(0);
+          cb();
+        }),
+        cb => q.size((err, size) => {
+          size.should.equal(0);
+          cb();
+        }),
+        cb => q.totalSize((err, size) => {
+          size.should.equal(1);
+          cb();
+        }),
+        cb => q.next_t((err, res) => {
+          res.getTime().should.be.approximately(new Date().getTime() + 120000, 500);
+          cb();
+        }),
+        cb => q.commit(id, (err, res) => {
+          res.should.equal(true);
+          cb();
+        }),
+        cb => q.size((err, size) => {
+          size.should.equal(0);
+          cb();
+        }),
+        cb => q.totalSize((err, size) => {
+          size.should.equal(0);
+          cb();
+        }),
+        cb => q.next_t((err, res) => {
+          should.equal(res, null);
+          cb();
+        }),
+      ], (err, results) => {
         done();
       });
     });
@@ -778,7 +770,7 @@ var factory = null;
             should.equal(res, null);
             cb();
           })
-        }
+        },
       ], function (err, results) {
         done();
       });
@@ -849,7 +841,18 @@ var factory = null;
             should.equal(res, null);
             cb();
           })
-        }
+        },
+        cb => setTimeout (cb, 1000),
+        cb => q.stats((err, res) => {
+          res.should.eql({
+            get: 0,
+            put: 1,
+            reserve: 1,
+            commit: 1,
+            rollback: 0
+          });
+          cb();
+        }),
       ], function (err, results) {
         done();
       });
@@ -976,6 +979,17 @@ var factory = null;
           cb (null, res);
         }),
         cb => q.ok (state.reserved_obj, cb),
+        cb => setTimeout (cb, 1000),
+        cb => q.stats((err, res) => {
+          res.should.eql({
+            get: 0,
+            put: 1,
+            reserve: 3,
+            commit: 1,
+            rollback: 2
+          });
+          cb();
+        }),
       ], done);
     });
 

package/utils/RedisOrderedQueue.js

@@ -11,7 +11,8 @@ const _s_lua_code_push = `
   redis.call ('HSET', 'keuss:q:ordered_queue:hash:' .. KEYS[1], ARGV[1], ARGV[3])
 
   -- insert id+mature in index
-  return redis.call ('ZADD', 'keuss:q:ordered_queue:index:' .. KEYS[1], ARGV[2], ARGV[1])
+  redis.call ('ZADD', 'keuss:q:ordered_queue:index:' .. KEYS[1], ARGV[2], ARGV[1])
+  return ARGV[1]
 `;
 
 const _s_lua_code_pop = `
@@ -86,7 +87,7 @@ const _s_lua_code_commit = `
   local id = ARGV[1]
   local val = redis.call ('HGET', 'keuss:q:ordered_queue:hash:' .. KEYS[1], id)
 
-  if (val == nil) then
+  if (not(val)) then
     return nil
   end
 
@@ -113,7 +114,7 @@ const _s_lua_code_rollback = `
   local id = ARGV[1]
   local val = redis.call ('HGET', 'keuss:q:ordered_queue:hash:' .. KEYS[1], id)
 
-  if (val==false) then
+  if (not(val)) then
     return nil
   end
 
@@ -135,6 +136,31 @@ const _s_lua_code_rollback = `
   return id
 `;
 
+const _s_lua_code_remove = `
+  -- qname in KEYS[1]
+  -- id in ARGV[1]
+
+  local id = ARGV[1]
+  local val = redis.call ('HGET', 'keuss:q:ordered_queue:hash:' .. KEYS[1], id)
+
+  if (not (val)) then
+    return nil
+  end
+
+  -- check if it was reserved
+  local obj_val = cjson.decode (val)
+
+  if (obj_val.reserved) then
+    -- it is reserved
+    return nil
+  end
+
+  -- delete from index, hash
+  redis.call ('ZREM', 'keuss:q:ordered_queue:index:' .. KEYS[1], id)
+  redis.call ('HDEL', 'keuss:q:ordered_queue:hash:' ..  KEYS[1], id)
+
+  return id
+`;
 
 
 class RedisOrderedQueue {
@@ -164,6 +190,7 @@ class RedisOrderedQueue {
     this._rediscl.roq_push (this._name, pl._id, pl.mature, JSON.stringify (pl), done);
   }
 
+
   //////////////////////////////////
   pop (done) {
   //////////////////////////////////
@@ -184,6 +211,7 @@ class RedisOrderedQueue {
     });
   }
 
+
   //////////////////////////////////
   reserve (incr, done) {
   //////////////////////////////////
@@ -204,18 +232,21 @@ class RedisOrderedQueue {
     });
   }
 
+
   //////////////////////////////////
   commit (id, done) {
   //////////////////////////////////
     this._rediscl.roq_commit (this._name, id, done);
   }
 
+
   //////////////////////////////////
   rollback (id, next_t, done) {
   //////////////////////////////////
     this._rediscl.roq_rollback (this._name, id, next_t || (new Date().getTime ()), done);
   }
 
+
   //////////////////////////////////
   // queue size including non-mature elements
   totalSize (callback) {
@@ -223,6 +254,7 @@ class RedisOrderedQueue {
     this._rediscl.zcard ('keuss:q:ordered_queue:index:' + this._name,  callback);
   }
 
+
   //////////////////////////////////
   // queue size NOT including non-mature elements
   size (callback) {
@@ -230,6 +262,7 @@ class RedisOrderedQueue {
     this._rediscl.zcount ('keuss:q:ordered_queue:index:' + this._name, '-inf', new Date().getTime(), callback);
   }
 
+
   //////////////////////////////////
   // queue size of non-mature elements only
   schedSize (callback) {
@@ -237,12 +270,20 @@ class RedisOrderedQueue {
     this._rediscl.zcount ('keuss:q:ordered_queue:index:' + this._name, new Date().getTime(), '+inf', callback);
   }
 
+
   //////////////////////////////////
   // get first
   peek (callback) {
   //////////////////////////////////
     this._rediscl.zrange ('keuss:q:ordered_queue:index:' + this._name, 0, 0, 'WITHSCORES', callback);
   }
+
+
+  //////////////////////////////////
+  remove (id, done) {
+  //////////////////////////////////
+    this._rediscl.roq_remove (this._name, id, done);
+  }
 }
 
 
@@ -255,8 +296,10 @@ class Factory {
     this._rediscl.defineCommand('roq_reserve',  {numberOfKeys: 1, lua: _s_lua_code_reserve});
     this._rediscl.defineCommand('roq_commit',   {numberOfKeys: 1, lua: _s_lua_code_commit});
     this._rediscl.defineCommand('roq_rollback', {numberOfKeys: 1, lua: _s_lua_code_rollback});
+    this._rediscl.defineCommand('roq_remove',   {numberOfKeys: 1, lua: _s_lua_code_remove});
   }
 
+
   roq (name) {
     return new RedisOrderedQueue (name, this);
   }