8346099: JFR: Query for 'jfr view' can't handle wildcard with multipl…

…e event types Reviewed-by: mgronlun
openjdk · Jan 8, 2025 · 3fe0818 · 3fe0818 · openjdk-notifier · Jan 8, 2025
1 parent 55bcf4c
commit 3fe0818
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/query/FieldBuilder.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/query/FieldBuilder.java
@@ -370,7 +370,6 @@ record WildcardElement(String name, String label, ValueDescriptor field) {
             FieldBuilder fb = new FieldBuilder(eventTypes, type, we.name());
             Field field = fb.build().getFirst();
             field.label = we.label;
-            field.index = result.size();
             field.visible = true;
             field.sourceFields.add(field);
             result.add(field);

diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/query/QueryResolver.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/query/QueryResolver.java
@@ -98,11 +98,19 @@ public List<Field> resolve() throws QueryException {
         resolveGroupBy();
         resolveOrderBy();
         resolveWhere();
+        applyIndex();
         applyColumn();
         applyFormat();
         return resultFields;
     }
 
+    private void applyIndex() {
+        int index = 0;
+        for (Field field : resultFields) {
+            field.index = index++;
+        }
+    }
+
     private void resolveWhere() throws QuerySyntaxException {
         for (Condition condition : where) {
             List<Field> fields = new ArrayList<>();
@@ -238,7 +246,6 @@ private Field addField(String name, List<FilteredType> types) throws QueryExcept
             }
         }
         for (Field field: fields) {
-            field.index = resultFields.size();
             primary.sourceFields.add(field);
             // Convert to String if field data types mismatch
             if (mixedTypes) {