use ById mechanism for SystemPackageInstalled report db table

uyuni-project · Jan 12, 2024 · 4ebca09 · 4ebca09
1 parent e77aba0
commit 4ebca09
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 18 deletions.
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/SystemReport_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/SystemReport_queries.xml
@@ -337,22 +337,29 @@
     </query>
 </mode>
 
-<mode name="SystemPackageInstalled" class="">
-    <query params="system_id, name, limit">
-          SELECT rhnServerPackage.server_id AS system_id
-                    , rhnPackageName.name
-                    , rhnPackageEvr.epoch
-                    , rhnPackageEvr.version
-                    , rhnPackageEvr.release
-                    , rhnPackageArch.label AS arch
-                    , rhnPackageEvr.type
-            FROM rhnServerPackage
-                    INNER JOIN rhnPackageName ON rhnServerPackage.name_id = rhnPackageName.id
-                    INNER JOIN rhnPackageEvr ON rhnServerPackage.evr_id = rhnPackageEvr.id
-                    INNER JOIN rhnPackageArch ON rhnServerPackage.package_arch_id = rhnPackageArch.id
-           WHERE (rhnServerPackage.server_id, rhnPackageName.name) &gt; (:system_id, :name)
-        ORDER BY system_id, name
-           FETCH FIRST :limit ROWS WITH TIES
+<mode name="SystemPackageInstalled_Ids" class="">
+    <query>
+        SELECT DISTINCT server_id AS id FROM rhnserverpackage
+    </query>
+</mode>
+
+<mode name="SystemPackageInstalled_byId" class="">
+    <query params="id, name, limit">
+        SELECT rhnServerPackage.server_id AS system_id
+             , rhnPackageName.name
+             , rhnPackageEvr.epoch
+             , rhnPackageEvr.version
+             , rhnPackageEvr.release
+             , rhnPackageArch.label AS arch
+             , rhnPackageEvr.type
+        FROM rhnServerPackage
+            INNER JOIN rhnPackageName ON rhnServerPackage.name_id = rhnPackageName.id
+            INNER JOIN rhnPackageEvr ON rhnServerPackage.evr_id = rhnPackageEvr.id
+            INNER JOIN rhnPackageArch ON rhnServerPackage.package_arch_id = rhnPackageArch.id
+        WHERE rhnServerPackage.server_id = :id
+          AND rhnPackageName.name &gt; :name
+        ORDER BY name
+            FETCH FIRST :limit ROWS WITH TIES
     </query>
 </mode>
 

diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/ReportDbUpdateTask.java b/java/code/src/com/redhat/rhn/taskomatic/task/ReportDbUpdateTask.java
@@ -126,8 +126,8 @@ public void execute(JobExecutionContext arg0) throws JobExecutionException {
                 Map.of(SYSTEM_ID, 0, SYSTEM_GROUP_ID, 0));
             fillReportDbTable(rh.getSession(), SYSTEM_REPORT_QUERIES, "SystemErrata",
                 Map.of(SYSTEM_ID, 0, ERRATA_ID, 0));
-            fillReportDbTable(rh.getSession(), SYSTEM_REPORT_QUERIES, "SystemPackageInstalled",
-                Map.of(SYSTEM_ID, 0, NAME, ""));
+            fillReportDbTableById(rh.getSession(), SYSTEM_REPORT_QUERIES, "SystemPackageInstalled",
+                Map.of(NAME, ""));
             fillReportDbTableById(rh.getSession(), SYSTEM_REPORT_QUERIES, "SystemPackageUpdate",
                 Map.of(PACKAGE_ID, 0));
             fillReportDbTable(rh.getSession(), SYSTEM_REPORT_QUERIES, "SystemCustomInfo",