-
Notifications
You must be signed in to change notification settings - Fork 9.3k
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
MC-23881: When category URL page param is larger than the pagination, the page will break with elastic search 2 #31594
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -23,6 +23,8 @@ | |||||
*/ | ||||||
class Builder extends Elasticsearch5Builder | ||||||
{ | ||||||
private const ELASTIC_INT_MAX = 2147483647; | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
|
||||||
/** | ||||||
* @var Sort | ||||||
*/ | ||||||
|
@@ -61,7 +63,7 @@ public function initQuery(RequestInterface $request) | |||||
'index' => $this->searchIndexNameResolver->getIndexName($storeId, $request->getIndex()), | ||||||
'type' => $this->clientConfig->getEntityType(), | ||||||
'body' => [ | ||||||
'from' => $request->getFrom(), | ||||||
'from' => min(self::ELASTIC_INT_MAX, $request->getFrom()), | ||||||
'size' => $request->getSize(), | ||||||
'fields' => ['_id', '_score'], | ||||||
'sort' => $this->sortBuilder->getSort($request), | ||||||
|
189 changes: 189 additions & 0 deletions
189
app/code/Magento/Elasticsearch/Test/Unit/Elasticsearch5/SearchAdapter/Query/BuilderTest.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,189 @@ | ||
<?php | ||
|
||
/** | ||
* Copyright © Magento, Inc. All rights reserved. | ||
* See COPYING.txt for license details. | ||
*/ | ||
declare(strict_types=1); | ||
|
||
namespace Magento\Elasticsearch\Test\Unit\Elasticsearch5\SearchAdapter\Query; | ||
|
||
use Magento\Elasticsearch\Elasticsearch5\SearchAdapter\Query\Builder; | ||
use Magento\Elasticsearch\Model\Config; | ||
use Magento\Elasticsearch\SearchAdapter\Query\Builder\Aggregation as AggregationBuilder; | ||
use Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver; | ||
use Magento\Framework\App\ScopeInterface; | ||
use Magento\Framework\App\ScopeResolverInterface; | ||
use Magento\Framework\Search\Request\Dimension; | ||
use Magento\Framework\Search\RequestInterface; | ||
use PHPUnit\Framework\MockObject\MockObject; | ||
use PHPUnit\Framework\TestCase; | ||
|
||
/** | ||
* @SuppressWarnings(PHPMD.CouplingBetweenObjects) | ||
*/ | ||
class BuilderTest extends TestCase | ||
{ | ||
/** | ||
* @var Builder | ||
*/ | ||
protected $model; | ||
|
||
/** | ||
* @var Config|MockObject | ||
*/ | ||
protected $clientConfig; | ||
|
||
/** | ||
* @var SearchIndexNameResolver|MockObject | ||
*/ | ||
protected $searchIndexNameResolver; | ||
|
||
/** | ||
* @var AggregationBuilder|MockObject | ||
*/ | ||
protected $aggregationBuilder; | ||
|
||
/** | ||
* @var RequestInterface|MockObject | ||
*/ | ||
protected $request; | ||
|
||
/** | ||
* @var ScopeResolverInterface|MockObject | ||
*/ | ||
protected $scopeResolver; | ||
|
||
/** | ||
* @var ScopeInterface|MockObject | ||
*/ | ||
protected $scopeInterface; | ||
|
||
/** | ||
* Setup method | ||
* | ||
* @return void | ||
*/ | ||
protected function setUp(): void | ||
{ | ||
$this->clientConfig = $this->getMockBuilder(Config::class) | ||
->onlyMethods(['getEntityType']) | ||
->disableOriginalConstructor() | ||
->getMock(); | ||
$this->searchIndexNameResolver = $this | ||
->getMockBuilder(SearchIndexNameResolver::class) | ||
->onlyMethods(['getIndexName']) | ||
->disableOriginalConstructor() | ||
->getMock(); | ||
$this->aggregationBuilder = $this | ||
->getMockBuilder(\Magento\Elasticsearch\SearchAdapter\Query\Builder\Aggregation::class) | ||
->onlyMethods(['build']) | ||
->disableOriginalConstructor() | ||
->getMock(); | ||
$this->request = $this->getMockBuilder(RequestInterface::class) | ||
->disableOriginalConstructor() | ||
->getMockForAbstractClass(); | ||
$this->scopeResolver = $this->getMockForAbstractClass( | ||
ScopeResolverInterface::class, | ||
[], | ||
'', | ||
false | ||
); | ||
$this->scopeInterface = $this->getMockForAbstractClass( | ||
ScopeInterface::class, | ||
[], | ||
'', | ||
false | ||
); | ||
|
||
$this->model = new Builder( | ||
$this->clientConfig, | ||
$this->searchIndexNameResolver, | ||
$this->aggregationBuilder, | ||
$this->scopeResolver, | ||
); | ||
} | ||
|
||
/** | ||
* Test initQuery() method | ||
*/ | ||
public function testInitQuery() | ||
{ | ||
$dimensionValue = 1; | ||
$dimension = $this->getMockBuilder(Dimension::class) | ||
->onlyMethods(['getValue']) | ||
->disableOriginalConstructor() | ||
->getMock(); | ||
|
||
$this->request->expects($this->once()) | ||
->method('getDimensions') | ||
->willReturn([$dimension]); | ||
$dimension->expects($this->once()) | ||
->method('getValue') | ||
->willReturn($dimensionValue); | ||
$this->scopeResolver->expects($this->once()) | ||
->method('getScope') | ||
->willReturn($this->scopeInterface); | ||
$this->scopeInterface->expects($this->once()) | ||
->method('getId') | ||
->willReturn($dimensionValue); | ||
$this->request->expects($this->once()) | ||
->method('getFrom') | ||
->willReturn(0); | ||
$this->request->expects($this->once()) | ||
->method('getSize') | ||
->willReturn(10); | ||
$this->request->expects($this->once()) | ||
->method('getIndex') | ||
->willReturn('catalogsearch_fulltext'); | ||
$this->searchIndexNameResolver->expects($this->once()) | ||
->method('getIndexName') | ||
->willReturn('indexName'); | ||
$this->clientConfig->expects($this->once()) | ||
->method('getEntityType') | ||
->willReturn('document'); | ||
$this->model->initQuery($this->request); | ||
} | ||
|
||
/** | ||
* Test initQuery() method with update from value | ||
*/ | ||
public function testInitQueryLimitFrom() | ||
{ | ||
$dimensionValue = 1; | ||
$dimension = $this->getMockBuilder(Dimension::class) | ||
->onlyMethods(['getValue']) | ||
->disableOriginalConstructor() | ||
->getMock(); | ||
|
||
$this->request->expects($this->once()) | ||
->method('getDimensions') | ||
->willReturn([$dimension]); | ||
$dimension->expects($this->once()) | ||
->method('getValue') | ||
->willReturn($dimensionValue); | ||
$this->scopeResolver->expects($this->once()) | ||
->method('getScope') | ||
->willReturn($this->scopeInterface); | ||
$this->scopeInterface->expects($this->once()) | ||
->method('getId') | ||
->willReturn($dimensionValue); | ||
$this->request->expects($this->once()) | ||
->method('getFrom') | ||
->willReturn(PHP_INT_MAX); | ||
$this->request->expects($this->once()) | ||
->method('getSize') | ||
->willReturn(10); | ||
$this->request->expects($this->once()) | ||
->method('getIndex') | ||
->willReturn('catalogsearch_fulltext'); | ||
$this->searchIndexNameResolver->expects($this->once()) | ||
->method('getIndexName') | ||
->willReturn('indexName'); | ||
$this->clientConfig->expects($this->once()) | ||
->method('getEntityType') | ||
->willReturn('document'); | ||
$query = $this->model->initQuery($this->request); | ||
$this->assertLessThanOrEqual(2147483647, $query['body']['from']); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Agree that max_int sounds better but there is defined PHP_INT_MAX constant. I think it is better to keep the same format here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok, that make sense