Merge pull request #1392 from mailchimp/Issue1391-2.3

Optimize queries for ecommerce table Issue1391 2.3
mailchimp · May 20, 2022 · e43efba · e43efba
2 parents 77bbe28 + 80a97b2
commit e43efba
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 2 deletions.
diff --git a/Model/Api/Cart.php b/Model/Api/Cart.php
@@ -146,6 +146,8 @@ protected function _getConvertedQuotes($mailchimpStoreId, $magentoStoreId)
         // get only the converted quotes
         $convertedCarts->addFieldToFilter('store_id', ['eq' => $magentoStoreId]);
         $convertedCarts->addFieldToFilter('is_active', ['eq' => 0]);
+        $convertedCarts->getSelect()->reset(\Zend_Db_Select::COLUMNS)->columns(['entity_id']);
+
         //join with mailchimp_ecommerce_sync_data table to filter by sync data.
         $convertedCarts->getSelect()->joinLeft(
             ['m4m' => $this->_helper->getTableName('mailchimp_sync_ecommerce')],
@@ -223,6 +225,8 @@ protected function _getModifiedQuotes($mailchimpStoreId, $magentoStoreId)
         $modifiedCarts->addFieldToFilter('is_active', ['eq'=>1]);
         // select carts for the current Magento store id
         $modifiedCarts->addFieldToFilter('store_id', ['eq' => $magentoStoreId]);
+        $modifiedCarts->getSelect()->reset(\Zend_Db_Select::COLUMNS)->columns(['entity_id']);
+
         //join with mailchimp_ecommerce_sync_data table to filter by sync data.
         $modifiedCarts->getSelect()->joinLeft(
             ['m4m' => $this->_helper->getTableName('mailchimp_sync_ecommerce')],
@@ -237,7 +241,6 @@ protected function _getModifiedQuotes($mailchimpStoreId, $magentoStoreId)
         );
         // limit the collection
         $modifiedCarts->getSelect()->limit(self::BATCH_LIMIT);
-
         /**
          * @var $cart \Magento\Quote\Model\Quote
          */
@@ -356,6 +359,8 @@ protected function _getNewQuotes($mailchimpStoreId, $magentoStoreId)
         if ($this->_firstDate) {
             $newCarts->addFieldToFilter('created_at', ['gt' => $this->_firstDate]);
         }
+        $newCarts->getSelect()->reset(\Zend_Db_Select::COLUMNS)->columns(['entity_id']);
+
         //join with mailchimp_ecommerce_sync_data table to filter by sync data.
         $newCarts->getSelect()->joinLeft(
             ['m4m' => $this->_helper->getTableName('mailchimp_sync_ecommerce')],
@@ -365,7 +370,6 @@ protected function _getNewQuotes($mailchimpStoreId, $magentoStoreId)
         );
         // be sure that the quotes are already in mailchimp and not deleted
         $newCarts->getSelect()->where("m4m.mailchimp_sync_delta IS NULL");
-
         // limit the collection
         $newCarts->getSelect()->limit(self::BATCH_LIMIT);
         /**

diff --git a/Model/Api/Customer.php b/Model/Api/Customer.php
@@ -93,6 +93,7 @@ public function sendCustomers($storeId)
         $listId = $this->_helper->getConfigValue(\Ebizmarts\MailChimp\Helper\Data::XML_PATH_LIST, $storeId);
         $collection = $this->_collection->create();
         $collection->addFieldToFilter('store_id', ['eq'=>$storeId]);
+        $collection->getSelect()->reset(\Zend_Db_Select::COLUMNS)->columns(['entity_id','store_id']);
         $collection->getSelect()->joinLeft(
             ['m4m' => $this->_helper->getTableName('mailchimp_sync_ecommerce')],
             "m4m.related_id = e.entity_id and m4m.type = '".\Ebizmarts\MailChimp\Helper\Data::IS_CUSTOMER.

diff --git a/Model/Api/Order.php b/Model/Api/Order.php
@@ -159,6 +159,7 @@ protected function _getModifiedOrders($magentoStoreId)
         $modifiedOrders = $this->_getCollection();
         // select orders for the current Magento store id
         $modifiedOrders->addFieldToFilter('store_id', ['eq' => $magentoStoreId]);
+        $modifiedOrders->addFieldToSelect(['store_id','created_at']);
         //join with mailchimp_ecommerce_sync_data table to filter by sync data.
         $modifiedOrders->getSelect()->joinLeft(
             ['m4m' => $this->_helper->getTableName('mailchimp_sync_ecommerce')],
@@ -238,6 +239,7 @@ protected function _getNewOrders($magentoStoreId)
         $newOrders = $this->_getCollection();
         // select carts for the current Magento store id
         $newOrders->addFieldToFilter('store_id', ['eq' => $magentoStoreId]);
+        $newOrders->addFieldToSelect(['store_id','created_at']);
         // filter by first date if exists.
         if ($this->_firstDate) {
             $newOrders->addFieldToFilter('created_at', ['gt' => $this->_firstDate]);

diff --git a/Model/Api/Product.php b/Model/Api/Product.php
@@ -129,6 +129,7 @@ public function _sendProducts($magentoStoreId)
         $collection = $this->_getCollection();
         $collection->addFieldToFilter("type_id", ["nin"=>[\Magento\Catalog\Model\Product\Type::TYPE_BUNDLE, "grouped"]]);
         $collection->addStoreFilter($magentoStoreId);
+        $collection->getSelect()->reset(\Zend_Db_Select::COLUMNS)->columns(['entity_id']);
         $collection->getSelect()->joinLeft(
             ['m4m' => $this->_helper->getTableName('mailchimp_sync_ecommerce')],
             "m4m.related_id = e.entity_id and m4m.type = '".\Ebizmarts\MailChimp\Helper\Data::IS_PRODUCT.
@@ -139,6 +140,7 @@ public function _sendProducts($magentoStoreId)
             $this->_helper->getMCMinSyncDateFlag().
             "' and m4m.mailchimp_sync_modified = 1)");
         $collection->getSelect()->limit(self::MAX);
+
         foreach ($collection as $item) {
             /**
              * @var $product \Magento\Catalog\Model\Product

diff --git a/Setup/UpgradeSchema.php b/Setup/UpgradeSchema.php
@@ -546,5 +546,17 @@ public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $con
                 ['store_id','regtype','original_id']
             );
         }
+        if (version_compare($context->getVersion(), '102.3.45') < 0) {
+            $connection->addIndex(
+                $setup->getTable('mailchimp_sync_ecommerce'),
+                $connection->getIndexName($setup->getTable('mailchimp_sync_ecommerce'), 'mailchimp_sync_delta', 'index'),
+                'mailchimp_sync_delta'
+            );
+            $connection->addIndex(
+                $setup->getTable('mailchimp_sync_ecommerce'),
+                $connection->getIndexName($setup->getTable('mailchimp_sync_ecommerce'), 'mailchimp_sync_modified', 'index'),
+                'mailchimp_sync_modified'
+            );
+        }
     }
 }