Skip to content

[Backport] Add indexes to timestamp field in oauth_nonce #16482

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.

Sign up for GitHub

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

Closed
gelanivishal wants to merge 8 commits into from
+21 −5
Closed

[Backport] Add indexes to timestamp field in oauth_nonce #16482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
746ffce
Merge pull request #32 from vgelani/2.1-develop-PR-port-15534
gelanivishal Jun 20, 2018
cfeba9c
during product import, use correct error message for duplicate error key
denteblu Jun 10, 2018
4e23358
Updated according to coding style requirements
ishakhsuvarov Jun 11, 2018
6e9661d
Merge pull request #35 from gelanivishal/2.1-develop-PR-port-15980
gelanivishal Jun 25, 2018
d2a3065
Fix $useCache for container child blocks
Mar 9, 2018
05be531
Merge pull request #37 from gelanivishal/2.1-develop-PR-port-14029
gelanivishal Jun 30, 2018
cd686bf
Add indexes to timestamp field in oauth_nonce
Jan 23, 2018
c5aa267
Merge pull request #38 from gelanivishal/2.1-develop-PR-port-13328
gelanivishal Jul 2, 2018
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
7 changes: 6 additions & 1 deletion app/code/Magento/CatalogImportExport/Model/Import/Product.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2643,7 +2643,12 @@ protected function checkUrlKeyDuplicates()
);
foreach ($urlKeyDuplicates as $entityData) {
$rowNum = $this->rowNumbers[$entityData['store_id']][$entityData['request_path']];
$this->addRowError(ValidatorInterface::ERROR_DUPLICATE_URL_KEY, $rowNum);
$message = sprintf(
$this->retrieveMessageTemplate(ValidatorInterface::ERROR_DUPLICATE_URL_KEY),
$entityData['request_path'],
$entityData['sku']
);
$this->addRowError(ValidatorInterface::ERROR_DUPLICATE_URL_KEY, $rowNum, 'url_key', $message);
}
}
}
Expand Down
10 changes: 10 additions & 0 deletions app/code/Magento/Integration/Setup/UpgradeSchema.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,16 @@ public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $con
$setup->getConnection()->createTable($table);
}

if (version_compare($context->getVersion(), '2.2.1', '<')) {
$connection = $setup->getConnection();

$connection->addIndex(
$setup->getTable('oauth_nonce'),
$setup->getIdxName('oauth_nonce', ['timestamp']),
['timestamp']
);
}

$setup->endSetup();
}
}
2 changes: 1 addition & 1 deletion app/code/Magento/Integration/etc/module.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
<module name="Magento_Integration" setup_version="2.2.0">
<module name="Magento_Integration" setup_version="2.2.1">
<sequence>
<module name="Magento_Store"/>
<module name="Magento_User"/>
Expand Down
7 changes: 4 additions & 3 deletions lib/internal/Magento/Framework/View/Layout.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,7 +517,7 @@ public function renderNonCachedElement($name)
} elseif ($this->isBlock($name)) {
$result = $this->_renderBlock($name);
} else {
$result = $this->_renderContainer($name);
$result = $this->_renderContainer($name, false);
}
} catch (\Exception $e) {
if ($this->appState->getMode() === AppState::MODE_DEVELOPER) {
Expand Down Expand Up @@ -559,14 +559,15 @@ protected function _renderUiComponent($name)
* Gets HTML of container element
*
* @param string $name
* @param bool $useCache
* @return string
*/
protected function _renderContainer($name)
protected function _renderContainer($name, $useCache = true)
{
$html = '';
$children = $this->getChildNames($name);
foreach ($children as $child) {
$html .= $this->renderElement($child);
$html .= $this->renderElement($child, $useCache);
}
if ($html == '' || !$this->structure->getAttribute($name, Element::CONTAINER_OPT_HTML_TAG)) {
return $html;
Expand Down