X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=classes%2FQueue_item.php;h=007d4ed23203464a3df8f79031051f276171333b;hb=b54a9f389cacd6b4efd5499316a10729e89e2578;hp=8ba3281de39cf30846b57eb61d4403f9099cb22b;hpb=29146a13f295a13a4ee4470cffaaa7fde6858689;p=quix0rs-gnu-social.git

diff --git a/classes/Queue_item.php b/classes/Queue_item.php
index 8ba3281de3..007d4ed232 100644
--- a/classes/Queue_item.php
+++ b/classes/Queue_item.php
@@ -4,52 +4,77 @@
  */
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
-class Queue_item extends Memcached_DataObject 
+class Queue_item extends Memcached_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
 
     public $__table = 'queue_item';                      // table name
-    public $notice_id;                       // int(4)  primary_key not_null
-    public $transport;                       // varchar(8)  primary_key not_null
+    public $id;                              // int(4)  primary_key not_null
+    public $frame;                           // blob not_null
     public $created;                         // datetime()   not_null
-    public $claimed;                         // datetime()  
+    public $claimed;                         // datetime()
 
     /* Static get */
-    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Queue_item',$k,$v); }
+    function staticGet($k,$v=null)
+    { return Memcached_DataObject::staticGet('Queue_item',$k,$v); }
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
-    function sequenceKey() { return array(false, false); }
-	
-	static function top($transport) {
-
-		$qi = new Queue_item();
-		$qi->transport = $transport;
-		$qi->orderBy('created');
-		$qi->whereAdd('claimed is NULL');
-
-		$qi->limit(1);
-
-		$cnt = $qi->find(TRUE);
-
-		if ($cnt) {
-			# XXX: potential race condition
-			# can we force it to only update if claimed is still NULL
-			# (or old)?
-			common_log(LOG_INFO, 'claiming queue item = ' . $qi->notice_id . ' for transport ' . $transport);
-			$orig = clone($qi);
-			$qi->claimed = common_sql_now();
-			$result = $qi->update($orig);
-			if ($result) {
-				common_log(LOG_INFO, 'claim succeeded.');
-				return $qi;
-			} else {
-				common_log(LOG_INFO, 'claim failed.');
-			}
-		}
-		$qi = NULL;
-		return NULL;
-	}
+    /**
+     * @param mixed $transports name of a single queue or array of queues to pull from
+     *                          If not specified, checks all queues in the system.
+     */
+    static function top($transports=null) {
+
+        $qi = new Queue_item();
+        if ($transports) {
+            if (is_array($transports)) {
+                // @fixme use safer escaping
+                $list = implode("','", array_map(array($qi, 'escape'), $transports));
+                $qi->whereAdd("transport in ('$list')");
+            } else {
+                $qi->transport = $transports;
+            }
+        }
+        $qi->orderBy('created');
+        $qi->whereAdd('claimed is null');
+
+        $qi->limit(1);
+
+        $cnt = $qi->find(true);
+
+        if ($cnt) {
+            # XXX: potential race condition
+            # can we force it to only update if claimed is still null
+            # (or old)?
+            common_log(LOG_INFO, 'claiming queue item id = ' . $qi->id .
+                ' for transport ' . $qi->transport);
+            $orig = clone($qi);
+            $qi->claimed = common_sql_now();
+            $result = $qi->update($orig);
+            if ($result) {
+                common_log(LOG_INFO, 'claim succeeded.');
+                return $qi;
+            } else {
+                common_log(LOG_INFO, 'claim failed.');
+            }
+        }
+        $qi = null;
+        return null;
+    }
+
+    /**
+     * Release a claimed item.
+     */
+    function releaseCLaim()
+    {
+        // DB_DataObject doesn't let us save nulls right now
+        $sql = sprintf("UPDATE queue_item SET claimed=NULL WHERE id=%d", $this->id);
+        $this->query($sql);
+
+        $this->claimed = null;
+        $this->encache();
+    }
 }