From 3fa1a1567047b3ea092603b0a0c896d8e12d914e Mon Sep 17 00:00:00 2001
From: Mehmet Yilmaz <mehmetyilmaz@microsoft.com>
Date: Wed, 9 Jul 2025 13:16:04 +0000
Subject: [PATCH] Update executor adapter functions for PostgreSQL 18
 compatibility

---
 src/backend/distributed/shared_library_init.c | 31 ++++++++++++++-----
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/src/backend/distributed/shared_library_init.c b/src/backend/distributed/shared_library_init.c
index 59a5090c4..55e82e049 100644
--- a/src/backend/distributed/shared_library_init.c
+++ b/src/backend/distributed/shared_library_init.c
@@ -391,7 +391,7 @@ static const struct config_enum_entry metadata_sync_mode_options[] = {
 static bool
 citus_executor_start_adapter(QueryDesc *queryDesc, int eflags)
 {
-	/* call the original Citus hook (void) and always return “true” */
+	/* PG18+ expects a bool return */
 	CitusExecutorStart(queryDesc, eflags);
 	return true;
 }
@@ -402,11 +402,33 @@ citus_executor_run_adapter(QueryDesc *queryDesc,
 						   ScanDirection direction,
 						   uint64 count)
 {
-	/* call the original Citus hook (which still expects the old 4-arg form) */
+	/* PG18+ has no run_once flag
+	 * call the original Citus hook (which still expects the old 4-arg form) */
 	CitusExecutorRun(queryDesc, direction, count, true);
 }
 
 
+#else
+static bool
+citus_executor_start_adapter(QueryDesc *queryDesc, int eflags)
+{
+	CitusExecutorStart(queryDesc, eflags);
+
+	/* our adapter must return bool even if PG15–17 don’t use it */
+	return true;
+}
+
+
+static void
+citus_executor_run_adapter(QueryDesc *queryDesc,
+						   ScanDirection direction,
+						   uint64 count)
+{
+	/* older PG wants the run_once flag back */
+	CitusExecutorRun(queryDesc, direction, count, /*run_once=*/ true);
+}
+
+
 #endif
 
 
@@ -484,13 +506,8 @@ _PG_init(void)
 	set_rel_pathlist_hook = multi_relation_restriction_hook;
 	get_relation_info_hook = multi_get_relation_info_hook;
 	set_join_pathlist_hook = multi_join_restriction_hook;
-#if PG_VERSION_NUM >= PG_VERSION_18
 	ExecutorStart_hook = citus_executor_start_adapter;
 	ExecutorRun_hook = citus_executor_run_adapter;
-#else
-	ExecutorStart_hook = CitusExecutorStart;
-	ExecutorRun_hook = CitusExecutorRun;
-#endif
 	ExplainOneQuery_hook = CitusExplainOneQuery;
 	prev_ExecutorEnd = ExecutorEnd_hook;
 	ExecutorEnd_hook = CitusAttributeToEnd;