Optimize(Search): use LEFT JOIN filter on SELECT statement

glpi-project · May 6, 2024 · 985862c · 985862c
1 parent afbfebf
commit 985862c
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 3 deletions.
diff --git a/src/ConsumableItem.php b/src/ConsumableItem.php
@@ -221,7 +221,6 @@ public function rawSearchOptions()
             'massiveaction'      => false,
             'joinparams'         => [
                 'jointype'           => 'child',
-                'condition'          => ['NOT' => ['NEWTABLE.date_out' => null]]
             ]
         ];
 
@@ -236,7 +235,6 @@ public function rawSearchOptions()
             'massiveaction'      => false,
             'joinparams'         => [
                 'jointype'           => 'child',
-                'condition'          => ['NEWTABLE.date_out' => null]
             ]
         ];
 

diff --git a/src/Search/Provider/SQLProvider.php b/src/Search/Provider/SQLProvider.php
@@ -38,6 +38,7 @@
 use Change;
 use CommonDBTM;
 use CommonITILObject;
+use ConsumableItem;
 use DBmysqlIterator;
 use Glpi\Application\View\TemplateRenderer;
 use Glpi\Asset\Asset_PeripheralAsset;
@@ -461,7 +462,32 @@ public static function getSelectCriteria(string $itemtype, int $ID, bool $meta =
                     return array_merge($SELECT, $ADDITONALFIELDS);
                 }
                 break;
-
+            case "glpi_consumables.id":
+                if (
+                    $itemtype == ConsumableItem::class
+                    && ($ID == 17 || $ID = 19)
+                    && $opt_arrays[$ID]["datatype"] == 'count'
+                ) {
+                    // forces the LEFT JOIN filter directly into the SELECT statement to optimise data loading
+                    if ($ID == 19) {
+                        $SELECT = [
+                            new QueryExpression(
+                                QueryFunction::sum(new QueryExpression("CASE WHEN $table$addtable.date_out IS NULL THEN 1 ELSE 0 END")),
+                                alias: $NAME
+                            )
+                        ];
+                        return array_merge($SELECT, $ADDITONALFIELDS);
+                    } else {
+                        $SELECT = [
+                            new QueryExpression(
+                                QueryFunction::sum(new QueryExpression("CASE WHEN $table$addtable.date_out IS NOT NULL THEN 1 ELSE 0 END")),
+                                alias: $NAME
+                            )
+                        ];
+                        return array_merge($SELECT, $ADDITONALFIELDS);
+                    }
+                }
+                break;
             default:
                 break;
         }