Merge pull request #58 from CheapHasz/bulk-index

Added bulkIndex
novaway · Jan 21, 2019 · a0e5916 · a0e5916
2 parents ff716a2 + bd07225
commit a0e5916
Show file tree

Hide file tree

Showing 6 changed files with 89 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -18,7 +18,8 @@
     "symfony/serializer": "^3.3",
     "guzzlehttp/ringphp": "^1.1",
     "symfony/yaml": "^3.3",
-    "symfony/var-dumper": "^3.3"
+    "symfony/var-dumper": "^3.3",
+    "webmozart/assert": "^1.0"
   },
   "suggest": {
     "symfony/serializer": "Is required when working with the SymfonySerializerBridge"

diff --git a/src/Index.php b/src/Index.php
@@ -91,6 +91,15 @@ public function index(array $params)
         $this->client->index($params);
     }
 
+    /**
+     * @params array
+     */
+    public function bulkIndex(array $params): array
+    {
+        $params['index'] = $this->getMainIndexName();
+        return $this->client->bulk($params);
+    }
+
     /**
      * @params array
      */

diff --git a/src/ObjectIndexer.php b/src/ObjectIndexer.php
@@ -2,6 +2,8 @@
 
 namespace Novaway\ElasticsearchClient;
 
+use Webmozart\Assert\Assert;
+
 class ObjectIndexer
 {
     /** @var Index */
@@ -34,6 +36,27 @@ public function index(Indexable $object, string $type = "_doc")
         $this->index->index($params);
     }
 
+    /**
+     * @param Indexable[] $objects
+     * @param string $type
+     */
+    public function bulkIndex(array $objects, string $type = "_doc"): array
+    {
+        $params['type'] = $type;
+
+        Assert::allIsInstanceOf($objects, Indexable::class);
+
+        foreach ($objects as $indexable) {
+            $key = $indexable->shouldBeIndexed() ? 'index' : 'delete';
+            $body[] = [$key => ['_id' => $indexable->getId()]];
+            if ($indexable->shouldBeIndexed()) {
+                $body[] = $indexable->toArray();
+            }
+        }
+        $params['body'] = $body;
+        return $this->index->bulkIndex($params);
+    }
+
     /**
      * @param Indexable $object
      * @param string $type

diff --git a/test/functional/bootstrap/FeatureContext.php b/test/functional/bootstrap/FeatureContext.php
@@ -30,6 +30,7 @@
 use Novaway\ElasticsearchClient\Score\ScriptScore;
 use Novaway\ElasticsearchClient\Script\ScriptField;
 use Symfony\Component\Yaml\Yaml;
+use Test\Functional\Novaway\ElasticsearchClient\Context\Gizmos\DesindexableObject;
 use Test\Functional\Novaway\ElasticsearchClient\Context\Gizmos\IndexableObject;
 
 /**
@@ -166,11 +167,11 @@ public function iAddObjectsOfTypeToIndexWithData($objectType, $indexName, TableN
         $objectIndexer = new ObjectIndexer($this->getIndex($indexName));
 
         $objectListHash = $objectList->getHash();
+        $indexableObjects = [];
         foreach ($objectListHash as $objectListRow) {
-            $indexableObject = new IndexableObject($objectListRow['id'], $objectListRow);
-            $objectIndexer->index($indexableObject, $objectType);
+            $indexableObjects[] = new IndexableObject($objectListRow['id'], $objectListRow);
         }
-
+        $objectIndexer->bulkIndex($indexableObjects, $objectType);
         sleep(1);
     }
 
@@ -207,6 +208,27 @@ public function iDeleteTheObjectWithIdOfTypeIndexedIn($id, $objectType, $indexNa
         $objectIndexer->removeById($id, $objectType);
     }
 
+    /**
+     * @When I bulk delete the objects with ids :ids of type :objectType indexed in :indexName
+     */
+    public function iBulkDeleteTheObjectWithIdOfTypeIndexedIn($ids, $objectType, $indexName)
+    {
+        $objectIndexer = new ObjectIndexer($this->getIndex($indexName));
+        $objects = [];
+        foreach ($ids as $id) {
+            $objects[] = new DesindexableObject($id, []);
+        }
+        $objectIndexer->bulkIndex($objects, $objectType);
+    }
+
+    /**
+     * @Then the object of type :objectType indexed in :indexName with id :id exists
+     */
+    public function theObjectOfTypeIndexedInWithIdExists($objectType, $indexName, $id)
+    {
+        $this->assert->integer($this->httpGetStatus(sprintf('/%s/%s/%s', $indexName, $objectType, $id)))->isEqualTo(200);
+    }
+
     /**
      * @Then the object of type :objectType indexed in :indexName with id :id does not exist
      */

diff --git a/test/functional/bootstrap/Gizmos/DesindexableObject.php b/test/functional/bootstrap/Gizmos/DesindexableObject.php
@@ -0,0 +1,13 @@
+<?php
+
+
+namespace Test\Functional\Novaway\ElasticsearchClient\Context\Gizmos;
+
+
+class DesindexableObject extends IndexableObject
+{
+    public function shouldBeIndexed(): bool
+    {
+        return false;
+    }
+}
diff --git a/test/functional/features/index.feature b/test/functional/features/index.feature
@@ -48,6 +48,23 @@ Feature: Add and remove data to the elasticsearch index
         When I delete the object with id "1" of type "_doc" indexed in "my_index"
         Then the object of type "_doc" indexed in "my_index" with id "1" does not exist
 
+    @bulk-delete
+    Scenario: Delete bulk objects
+        Given I reload the index named "my_index"
+        And I add objects of type "_doc" to index "my_index" with data :
+            | id | first_name | nick_name    | age |
+            | 1  | Barry      | flash        | 33  |
+            | 2  | Diana      | Wonder Woman | 910 |
+            | 3  | Bruce      | Batman       | 45  |
+            | 4  | Barbara    | Batgirl      | 27  |
+            | 5  | Oliver     | Green Arrow  | 35  |
+        When I bulk delete the objects with ids "[1;3;5]" of type "_doc" indexed in "my_index"
+        Then the object of type "_doc" indexed in "my_index" with id "1" does not exist
+        And the object of type "_doc" indexed in "my_index" with id "2" exists
+        And the object of type "_doc" indexed in "my_index" with id "3" does not exist
+        And the object of type "_doc" indexed in "my_index" with id "4" exists
+        And the object of type "_doc" indexed in "my_index" with id "5" does not exist
+
     @hotswap
     Scenario: Hotswap
         Given I reload the index named "my_index"