[SCM] PostGIS branch master updated. 3.5.0-198-gb72a2bb8a

git at osgeo.org git at osgeo.org
Fri Jan 24 12:14:36 PST 2025


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PostGIS".

The branch, master has been updated
       via  b72a2bb8a11c45d599975889ce354aaef05f26b3 (commit)
      from  f200a2da67687b27e684700b83b49060bc8d0321 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b72a2bb8a11c45d599975889ce354aaef05f26b3
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Fri Jan 24 12:13:56 2025 -0800

    Remove executor hook code, as new interrupt implementation
    does not have a race between geos and liblwgeom
    interruption any more.

diff --git a/postgis/postgis_module.c b/postgis/postgis_module.c
index c990e690a..170588938 100644
--- a/postgis/postgis_module.c
+++ b/postgis/postgis_module.c
@@ -26,7 +26,6 @@
 #include "postgres.h"
 #include "fmgr.h"
 #include "miscadmin.h"
-#include "executor/executor.h"
 #include "utils/elog.h"
 #include "utils/guc.h"
 #include "libpq/pqsignal.h"
@@ -46,8 +45,6 @@
  */
 PG_MODULE_MAGIC;
 
-// static ExecutorStart_hook_type onExecutorStartPrev = NULL;
-// static void onExecutorStart(QueryDesc *queryDesc, int eflags);
 
 static void interrupt_geos_callback()
 {
@@ -112,9 +109,6 @@ _PG_init(void)
 	proj_log_func(NULL, NULL, pjLogFunction);
 #endif
 
-	/* setup hooks */
-	// onExecutorStartPrev = ExecutorStart_hook;
-	// ExecutorStart_hook = onExecutorStart;
 }
 
 /*
@@ -125,28 +119,6 @@ void
 _PG_fini(void)
 {
 	elog(NOTICE, "Goodbye from PostGIS %s", POSTGIS_VERSION);
-
-	/* restore original hooks */
-	// ExecutorStart_hook = onExecutorStartPrev;
 }
 
 
-
-// static void onExecutorStart(QueryDesc *queryDesc, int eflags) {
-// 		/* cancel interrupt requests */
-
-// 		GEOS_interruptCancel();
-
-// #ifdef HAVE_LIBPROTOBUF
-// 		/* Taking out per #5385 crash */
-// 		//lwgeom_wagyu_interruptReset();
-// #endif
-
-// 		lwgeom_cancel_interrupt();
-
-// 		if (onExecutorStartPrev) {
-// 				(*onExecutorStartPrev)(queryDesc, eflags);
-// 		} else {
-// 				standard_ExecutorStart(queryDesc, eflags);
-// 		}
-// }

-----------------------------------------------------------------------

Summary of changes:
 postgis/postgis_module.c | 28 ----------------------------
 1 file changed, 28 deletions(-)


hooks/post-receive
-- 
PostGIS


More information about the postgis-tickets mailing list