Skip to content

Resolve Issue : Search REST API returns wrong total_count #21713

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 3 commits into from
Mar 16, 2019
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
48 changes: 47 additions & 1 deletion lib/internal/Magento/Framework/Search/Adapter/Mysql/Adapter.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

use Magento\Framework\App\ResourceConnection;
use Magento\Framework\DB\Ddl\Table;
use Magento\Framework\DB\Select;
use Magento\Framework\Search\Adapter\Mysql\Aggregation\Builder as AggregationBuilder;
use Magento\Framework\Search\AdapterInterface;
use Magento\Framework\Search\RequestInterface;
Expand Down Expand Up @@ -49,6 +50,16 @@ class Adapter implements AdapterInterface
*/
private $temporaryStorageFactory;

/**
* Query Select Parts to be skipped when prepare query for count
*
* @var array
*/
private $countSqlSkipParts = [
\Magento\Framework\DB\Select::LIMIT_COUNT => true,
\Magento\Framework\DB\Select::LIMIT_OFFSET => true,
];

/**
* @param Mapper $mapper
* @param ResponseFactory $responseFactory
Expand Down Expand Up @@ -86,7 +97,7 @@ public function query(RequestInterface $request)
$response = [
'documents' => $documents,
'aggregations' => $aggregations,
'total' => count($documents)
'total' => $this->getSize($query)
];
return $this->responseFactory->create($response);
}
Expand Down Expand Up @@ -115,4 +126,39 @@ private function getConnection()
{
return $this->resource->getConnection();
}

/**
* Get rows size
*
* @param Select $query
* @return int
*/
private function getSize(Select $query): int
{
$sql = $this->getSelectCountSql($query);
$parentSelect = $this->getConnection()->select();
$parentSelect->from(['core_select' => $sql]);
$parentSelect->reset(\Magento\Framework\DB\Select::COLUMNS);
$parentSelect->columns('COUNT(*)');
$totalRecords = $this->getConnection()->fetchOne($parentSelect);

return intval($totalRecords);
}

/**
* Reset limit and offset
*
* @param Select $query
* @return Select
*/
private function getSelectCountSql(Select $query): Select
{
foreach ($this->countSqlSkipParts as $part => $toSkip) {
if ($toSkip) {
$query->reset($part);
}
}

return $query;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -161,10 +161,16 @@ public function testQuery()
$select = $this->getMockBuilder(\Magento\Framework\DB\Select::class)
->disableOriginalConstructor()
->getMock();
$this->connectionAdapter->expects($this->once())

$this->connectionAdapter->expects($this->exactly(2))
->method('select')
->willReturn($select);

$this->connectionAdapter->expects($this->once())
->method('fetchOne')
->with($select)
->willReturn($selectResult['total']);

$table = $this->getMockBuilder(\Magento\Framework\DB\Ddl\Table::class)
->disableOriginalConstructor()
->getMock();
Expand Down