Merge remote-tracking branch 'origin/indexers' into stock_indexer_batching

Author: Stanislav Idolov

app/code/Magento/Bundle/Model/ResourceModel/Indexer/Price.php

@@ -15,8 +15,7 @@
 class Price extends \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\DefaultPrice
 {
     /**
-     * {@inheritdoc}
-     * @param null|array $entityIds
+     * @inheritdoc
      */
     protected function reindex($entityIds = null)
     {

app/code/Magento/CacheInvalidate/Model/PurgeCache.php

@@ -67,6 +67,7 @@ public function sendPurgeRequest($tagsPattern)
                     '1.1',
                     $headers
                 );
+                $socketAdapter->read();
                 $socketAdapter->close();
             } catch (\Exception $e) {
                 $this->logger->critical($e->getMessage(), compact('server', 'tagsPattern'));

app/code/Magento/CacheInvalidate/Test/Unit/Model/PurgeCacheTest.php

@@ -71,6 +71,8 @@ public function testSendPurgeRequest($hosts)
             $this->socketAdapterMock->expects($this->at($i++))
                 ->method('write')
                 ->with('PURGE', $uri, '1.1', ['X-Magento-Tags-Pattern' => 'tags', 'Host' => $uri->getHost()]);
+            $this->socketAdapterMock->expects($this->at($i++))
+                ->method('read');
             $i++;
         }
         $this->socketAdapterMock->expects($this->exactly(count($uris)))

app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php

@@ -135,7 +135,7 @@ protected function _syncData(array $processIds = [])
     {
         // delete invalid rows
         $select = $this->_connection->select()->from(
-            ['index_price' => $this->getIndexerDefaultTable()],
+            ['index_price' => $this->getIndexTargetTable()],
             null
         )->joinLeft(
             ['ip_tmp' => $this->_defaultIndexerResource->getIdxTable()],
@@ -152,7 +152,7 @@ protected function _syncData(array $processIds = [])
 
         $this->_insertFromTable(
             $this->_defaultIndexerResource->getIdxTable(),
-            $this->getIndexerDefaultTable()
+            $this->getIndexTargetTable()
         );
         return $this;
     }
@@ -471,7 +471,7 @@ protected function _copyRelationIndexData($parentIds, $excludeIds = null)
 
         if ($children) {
             $select = $this->_connection->select()->from(
-                $this->getIndexerDefaultTable()
+                $this->getIndexTargetTable()
             )->where(
                 'entity_id IN(?)',
                 $children
@@ -484,14 +484,13 @@ protected function _copyRelationIndexData($parentIds, $excludeIds = null)
     }
 
     /**
-     * Returns default table name for writing
+     * Retrieve index table that will be used for write operations.
      *
-     * Method support writing to frontend table in case with partial reindex
-     * and case with writing to replica table during full reindex
+     * This method is used to during both partial and full reindex to identify the the table.
      *
      * @return string
      */
-    protected function getIndexerDefaultTable()
+    protected function getIndexTargetTable()
     {
         return $this->indexerFrontendResource->getMainTable();
     }

app/code/Magento/Catalog/Model/Indexer/Product/Price/Action/Full.php

@@ -57,15 +57,6 @@ public function __construct(
         \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\BatchSizeCalculator $batchSizeCalculator = null,
         \Magento\Framework\Indexer\BatchProviderInterface $batchProvider = null
     ) {
-        $this->metadataPool = $metadataPool ?: ObjectManager::getInstance()->get(
-            \Magento\Framework\EntityManager\MetadataPool::class
-        );
-        $this->batchSizeCalculator = $batchSizeCalculator ?: ObjectManager::getInstance()->get(
-            \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\BatchSizeCalculator::class
-        );
-        $this->batchProvider = $batchProvider ?: ObjectManager::getInstance()->get(
-            \Magento\Framework\Indexer\BatchProviderInterface::class
-        );
         parent::__construct(
             $config,
             $storeManager,
@@ -77,6 +68,15 @@ public function __construct(
             $defaultIndexerResource,
             $indexerFrontendResource
         );
+        $this->metadataPool = $metadataPool ?: ObjectManager::getInstance()->get(
+            \Magento\Framework\EntityManager\MetadataPool::class
+        );
+        $this->batchSizeCalculator = $batchSizeCalculator ?: ObjectManager::getInstance()->get(
+            \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\BatchSizeCalculator::class
+        );
+        $this->batchProvider = $batchProvider ?: ObjectManager::getInstance()->get(
+            \Magento\Framework\Indexer\BatchProviderInterface::class
+        );
     }
 
     /**
@@ -140,9 +140,8 @@ public function execute($ids = null)
 
     /**
      * @inheritdoc
-     * @return string
      */
-    protected function getIndexerDefaultTable()
+    protected function getIndexTargetTable()
     {
         return $this->_defaultIndexerResource->getMainTable();
     }

app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/BatchSizeCalculator.php

@@ -33,7 +33,9 @@ public function __construct(array $batchRowsCount, array $estimators)
     }
 
     /**
-     * Composite object for batch size calculators
+     * Retrieve batch size for the given indexer.
+     *
+     * Ensure that the database will be able to handle provided batch size correctly.
      *
      * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
      * @param string $indexerTypeId

app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/CompositeProductRowSizeEstimator.php

@@ -38,7 +38,7 @@ public function __construct(
     /**
      * Calculate memory size for largest composite product in database.
      *
-     * @inheritdoc
+     * {@inheritdoc}
      */
     public function estimateRowSize()
     {

app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/DefaultPrice.php

@@ -709,10 +709,9 @@ protected function hasEntity()
     }
 
     /**
-     * @inheritdoc
      * Returns main table name based on the suffix stored in the 'indexer_state' table
      *
-     * @return string
+     * {@inheritdoc}
      */
     public function getMainTable()
     {

app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml

@@ -94,7 +94,7 @@
                         <argument name="at_call" xsi:type="string">getShortDescription</argument>
                         <argument name="at_code" xsi:type="string">short_description</argument>
                         <argument name="css_class" xsi:type="string">overview</argument>
-                        <argument name="at_label" translate="true" xsi:type="string">none</argument>
+                        <argument name="at_label" xsi:type="string">none</argument>
                         <argument name="title" translate="true" xsi:type="string">Overview</argument>
                         <argument name="add_attribute" xsi:type="string">itemprop="description"</argument>
                     </arguments>

app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Price.php

@@ -39,10 +39,15 @@ public function getFinalPrice($qty, $product)
      */
     public function getPrice($product)
     {
-        if ($product->getCustomOption('simple_product')) {
-            return $product->getCustomOption('simple_product')->getProduct()->getPrice();
-        } else {
-            return 0;
+        if (!empty($product)) {
+            $simpleProductOption = $product->getCustomOption('simple_product');
+            if (!empty($simpleProductOption)) {
+                $simpleProduct = $simpleProductOption->getProduct();
+                if (!empty($simpleProduct)) {
+                    return $simpleProduct->getPrice();
+                }
+            }
         }
+        return 0;
     }
 }