Merge remote-tracking branch 'origin/MAGETWO-88184' into PR-13032018

Author: Dmytro Vilchynskyi

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

@@ -87,13 +87,29 @@ public function __construct(
         $this->activeTableSwitcher = $activeTableSwitcher ?: $objectManager->get(ActiveTableSwitcher::class);
     }
 
+    /**
+     *
+     * Clear the table we'll be writing de-normalized data into
+     * to prevent archived data getting in the way of actual data.
+     *
+     * @return void
+     */
+    private function clearCurrentTable()
+    {
+        $this->connection->delete(
+            $this->activeTableSwitcher
+                ->getAdditionalTableName($this->getMainTable())
+        );
+    }
+
     /**
      * Refresh entities index
      *
      * @return $this
      */
     public function execute()
     {
+        $this->clearCurrentTable();
         $this->reindex();
         $this->activeTableSwitcher->switchTable($this->connection, [$this->getMainTable()]);
         return $this;
@@ -103,6 +119,9 @@ public function execute()
      * Return select for remove unnecessary data
      *
      * @return \Magento\Framework\DB\Select
+     *
+     * @deprecated Not used anymore.
+     * @see clearCurrentTable()
      */
     protected function getSelectUnnecessaryData()
     {
@@ -127,12 +146,14 @@ protected function getSelectUnnecessaryData()
      * Remove unnecessary data
      *
      * @return void
+     *
+     * @deprecated Not used anymore.
+     * @see clearCurrentTable()
      */
     protected function removeUnnecessaryData()
     {
-        $this->connection->query(
-            $this->connection->deleteFromSelect($this->getSelectUnnecessaryData(), $this->getMainTable())
-        );
+        //Called for backward compatibility.
+        $this->getSelectUnnecessaryData();
     }
 
     /**
@@ -233,6 +254,7 @@ private function reindexCategoriesBySelect(\Magento\Framework\DB\Select $basicSe
                 )
             );
             $this->publishData();
+            //Called for backward compatibility.
             $this->removeUnnecessaryData();
         }
     }