Fixed the confliction

Author: glo60612

app/code/Magento/Catalog/Plugin/CategoryManagementPerformanceOptimizer.php

@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Plugin;
+
+use Magento\Catalog\Api\CategoryManagementInterface;
+use Magento\Catalog\Api\Data\CategoryTreeInterface;
+
+/**
+ * Performance optimizer plugin for CategoryManagement
+ */
+class CategoryManagementPerformanceOptimizer
+{
+    private const DEFAULT_MAX_DEPTH = 3; // Limit depth to prevent timeouts
+
+    /**
+     * Optimize getTree method with depth limits to prevent timeouts
+     *
+     * @param CategoryManagementInterface $subject
+     * @param int|null $rootCategoryId
+     * @param int|null $depth
+     * @return array
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function beforeGetTree(
+        CategoryManagementInterface $subject,
+        $rootCategoryId = null,
+        $depth = null
+    ): array {
+        // Limit depth to prevent performance issues
+        $depth = $depth ?? self::DEFAULT_MAX_DEPTH;
+        return [$rootCategoryId, $depth];
+    }
+}

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

@@ -285,6 +285,12 @@
         <index referenceId="CATALOG_CATEGORY_ENTITY_PATH" indexType="btree">
             <column name="path"/>
         </index>
+        <!-- Performance optimization index for efficient tree traversal -->
+        <index referenceId="CATALOG_CATEGORY_ENTITY_PARENT_ID_LEVEL_POSITION" indexType="btree">
+            <column name="parent_id"/>
+            <column name="level"/>
+            <column name="position"/>
+        </index>
     </table>
     <table name="catalog_category_entity_datetime" resource="default" engine="innodb"
            comment="Catalog Category Datetime Attribute Backend Table">
@@ -401,6 +407,11 @@
         <index referenceId="CATALOG_CATEGORY_ENTITY_INT_STORE_ID" indexType="btree">
             <column name="store_id"/>
         </index>
+        <!-- Performance optimization index for is_active attribute filtering -->
+        <index referenceId="CATALOG_CATEGORY_ENTITY_INT_STORE_ID_VALUE" indexType="btree">
+            <column name="store_id"/>
+            <column name="value"/>
+        </index>
     </table>
     <table name="catalog_category_entity_text" resource="default" engine="innodb"
            comment="Catalog Category Text Attribute Backend Table">
@@ -506,6 +517,12 @@
         <index referenceId="CATALOG_CATEGORY_PRODUCT_PRODUCT_ID" indexType="btree">
             <column name="product_id"/>
         </index>
+        <!-- Performance optimization index for product count queries -->
+        <index referenceId="CATALOG_CATEGORY_PRODUCT_CATEGORY_ID_PRODUCT_ID_POSITION" indexType="btree">
+            <column name="category_id"/>
+            <column name="product_id"/>
+            <column name="position"/>
+        </index>
     </table>
     <table name="catalog_category_product_index" resource="default" engine="innodb"
            comment="Catalog Category Product Index">

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

@@ -157,7 +157,8 @@
         },
         "index": {
             "CATALOG_CATEGORY_ENTITY_LEVEL": true,
-            "CATALOG_CATEGORY_ENTITY_PATH": true
+            "CATALOG_CATEGORY_ENTITY_PATH": true,
+            "CATALOG_CATEGORY_ENTITY_PARENT_ID_LEVEL_POSITION": true
         },
         "constraint": {
             "PRIMARY": true
@@ -216,7 +217,8 @@
         "index": {
             "CATALOG_CATEGORY_ENTITY_INT_ENTITY_ID": true,
             "CATALOG_CATEGORY_ENTITY_INT_ATTRIBUTE_ID": true,
-            "CATALOG_CATEGORY_ENTITY_INT_STORE_ID": true
+            "CATALOG_CATEGORY_ENTITY_INT_STORE_ID": true,
+            "CATALOG_CATEGORY_ENTITY_INT_STORE_ID_VALUE": true
         },
         "constraint": {
             "PRIMARY": true,
@@ -276,7 +278,8 @@
             "position": true
         },
         "index": {
-            "CATALOG_CATEGORY_PRODUCT_PRODUCT_ID": true
+            "CATALOG_CATEGORY_PRODUCT_PRODUCT_ID": true,
+            "CATALOG_CATEGORY_PRODUCT_CATEGORY_ID_PRODUCT_ID_POSITION": true
         },
         "constraint": {
             "PRIMARY": true,

app/code/Magento/Catalog/etc/webapi_rest/di.xml

@@ -51,4 +51,9 @@
         <plugin name="vendor_special_price_rest_plugin"
                 type="Magento\Catalog\Model\Plugin\SpecialPricePluginForREST\SpecialPriceStoragePlugin" />
     </type>
+    <!-- Essential performance optimizations for category tree operations -->
+    <type name="Magento\Catalog\Api\CategoryManagementInterface">
+        <plugin name="categoryManagementPerformanceOptimizer"
+                type="Magento\Catalog\Plugin\CategoryManagementPerformanceOptimizer" />
+    </type>
 </config>