From 36bd54df8d368974c770e9098231bdb80c16b61c Mon Sep 17 00:00:00 2001
From: erik_gahlin <erik.gahlin@oracle.com>
Date: Thu, 4 Sep 2025 16:17:14 +0200
Subject: [PATCH 1/2] Initial

---
 src/jdk.jfr/share/classes/jdk/jfr/internal/query/view.ini | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/query/view.ini b/src/jdk.jfr/share/classes/jdk/jfr/internal/query/view.ini
index 1ab9840b28e70..adbd6f7b45b6b 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/query/view.ini
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/query/view.ini
@@ -292,14 +292,16 @@ table = "SELECT finalizableClass, LAST_BATCH(objects) AS O, LAST_BATCH(totalFina
 label = "Garbage Collections"
 table = "COLUMN 'Start', 'GC ID', 'Type', 'Heap Before GC', 'Heap After GC', 'Longest Pause'
          FORMAT none, none, missing:Unknown, none, none, none
-         SELECT G.startTime, gcId, [Y|O].eventType.label,
+         SELECT G.startTime, gcId, [Y|ZY|O|ZO].eventType.label,
                 B.heapUsed, A.heapUsed, longestPause
          FROM
                 GarbageCollection AS G,
                 GCHeapSummary AS B,
                 GCHeapSummary AS A,
                 OldGarbageCollection AS O,
-                YoungGarbageCollection AS Y
+                ZOldGarbageCollection AS ZO,
+                YoungGarbageCollection AS Y,
+                ZYoungGarbageCollection AS ZY
          WHERE B.when = 'Before GC' AND A.when = 'After GC'
          GROUP BY gcId ORDER BY G.startTime"
 

From dd247b359a2fb7fc4e026ea6337694dae2033748 Mon Sep 17 00:00:00 2001
From: erik_gahlin <erik.gahlin@oracle.com>
Date: Thu, 4 Sep 2025 16:36:36 +0200
Subject: [PATCH 2/2] Order by GC id

---
 src/jdk.jfr/share/classes/jdk/jfr/internal/query/view.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/query/view.ini b/src/jdk.jfr/share/classes/jdk/jfr/internal/query/view.ini
index adbd6f7b45b6b..bf6ce5be079c6 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/query/view.ini
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/query/view.ini
@@ -303,7 +303,7 @@ table = "COLUMN 'Start', 'GC ID', 'Type', 'Heap Before GC', 'Heap After GC', 'Lo
                 YoungGarbageCollection AS Y,
                 ZYoungGarbageCollection AS ZY
          WHERE B.when = 'Before GC' AND A.when = 'After GC'
-         GROUP BY gcId ORDER BY G.startTime"
+         GROUP BY gcId ORDER BY gcId"
 
 [jvm.gc-concurrent-phases]
 label = "Concurrent GC Phases"