Merge remote-tracking branch 'magento-tango/MC-19652' into MPI-PR-10012019

Author: arnobsh

app/code/Magento/Catalog/Model/Indexer/Product/Category/Action/Rows.php

@@ -105,7 +105,7 @@ public function execute(array $entityIds = [], $useTempTable = false)
      * @throws \Exception if metadataPool doesn't contain metadata for ProductInterface
      * @throws \DomainException
      */
-    private function getProductIdsWithParents(array $childProductIds)
+    private function getProductIdsWithParents(array $childProductIds): array
     {
         /** @var \Magento\Framework\EntityManager\EntityMetadataInterface $metadata */
         $metadata = $this->metadataPool->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class);
@@ -123,8 +123,12 @@ private function getProductIdsWithParents(array $childProductIds)
             );
 
         $parentProductIds = $this->connection->fetchCol($select);
+        $ids = array_unique(array_merge($childProductIds, $parentProductIds));
+        foreach ($ids as $key => $id) {
+            $ids[$key] = (int) $id;
+        }
 
-        return array_unique(array_merge($childProductIds, $parentProductIds));
+        return $ids;
     }
 
     /**
@@ -175,7 +179,7 @@ protected function removeEntries()
     protected function getNonAnchorCategoriesSelect(\Magento\Store\Model\Store $store)
     {
         $select = parent::getNonAnchorCategoriesSelect($store);
-        return $select->where('ccp.product_id IN (?) OR relation.child_id IN (?)', $this->limitationByProducts);
+        return $select->where('ccp.product_id IN (?)', $this->limitationByProducts);
     }
 
     /**
@@ -216,28 +220,28 @@ protected function isRangingNeeded()
      * Returns a list of category ids which are assigned to product ids in the index
      *
      * @param array $productIds
-     * @return \Magento\Framework\Indexer\CacheContext
+     * @return array
      */
-    private function getCategoryIdsFromIndex(array $productIds)
+    private function getCategoryIdsFromIndex(array $productIds): array
     {
         $categoryIds = [];
         foreach ($this->storeManager->getStores() as $store) {
-            $categoryIds = array_merge(
-                $categoryIds,
-                $this->connection->fetchCol(
-                    $this->connection->select()
-                        ->from($this->getIndexTable($store->getId()), ['category_id'])
-                        ->where('product_id IN (?)', $productIds)
-                        ->distinct()
-                )
+            $storeCategories = $this->connection->fetchCol(
+                $this->connection->select()
+                    ->from($this->getIndexTable($store->getId()), ['category_id'])
+                    ->where('product_id IN (?)', $productIds)
+                    ->distinct()
             );
+            $categoryIds[] = $storeCategories;
         }
-        $parentCategories = $categoryIds;
+        $categoryIds = array_merge(...$categoryIds);
+
+        $parentCategories = [$categoryIds];
         foreach ($categoryIds as $categoryId) {
             $parentIds = explode('/', $this->getPathFromCategoryId($categoryId));
-            $parentCategories = array_merge($parentCategories, $parentIds);
+            $parentCategories[] = $parentIds;
         }
-        $categoryIds = array_unique($parentCategories);
+        $categoryIds = array_unique(array_merge(...$parentCategories));
 
         return $categoryIds;
     }