From 77a71c5b097500ea2cab0c84f87553e833692fd2 Mon Sep 17 00:00:00 2001
From: Erik Gahlin <egahlin@openjdk.org>
Date: Thu, 25 Sep 2025 12:08:39 +0000
Subject: [PATCH] 8366896: JFR: Use GarbageCollection.name in gc view

Reviewed-by: mgronlun
---
 .../share/classes/jdk/jfr/internal/query/view.ini      | 10 ++++------
 test/jdk/jdk/jfr/jcmd/TestJcmdView.java                |  2 +-
 test/jdk/jdk/jfr/tool/TestView.java                    |  2 +-
 3 files changed, 6 insertions(+), 8 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 1ab9840b28e..91decb1aa20 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
@@ -290,18 +290,16 @@ table = "SELECT finalizableClass, LAST_BATCH(objects) AS O, LAST_BATCH(totalFina
 
 [jvm.gc]
 label = "Garbage Collections"
-table = "COLUMN 'Start', 'GC ID', 'Type', 'Heap Before GC', 'Heap After GC', 'Longest Pause'
+table = "COLUMN 'Start', 'GC ID', 'GC Name', '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, G.name,
                 B.heapUsed, A.heapUsed, longestPause
          FROM
                 GarbageCollection AS G,
                 GCHeapSummary AS B,
-                GCHeapSummary AS A,
-                OldGarbageCollection AS O,
-                YoungGarbageCollection AS Y
+                GCHeapSummary AS A
          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"
diff --git a/test/jdk/jdk/jfr/jcmd/TestJcmdView.java b/test/jdk/jdk/jfr/jcmd/TestJcmdView.java
index 92e5c950f9b..206d6c7bc8f 100644
--- a/test/jdk/jdk/jfr/jcmd/TestJcmdView.java
+++ b/test/jdk/jdk/jfr/jcmd/TestJcmdView.java
@@ -163,7 +163,7 @@ public class TestJcmdView {
         // Verify verbose heading
         output.shouldContain("(longestPause)");
         // Verify row contents
-        output.shouldContain("Old Garbage Collection");
+        output.shouldContain("G1");
         // Verify verbose query
         output.shouldContain("SELECT");
     }
diff --git a/test/jdk/jdk/jfr/tool/TestView.java b/test/jdk/jdk/jfr/tool/TestView.java
index 89c45c3e068..38174859b51 100644
--- a/test/jdk/jdk/jfr/tool/TestView.java
+++ b/test/jdk/jdk/jfr/tool/TestView.java
@@ -84,7 +84,7 @@ public class TestView {
         // Verify verbose heading
         output.shouldContain("(longestPause)");
         // Verify row contents
-        output.shouldContain("Old Garbage Collection");
+        output.shouldContain("G1");
         // Verify verbose query
         output.shouldContain("SELECT");
     }