Merge pull request #83 from martiis/batch_improv

Batch improvements

Author: Martynas Sudintas

Controller/RestController.php

@@ -51,7 +51,7 @@ public function postAction(RestRequest $restRequest, $id = null)
         $types = $repository->getTypes();
         $data['_id'] = $id;
         $repository->getManager()->getConnection()->bulk('create', reset($types), $data);
-        $repository->getManager()->commit();
+        $repository->getManager()->getConnection()->commit(!$this->isBatch());
 
         return $this->renderRest(
             null,
@@ -110,7 +110,7 @@ public function putAction(RestRequest $restRequest, $id = null)
         $types = $repository->getTypes();
         $data['_id'] = $id;
         $repository->getManager()->getConnection()->bulk('index', reset($types), $data);
-        $repository->getManager()->commit();
+        $repository->getManager()->getConnection()->commit(!$this->isBatch());
 
         return $this->renderRest(
             null,
@@ -129,14 +129,22 @@ public function deleteAction(RestRequest $restRequest, $id = null)
         }
 
         $connection = $restRequest->getRepository()->getManager()->getConnection();
+        $types = $restRequest->getRepository()->getTypes();
+
         try {
-            $connection->delete(
-                [
-                    'id' => $id,
-                    'type' => $restRequest->getRepository()->getTypes(),
-                    'index' => $connection->getIndexName(),
-                ]
-            );
+            if ($this->isBatch()) {
+                $types = $restRequest->getRepository()->getTypes();
+                $connection->bulk('delete', reset($types), ['_id' => $id]);
+                $connection->commit(false);
+            } else {
+                $connection->delete(
+                    [
+                        'id' => $id,
+                        'type' => $types,
+                        'index' => $connection->getIndexName(),
+                    ]
+                );
+            }
         } catch (Missing404Exception $e) {
             return $this->renderRest(
                 ['message' => $this->trans('response.error.not_found', ['%id%' => $id])],

Request/BatchProcessor.php

@@ -65,6 +65,7 @@ public function handle(RestRequest $restRequest)
         }
 
         $out = [];
+        $indexes = [];
         $proxy = RestRequestProxy::initialize($restRequest);
         $currentMethod = $this->getRouter()->getContext()->getMethod();
 
@@ -85,8 +86,18 @@ public function handle(RestRequest $restRequest)
             $this->prepareProxy($proxy, $action['body'], $options);
 
             $out[] = call_user_func_array([$this->getController($id), $method], [$proxy, $options['id']]);
+            $indexes[$proxy->getRepository()->getManager()->getConnection()->getIndexName()] = null;
         }
 
+        if (!empty($indexes)) {
+            $proxy
+                ->getRepository()
+                ->getManager()
+                ->getConnection()
+                ->getClient()
+                ->indices()
+                ->flush(['index' => implode(',', array_keys($indexes))]);
+        }
         $this->getRouter()->getContext()->setMethod($currentMethod);
 
         return $out;

composer.json

@@ -16,7 +16,7 @@
         "doctrine/orm": "~2.4",
         "doctrine/doctrine-bundle": "~1.2",
         "symfony/monolog-bundle": "~2.0",
-        "ongr/elasticsearch-bundle": "~0.9",
+        "ongr/elasticsearch-bundle": "~0.10.3",
         "jms/serializer-bundle": "~1.0"
     },
     "require-dev": {