Reuse formatOrderingScheme method

trinodb · Nov 2, 2024 · 356835a · 356835a
1 parent d71b9e3
commit 356835a
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/planprinter/PlanPrinter.java b/core/trino-main/src/main/java/io/trino/sql/planner/planprinter/PlanPrinter.java
@@ -2071,7 +2071,7 @@ private String formatOrderingScheme(OrderingScheme orderingScheme, int preSorted
 
         private String formatOrderingScheme(OrderingScheme orderingScheme)
         {
-            return formatCollection(orderingScheme.orderBy(), input -> anonymizer.anonymize(input) + " " + orderingScheme.ordering(input));
+            return PlanPrinter.formatOrderingScheme(anonymizer, orderingScheme);
         }
 
         @SafeVarargs
@@ -2177,6 +2177,11 @@ public NodeRepresentation addNode(
         }
     }
 
+    private static String formatOrderingScheme(Anonymizer anonymizer, OrderingScheme orderingScheme)
+    {
+        return formatCollection(orderingScheme.orderBy(), input -> anonymizer.anonymize(input) + " " + orderingScheme.ordering(input));
+    }
+
     private static <T> String formatCollection(Collection<T> collection, Function<T, String> formatter)
     {
         return collection.stream()
@@ -2201,9 +2206,9 @@ public static String formatAggregation(Anonymizer anonymizer, Aggregation aggreg
         builder.append(formatFunctionName(aggregation.getResolvedFunction()))
                 .append('(').append(arguments);
 
-        aggregation.getOrderingScheme().ifPresent(orderingScheme -> builder.append(' ').append(orderingScheme.orderBy().stream()
-                .map(input -> anonymizer.anonymize(input) + " " + orderingScheme.ordering(input))
-                .collect(joining(", "))));
+        aggregation.getOrderingScheme()
+                .map(orderingScheme -> formatOrderingScheme(anonymizer, orderingScheme))
+                .ifPresent(ordering -> builder.append(' ').append(ordering));
 
         builder.append(')');