Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / classes / Queue_item.php

diff --git a/classes/Queue_item.php b/classes/Queue_item.php
index 295c321b57d4615fa5a139b9e14b9752fd19a4e3..0d6fd56af278df6adff8654ae4302d4850a94b96 100644 (file)
--- a/classes/Queue_item.php
+++ b/classes/Queue_item.php
@@ -4,31 +4,54 @@
  */
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
-class Queue_item extends Memcached_DataObject
+class Queue_item extends Managed_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 $transport;                       // varchar(32)
     public $created;                         // datetime()   not_null
     public $claimed;                         // datetime()
 
-    /* Static get */
-    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); }
+    public static function schemaDef()
+    {
+        return array(
+            'fields' => array(
+                'id' => array('type' => 'serial', 'not null' => true, 'description' => 'unique identifier'),
+                'frame' => array('type' => 'blob', 'not null' => true, 'description' => 'data: object reference or opaque string'),
+                'transport' => array('type' => 'varchar', 'length' => 32, 'not null' => true, 'description' => 'queue for what? "email", "xmpp", "sms", "irc", ...'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+                'claimed' => array('type' => 'datetime', 'description' => 'date this item was claimed'),
+            ),
+            'primary key' => array('id'),
+            'indexes' => array(
+                'queue_item_created_idx' => array('created'),
+            ),
+        );
+    }
 
-    static function top($transport) {
+    /**
+     * @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();
-        $qi->transport = $transport;
+        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');
 
@@ -37,10 +60,11 @@ class Queue_item extends Memcached_DataObject
         $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);
+            // 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);
@@ -55,8 +79,16 @@ class Queue_item extends Memcached_DataObject
         return null;
     }
 
-    function &pkeyGet($kv)
+    /**
+     * Release a claimed item.
+     */
+    function releaseClaim()
     {
-        return Memcached_DataObject::pkeyGet('Queue_item', $kv);
+        // 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();
     }
 }