From: Robert Haas <rhaas@postgresql.org>
Date: Wed, 21 May 2025 18:47:51 +0000 (-0400)
Subject: pgpa_join_strategy renaming
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=bb60715d6d59ea2ce365e2d01b6973e61861c037;p=users%2Frhaas%2Fpostgres.git

pgpa_join_strategy renaming
---

diff --git a/contrib/pg_plan_advice/pgpa_join.c b/contrib/pg_plan_advice/pgpa_join.c
index 513b83d703..03f3a2c9b3 100644
--- a/contrib/pg_plan_advice/pgpa_join.c
+++ b/contrib/pg_plan_advice/pgpa_join.c
@@ -249,29 +249,29 @@ pgpa_decompose_join(Plan *plan, Plan **realinner, Plan **realouter)
 			if (IsA(innerplan, Material))
 			{
 				innerplan = innerplan->lefttree;
-				strategy = JSTRAT_MERGEJOIN_MATERIALIZE;
+				strategy = JSTRAT_MERGE_JOIN_MATERIALIZE;
 			}
 			else
-				strategy = JSTRAT_MERGEJOIN_PLAIN;
+				strategy = JSTRAT_MERGE_JOIN_PLAIN;
 			break;
 		case T_NestLoop:
 			if (IsA(innerplan, Material))
 			{
 				innerplan = innerplan->lefttree;
-				strategy = JSTRAT_NESTLOOP_MATERIALIZE;
+				strategy = JSTRAT_NESTED_LOOP_MATERIALIZE;
 			}
 			else if (IsA(innerplan, Memoize))
 			{
 				innerplan = innerplan->lefttree;
-				strategy = JSTRAT_NESTLOOP_MEMOIZE;
+				strategy = JSTRAT_NESTED_LOOP_MEMOIZE;
 			}
 			else
-				strategy = JSTRAT_NESTLOOP_PLAIN;
+				strategy = JSTRAT_NESTED_LOOP_PLAIN;
 			break;
 		case T_HashJoin:
 			Assert(IsA(innerplan, Hash));
 			innerplan = innerplan->lefttree;
-			strategy = JSTRAT_HASHJOIN;
+			strategy = JSTRAT_HASH_JOIN;
 			break;
 		default:
 			elog(ERROR, "unrecognized node type: %d", (int) nodeTag(plan));
diff --git a/contrib/pg_plan_advice/pgpa_join.h b/contrib/pg_plan_advice/pgpa_join.h
index 4303741be1..12348c1861 100644
--- a/contrib/pg_plan_advice/pgpa_join.h
+++ b/contrib/pg_plan_advice/pgpa_join.h
@@ -63,12 +63,12 @@ typedef struct
  */
 typedef enum
 {
-	JSTRAT_MERGEJOIN_PLAIN,
-	JSTRAT_MERGEJOIN_MATERIALIZE,
-	JSTRAT_NESTLOOP_PLAIN,
-	JSTRAT_NESTLOOP_MATERIALIZE,
-	JSTRAT_NESTLOOP_MEMOIZE,
-	JSTRAT_HASHJOIN
+	JSTRAT_MERGE_JOIN_PLAIN,
+	JSTRAT_MERGE_JOIN_MATERIALIZE,
+	JSTRAT_NESTED_LOOP_PLAIN,
+	JSTRAT_NESTED_LOOP_MATERIALIZE,
+	JSTRAT_NESTED_LOOP_MEMOIZE,
+	JSTRAT_HASH_JOIN
 } pgpa_join_strategy;
 
 /*