Skip to content

bulk method now executes all operations #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 1, 2014
Merged

bulk method now executes all operations #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
336f5a5
bulk method now executes all operations
Nov 21, 2014
59e3435
Added delete case in switch in bulk method
Nov 27, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 24 additions & 16 deletions Client/Connection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,28 +89,36 @@ public function getClient()
*/
public function bulk($operation, $type, array $query)
{
if (!in_array($operation, ['index', 'create', 'update', 'delete'])) {
throw new \InvalidArgumentException('Wrong bulk operation selected');
}

$this->bulkQueries['body'][] = [
$operation => array_filter(
[
'_index' => $this->getIndexName(),
'_type' => $type,
'_id' => isset($query['_id']) ? $query['_id'] : null,
'_ttl' => isset($query['_ttl']) ? $query['_ttl'] : null,
'_parent' => isset($query['_parent']) ? $query['_parent'] : null,
]
),
];
unset($query['_id'], $query['_ttl'], $query['_parent']);

switch ($operation) {
case 'index':
case 'create':
case 'update':

$this->bulkQueries['body'][] = [
$operation => [
'_index' => $this->getIndexName(),
'_type' => $type,
'_id' => isset($query['_id']) ? $query['_id'] : null,
'_ttl' => isset($query['_ttl']) ? $query['_ttl'] : null,
'_parent' => isset($query['_parent']) ? $query['_parent'] : null
]
];

// Unset reserved keys.
unset($query['_id'], $query['_ttl'], $query['_parent']);

$this->bulkQueries['body'][] = $query;
break;
case 'update':
$this->bulkQueries['body'][] = ['doc' => $query];
break;
case 'delete':
// Body for delete opertation is not needed to apply.
default:
throw new \InvalidArgumentException('Wrong bulk operation selected');
// Do nothing.
break;
}
}

Expand Down
38 changes: 38 additions & 0 deletions Tests/Functional/Client/ConnectionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,42 @@ public function testUpdateMapping()
$status = $connection->updateMapping();
$this->assertTrue($status, 'Mapping should be updated');
}

/**
* Tests bulk operations.
*/
public function testBulk()
{
$manager = $this->getManager();
$connection = $manager->getConnection();
$repository = $manager->getRepository('ONGRTestingBundle:Product');

// CREATE.
$connection->bulk('create', 'product', ['_id' => 'baz', 'title' => 'Awesomo']);
$connection->commit();

$product = $repository->find('baz');
$this->assertEquals('Awesomo', $product->title, 'Document should be created.');

// UPDATE.
$connection->bulk('update', 'product', ['_id' => 'baz', 'title' => 'Improved awesomo']);
$connection->commit();

$product = $repository->find('baz');
$this->assertEquals('Improved awesomo', $product->title, 'Document should be updated.');

// INDEX.
$connection->bulk('index', 'product', ['_id' => 'baz', 'title' => 'Indexed awesomo']);
$connection->commit();

$product = $repository->find('baz');
$this->assertEquals('Indexed awesomo', $product->title, 'Document should be indexed.');

// DELETE.
$connection->bulk('delete', 'product', ['_id' => 'baz']);
$connection->commit();

$this->setExpectedException('Elasticsearch\Common\Exceptions\Missing404Exception');
$product = $repository->find('baz');
}
}