Add counts and add_new_item methods, without tests

go/WorkQueue.go

@@ -120,6 +120,73 @@ func (workQueue *WorkQueue) AddItem(ctx context.Context, db *redis.Client, item
 	return err
 }
 
+// AddNewItem to the work Queue.
+//
+// This function allows the adding of item to queue atomically. Using Watch it keeps trying to execute
+// addItem untill there is no change within the queues, verifications have been done and the addItem has been fully executed.
+// Therefore this wont allow duplifications of items within the queues
+// This method should be used only when database is locked it could break other redis commands.
+//
+// Returns nil if successful  otherwise the error.
+func (workQueue *WorkQueue) AddNewItem(ctx context.Context, db *redis.Client, item Item) error {
+	txf := func(tx *redis.Tx) error {
+
+		pipeNew := db.Pipeline()
+
+		processingItemsInQueueCmd := pipeNew.LPos(ctx, workQueue.processingKey, item.ID, redis.LPosArgs{
+			Rank:   0,
+			MaxLen: 0,
+		})
+
+		workingItemsInQueueCmd := pipeNew.LPos(ctx, workQueue.mainQueueKey, item.ID, redis.LPosArgs{
+			Rank:   0,
+			MaxLen: 0,
+		})
+
+		_, err := pipeNew.Exec(ctx)
+
+		_, ProcessingQueueCheck := processingItemsInQueueCmd.Result()
+		_, WorkingQueueCheck := workingItemsInQueueCmd.Result()
+		if ProcessingQueueCheck == redis.Nil && WorkingQueueCheck == redis.Nil {
+
+			pipeEx := tx.Pipeline()
+			workQueue.AddItemToPipeline(ctx, pipeEx, item)
+			_, err = pipeEx.Exec(ctx)
+			if err != nil {
+				return err
+			}
+		}
+		return nil
+	}
+
+	for {
+		err := db.Watch(ctx, txf, workQueue.mainQueueKey, workQueue.processingKey)
+		// Retry on transaction failure, return on anything else.
+		if err != redis.TxFailedErr {
+			return err
+		}
+	}
+}
+
+// Lengths gets you the lengths of the lists atomically.
+//
+// This can be used to get the real number of items within the main and processing queue
+func (workQueue *WorkQueue) Lengths(ctx context.Context, db *redis.Client) (queueLen, processingLen int64, err error) {
+	tx := db.TxPipeline()
+
+	queueLenPipe := tx.LLen(ctx, workQueue.mainQueueKey)
+	processingLenPipe := tx.LLen(ctx, workQueue.processingKey)
+
+	_, err = tx.Exec(ctx)
+	if err == nil {
+		queueLen, err = queueLenPipe.Result()
+	}
+	if err == nil {
+		processingLen, err = processingLenPipe.Result()
+	}
+	return
+}
+
 // Return the length of the work queue (not including items being processed, see
 // [WorkQueue.Processing]).
 func (workQueue *WorkQueue) QueueLen(ctx context.Context, db *redis.Client) (int64, error) {
@@ -204,3 +271,12 @@ func (workQueue *WorkQueue) Complete(ctx context.Context, db *redis.Client, item
 	})
 	return true, err
 }
+
+func sliceContainsString(slice []string, target string) bool {
+	for _, s := range slice {
+		if s == target {
+			return true
+		}
+	}
+	return false
+}

node/src/WorkQueue.ts

@@ -7,6 +7,11 @@ import Redis, {ChainableCommander} from 'ioredis';
 import {v4 as uuidv4} from 'uuid';
 import {Item} from './Item';
 import {KeyPrefix} from './KeyPrefix';
+import { resolve } from 'path';
+
+function delay(ms: number) {
+  return new Promise( resolve => setTimeout(resolve, ms) );
+}
 
 export {KeyPrefix, Item};
 
@@ -47,6 +52,45 @@ export class WorkQueue {
     pipeline.lpush(this.mainQueueKey, item.id);
   }
 
+  /**
+   * This function allows the adding of item to queue atomically. Using Watch it keeps trying to execute
+   * addItem untill there is no change within the queues, verifications have been done and the addItem has been fully executed.
+   * Therefore this wont allow duplifications of items within the queues
+   * This method should be used only when database is locked it could break other redis commands.
+   * 
+   * @param {Redis} db The Redis Connection.
+   * @param item The item that will be executed using the method addItemToPipeline.
+   * @returns {boolean} returns false if already in queue or true if the transaction succesfully happen.
+   */
+  async addNewItem(db: Redis, item: Item): Promise<boolean> {
+      for (;;) {
+        try {
+          await db.watch(this.mainQueueKey, this.processingKey);
+
+          const pipeNew = db.pipeline();
+
+          pipeNew.lpos(this.processingKey, item.id);
+
+          pipeNew.lpos(this.mainQueueKey, item.id);
+
+          const pipeResult = await pipeNew.exec();
+          if (pipeResult && (pipeResult[0][1] !== null || pipeResult[1][1] !== null)) {
+            return false;// Item already exists in either mainQueue or processingKey
+          }
+
+          const pipeEx = db.multi();
+          this.addItemToPipeline(pipeEx, item);
+          let results = await pipeEx.exec()
+          if (results && results[0][1] === "OK") {
+            return true;
+          }
+        } finally {
+          db.unwatch();
+        }
+      }
+  }
+
+
   /**
    * Add an item to the work queue.
    * This creates a pipeline and executes it on the database.
@@ -70,6 +114,24 @@ export class WorkQueue {
     return db.llen(this.mainQueueKey);
   }
 
+  /**
+   * Lengths gets you the lengths of the lists atomically.
+   * This can be used to get the real number of items within the main and processing queue
+   * 
+   * @param {Redis} db The Redis Connection.
+   * @returns {Promise<[number, number]>} Return the length of main queue and processing queue.
+   */
+  async getQueueLengths(db: Redis): Promise<[number, number]> {
+    const multi = db.multi();
+    multi.llen(this.mainQueueKey);
+    multi.llen(this.processingKey);
+
+    const result = (await multi.exec()) as Array<[Error | null, number]>;
+    const queueLength = result[0][1];
+    const processingLength = result[1][1];
+    return [queueLength, processingLength];
+  }
+
   /**
    * This is used to get the lenght of the Processing Queue.
    *

python/redis_work_queue/workqueue.py

@@ -37,6 +37,38 @@ def add_item(self, db: Redis, item: Item) -> None:
         pipeline = db.pipeline()
         self.add_item_to_pipeline(pipeline, item)
         pipeline.execute()
+
+    def add_new_item(self, db: Redis, item: Item) -> None:
+        """Add an item to the work queue in an atomic way.
+        This function allows the adding of item to queue atomically. Using Watch it keeps trying to execute
+        addItem untill there is no change within the queues, verifications have been done and the addItem has been fully executed.
+        Therefore this wont allow duplifications of items within the queues
+        This method should be used only when database is locked it could break other redis commands.
+
+        This returns False if item was already in queue otherwise True as Item was addeed to the queue.
+        """
+        pipeline = db.pipeline(transaction=True)
+        while True:
+            try:
+                pipeline.watch(self._main_queue_key, self._processing_key)
+
+                pipelineLPOS = db.pipeline()
+
+                main_pos = pipelineLPOS.lpos(self._main_queue_key, item.id())
+                processing_pos = pipelineLPOS.lpos(self._processing_key, item.id())
+
+                LPosPipeline = pipelineLPOS.execute()
+                if LPosPipeline[0] is not None or LPosPipeline[1] is not None:
+                    return False  
+
+                pipeline.multi()
+                self.add_item_to_pipeline(pipeline, item)
+                pipeline.execute()
+                return True
+            except WatchError:
+                continue
+
+        pipeline.unwatch()
 
     def queue_len(self, db: Redis) -> int:
         """Return the length of the work queue (not including items being processed, see
@@ -47,6 +79,18 @@ def processing(self, db: Redis) -> int:
         """Return the number of items being processed."""
         return db.llen(self._processing_key)
 
+
+    def get_queue_lengths(self, db):
+        """Returns the lengths of the lists atomically.
+        This can be used to get the real number of items within the main and processing queue.
+        """
+        pipeline = db.pipeline(transaction=True)
+        pipeline.llen(self._main_queue_key)
+        pipeline.llen(self._processing_key)
+        return pipeline.execute()
+
+
+
     def light_clean(self, db: Redis) -> None:
         processing: list[bytes | str] = db.lrange(
             self._processing_key, 0, -1)

rust/src/lib.rs

@@ -277,9 +277,6 @@ impl WorkQueue {
         pipeline.lpush(&self.main_queue_key, &item.id);
     }
 
-    /// Add an item to the work queue.
-    ///
-    /// This creates a pipeline and executes it on the database.
     pub async fn add_item<C: AsyncCommands>(&self, db: &mut C, item: &Item) -> RedisResult<()> {
         let mut pipeline = Box::new(redis::pipe());
         self.add_item_to_pipeline(&mut pipeline, item);
@@ -303,6 +300,20 @@ impl WorkQueue {
         db.llen(&self.processing_key)
     }
 
+    pub async fn get_queue_lengths<'a, C: AsyncCommands>(
+        &'a self,
+        db: &mut C,
+    ) -> RedisResult<Vec<i64>> {
+        let (queue_length, processing_length): (i64, i64) = redis::pipe()
+            .atomic()
+            .llen(&self.main_queue_key)
+            .llen(&self.processing_key)
+            .query_async(db)
+            .await?;
+
+        Ok(vec![queue_length, processing_length])
+    }
+
     /// Request a work lease the work queue. This should be called by a worker to get work to
     /// complete. When completed, the `complete` method should be called.
     ///

tests/go/go.mod

@@ -6,10 +6,11 @@ go 1.20
 
 require (
 	github.com/mevitae/redis-work-queue/go v0.1.0
-	github.com/redis/go-redis/v9 v9.0.2
+	github.com/redis/go-redis/v9 v9.0.3
 )
 
 require (
+	github.com/bsm/redislock v0.9.3 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/google/uuid v1.3.0 // indirect

tests/go/go.sum

@@ -1,5 +1,9 @@
 github.com/bsm/ginkgo/v2 v2.5.0 h1:aOAnND1T40wEdAtkGSkvSICWeQ8L3UASX7YVCqQx+eQ=
+github.com/bsm/ginkgo/v2 v2.7.0 h1:ItPMPH90RbmZJt5GtkcNvIRuGEdwlBItdNVoyzaNQao=
 github.com/bsm/gomega v1.20.0 h1:JhAwLmtRzXFTx2AkALSLa8ijZafntmhSoU63Ok18Uq8=
+github.com/bsm/gomega v1.26.0 h1:LhQm+AFcgV2M0WyKroMASzAzCAJVpAxQXv4SaI9a69Y=
+github.com/bsm/redislock v0.9.3 h1:osmvugkXGiLDEhzUPdM0EUtKpTEgLLuli4Ky2Z4vx38=
+github.com/bsm/redislock v0.9.3/go.mod h1:Epf7AJLiSFwLCiZcfi6pWFO/8eAYrYpQXFxEDPoDeAk=
 github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
 github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
@@ -10,5 +14,7 @@ github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/redis/go-redis/v9 v9.0.2 h1:BA426Zqe/7r56kCcvxYLWe1mkaz71LKF77GwgFzSxfE=
 github.com/redis/go-redis/v9 v9.0.2/go.mod h1:/xDTe9EF1LM61hek62Poq2nzQSGj0xSrEtEHbBQevps=
+github.com/redis/go-redis/v9 v9.0.3 h1:+7mmR26M0IvyLxGZUHxu4GiBkJkVDid0Un+j4ScYu4k=
+github.com/redis/go-redis/v9 v9.0.3/go.mod h1:WqMKv5vnQbRuZstUwxQI195wHy+t4PuXDOjzMvcuQHk=
 github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=