Merge pull request #6254 from laboro/revert-6227-fix/CRM-4744

Revert "CRM-4744: Optimize performance of the Magento sync for one day period"
oroinc · Dec 16, 2015 · fa66991 · fa66991
2 parents 4875f9c + 2fe503d
commit fa66991
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 50 deletions.
diff --git a/src/Oro/Bundle/BatchBundle/Step/ItemStep.php b/src/Oro/Bundle/BatchBundle/Step/ItemStep.php
@@ -32,8 +32,6 @@ public function doExecute(StepExecution $stepExecution)
 
         $stepExecutor->execute($this);
         $this->flushStepElements();
-
-        $this->restoreStepElements();
     }
 
     /**
@@ -72,16 +70,4 @@ public function flushStepElements()
             }
         }
     }
-
-    /**
-     * Restores step elements to a state that was before a job execution.
-     */
-    protected function restoreStepElements()
-    {
-        foreach ($this->getConfigurableStepElements() as $element) {
-            if ($element instanceof StepExecutionRestoreInterface) {
-                $element->restoreStepExecution();
-            }
-        }
-    }
 }
diff --git a/src/Oro/Bundle/BatchBundle/Step/StepExecutionRestoreInterface.php b/src/Oro/Bundle/BatchBundle/Step/StepExecutionRestoreInterface.php
diff --git a/src/Oro/Bundle/IntegrationBundle/ImportExport/Writer/PersistentBatchWriter.php b/src/Oro/Bundle/IntegrationBundle/ImportExport/Writer/PersistentBatchWriter.php
@@ -9,8 +9,6 @@
 
 use Doctrine\ORM\EntityManager;
 
-use Oro\Bundle\BatchBundle\Step\StepExecutionRestoreInterface;
-
 use Oro\Bundle\ImportExportBundle\Context\ContextRegistry;
 use Oro\Bundle\IntegrationBundle\Event\WriterErrorEvent;
 use Oro\Bundle\IntegrationBundle\Event\WriterAfterFlushEvent;
@@ -21,10 +19,7 @@
 use Akeneo\Bundle\BatchBundle\Item\InvalidItemException;
 use Akeneo\Bundle\BatchBundle\Step\StepExecutionAwareInterface;
 
-class PersistentBatchWriter implements
-    ItemWriterInterface,
-    StepExecutionAwareInterface,
-    StepExecutionRestoreInterface
+class PersistentBatchWriter implements ItemWriterInterface, StepExecutionAwareInterface
 {
     /** @var RegistryInterface */
     protected $registry;
@@ -41,9 +36,6 @@ class PersistentBatchWriter implements
     /** @var LoggerInterface */
     protected $logger;
 
-    /** @var StepExecution|null */
-    protected $previousStepExecution;
-
     /**
      * @param RegistryInterface        $registry
      * @param EventDispatcherInterface $eventDispatcher
@@ -132,16 +124,6 @@ public function write(array $items)
      */
     public function setStepExecution(StepExecution $stepExecution)
     {
-        $this->previousStepExecution = $this->stepExecution;
-
         $this->stepExecution = $stepExecution;
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function restoreStepExecution()
-    {
-        $this->stepExecution = $this->previousStepExecution;
-    }
 }