Merge pull request #380 from magento-troll/MAGETWO-37201 (3ad1194c) · Commits · KIII-12 / Magento

Commit 3ad1194c authored 9 years ago by

Pelipenko, Vladimir(vpelipenko)

Merge pull request #380 from magento-troll/MAGETWO-37201

[Troll] Concurrency enhancements & bugfix

parents 62f58762 4a31f3ec

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Bundle/Model/Resource/Indexer/Price.php 4 additions, 13 deletions

app/code/Magento/Bundle/Model/Resource/Indexer/Price.php
app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php 65 additions, 124 deletions

...to/Catalog/Model/Indexer/Product/Price/AbstractAction.php
app/code/Magento/Catalog/Model/Indexer/Product/Price/Action/Full.php 2 additions, 2 deletions

...gento/Catalog/Model/Indexer/Product/Price/Action/Full.php
app/code/Magento/Catalog/Model/Resource/Category/Flat.php 6 additions, 1 deletion

app/code/Magento/Catalog/Model/Resource/Category/Flat.php
app/code/Magento/Catalog/Model/Resource/Product/Indexer/AbstractIndexer.php 3 additions, 1 deletion

...atalog/Model/Resource/Product/Indexer/AbstractIndexer.php
app/code/Magento/Catalog/Model/Resource/Product/Indexer/Eav/AbstractEav.php 24 additions, 14 deletions

...atalog/Model/Resource/Product/Indexer/Eav/AbstractEav.php
app/code/Magento/Catalog/Model/Resource/Product/Indexer/Eav/Decimal.php 1 addition, 4 deletions

...to/Catalog/Model/Resource/Product/Indexer/Eav/Decimal.php
app/code/Magento/Catalog/Model/Resource/Product/Indexer/Eav/Source.php 4 additions, 5 deletions

...nto/Catalog/Model/Resource/Product/Indexer/Eav/Source.php
app/code/Magento/Catalog/Model/Resource/Product/Indexer/Price/DefaultPrice.php 30 additions, 18 deletions

...log/Model/Resource/Product/Indexer/Price/DefaultPrice.php
app/code/Magento/Catalog/etc/di.xml 1 addition, 1 deletion

app/code/Magento/Catalog/etc/di.xml
app/code/Magento/CatalogInventory/Model/Resource/Indexer/Stock/DefaultStock.php 5 additions, 6 deletions

...ogInventory/Model/Resource/Indexer/Stock/DefaultStock.php
app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog.php 10 additions, 3 deletions

...agento/CatalogRule/Controller/Adminhtml/Promo/Catalog.php
app/code/Magento/CatalogRule/Helper/Data.php 1 addition, 2 deletions

app/code/Magento/CatalogRule/Helper/Data.php
app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php 26 additions, 5 deletions

app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php
app/code/Magento/CatalogRule/Setup/InstallSchema.php 0 additions, 16 deletions

app/code/Magento/CatalogRule/Setup/InstallSchema.php
app/code/Magento/CatalogRule/Test/Unit/Helper/DataTest.php 67 additions, 0 deletions

app/code/Magento/CatalogRule/Test/Unit/Helper/DataTest.php
app/code/Magento/CatalogRule/Test/Unit/Model/CronTest.php 18 additions, 8 deletions

app/code/Magento/CatalogRule/Test/Unit/Model/CronTest.php
app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/IndexBuilderTest.php 213 additions, 0 deletions

.../CatalogRule/Test/Unit/Model/Indexer/IndexBuilderTest.php
app/code/Magento/CatalogRule/Test/Unit/Plugin/Indexer/CategoryTest.php 36 additions, 15 deletions

...nto/CatalogRule/Test/Unit/Plugin/Indexer/CategoryTest.php
app/code/Magento/CatalogRule/Test/Unit/Plugin/Indexer/CustomerGroupTest.php 28 additions, 9 deletions

...atalogRule/Test/Unit/Plugin/Indexer/CustomerGroupTest.php

with 544 additions and 247 deletions

Please register or to comment

Admin message

Merge pull request #380 from magento-troll/MAGETWO-37201