Merge pull request ezsystems#481 from ezsystems/ezp-19650_trashpurge_…

…memory_use Fix EZP-19650: move to trash and trashpurge.php can hit the memory limit
nfrp · Apr 10, 2013 · 390685b · 390685b
2 parents 46bdd1d + 2d2f287
commit 390685b
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 19 deletions.
diff --git a/kernel/classes/ezcontentobject.php b/kernel/classes/ezcontentobject.php
@@ -1615,14 +1615,22 @@ function purge()
 
         $db->begin();
 
-        $contentobjectAttributes = $this->allContentObjectAttributes( $delID );
-
-        foreach ( $contentobjectAttributes as $contentobjectAttribute )
-        {
-            $dataType = $contentobjectAttribute->dataType();
-            if ( !$dataType )
-                continue;
-            $dataType->deleteStoredObjectAttribute( $contentobjectAttribute );
+        $attrOffset = 0;
+        $attrLimit = 20;
+        while (
+            $contentobjectAttributes = $this->allContentObjectAttributes(
+                $delID, true, array( 'limit' => $attrLimit, 'offset' => $attrOffset )
+            )
+        )
+        {
+            foreach ( $contentobjectAttributes as $contentobjectAttribute )
+            {
+                $dataType = $contentobjectAttribute->dataType();
+                if ( !$dataType )
+                    continue;
+                $dataType->deleteStoredObjectAttribute( $contentobjectAttribute );
+            }
+            $attrOffset += $attrLimit;
         }
 
         eZInformationCollection::removeContentObject( $delID );
@@ -1872,16 +1880,22 @@ static function cleanupAllInternalDrafts( $userID = false, $timeDuration = 86400
         }
     }
 
-    /*
-     Fetch all attributes of all versions belongs to a contentObject.
-    */
-    function allContentObjectAttributes( $contentObjectID, $asObject = true )
+    /**
+     * Fetches all attributes from any versions of the content object
+     *
+     * @param int $contentObjectID
+     * @param bool $asObject
+     * @param array|null $limit the limit array passed to
+     *        eZPersistentObject::fetchObjectList
+     * @return eZContentObjectAttribute[]|array|null
+     */
+    function allContentObjectAttributes( $contentObjectID, $asObject = true, $limit = null )
     {
         return eZPersistentObject::fetchObjectList( eZContentObjectAttribute::definition(),
                                                     null,
                                                     array("contentobject_id" => $contentObjectID ),
                                                     null,
-                                                    null,
+                                                    $limit,
                                                     $asObject );
     }
 

diff --git a/kernel/classes/ezcontentobjecttrashnode.php b/kernel/classes/ezcontentobjecttrashnode.php
@@ -147,13 +147,23 @@ function storeToTrash()
         $db->begin();
 
         $contentObject = $this->attribute( 'object' );
-        $contentobjectAttributes = $contentObject->allContentObjectAttributes( $contentObject->attribute( 'id' ) );
-        foreach ( $contentobjectAttributes as $contentobjectAttribute )
+        $offset = 0;
+        $limit = 20;
+        while (
+            $contentobjectAttributes = $contentObject->allContentObjectAttributes(
+                $contentObject->attribute( 'id' ), true,
+                array( 'limit' => $limit, 'offset' => $offset )
+            )
+        )
         {
-            $dataType = $contentobjectAttribute->dataType();
-            if ( !$dataType )
-                continue;
-            $dataType->trashStoredObjectAttribute( $contentobjectAttribute );
+            foreach ( $contentobjectAttributes as $contentobjectAttribute )
+            {
+                $dataType = $contentobjectAttribute->dataType();
+                if ( !$dataType )
+                    continue;
+                $dataType->trashStoredObjectAttribute( $contentobjectAttribute );
+            }
+            $offset += $limit;
         }
 
         $db->commit();