Merge remote-tracking branch 'origin/MAGETWO-59406' into 2.0-develop-pr6

zakdma · zakdma · commit e8b26e5d80aa · 2017-02-10T10:25:36.000+02:00
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Full.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Full.php
@@ -7,6 +7,13 @@
 
 class Full extends \Magento\Catalog\Model\Indexer\Category\Product\AbstractAction
 {
+    /**
+     * Whether to use main or temporary index table
+     *
+     * @var bool
+     */
+    protected $useTempTable = false;
+
     /**
      * Refresh entities index
      *
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/MaxHeapTableSizeProcessor.php b/app/code/Magento/Catalog/Model/ResourceModel/MaxHeapTableSizeProcessor.php
@@ -7,6 +7,9 @@
 
 use Magento\Framework\App\ResourceConnection;
 
+/**
+ * @deprecated
+ */
 class MaxHeapTableSizeProcessor
 {
     /**
diff --git a/app/code/Magento/Catalog/Plugin/Model/Indexer/Category/Product/MaxHeapTableSizeProcessorOnFullReindex.php b/app/code/Magento/Catalog/Plugin/Model/Indexer/Category/Product/MaxHeapTableSizeProcessorOnFullReindex.php
@@ -10,6 +10,9 @@
 use Magento\Catalog\Model\ResourceModel\MaxHeapTableSizeProcessor;
 use Psr\Log\LoggerInterface;
 
+/**
+ * @deprecated
+ */
 class MaxHeapTableSizeProcessorOnFullReindex
 {
     /**
diff --git a/app/code/Magento/Catalog/etc/adminhtml/di.xml b/app/code/Magento/Catalog/etc/adminhtml/di.xml
@@ -62,7 +62,6 @@
     </type>
     <type name="Magento\Catalog\Model\Indexer\Category\Product\Action\Full">
         <plugin name="invalidate_pagecache_after_full_reindex" type="Magento\Catalog\Plugin\Model\Indexer\Category\Product\Execute" />
-        <plugin name="max_heap_tablse_size_processor_on_full_reindex" type="Magento\Catalog\Plugin\Model\Indexer\Category\Product\MaxHeapTableSizeProcessorOnFullReindex"/>
     </type>
     <type name="Magento\Catalog\Model\ResourceModel\Attribute">
         <plugin name="invalidate_pagecache_after_attribute_save" type="Magento\Catalog\Plugin\Model\ResourceModel\Attribute\Save" />

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,13 @@`
`7`	`7`
`8`	`8`	`class Full extends \Magento\Catalog\Model\Indexer\Category\Product\AbstractAction`
`9`	`9`	`{`
	`10`	`+ /**`
	`11`	`+ * Whether to use main or temporary index table`
	`12`	`+ *`
	`13`	`+ * @var bool`
	`14`	`+ */`
	`15`	`+ protected $useTempTable = false;`
	`16`	`+`
`10`	`17`	`/**`
`11`	`18`	`* Refresh entities index`
`12`	`19`	`*`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,9 @@`
`7`	`7`
`8`	`8`	`use Magento\Framework\App\ResourceConnection;`
`9`	`9`
	`10`	`+/**`
	`11`	`+ * @deprecated`
	`12`	`+ */`
`10`	`13`	`class MaxHeapTableSizeProcessor`
`11`	`14`	`{`
`12`	`15`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,9 @@`
`10`	`10`	`use Magento\Catalog\Model\ResourceModel\MaxHeapTableSizeProcessor;`
`11`	`11`	`use Psr\Log\LoggerInterface;`
`12`	`12`
	`13`	`+/**`
	`14`	`+ * @deprecated`
	`15`	`+ */`
`13`	`16`	`class MaxHeapTableSizeProcessorOnFullReindex`
`14`	`17`	`{`
`15`	`18`	`/**`