Skip to content

Commit b1ac6c3

Browse files
igrybkovigrybkov
authoredFeb 15, 2018
Merge pull request magento#2084 from magento-performance/MAGETWO-75769
Fixed issue: MAGETWO-75769: Cache Popular Search Terms and Their Search Results Pages
2 parents dcd0dbc + 83f6fbf commit b1ac6c3

File tree

11 files changed

+491
-19
lines changed

11 files changed

+491
-19
lines changed
 

‎app/code/Magento/CatalogSearch/Block/SearchTermsLog.php

+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
namespace Magento\CatalogSearch\Block;
7+
8+
use Magento\Framework\App\ResponseInterface;
9+
use Magento\Framework\View\Element\Block\ArgumentInterface;
10+
11+
/**
12+
* Class for logging search terms on cached pages
13+
*/
14+
class SearchTermsLog implements ArgumentInterface
15+
{
16+
/**
17+
* @var \Magento\Framework\App\ResponseInterface
18+
*/
19+
private $response;
20+
21+
/**
22+
* @param ResponseInterface $response
23+
*/
24+
public function __construct(
25+
ResponseInterface $response
26+
) {
27+
$this->response = $response;
28+
}
29+
30+
/**
31+
* Check is current page cacheable
32+
*
33+
* @return bool
34+
*/
35+
public function isPageCacheable()
36+
{
37+
$pragma = $this->response->getHeader('pragma')->getFieldValue();
38+
return ($pragma == 'cache');
39+
}
40+
}

‎app/code/Magento/CatalogSearch/Controller/Result/Index.php

+69-15
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
use Magento\Catalog\Model\Layer\Resolver;
1010
use Magento\Catalog\Model\Session;
1111
use Magento\Framework\App\Action\Context;
12-
use Magento\Framework\App\ResourceConnection;
1312
use Magento\Store\Model\StoreManagerInterface;
1413
use Magento\Search\Model\QueryFactory;
14+
use Magento\Search\Model\PopularSearchTerms;
1515

1616
class Index extends \Magento\Framework\App\Action\Action
1717
{
@@ -64,34 +64,88 @@ public function __construct(
6464
* Display search result
6565
*
6666
* @return void
67+
*
68+
* @throws \Magento\Framework\Exception\LocalizedException
6769
*/
6870
public function execute()
6971
{
7072
$this->layerResolver->create(Resolver::CATALOG_LAYER_SEARCH);
73+
7174
/* @var $query \Magento\Search\Model\Query */
7275
$query = $this->_queryFactory->get();
7376

74-
$query->setStoreId($this->_storeManager->getStore()->getId());
77+
$storeId = $this->_storeManager->getStore()->getId();
78+
$query->setStoreId($storeId);
79+
80+
$queryText = $query->getQueryText();
81+
82+
if ($queryText != '') {
83+
$catalogSearchHelper = $this->_objectManager->get(\Magento\CatalogSearch\Helper\Data::class);
7584

76-
if ($query->getQueryText() != '') {
77-
if ($this->_objectManager->get(\Magento\CatalogSearch\Helper\Data::class)->isMinQueryLength()) {
78-
$query->setId(0)->setIsActive(1)->setIsProcessed(1);
85+
$getAdditionalRequestParameters = $this->getRequest()->getParams();
86+
unset($getAdditionalRequestParameters[QueryFactory::QUERY_VAR_NAME]);
87+
88+
if (empty($getAdditionalRequestParameters) &&
89+
$this->_objectManager->get(PopularSearchTerms::class)->isCacheable($queryText, $storeId)
90+
) {
91+
$this->getCacheableResult($catalogSearchHelper, $query);
7992
} else {
80-
$query->saveIncrementalPopularity();
93+
$this->getNotCacheableResult($catalogSearchHelper, $query);
94+
}
95+
} else {
96+
$this->getResponse()->setRedirect($this->_redirect->getRedirectUrl());
97+
}
98+
}
8199

82-
$redirect = $query->getRedirect();
83-
if ($redirect && $this->_url->getCurrentUrl() !== $redirect) {
84-
$this->getResponse()->setRedirect($redirect);
85-
return;
86-
}
100+
/**
101+
* Return cacheable result
102+
*
103+
* @param \Magento\CatalogSearch\Helper\Data $catalogSearchHelper
104+
* @param \Magento\Search\Model\Query $query
105+
* @return void
106+
*/
107+
private function getCacheableResult($catalogSearchHelper, $query)
108+
{
109+
if (!$catalogSearchHelper->isMinQueryLength()) {
110+
$redirect = $query->getRedirect();
111+
if ($redirect && $this->_url->getCurrentUrl() !== $redirect) {
112+
$this->getResponse()->setRedirect($redirect);
113+
return;
87114
}
115+
}
88116

89-
$this->_objectManager->get(\Magento\CatalogSearch\Helper\Data::class)->checkNotes();
117+
$catalogSearchHelper->checkNotes();
118+
119+
$this->_view->loadLayout();
120+
$this->_view->renderLayout();
121+
}
90122

91-
$this->_view->loadLayout();
92-
$this->_view->renderLayout();
123+
/**
124+
* Return not cacheable result
125+
*
126+
* @param \Magento\CatalogSearch\Helper\Data $catalogSearchHelper
127+
* @param \Magento\Search\Model\Query $query
128+
* @return void
129+
*
130+
* @throws \Magento\Framework\Exception\LocalizedException
131+
*/
132+
private function getNotCacheableResult($catalogSearchHelper, $query)
133+
{
134+
if ($catalogSearchHelper->isMinQueryLength()) {
135+
$query->setId(0)->setIsActive(1)->setIsProcessed(1);
93136
} else {
94-
$this->getResponse()->setRedirect($this->_redirect->getRedirectUrl());
137+
$query->saveIncrementalPopularity();
138+
$redirect = $query->getRedirect();
139+
if ($redirect && $this->_url->getCurrentUrl() !== $redirect) {
140+
$this->getResponse()->setRedirect($redirect);
141+
return;
142+
}
95143
}
144+
145+
$catalogSearchHelper->checkNotes();
146+
147+
$this->_view->loadLayout();
148+
$this->getResponse()->setNoCacheHeaders();
149+
$this->_view->renderLayout();
96150
}
97151
}

‎app/code/Magento/CatalogSearch/Controller/SearchTermsLog/Save.php

+95
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
<?php
2+
/**
3+
*
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
namespace Magento\CatalogSearch\Controller\SearchTermsLog;
8+
9+
use Magento\Framework\App\Action\Context;
10+
use Magento\Store\Model\StoreManagerInterface;
11+
use Magento\Search\Model\QueryFactory;
12+
use Magento\Framework\Controller\Result\JsonFactory;
13+
use Magento\CatalogSearch\Helper\Data as HelperData;
14+
use Magento\Framework\Controller\Result\Json;
15+
16+
/**
17+
* Controller for save search terms
18+
*/
19+
class Save extends \Magento\Framework\App\Action\Action
20+
{
21+
/**
22+
* @var StoreManagerInterface
23+
*/
24+
private $storeManager;
25+
26+
/**
27+
* Catalog search helper
28+
*
29+
* @var HelperData
30+
*/
31+
private $catalogSearchHelper;
32+
33+
/**
34+
* @var QueryFactory
35+
*/
36+
private $queryFactory;
37+
38+
/**
39+
* @var JsonFactory
40+
*/
41+
private $resultJsonFactory;
42+
43+
/**
44+
* @param Context $context
45+
* @param HelperData $catalogSearchHelper
46+
* @param StoreManagerInterface $storeManager
47+
* @param QueryFactory $queryFactory
48+
* @param JsonFactory $resultJsonFactory
49+
*/
50+
public function __construct(
51+
Context $context,
52+
HelperData $catalogSearchHelper,
53+
StoreManagerInterface $storeManager,
54+
QueryFactory $queryFactory,
55+
JsonFactory $resultJsonFactory
56+
) {
57+
parent::__construct($context);
58+
$this->storeManager = $storeManager;
59+
$this->catalogSearchHelper = $catalogSearchHelper;
60+
$this->queryFactory = $queryFactory;
61+
$this->resultJsonFactory = $resultJsonFactory;
62+
}
63+
64+
/**
65+
* Save search term
66+
*
67+
* @return Json
68+
*/
69+
public function execute()
70+
{
71+
/* @var $query \Magento\Search\Model\Query */
72+
$query = $this->queryFactory->get();
73+
74+
$query->setStoreId($this->storeManager->getStore()->getId());
75+
76+
if ($query->getQueryText() != '') {
77+
try {
78+
if ($this->catalogSearchHelper->isMinQueryLength()) {
79+
$query->setId(0)->setIsActive(1)->setIsProcessed(1);
80+
} else {
81+
$query->saveIncrementalPopularity();
82+
}
83+
$responseContent = ['success' => true, 'error_message' => ''];
84+
} catch (\Magento\Framework\Exception\LocalizedException $e) {
85+
$responseContent = ['success' => false, 'error_message' => $e];
86+
}
87+
} else {
88+
$responseContent = ['success' => false, 'error_message' => __('Search term is empty')];
89+
}
90+
91+
/** @var Json $resultJson */
92+
$resultJson = $this->resultJsonFactory->create();
93+
return $resultJson->setData($responseContent);
94+
}
95+
}

‎app/code/Magento/CatalogSearch/etc/adminhtml/system.xml

+5
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,11 @@
2727
<label>Maximum Query Length</label>
2828
<validate>validate-digits</validate>
2929
</field>
30+
<field id="max_count_cacheable_search_terms" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
31+
<label>Number of top search results to cache</label>
32+
<comment>Number of popular search terms to be cached for faster response. Use “0” to cache all results after a term is searched for the second time.</comment>
33+
<validate>validate-digits</validate>
34+
</field>
3035
</group>
3136
</section>
3237
</system>

‎app/code/Magento/CatalogSearch/etc/config.xml

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<engine>mysql</engine>
1616
<min_query_length>1</min_query_length>
1717
<max_query_length>128</max_query_length>
18+
<max_count_cacheable_search_terms>100</max_count_cacheable_search_terms>
1819
</search>
1920
</catalog>
2021
</default>

‎app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_result_index.xml

+9-4
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@
99
<body>
1010
<attribute name="class" value="page-products"/>
1111
<referenceContainer name="content">
12-
<block class="Magento\CatalogSearch\Block\Result" name="search.result" template="Magento_CatalogSearch::result.phtml" cacheable="false">
13-
<block class="Magento\CatalogSearch\Block\SearchResult\ListProduct" name="search_result_list" template="Magento_Catalog::product/list.phtml" cacheable="false">
12+
<block class="Magento\CatalogSearch\Block\Result" name="search.result" template="Magento_CatalogSearch::result.phtml">
13+
<block class="Magento\CatalogSearch\Block\SearchResult\ListProduct" name="search_result_list" template="Magento_Catalog::product/list.phtml">
1414
<arguments>
1515
<!-- If argument's position depends on image size changeable in VDE:
1616
positions:list-secondary,grid-secondary,list-actions,grid-actions,list-primary,grid-primary
1717
-->
1818
<argument name="positioned" xsi:type="string">positions:list-secondary</argument>
1919
</arguments>
20-
<block class="Magento\Catalog\Block\Product\ProductList\Toolbar" name="product_list_toolbar" template="Magento_Catalog::product/list/toolbar.phtml" cacheable="false">
21-
<block class="Magento\Theme\Block\Html\Pager" name="product_list_toolbar_pager" cacheable="false"/>
20+
<block class="Magento\Catalog\Block\Product\ProductList\Toolbar" name="product_list_toolbar" template="Magento_Catalog::product/list/toolbar.phtml">
21+
<block class="Magento\Theme\Block\Html\Pager" name="product_list_toolbar_pager"/>
2222
</block>
2323
<action method="setToolbarBlockName">
2424
<argument name="name" xsi:type="string">product_list_toolbar</argument>
@@ -36,6 +36,11 @@
3636
<action method="setListModes"/>
3737
<action method="setListCollection"/>
3838
</block>
39+
<block name="search.search_terms_log" template="Magento_CatalogSearch::search_terms_log.phtml">
40+
<arguments>
41+
<argument name="search_terms_log" xsi:type="object">Magento\CatalogSearch\Block\SearchTermsLog</argument>
42+
</arguments>
43+
</block>
3944
</referenceContainer>
4045
</body>
4146
</page>

‎app/code/Magento/CatalogSearch/view/frontend/templates/search_terms_log.phtml

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
// @codingStandardsIgnoreFile
7+
?>
8+
<?php if ($block->getSearchTermsLog()->isPageCacheable()): ?>
9+
<script type="text/x-magento-init">
10+
{
11+
"*": {
12+
"Magento_CatalogSearch/js/search-terms-log": {
13+
"url": "<?= /* @escapeNotVerified */ $block->getUrl('catalogsearch/searchTermsLog/save') ?>"
14+
}
15+
}
16+
}
17+
</script>
18+
<?php endif; ?>

‎app/code/Magento/CatalogSearch/view/frontend/web/js/search-terms-log.js

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
/**
2+
* Copyright © Magento, Inc. All rights reserved.
3+
* See COPYING.txt for license details.
4+
*/
5+
6+
define([
7+
'jquery'
8+
], function ($) {
9+
'use strict';
10+
11+
/**
12+
* Return url parameters.
13+
* @returns {Object}
14+
*/
15+
function urlParameters() {
16+
var params = {},
17+
queries = window.location.search.substring(1).split('&'),
18+
temp,
19+
i,
20+
l;
21+
22+
for (i = 0, l = queries.length; i < l; i++) {
23+
temp = queries[i].split('=');
24+
params[temp[0]] = temp[1];
25+
}
26+
27+
return params;
28+
}
29+
30+
return function (data) {
31+
$.ajax({
32+
method: 'GET',
33+
url: data.url,
34+
data: {
35+
'q': urlParameters().q
36+
}
37+
});
38+
};
39+
});

0 commit comments

Comments
 (0)
Please sign in to comment.