Skip to content

Commit

Permalink
Merge pull request #4511 from magento-performance/MC-18321-pr
Browse files Browse the repository at this point in the history 
[Troll] Price indexation and benchmark.jmx fixes
  • Loading branch information
@duhon
duhon authored Jul 26, 2019
2 parents 63f34c6 + b8d034b commit d7b928a
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 69 deletions.
1 change: 1 addition & 0 deletions app/code/Magento/Catalog/Model/Indexer/Product/Price/Action/Full.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,7 @@ private function getBatchesForIndexer(string $typeId): BatchIterator
$select = $connection->select();
$select->distinct(true);
$select->from(['e' => $entityMetadata->getEntityTable()], $entityMetadata->getIdentifierField());
$select->where('type_id = ?', $typeId);

return $this->batchQueryGenerator->generate(
$this->getProductMetaData()->getIdentifierField(),
Expand Down
69 changes: 0 additions & 69 deletions setup/performance-toolkit/benchmark.jmx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2478,75 +2478,6 @@ if (props.get("cms_pages") == null) {
<stringProp name="HTTPSampler.embedded_url_re"/>
<stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/warmup_add_to_cart.jmx</stringProp></HTTPSamplerProxy>
<hashTree/>

<HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="SetUp - Ajax Load Login Form" enabled="true">
<elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" enabled="true">
<collectionProp name="Arguments.arguments">
<elementProp name="blocks" elementType="HTTPArgument">
<boolProp name="HTTPArgument.always_encode">true</boolProp>
<stringProp name="Argument.value">["customer_form_login"]</stringProp>
<stringProp name="Argument.metadata">=</stringProp>
<boolProp name="HTTPArgument.use_equals">true</boolProp>
<stringProp name="Argument.name">blocks</stringProp>
</elementProp>
<elementProp name="handles" elementType="HTTPArgument">
<boolProp name="HTTPArgument.always_encode">true</boolProp>
<stringProp name="Argument.value">["default","customer_account_login"]</stringProp>
<stringProp name="Argument.metadata">=</stringProp>
<boolProp name="HTTPArgument.use_equals">true</boolProp>
<stringProp name="Argument.name">handles</stringProp>
</elementProp>
<elementProp name="originalRequest" elementType="HTTPArgument">
<boolProp name="HTTPArgument.always_encode">true</boolProp>
<stringProp name="Argument.value">{"route":"customer","controller":"account","action":"login","uri":"/customer/account/login/"}</stringProp>
<stringProp name="Argument.metadata">=</stringProp>
<boolProp name="HTTPArgument.use_equals">true</boolProp>
<stringProp name="Argument.name">originalRequest</stringProp>
</elementProp>
<elementProp name="ajax" elementType="HTTPArgument">
<boolProp name="HTTPArgument.always_encode">true</boolProp>
<stringProp name="Argument.value">true</stringProp>
<stringProp name="Argument.metadata">=</stringProp>
<boolProp name="HTTPArgument.use_equals">true</boolProp>
<stringProp name="Argument.name">ajax</stringProp>
</elementProp>
<elementProp name="isAjax" elementType="HTTPArgument">
<boolProp name="HTTPArgument.always_encode">true</boolProp>
<stringProp name="Argument.value">true</stringProp>
<stringProp name="Argument.metadata">=</stringProp>
<boolProp name="HTTPArgument.use_equals">true</boolProp>
<stringProp name="Argument.name">isAjax</stringProp>
</elementProp>
</collectionProp>
</elementProp>
<stringProp name="HTTPSampler.domain"/>
<stringProp name="HTTPSampler.port"/>
<stringProp name="HTTPSampler.connect_timeout">60000</stringProp>
<stringProp name="HTTPSampler.response_timeout">200000</stringProp>
<stringProp name="HTTPSampler.protocol">${request_protocol}</stringProp>
<stringProp name="HTTPSampler.contentEncoding"/>
<stringProp name="HTTPSampler.path">${base_path}page_cache/block/render/</stringProp>
<stringProp name="HTTPSampler.method">GET</stringProp>
<boolProp name="HTTPSampler.follow_redirects">true</boolProp>
<boolProp name="HTTPSampler.auto_redirects">false</boolProp>
<boolProp name="HTTPSampler.use_keepalive">true</boolProp>
<boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
<boolProp name="HTTPSampler.monitor">false</boolProp>
<stringProp name="HTTPSampler.embedded_url_re"/>
<stringProp name="TestPlan.comments">mpaf/tool/fragments/ce/setup/ajax_load_login_form.jmx</stringProp></HTTPSamplerProxy>
<hashTree>
<ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
<collectionProp name="Asserion.test_strings">
<stringProp name="940598773">"customer_form_login"</stringProp>
<stringProp name="1951684663">Registered Customers</stringProp>
<stringProp name="474011748">form_key</stringProp>
</collectionProp>
<stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
<boolProp name="Assertion.assume_success">false</boolProp>
<intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
</hashTree>
</hashTree>

<ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Frontend Pool" enabled="true">
Expand Down

0 comments on commit d7b928a

Please sign in to comment.