Merge branch 'ACP2E-2673' of https://github.com/magento-l3/magento2ce into L3-PR-2024-02-16

Author: ArtemVasyliev

app/code/Magento/Catalog/etc/db_schema.xml

@@ -1645,6 +1645,11 @@
         <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="id"/>
         </constraint>
+        <index referenceId="CAT_PRD_IDX_PRICE_TMP_ENTT_ID_CSTR_GROUP_ID_WS_ID" indexType="btree">
+            <column name="entity_id"/>
+            <column name="customer_group_id"/>
+            <column name="website_id"/>
+        </index>
     </table>
     <table name="catalog_category_product_index_tmp" resource="default" engine="innodb"
            comment="Catalog Category Product Indexer temporary table">

app/code/Magento/Catalog/etc/db_schema_whitelist.json

@@ -992,7 +992,8 @@
         "index": {
             "CATALOG_PRODUCT_INDEX_PRICE_TMP_CUSTOMER_GROUP_ID": true,
             "CATALOG_PRODUCT_INDEX_PRICE_TMP_WEBSITE_ID": true,
-            "CATALOG_PRODUCT_INDEX_PRICE_TMP_MIN_PRICE": true
+            "CATALOG_PRODUCT_INDEX_PRICE_TMP_MIN_PRICE": true,
+            "CAT_PRD_IDX_PRICE_TMP_ENTT_ID_CSTR_GROUP_ID_WS_ID": true
         },
         "constraint": {
             "PRIMARY": true

dev/tests/integration/testsuite/Magento/Catalog/DbSchemaTest.php

@@ -0,0 +1,62 @@
+<?php
+/************************************************************************
+ *
+ * Copyright 2023 Adobe
+ * All Rights Reserved.
+ *
+ * NOTICE: All information contained herein is, and remains
+ * the property of Adobe and its suppliers, if any. The intellectual
+ * and technical concepts contained herein are proprietary to Adobe
+ * and its suppliers and are protected by all applicable intellectual
+ * property laws, including trade secret and copyright laws.
+ * Dissemination of this information or reproduction of this material
+ * is strictly forbidden unless prior written permission is obtained
+ * from Adobe.
+ * ***********************************************************************
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog;
+
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Monolog\Test\TestCase;
+
+class DbSchemaTest extends TestCase
+{
+    /**
+     * @param string $tableName
+     * @param string $indexName
+     * @param array $columns
+     * @param string $indexType
+     * @return void
+     * @dataProvider indexDataProvider
+     */
+    public function testIndex(
+        string $tableName,
+        string $indexName,
+        array $columns,
+        string $indexType = AdapterInterface::INDEX_TYPE_INDEX,
+    ): void {
+        $connection = ObjectManager::getInstance()->get(ResourceConnection::class)->getConnection();
+        $indexes = $connection->getIndexList($tableName);
+        $this->assertArrayHasKey($indexName, $indexes);
+        $this->assertSame($columns, $indexes[$indexName]['COLUMNS_LIST']);
+        $this->assertSame($indexType, $indexes[$indexName]['INDEX_TYPE']);
+    }
+
+    /**
+     * @return array[]
+     */
+    public function indexDataProvider(): array
+    {
+        return [
+            [
+                'catalog_product_index_price_tmp',
+                'CAT_PRD_IDX_PRICE_TMP_ENTT_ID_CSTR_GROUP_ID_WS_ID',
+                ['entity_id', 'customer_group_id', 'website_id']
+            ]
+        ];
+    }
+}