Fix print of Path nodes when using OPTIMIZER_DEBUG

GatherMergePath (introduced in 10) and CustomPath (introduced in 9.5)
have gone missing.  The order of the Path nodes was inconsistent with
what is listed in nodes.h, so make the order consistent at the same time
to ease future checks and additions.

Author: Sawada Masahiko
Reviewed-by: Michael Paquier
Discussion: https://postgr.es/m/CAD21AoBQMLoc=ohH-oocuAPsELrmk8_EsRJjOyR8FQLZkbE0wA@mail.gmail.com

diff --git a/src/backend/optimizer/path/allpaths.c b/src/backend/optimizer/path/allpaths.c
index a53b545bb19b9a099388c17b1cbfce8e22c8c72b..fff2f4c8badc614b77d857a81a7e19b9022866f0 100644 (file)
--- a/src/backend/optimizer/path/allpaths.c
+++ b/src/backend/optimizer/path/allpaths.c
@@ -3282,6 +3282,21 @@ print_path(PlannerInfo *root, Path *path, int indent)
                case T_ForeignPath:
                        ptype = "ForeignScan";
                        break;
+               case T_CustomPath:
+                       ptype = "CustomScan";
+                       break;
+               case T_NestPath:
+                       ptype = "NestLoop";
+                       join = true;
+                       break;
+               case T_MergePath:
+                       ptype = "MergeJoin";
+                       join = true;
+                       break;
+               case T_HashPath:
+                       ptype = "HashJoin";
+                       join = true;
+                       break;
                case T_AppendPath:
                        ptype = "Append";
                        break;
@@ -3303,6 +3318,10 @@ print_path(PlannerInfo *root, Path *path, int indent)
                        ptype = "Gather";
                        subpath = ((GatherPath *) path)->subpath;
                        break;
+               case T_GatherMergePath:
+                       ptype = "GatherMerge";
+                       subpath = ((GatherMergePath *) path)->subpath;
+                       break;
                case T_ProjectionPath:
                        ptype = "Projection";
                        subpath = ((ProjectionPath *) path)->subpath;
@@ -3356,18 +3375,6 @@ print_path(PlannerInfo *root, Path *path, int indent)
                        ptype = "Limit";
                        subpath = ((LimitPath *) path)->subpath;
                        break;
-               case T_NestPath:
-                       ptype = "NestLoop";
-                       join = true;
-                       break;
-               case T_MergePath:
-                       ptype = "MergeJoin";
-                       join = true;
-                       break;
-               case T_HashPath:
-                       ptype = "HashJoin";
-                       join = true;
-                       break;
                default:
                        ptype = "???Path";
                        break;