-
Notifications
You must be signed in to change notification settings - Fork 9.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #83 from magento-epam/2.3-develop
Merge 2.3-develop to EPAM-PR-2
- Loading branch information
Showing
42 changed files
with
1,994 additions
and
167 deletions.
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
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
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
251 changes: 251 additions & 0 deletions
251
app/code/Magento/Elasticsearch/Elasticsearch5/SearchAdapter/Aggregation/Interval.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,251 @@ | ||
| <?php | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| declare(strict_types=1); | ||
|
|
||
| namespace Magento\Elasticsearch\Elasticsearch5\SearchAdapter\Aggregation; | ||
|
|
||
| use Magento\Framework\Search\Dynamic\IntervalInterface; | ||
| use Magento\Elasticsearch\SearchAdapter\ConnectionManager; | ||
| use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface; | ||
| use Magento\Elasticsearch\Model\Config; | ||
| use Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver; | ||
| use Magento\CatalogSearch\Model\Indexer\Fulltext; | ||
|
|
||
| /** | ||
| * Aggregate price intervals for search query result. | ||
| */ | ||
| class Interval implements IntervalInterface | ||
| { | ||
| /** | ||
| * Minimal possible value | ||
| */ | ||
| const DELTA = 0.005; | ||
|
|
||
| /** | ||
| * @var ConnectionManager | ||
| */ | ||
| private $connectionManager; | ||
|
|
||
| /** | ||
| * @var FieldMapperInterface | ||
| */ | ||
| private $fieldMapper; | ||
|
|
||
| /** | ||
| * @var Config | ||
| */ | ||
| private $clientConfig; | ||
|
|
||
| /** | ||
| * @var string | ||
| */ | ||
| private $fieldName; | ||
|
|
||
| /** | ||
| * @var string | ||
| */ | ||
| private $storeId; | ||
|
|
||
| /** | ||
| * @var array | ||
| */ | ||
| private $entityIds; | ||
|
|
||
| /** | ||
| * @var SearchIndexNameResolver | ||
| */ | ||
| private $searchIndexNameResolver; | ||
|
|
||
| /** | ||
| * @param ConnectionManager $connectionManager | ||
| * @param FieldMapperInterface $fieldMapper | ||
| * @param Config $clientConfig | ||
| * @param SearchIndexNameResolver $searchIndexNameResolver | ||
| * @param string $fieldName | ||
| * @param string $storeId | ||
| * @param array $entityIds | ||
| */ | ||
| public function __construct( | ||
| ConnectionManager $connectionManager, | ||
| FieldMapperInterface $fieldMapper, | ||
| Config $clientConfig, | ||
| SearchIndexNameResolver $searchIndexNameResolver, | ||
| string $fieldName, | ||
| string $storeId, | ||
| array $entityIds | ||
| ) { | ||
| $this->connectionManager = $connectionManager; | ||
| $this->fieldMapper = $fieldMapper; | ||
| $this->clientConfig = $clientConfig; | ||
| $this->fieldName = $fieldName; | ||
| $this->storeId = $storeId; | ||
| $this->entityIds = $entityIds; | ||
| $this->searchIndexNameResolver = $searchIndexNameResolver; | ||
| } | ||
|
|
||
| /** | ||
| * {@inheritdoc} | ||
| */ | ||
| public function load($limit, $offset = null, $lower = null, $upper = null) | ||
| { | ||
| $from = $to = []; | ||
| if ($lower) { | ||
| $from = ['gte' => $lower - self::DELTA]; | ||
| } | ||
| if ($upper) { | ||
| $to = ['lt' => $upper - self::DELTA]; | ||
| } | ||
|
|
||
| $requestQuery = $this->prepareBaseRequestQuery($from, $to); | ||
| $requestQuery = array_merge_recursive( | ||
| $requestQuery, | ||
| ['body' => ['stored_fields' => [$this->fieldName], 'size' => $limit]] | ||
| ); | ||
|
|
||
| if ($offset) { | ||
| $requestQuery['body']['from'] = $offset; | ||
| } | ||
|
|
||
| $queryResult = $this->connectionManager->getConnection() | ||
| ->query($requestQuery); | ||
|
|
||
| return $this->arrayValuesToFloat($queryResult['hits']['hits'], $this->fieldName); | ||
| } | ||
|
|
||
| /** | ||
| * {@inheritdoc} | ||
| */ | ||
| public function loadPrevious($data, $index, $lower = null) | ||
| { | ||
| if ($lower) { | ||
| $from = ['gte' => $lower - self::DELTA]; | ||
| } | ||
| if ($data) { | ||
| $to = ['lt' => $data - self::DELTA]; | ||
| } | ||
|
|
||
| $requestQuery = $this->prepareBaseRequestQuery($from, $to); | ||
| $requestQuery = array_merge_recursive( | ||
| $requestQuery, | ||
| ['size' => 0] | ||
| ); | ||
|
|
||
| $queryResult = $this->connectionManager->getConnection() | ||
| ->query($requestQuery); | ||
|
|
||
| $offset = $queryResult['hits']['total']; | ||
| if (!$offset) { | ||
| return false; | ||
| } | ||
|
|
||
| return $this->load($index - $offset + 1, $offset - 1, $lower); | ||
| } | ||
|
|
||
| /** | ||
| * {@inheritdoc} | ||
| */ | ||
| public function loadNext($data, $rightIndex, $upper = null) | ||
| { | ||
| $from = ['gt' => $data + self::DELTA]; | ||
| $to = ['lt' => $data - self::DELTA]; | ||
|
|
||
| $requestCountQuery = $this->prepareBaseRequestQuery($from, $to); | ||
| $requestCountQuery = array_merge_recursive( | ||
| $requestCountQuery, | ||
| ['size' => 0] | ||
| ); | ||
|
|
||
| $queryCountResult = $this->connectionManager->getConnection() | ||
| ->query($requestCountQuery); | ||
|
|
||
| $offset = $queryCountResult['hits']['total']; | ||
| if (!$offset) { | ||
| return false; | ||
| } | ||
|
|
||
| $from = ['gte' => $data - self::DELTA]; | ||
| if ($upper !== null) { | ||
| $to = ['lt' => $data - self::DELTA]; | ||
| } | ||
|
|
||
| $requestQuery = $requestCountQuery; | ||
|
|
||
| $requestCountQuery['body']['query']['bool']['filter']['bool']['must']['range'] = | ||
| [$this->fieldName => array_merge($from, $to)]; | ||
| $requestCountQuery['body']['from'] = $offset - 1; | ||
| $requestCountQuery['body']['size'] = $rightIndex - $offset + 1; | ||
| $queryResult = $this->connectionManager->getConnection() | ||
| ->query($requestQuery); | ||
|
|
||
| return array_reverse($this->arrayValuesToFloat($queryResult['hits']['hits'], $this->fieldName)); | ||
| } | ||
|
|
||
| /** | ||
| * Conver array values to float type. | ||
| * | ||
| * @param array $hits | ||
| * @param string $fieldName | ||
| * | ||
| * @return float[] | ||
| */ | ||
| private function arrayValuesToFloat(array $hits, string $fieldName): array | ||
| { | ||
| $returnPrices = []; | ||
| foreach ($hits as $hit) { | ||
| $returnPrices[] = (float)$hit['fields'][$fieldName][0]; | ||
| } | ||
|
|
||
| return $returnPrices; | ||
| } | ||
|
|
||
| /** | ||
| * Prepare base query for search. | ||
| * | ||
| * @param array|null $from | ||
| * @param array|null $to | ||
| * @return array | ||
| */ | ||
| private function prepareBaseRequestQuery($from = null, $to = null): array | ||
| { | ||
| $requestQuery = [ | ||
| 'index' => $this->searchIndexNameResolver->getIndexName($this->storeId, Fulltext::INDEXER_ID), | ||
| 'type' => $this->clientConfig->getEntityType(), | ||
| 'body' => [ | ||
| 'stored_fields' => [ | ||
| '_id', | ||
| ], | ||
| 'query' => [ | ||
| 'bool' => [ | ||
| 'must' => [ | ||
| 'match_all' => new \stdClass(), | ||
| ], | ||
| 'filter' => [ | ||
| 'bool' => [ | ||
| 'must' => [ | ||
| [ | ||
| 'terms' => [ | ||
| '_id' => $this->entityIds, | ||
| ], | ||
| ], | ||
| [ | ||
| 'range' => [ | ||
| $this->fieldName => array_merge($from, $to), | ||
| ], | ||
| ], | ||
| ], | ||
| ], | ||
| ], | ||
| ], | ||
| ], | ||
| 'sort' => [ | ||
| $this->fieldName, | ||
| ], | ||
| ], | ||
| ]; | ||
|
|
||
| return $requestQuery; | ||
| } | ||
| } |
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
Oops, something went wrong.