Skip to content

Prevent flushing same tags several times #29885

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.

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 4 commits into from
Oct 7, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion lib/internal/Magento/Framework/Indexer/CacheContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,6 @@ public function getIdentities()
$identities[] = $cacheTag . '_' . $id;
}
}
return array_merge($identities, array_unique($this->tags));
return array_unique(array_merge($identities, array_unique($this->tags)));
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
<?php

/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
declare(strict_types=1);

namespace Magento\Framework\Indexer\Test\Unit;

use Magento\Framework\Indexer\CacheContext;
use PHPUnit\Framework\TestCase;

class CacheContextTest extends TestCase
{
/**
* @var Batch
*/
private $object;

protected function setUp(): void
{
$this->object = new CacheContext();
}

/**
* @param array $tagsData
* @param array $expected
* @dataProvider getTagsDataProvider
*/
public function testUniqueTags($tagsData, $expected)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a recommendation for the future to use type hinting whenever it's possible. It's a very useful habit in PHP 7.x

{
foreach ($tagsData as $tagSet) {
foreach ($tagSet as $cacheTag => $ids) {
$this->object->registerEntities($cacheTag, $ids);
}
}

$this->assertEquals($this->object->getIdentities(), $expected);
}

/**
* @return array
*/
public function getTagsDataProvider()
{
return [
'same entities and ids' => [
[['cat_p' => [1]], ['cat_p' => [1]]],
['cat_p_1']
],
'same entities with overlapping ids' => [
[['cat_p' => [1, 2, 3]], ['cat_p' => [3]]],
['cat_p_1', 'cat_p_2', 'cat_p_3']
]
];
}
}