Make oldFields mapping hardcoded to speed up system

tmotyl · tmotyl · commit e15d959fe9a4 · 2020-04-06T14:16:57.000+02:00
The mapping came with Magneto 1.6 to provide a backward compatibility for old (pre 1.6) db field names. Now the mapping is hardcoded in the class instead of saved in the configuration. This improves performance as Magento will not create tons of objects for every new product/order/... entities. Related: #920
diff --git a/app/code/core/Mage/Catalog/Model/Product.php b/app/code/core/Mage/Catalog/Model/Product.php
@@ -118,18 +118,6 @@ protected function _construct()
         $this->_init('catalog/product');
     }
 
-    /**
-     * Init mapping array of short fields to
-     * its full names
-     *
-     * @return Varien_Object
-     */
-    protected function _initOldFieldsMap()
-    {
-        $this->_oldFieldsMap = Mage::helper('catalog')->getOldFieldMap();
-        return $this;
-    }
-
     /**
      * Retrieve Store Id
      *
diff --git a/app/code/core/Mage/CatalogInventory/Model/Stock/Item.php b/app/code/core/Mage/CatalogInventory/Model/Stock/Item.php
@@ -152,6 +152,7 @@ protected function _construct()
      */
     protected function _initOldFieldsMap()
     {
+        // pre 1.6 fields names, old => new
         $this->_oldFieldsMap = array(
             'stock_status_changed_automatically' => 'stock_status_changed_auto',
             'use_config_enable_qty_increments'   => 'use_config_enable_qty_inc'
diff --git a/app/code/core/Mage/Sales/Model/Order.php b/app/code/core/Mage/Sales/Model/Order.php
@@ -431,7 +431,12 @@ protected function _construct()
      */
     protected function _initOldFieldsMap()
     {
-        $this->_oldFieldsMap = Mage::helper('sales')->getOldFieldMap('order');
+        // pre 1.6 fields names, old => new
+        $this->_oldFieldsMap = [
+            'payment_authorization_expiration' => 'payment_auth_expiration',
+            'forced_do_shipment_with_invoice' => 'forced_shipment_with_invoice',
+            'base_shipping_hidden_tax_amount' => 'base_shipping_hidden_tax_amnt',
+        ];
         return $this;
     }
 
diff --git a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Item.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Item.php
@@ -132,7 +132,10 @@ public function setCreditmemo(Mage_Sales_Model_Order_Creditmemo $creditmemo)
      */
     protected function _initOldFieldsMap()
     {
-        $this->_oldFieldsMap = Mage::helper('sales')->getOldFieldMap('creditmemo_item');
+        // pre 1.6 fields names, old => new
+        $this->_oldFieldsMap = [
+            'base_weee_tax_applied_row_amount' => 'base_weee_tax_applied_row_amnt',
+        ];
         return $this;
     }
 
diff --git a/app/code/core/Mage/Sales/Model/Order/Invoice/Item.php b/app/code/core/Mage/Sales/Model/Order/Invoice/Item.php
@@ -122,7 +122,10 @@ function _construct()
      */
     protected function _initOldFieldsMap()
     {
-        $this->_oldFieldsMap = Mage::helper('sales')->getOldFieldMap('invoice_item');
+        // pre 1.6 fields names, old => new
+        $this->_oldFieldsMap = [
+            'base_weee_tax_applied_row_amount' => 'base_weee_tax_applied_row_amnt',
+        ];
         return $this;
     }
     /**
diff --git a/app/code/core/Mage/Sales/Model/Order/Item.php b/app/code/core/Mage/Sales/Model/Order/Item.php
@@ -236,7 +236,10 @@ protected function _construct()
      */
     protected function _initOldFieldsMap()
     {
-        $this->_oldFieldsMap = Mage::helper('sales')->getOldFieldMap('order_item');
+        // pre 1.6 fields names, old => new
+        $this->_oldFieldsMap = [
+            'base_weee_tax_applied_row_amount' => 'base_weee_tax_applied_row_amnt',
+        ];
         return $this;
     }
 
diff --git a/app/code/core/Mage/Sales/etc/config.xml b/app/code/core/Mage/Sales/etc/config.xml
@@ -1198,13 +1198,6 @@
             </product>
         </catalog>
         <sales>
-            <old_fields_map>
-                <order>
-                    <payment_authorization_expiration>payment_auth_expiration</payment_authorization_expiration>
-                    <forced_do_shipment_with_invoice>forced_shipment_with_invoice</forced_do_shipment_with_invoice>
-                    <base_shipping_hidden_tax_amount>base_shipping_hidden_tax_amnt</base_shipping_hidden_tax_amount>
-                </order>
-            </old_fields_map>
             <quote>
                 <totals>
                     <nominal>
diff --git a/app/code/core/Mage/Weee/etc/config.xml b/app/code/core/Mage/Weee/etc/config.xml
@@ -225,17 +225,6 @@
                     </weee>
                 </totals>
             </order_creditmemo>
-            <old_fields_map>
-                <order_item>
-                    <base_weee_tax_applied_row_amount>base_weee_tax_applied_row_amnt</base_weee_tax_applied_row_amount>
-                </order_item>
-                <invoice_item>
-                    <base_weee_tax_applied_row_amount>base_weee_tax_applied_row_amnt</base_weee_tax_applied_row_amount>
-                </invoice_item>
-                <creditmemo_item>
-                    <base_weee_tax_applied_row_amount>base_weee_tax_applied_row_amnt</base_weee_tax_applied_row_amount>
-                </creditmemo_item>
-            </old_fields_map>
         </sales>
     </global>
     <adminhtml>

Original file line number	Diff line number	Diff line change
`@@ -152,6 +152,7 @@ protected function _construct()`
`152`	`152`	`*/`
`153`	`153`	`protected function _initOldFieldsMap()`
`154`	`154`	`{`
	`155`	`+ // pre 1.6 fields names, old => new`
`155`	`156`	`$this->_oldFieldsMap = array(`
`156`	`157`	`'stock_status_changed_automatically' => 'stock_status_changed_auto',`
`157`	`158`	`'use_config_enable_qty_increments' => 'use_config_enable_qty_inc'`
Original file line number	Diff line number	Diff line change
`@@ -431,7 +431,12 @@ protected function _construct()`
`431`	`431`	`*/`
`432`	`432`	`protected function _initOldFieldsMap()`
`433`	`433`	`{`
`434`		`- $this->_oldFieldsMap = Mage::helper('sales')->getOldFieldMap('order');`
	`434`	`+ // pre 1.6 fields names, old => new`
	`435`	`+ $this->_oldFieldsMap = [`
	`436`	`+ 'payment_authorization_expiration' => 'payment_auth_expiration',`
	`437`	`+ 'forced_do_shipment_with_invoice' => 'forced_shipment_with_invoice',`
	`438`	`+ 'base_shipping_hidden_tax_amount' => 'base_shipping_hidden_tax_amnt',`
	`439`	`+ ];`
`435`	`440`	`return $this;`
`436`	`441`	`}`
`437`	`442`
Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,10 @@ public function setCreditmemo(Mage_Sales_Model_Order_Creditmemo $creditmemo)`
`132`	`132`	`*/`
`133`	`133`	`protected function _initOldFieldsMap()`
`134`	`134`	`{`
`135`		`- $this->_oldFieldsMap = Mage::helper('sales')->getOldFieldMap('creditmemo_item');`
	`135`	`+ // pre 1.6 fields names, old => new`
	`136`	`+ $this->_oldFieldsMap = [`
	`137`	`+ 'base_weee_tax_applied_row_amount' => 'base_weee_tax_applied_row_amnt',`
	`138`	`+ ];`
`136`	`139`	`return $this;`
`137`	`140`	`}`
`138`	`141`
Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,10 @@ function _construct()`
`122`	`122`	`*/`
`123`	`123`	`protected function _initOldFieldsMap()`
`124`	`124`	`{`
`125`		`- $this->_oldFieldsMap = Mage::helper('sales')->getOldFieldMap('invoice_item');`
	`125`	`+ // pre 1.6 fields names, old => new`
	`126`	`+ $this->_oldFieldsMap = [`
	`127`	`+ 'base_weee_tax_applied_row_amount' => 'base_weee_tax_applied_row_amnt',`
	`128`	`+ ];`
`126`	`129`	`return $this;`
`127`	`130`	`}`
`128`	`131`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -236,7 +236,10 @@ protected function _construct()`
`236`	`236`	`*/`
`237`	`237`	`protected function _initOldFieldsMap()`
`238`	`238`	`{`
`239`		`- $this->_oldFieldsMap = Mage::helper('sales')->getOldFieldMap('order_item');`
	`239`	`+ // pre 1.6 fields names, old => new`
	`240`	`+ $this->_oldFieldsMap = [`
	`241`	`+ 'base_weee_tax_applied_row_amount' => 'base_weee_tax_applied_row_amnt',`
	`242`	`+ ];`
`240`	`243`	`return $this;`
`241`	`244`	`}`
`242`	`245`