MAGETWO-71648: Disabling temp table removal on non-persistent connections for performance

Author: pdohogne-magento

lib/internal/Magento/Framework/Search/Adapter/Mysql/TemporaryStorage.php

@@ -6,6 +6,8 @@
 
 namespace Magento\Framework\Search\Adapter\Mysql;
 
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\DB\Ddl\Table;
 use Magento\Framework\DB\Select;
@@ -25,12 +27,21 @@ class TemporaryStorage
      */
     private $resource;
 
+    /**
+     * @var DeploymentConfig
+     */
+    private $config;
+
     /**
      * @param \Magento\Framework\App\ResourceConnection $resource
+     * @param DeploymentConfig|null $config
      */
-    public function __construct(\Magento\Framework\App\ResourceConnection $resource)
-    {
+    public function __construct(
+        \Magento\Framework\App\ResourceConnection $resource,
+        DeploymentConfig $config = null
+    ) {
         $this->resource = $resource;
+        $this->config = $config !== null ? $config : ObjectManager::getInstance()->get(DeploymentConfig::class);
     }
 
     /**
@@ -117,7 +128,9 @@ private function createTemporaryTable()
         $connection = $this->getConnection();
         $tableName = $this->resource->getTableName(str_replace('.', '_', uniqid(self::TEMPORARY_TABLE_PREFIX, true)));
         $table = $connection->newTable($tableName);
-        $connection->dropTemporaryTable($table->getName());
+        if ($this->config->get('db/connection/indexer/persistent')) {
+            $connection->dropTemporaryTable($table->getName());
+        }
         $table->addColumn(
             self::FIELD_ENTITY_ID,
             Table::TYPE_INTEGER,

lib/internal/Magento/Framework/Search/Test/Unit/Adapter/Mysql/TemporaryStorageTest.php

@@ -26,6 +26,11 @@ class TemporaryStorageTest extends \PHPUnit\Framework\TestCase
      */
     private $model;
 
+    /**
+     * @var \Magento\Framework\App\DeploymentConfig|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $config;
+
     protected function setUp()
     {
         $this->tableName = 'some_table_name';
@@ -44,9 +49,13 @@ protected function setUp()
             ->method('getTableName')
             ->willReturn($this->tableName);
 
+        $this->config = $this->getMockBuilder(\Magento\Framework\App\DeploymentConfig::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
         $this->model = (new ObjectManager($this))->getObject(
             \Magento\Framework\Search\Adapter\Mysql\TemporaryStorage::class,
-            ['resource' => $resource]
+            ['resource' => $resource, 'config' => $this->config]
         );
     }
 
@@ -138,15 +147,38 @@ public function testStoreApiDocuments()
         $this->assertEquals($result, $table);
     }
 
+    public function testNoDropIfNotPersistent()
+    {
+        $this->createTemporaryTable(false);
+
+        $this->adapter->expects($this->never())
+            ->method('dropTemporaryTable');
+
+        // model->createTemporaryTable() is a private method; this will call it
+        $this->model->storeApiDocuments([]);
+    }
+
     /**
      * @return \Magento\Framework\DB\Ddl\Table|\PHPUnit_Framework_MockObject_MockObject
      */
-    private function createTemporaryTable()
+    private function createTemporaryTable($persistentConnection = true)
     {
+        $this->config->expects($this->any())
+            ->method('get')
+            ->with('db/connection/indexer/persistent')
+            ->willReturn($persistentConnection);
+
         $table = $this->getMockBuilder(\Magento\Framework\DB\Ddl\Table::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $table->expects($this->at(1))
+
+        $tableInteractionCount = 0;
+        if ($persistentConnection) {
+            $this->adapter->expects($this->once())
+                ->method('dropTemporaryTable');
+            $tableInteractionCount += 1;
+        }
+        $table->expects($this->at($tableInteractionCount))
             ->method('addColumn')
             ->with(
                 TemporaryStorage::FIELD_ENTITY_ID,
@@ -155,7 +187,8 @@ private function createTemporaryTable()
                 ['unsigned' => true, 'nullable' => false, 'primary' => true],
                 'Entity ID'
             );
-        $table->expects($this->at(2))
+        $tableInteractionCount += 1;
+        $table->expects($this->at($tableInteractionCount))
             ->method('addColumn')
             ->with(
                 'score',
@@ -172,8 +205,6 @@ private function createTemporaryTable()
             ->method('newTable')
             ->with($this->tableName)
             ->willReturn($table);
-        $this->adapter->expects($this->once())
-            ->method('dropTemporaryTable');
         $this->adapter->expects($this->once())
             ->method('createTemporaryTable')
             ->with($table);