Skip to content

Commit aee3891

Browse files
committed
ACP2E-3896: Opensearch 2.19.1 illegal_argument_exception on one-priced categories
1 parent 147e077 commit aee3891

File tree

2 files changed

+38
-5
lines changed
  • app/code/Magento/Elasticsearch/ElasticAdapter/SearchAdapter/Aggregation
  • dev/tests/integration/testsuite/Magento/Elasticsearch/_files

2 files changed

+38
-5
lines changed

app/code/Magento/Elasticsearch/ElasticAdapter/SearchAdapter/Aggregation/Interval.php

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2015 Adobe
4+
* All Rights Reserved.
55
*/
66
declare(strict_types=1);
77

@@ -158,7 +158,11 @@ public function loadPrevious($data, $index, $lower = null)
158158
$offset = $offset['value'];
159159
}
160160

161-
return $this->load($index - $offset + 1, $offset - 1, $lower);
161+
if ($offset > 0) {
162+
return $this->load($index - $offset + 1, $offset - 1, $lower);
163+
}
164+
165+
return false;
162166
}
163167

164168
/**

dev/tests/integration/testsuite/Magento/Elasticsearch/_files/requests.xml

Lines changed: 31 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
4+
* Copyright 2015 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88
<requests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Search/etc/search_request_merged.xsd">
@@ -483,4 +483,33 @@
483483
<from>0</from>
484484
<size>10</size>
485485
</request>
486+
<request query="test_load_previous_empty" index="catalogsearch_fulltext">
487+
<dimensions>
488+
<dimension name="scope" value="default"/>
489+
</dimensions>
490+
<queries>
491+
<query xsi:type="boolQuery" name="test_load_previous_empty" boost="2">
492+
<queryReference clause="must" ref="fulltext_search_query"/>
493+
<queryReference clause="must" ref="price_filter"/>
494+
</query>
495+
<query xsi:type="matchQuery" name="fulltext_search_query" value="$fulltext_search_query$" boost="5">
496+
<match field="description" boost="2"/>
497+
</query>
498+
<query xsi:type="filteredQuery" name="price_filter">
499+
<filterReference clause="must" ref="narrow_price_filter"/>
500+
</query>
501+
</queries>
502+
<filters>
503+
<filter name="narrow_price_filter" xsi:type="rangeFilter" field="price" from="999999" to="999999.01"/>
504+
</filters>
505+
<aggregations>
506+
<bucket xsi:type="dynamicBucket" method="manual" name="dynamic_price" field="price">
507+
<metrics>
508+
<metric type="count"/>
509+
</metrics>
510+
</bucket>
511+
</aggregations>
512+
<from>0</from>
513+
<size>10</size>
514+
</request>
486515
</requests>

0 commit comments

Comments
 (0)