0001-fixup-supress-some-gcc-warnings.txt

From 06038e237420b7054912118076e8b981def4f545 Mon Sep 17 00:00:00 2001
From: Jakub Wartak <jakub.wartak@enterprisedb.com>
Date: Fri, 31 Oct 2025 09:35:59 +0100
Subject: [PATCH] fixup: supress some gcc warnings

---
 contrib/pg_plan_advice/pgpa_ast.c    |  3 ++-
 contrib/pg_plan_advice/pgpa_output.c | 12 ++++++++----
 contrib/pg_plan_advice/pgpa_walker.c |  4 +++-
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/contrib/pg_plan_advice/pgpa_ast.c b/contrib/pg_plan_advice/pgpa_ast.c
index ed18950af18..be598874c48 100644
--- a/contrib/pg_plan_advice/pgpa_ast.c
+++ b/contrib/pg_plan_advice/pgpa_ast.c
@@ -138,7 +138,8 @@ pgpa_cstring_advice_tag(pgpa_advice_tag_type advice_tag)
 			return "TID_SCAN";
 	}
 
-	Assert(false);
+	elog(ERROR, "unrecognized advice type: %d", advice_tag);
+	pg_unreachable();
 }
 
 /*
diff --git a/contrib/pg_plan_advice/pgpa_output.c b/contrib/pg_plan_advice/pgpa_output.c
index 2175278b580..5aae5071990 100644
--- a/contrib/pg_plan_advice/pgpa_output.c
+++ b/contrib/pg_plan_advice/pgpa_output.c
@@ -10,6 +10,7 @@
  *-------------------------------------------------------------------------
  */
 
+#include "c.h"
 #include "postgres.h"
 
 #include "pgpa_output.h"
@@ -507,7 +508,8 @@ pgpa_cstring_join_strategy(pgpa_join_strategy strategy)
 			return "HASH_JOIN";
 	}
 
-	Assert(false);
+	elog(ERROR, "unrecognized join strategy: %d", strategy);
+	pg_unreachable();
 }
 
 /*
@@ -536,11 +538,12 @@ pgpa_cstring_scan_strategy(pgpa_scan_strategy strategy)
 			return "TID_SCAN";
 	}
 
-	Assert(false);
+	elog(ERROR, "unrecognized scan strategy: %d", strategy);
+	pg_unreachable();
 }
 
 /*
- * Get a C string that corresponds to the specified scan strategy.
+ * Get a C string that corresponds to the specified query feature type.
  */
 static char *
 pgpa_cstring_query_feature_type(pgpa_qf_type type)
@@ -557,7 +560,8 @@ pgpa_cstring_query_feature_type(pgpa_qf_type type)
 			return "SEMIJOIN_UNIQUE";
 	}
 
-	Assert(false);
+	elog(ERROR, "unrecognized query feature type: %d", type);
+	pg_unreachable();
 }
 
 /*
diff --git a/contrib/pg_plan_advice/pgpa_walker.c b/contrib/pg_plan_advice/pgpa_walker.c
index d22ac11bf91..44adeb4511b 100644
--- a/contrib/pg_plan_advice/pgpa_walker.c
+++ b/contrib/pg_plan_advice/pgpa_walker.c
@@ -359,7 +359,7 @@ pgpa_walk_recursively(pgpa_plan_walker_context *walker, Plan *plan,
 	{
 		int			num_aqf = list_length(active_query_features);
 
-		(void) list_truncate(active_query_features, num_aqf - 1);
+		active_query_features = list_truncate(active_query_features, num_aqf - 1);
 	}
 }
 
@@ -768,6 +768,7 @@ pgpa_walker_join_order_matches_member(pgpa_join_member *member,
 					relids = bms_add_member(relids, rti);
 				}
 			}
+			break;
 
 		case PGPA_TARGET_IDENTIFIER:
 			{
@@ -777,6 +778,7 @@ pgpa_walker_join_order_matches_member(pgpa_join_member *member,
 										  &target->rid);
 				relids = bms_make_singleton(rti);
 			}
+			break;
 	}
 
 	return bms_equal(member->scan->relids, relids);
-- 
2.43.0