Add planner phase metrics to yaml-tests

Author: hazefully

yaml-tests/src/main/java/com/apple/foundationdb/relational/yamltests/YamlExecutionContext.java

@@ -427,16 +427,21 @@ public void saveMetricsAsYaml() {
             final var info = entry.getValue();
             final var countersAndTimers = info.getCountersAndTimers();
             final var infoMap =
-                    ImmutableMap.<String, Object>of("query", identifier.getQuery(),
-                            "explain", info.getExplain(),
-                            "task_count", countersAndTimers.getTaskCount(),
-                            "task_total_time_ms", TimeUnit.NANOSECONDS.toMillis(countersAndTimers.getTaskTotalTimeNs()),
-                            "transform_count", countersAndTimers.getTransformCount(),
-                            "transform_time_ms", TimeUnit.NANOSECONDS.toMillis(countersAndTimers.getTransformTimeNs()),
-                            "transform_yield_count", countersAndTimers.getTransformYieldCount(),
-                            "insert_time_ms", TimeUnit.NANOSECONDS.toMillis(countersAndTimers.getInsertTimeNs()),
-                            "insert_new_count", countersAndTimers.getInsertNewCount(),
-                            "insert_reused_count", countersAndTimers.getInsertReusedCount());
+                    ImmutableMap.<String, Object>ofEntries(
+                            Map.entry("query", identifier.getQuery()),
+                            Map.entry("explain", info.getExplain()),
+                            Map.entry("task_count", countersAndTimers.getTaskCount()),
+                            Map.entry("rewriting_phase_task_count", countersAndTimers.getRewritingPhaseTaskCount()),
+                            Map.entry("planning_phase_task_count", countersAndTimers.getPlanningPhaseTaskCount()),
+                            Map.entry("task_total_time_ms", TimeUnit.NANOSECONDS.toMillis(countersAndTimers.getTaskTotalTimeNs())),
+                            Map.entry("rewriting_phase_task_total_time_ms", TimeUnit.NANOSECONDS.toMillis(countersAndTimers.getRewritingPhaseTaskTotalTimeNs())),
+                            Map.entry("planning_phase_task_total_time_ms", TimeUnit.NANOSECONDS.toMillis(countersAndTimers.getPlanningPhaseTaskTotalTimeNs())),
+                            Map.entry("transform_count", countersAndTimers.getTransformCount()),
+                            Map.entry("transform_time_ms", TimeUnit.NANOSECONDS.toMillis(countersAndTimers.getTransformTimeNs())),
+                            Map.entry("transform_yield_count", countersAndTimers.getTransformYieldCount()),
+                            Map.entry("insert_time_ms", TimeUnit.NANOSECONDS.toMillis(countersAndTimers.getInsertTimeNs())),
+                            Map.entry("insert_new_count", countersAndTimers.getInsertNewCount()),
+                            Map.entry("insert_reused_count", countersAndTimers.getInsertReusedCount()));
             mmap.put(identifier.getBlockName(), infoMap);
         }
 

yaml-tests/src/main/java/com/apple/foundationdb/relational/yamltests/command/QueryConfig.java

@@ -299,7 +299,11 @@ void checkResultInternal(@Nonnull String currentQuery, @Nonnull Object actual, @
                                             .setTransformYieldCount(actualPlannerMetrics.getLong(5))
                                             .setInsertTimeNs(actualPlannerMetrics.getLong(6))
                                             .setInsertNewCount(actualPlannerMetrics.getLong(7))
-                                            .setInsertReusedCount(actualPlannerMetrics.getLong(8)))
+                                            .setInsertReusedCount(actualPlannerMetrics.getLong(8))
+                                            .setRewritingPhaseTaskCount(actualPlannerMetrics.getLong(9))
+                                            .setPlanningPhaseTaskCount(actualPlannerMetrics.getLong(10))
+                                            .setRewritingPhaseTaskTotalTimeNs(actualPlannerMetrics.getLong(11))
+                                            .setPlanningPhaseTaskTotalTimeNs(actualPlannerMetrics.getLong(12)))
                             .build();
                     if (expectedPlannerMetricsInfo == null) {
                         executionContext.putMetrics(blockName, currentQuery, lineNumber, actualInfo, true);
@@ -315,6 +319,14 @@ void checkResultInternal(@Nonnull String currentQuery, @Nonnull Object actual, @
                                         actualCountersAndTimers,
                                         metricsDescriptor.findFieldByName("task_count"),
                                         lineNumber) |
+                                        isMetricDifferent(expectedCountersAndTimers,
+                                                actualCountersAndTimers,
+                                                metricsDescriptor.findFieldByName("rewriting_phase_task_count"),
+                                                lineNumber) |
+                                        isMetricDifferent(expectedCountersAndTimers,
+                                                actualCountersAndTimers,
+                                                metricsDescriptor.findFieldByName("planning_phase_task_count"),
+                                                lineNumber) |
                                         isMetricDifferent(expectedCountersAndTimers,
                                                 actualCountersAndTimers,
                                                 metricsDescriptor.findFieldByName("transform_count"),

yaml-tests/src/main/proto/planner_metrics.proto

@@ -49,4 +49,8 @@ message CountersAndTimers {
   optional int64 insert_time_ns = 6;
   optional int64 insert_new_count = 7;
   optional int64 insert_reused_count = 8;
+  optional int64 rewriting_phase_task_count = 9;
+  optional int64 planning_phase_task_count = 10;
+  optional int64 rewriting_phase_task_total_time_ns = 11;
+  optional int64 planning_phase_task_total_time_ns = 12;
 }