Doctrine

Timestamp:

02/21/08 18:42:01 (17 months ago)

Author:

romanb

Message:

Added Doctrine_Record::free() from trunk that can help with controlling memory usage and improved the hydration for large result sets by reducing the number of getTypeOf() calls.

Location:

branches/0.10/lib/Doctrine

Files:

• Hydrator.php (modified) (2 diffs)
• Record.php (modified) (1 diff)
• Table.php (modified) (2 diffs)

branches/0.10/lib/Doctrine/Hydrator.php

@@ -300 +300 @@
                     $cache[$key]['isSimpleType'] = true;
                 } else {
+                    $cache[$key]['type'] = $type;
                     $cache[$key]['isSimpleType'] = false;
                 }
@@ -320 +321 @@
                 $rowData[$dqlAlias][$fieldName] = $value;
             } else {
-                $rowData[$dqlAlias][$fieldName] = $table->prepareValue($fieldName, $value);
+                $rowData[$dqlAlias][$fieldName] = $table->prepareValue(
+                        $fieldName, $value, $cache[$key]['type']);
             }
 

branches/0.10/lib/Doctrine/Record.php

@@ -1816 +1816 @@
         $this->getNode()->delete();
     }
+    
+    /**
+     * Helps freeing the memory occupied by the entity.
+     * Cuts all references the entity has to other entities and removes the entity
+     * from the instance pool.
+     * Note: The entity is no longer useable after free() has been called. Any operations
+     * done with the entity afterwards can lead to unpredictable results.
+     */
+    public function free()
+    {
+        $this->_table->getRepository()->evict($this->_oid);
+        $this->_table->removeRecord($this);
+        $this->_data = array();
+        $this->_id = array();
+        $this->_references = array();
+    }
+    
     public function toString()
     {

branches/0.10/lib/Doctrine/Table.php

@@ -1639 +1639 @@
      * @param string $field     the name of the field
      * @param string $value     field value
+     * @param string $typeHint  Type hint used to pass in the type of the value to prepare
+     *                          if it is already known. This enables the method to skip
+     *                          the type determination. Used i.e. during hydration.
      * @return mixed            prepared value
      */
-    public function prepareValue($fieldName, $value)
+    public function prepareValue($fieldName, $value, $typeHint = null)
     {
         if ($value === self::$_null) {
@@ -1648 +1651 @@
             return null;
         } else {
-            $type = $this->getTypeOf($fieldName);
+            $type = is_null($typeHint) ? $this->getTypeOf($fieldName) : $typeHint;
 
             switch ($type) {