Fix build due to changes in PostgreSQL 16 #64

MarinaPolyakova · 2022-11-21T14:46:20Z

See the commit 3057465acfbea2f3dd7a914a1478064022c6eecd (Replace the sorted
array of GUC variables with a hash table.) in PostgreSQL 16.
See the commit 0fe954c28584169938e5c0738cfaa9930ce77577 (Add
-Wshadow=compatible-local to the standard compilation flags) in PostgreSQL 16.

pg_wait_sampling.c: In function ‘pg_wait_sampling_get_current’:
pg_wait_sampling.c:454:42: warning: declaration of ‘params’ shadows a previous
local [-Wshadow=compatible-local]
  454 |                 WaitCurrentContext      *params;
      |                                          ^~~~~~
pg_wait_sampling.c:446:34: note: shadowed declaration is here
  446 |         WaitCurrentContext      *params;
      |                                  ^~~~~~

See the commit 3057465acfbea2f3dd7a914a1478064022c6eecd (Replace the sorted array of GUC variables with a hash table.) in PostgreSQL 16.

See the commit 0fe954c28584169938e5c0738cfaa9930ce77577 (Add -Wshadow=compatible-local to the standard compilation flags) in PostgreSQL 16. pg_wait_sampling.c: In function ‘pg_wait_sampling_get_current’: pg_wait_sampling.c:454:42: warning: declaration of ‘params’ shadows a previous local [-Wshadow=compatible-local] 454 | WaitCurrentContext *params; | ^~~~~~ pg_wait_sampling.c:446:34: note: shadowed declaration is here 446 | WaitCurrentContext *params; | ^~~~~~

AssertArg and AssertState were removed in PostgreSQL by commit #b1099eca8f.

rzharkov

Everything looks well.
While I'm at it I have replace AssertState with Assert.
Please take a look on my commit.

MarinaPolyakova · 2022-11-23T08:41:49Z

pg_wait_sampling is PostgreSQL extension which requires PostgreSQL 9.6 or higher.

I checked that:

AssertState is almost the same as Assert in REL9_6_STABLE (c.h):

#ifndef USE_ASSERT_CHECKING

#define Assert(condition)	((void)true)
#define AssertState(condition)	((void)true)

#elif defined(FRONTEND)

#define Assert(p) assert(p)
#define AssertState(condition) assert(condition)

#else							/* USE_ASSERT_CHECKING && !FRONTEND */

#define Assert(condition) \
		Trap(!(condition), "FailedAssertion")

#define AssertState(condition) \
		Trap(!(condition), "BadState")
		
#endif   /* USE_ASSERT_CHECKING && !FRONTEND */

Build and tests (= make installcheck after adding conf.add to $PGDATA/postgresql.conf) passed with USE_PGXS=1 with REL9_6_STABLE and master.

Thank you!

Marina Polyakova added 2 commits November 21, 2022 17:38

Fix build due to changes in PostgreSQL 16

fb3eb36

See the commit 3057465acfbea2f3dd7a914a1478064022c6eecd (Replace the sorted array of GUC variables with a hash table.) in PostgreSQL 16.

MarinaPolyakova requested a review from shinderuk November 21, 2022 14:46

MarinaPolyakova assigned shinderuk Nov 21, 2022

MarinaPolyakova requested review from rzharkov and removed request for shinderuk November 22, 2022 10:10

MarinaPolyakova assigned rzharkov and unassigned shinderuk Nov 22, 2022

Replace AssertState() with Assert().

9526428

AssertArg and AssertState were removed in PostgreSQL by commit #b1099eca8f.

rzharkov force-pushed the PGPRO-7444 branch from 11a8c45 to 9526428 Compare November 23, 2022 03:29

rzharkov reviewed Nov 23, 2022

View reviewed changes

MarinaPolyakova assigned MarinaPolyakova and unassigned rzharkov Nov 23, 2022

MarinaPolyakova merged commit 544a4ee into master Nov 23, 2022

MarinaPolyakova deleted the PGPRO-7444 branch November 23, 2022 08:43

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix build due to changes in PostgreSQL 16 #64

Fix build due to changes in PostgreSQL 16 #64

MarinaPolyakova commented Nov 21, 2022

rzharkov left a comment

MarinaPolyakova commented Nov 23, 2022 •

edited

Loading

Fix build due to changes in PostgreSQL 16 #64

Fix build due to changes in PostgreSQL 16 #64

Conversation

MarinaPolyakova commented Nov 21, 2022

rzharkov left a comment

Choose a reason for hiding this comment

MarinaPolyakova commented Nov 23, 2022 • edited Loading

MarinaPolyakova commented Nov 23, 2022 •

edited

Loading