Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit053a28d

Browse files
committed
Merge branch 'REL9_6_STABLE' into PGPRO9_6
2 parentsc890b5a +df04db0 commit053a28d

File tree

70 files changed

+1407
-505
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+1407
-505
lines changed

‎config/perl.m4

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,31 @@ AC_DEFUN([PGAC_CHECK_PERL_CONFIGS],
4949
[m4_foreach([pgac_item],[$1],[PGAC_CHECK_PERL_CONFIG(pgac_item)])])
5050

5151

52+
# PGAC_CHECK_PERL_EMBED_CCFLAGS
53+
# -----------------------------
54+
# We selectively extract stuff from $Config{ccflags}. We don't really need
55+
# anything except -D switches, and other sorts of compiler switches can
56+
# actively break things if Perl was compiled with a different compiler.
57+
# Moreover, although Perl likes to put stuff like -D_LARGEFILE_SOURCE and
58+
# -D_FILE_OFFSET_BITS=64 here, it would be fatal to try to compile PL/Perl
59+
# to a different libc ABI than core Postgres uses. The available information
60+
# says that all the symbols that affect Perl's own ABI begin with letters,
61+
# so it should be sufficient to adopt -D switches for symbols not beginning
62+
# with underscore.
63+
# For debugging purposes, let's have the configure output report the raw
64+
# ccflags value as well as the set of flags we chose to adopt.
65+
AC_DEFUN([PGAC_CHECK_PERL_EMBED_CCFLAGS],
66+
[AC_REQUIRE([PGAC_PATH_PERL])
67+
AC_MSG_CHECKING([for CFLAGS recommended by Perl])
68+
perl_ccflags=`$PERL -MConfig -e['print $Config{ccflags}']`
69+
AC_MSG_RESULT([$perl_ccflags])
70+
AC_MSG_CHECKING([for CFLAGS to compile embedded Perl])
71+
perl_embed_ccflags=`$PERL -MConfig -e['foreach $f (split(" ",$Config{ccflags})) {print $f, " " if ($f =~ /^-D[^_]/)}']`
72+
AC_SUBST(perl_embed_ccflags)dnl
73+
AC_MSG_RESULT([$perl_embed_ccflags])
74+
])# PGAC_CHECK_PERL_EMBED_CCFLAGS
75+
76+
5277
# PGAC_CHECK_PERL_EMBED_LDFLAGS
5378
# -----------------------------
5479
# We are after Embed's ldopts, but without the subset mentioned in

‎configure

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -672,6 +672,7 @@ python_version
672672
python_majorversion
673673
PYTHON
674674
perl_embed_ldflags
675+
perl_embed_ccflags
675676
perl_useshrplib
676677
perl_privlibexp
677678
perl_archlibexp
@@ -7576,6 +7577,18 @@ documentation for details. Use --without-perl to disable building
75767577
PL/Perl." "$LINENO" 5
75777578
fi
75787579

7580+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLAGS recommended by Perl" >&5
7581+
$as_echo_n "checking for CFLAGS recommended by Perl... " >&6; }
7582+
perl_ccflags=`$PERL -MConfig -e 'print $Config{ccflags}'`
7583+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $perl_ccflags" >&5
7584+
$as_echo "$perl_ccflags" >&6; }
7585+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLAGS to compile embedded Perl" >&5
7586+
$as_echo_n "checking for CFLAGS to compile embedded Perl... " >&6; }
7587+
perl_embed_ccflags=`$PERL -MConfig -e 'foreach $f (split(" ",$Config{ccflags})) {print $f, " " if ($f =~ /^-D[^_]/)}'`
7588+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $perl_embed_ccflags" >&5
7589+
$as_echo "$perl_embed_ccflags" >&6; }
7590+
7591+
75797592
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for flags to link embedded Perl" >&5
75807593
$as_echo_n "checking for flags to link embedded Perl... " >&6; }
75817594
if test "$PORTNAME" = "win32" ; then

‎configure.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -948,6 +948,7 @@ You might have to rebuild your Perl installation. Refer to the
948948
documentation for details. Use --without-perl to disable building
949949
PL/Perl.])
950950
fi
951+
PGAC_CHECK_PERL_EMBED_CCFLAGS
951952
PGAC_CHECK_PERL_EMBED_LDFLAGS
952953
fi
953954

‎contrib/hstore_plperl/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,4 @@ endif
4343
# last, probably because it sometimes contains some header files with names
4444
# that clash with some of ours, or with some that we include, notably on
4545
# Windows.
46-
overrideCPPFLAGS :=$(CPPFLAGS) -I$(perl_archlibexp)/CORE
46+
overrideCPPFLAGS :=$(CPPFLAGS)$(perl_embed_ccflags)-I$(perl_archlibexp)/CORE

‎contrib/hstore_plperl/hstore_plperl.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ PG_FUNCTION_INFO_V1(hstore_to_plperl);
1313
Datum
1414
hstore_to_plperl(PG_FUNCTION_ARGS)
1515
{
16+
dTHX;
1617
HStore*in=PG_GETARG_HS(0);
1718
inti;
1819
intcount=HS_COUNT(in);
@@ -45,16 +46,15 @@ PG_FUNCTION_INFO_V1(plperl_to_hstore);
4546
Datum
4647
plperl_to_hstore(PG_FUNCTION_ARGS)
4748
{
48-
HV*hv;
49+
dTHX;
50+
HV*hv= (HV*)SvRV((SV*)PG_GETARG_POINTER(0));
4951
HE*he;
5052
int32buflen;
5153
int32i;
5254
int32pcount;
5355
HStore*out;
5456
Pairs*pairs;
5557

56-
hv= (HV*)SvRV((SV*)PG_GETARG_POINTER(0));
57-
5858
pcount=hv_iterinit(hv);
5959

6060
pairs=palloc(pcount*sizeof(Pairs));

‎contrib/postgres_fdw/connection.c

Lines changed: 100 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include"miscadmin.h"
2222
#include"storage/latch.h"
2323
#include"utils/hsearch.h"
24+
#include"utils/inval.h"
2425
#include"utils/memutils.h"
2526
#include"utils/syscache.h"
2627

@@ -47,11 +48,15 @@ typedef struct ConnCacheEntry
4748
{
4849
ConnCacheKeykey;/* hash key (must be first) */
4950
PGconn*conn;/* connection to foreign server, or NULL */
51+
/* Remaining fields are invalid when conn is NULL: */
5052
intxact_depth;/* 0 = no xact open, 1 = main xact open, 2 =
5153
* one level of subxact open, etc */
5254
boolhave_prep_stmt;/* have we prepared any stmts in this xact? */
5355
boolhave_error;/* have any subxacts aborted in this xact? */
5456
boolchanging_xact_state;/* xact state change in process */
57+
boolinvalidated;/* true if reconnect is pending */
58+
uint32server_hashvalue;/* hash value of foreign server OID */
59+
uint32mapping_hashvalue;/* hash value of user mapping OID */
5560
}ConnCacheEntry;
5661

5762
/*
@@ -68,6 +73,7 @@ static bool xact_got_connection = false;
6873

6974
/* prototypes of private functions */
7075
staticPGconn*connect_pg_server(ForeignServer*server,UserMapping*user);
76+
staticvoiddisconnect_pg_server(ConnCacheEntry*entry);
7177
staticvoidcheck_conn_params(constchar**keywords,constchar**values);
7278
staticvoidconfigure_remote_session(PGconn*conn);
7379
staticvoiddo_sql_command(PGconn*conn,constchar*sql);
@@ -77,6 +83,7 @@ static void pgfdw_subxact_callback(SubXactEvent event,
7783
SubTransactionIdmySubid,
7884
SubTransactionIdparentSubid,
7985
void*arg);
86+
staticvoidpgfdw_inval_callback(Datumarg,intcacheid,uint32hashvalue);
8087
staticvoidpgfdw_reject_incomplete_xact_state_change(ConnCacheEntry*entry);
8188
staticboolpgfdw_cancel_query(PGconn*conn);
8289
staticboolpgfdw_exec_cleanup_query(PGconn*conn,constchar*query,
@@ -94,13 +101,6 @@ static bool pgfdw_get_cleanup_result(PGconn *conn, TimestampTz endtime,
94101
* will_prep_stmt must be true if caller intends to create any prepared
95102
* statements. Since those don't go away automatically at transaction end
96103
* (not even on error), we need this flag to cue manual cleanup.
97-
*
98-
* XXX Note that caching connections theoretically requires a mechanism to
99-
* detect change of FDW objects to invalidate already established connections.
100-
* We could manage that by watching for invalidation events on the relevant
101-
* syscaches. For the moment, though, it's not clear that this would really
102-
* be useful and not mere pedantry. We could not flush any active connections
103-
* mid-transaction anyway.
104104
*/
105105
PGconn*
106106
GetConnection(UserMapping*user,boolwill_prep_stmt)
@@ -129,6 +129,10 @@ GetConnection(UserMapping *user, bool will_prep_stmt)
129129
*/
130130
RegisterXactCallback(pgfdw_xact_callback,NULL);
131131
RegisterSubXactCallback(pgfdw_subxact_callback,NULL);
132+
CacheRegisterSyscacheCallback(FOREIGNSERVEROID,
133+
pgfdw_inval_callback, (Datum)0);
134+
CacheRegisterSyscacheCallback(USERMAPPINGOID,
135+
pgfdw_inval_callback, (Datum)0);
132136
}
133137

134138
/* Set flag that we did GetConnection during the current transaction */
@@ -143,17 +147,27 @@ GetConnection(UserMapping *user, bool will_prep_stmt)
143147
entry=hash_search(ConnectionHash,&key,HASH_ENTER,&found);
144148
if (!found)
145149
{
146-
/* initialize new hashtable entry (key is already filled in) */
150+
/*
151+
* We need only clear "conn" here; remaining fields will be filled
152+
* later when "conn" is set.
153+
*/
147154
entry->conn=NULL;
148-
entry->xact_depth=0;
149-
entry->have_prep_stmt= false;
150-
entry->have_error= false;
151-
entry->changing_xact_state= false;
152155
}
153156

154157
/* Reject further use of connections which failed abort cleanup. */
155158
pgfdw_reject_incomplete_xact_state_change(entry);
156159

160+
/*
161+
* If the connection needs to be remade due to invalidation, disconnect as
162+
* soon as we're out of all transactions.
163+
*/
164+
if (entry->conn!=NULL&&entry->invalidated&&entry->xact_depth==0)
165+
{
166+
elog(DEBUG3,"closing connection %p for option changes to take effect",
167+
entry->conn);
168+
disconnect_pg_server(entry);
169+
}
170+
157171
/*
158172
* We don't check the health of cached connection here, because it would
159173
* require some overhead. Broken connection will be detected when the
@@ -163,15 +177,26 @@ GetConnection(UserMapping *user, bool will_prep_stmt)
163177
/*
164178
* If cache entry doesn't have a connection, we have to establish a new
165179
* connection. (If connect_pg_server throws an error, the cache entry
166-
* willbe leftin a valid empty state.)
180+
* willremainin a valid empty state, ie conn == NULL.)
167181
*/
168182
if (entry->conn==NULL)
169183
{
170184
ForeignServer*server=GetForeignServer(user->serverid);
171185

172-
entry->xact_depth=0;/* just to be sure */
186+
/* Reset all transient state fields, to be sure all are clean */
187+
entry->xact_depth=0;
173188
entry->have_prep_stmt= false;
174189
entry->have_error= false;
190+
entry->changing_xact_state= false;
191+
entry->invalidated= false;
192+
entry->server_hashvalue=
193+
GetSysCacheHashValue1(FOREIGNSERVEROID,
194+
ObjectIdGetDatum(server->serverid));
195+
entry->mapping_hashvalue=
196+
GetSysCacheHashValue1(USERMAPPINGOID,
197+
ObjectIdGetDatum(user->umid));
198+
199+
/* Now try to make the connection */
175200
entry->conn=connect_pg_server(server,user);
176201

177202
elog(DEBUG3,"new postgres_fdw connection %p for server \"%s\" (user mapping oid %u, userid %u)",
@@ -285,6 +310,19 @@ connect_pg_server(ForeignServer *server, UserMapping *user)
285310
returnconn;
286311
}
287312

313+
/*
314+
* Disconnect any open connection for a connection cache entry.
315+
*/
316+
staticvoid
317+
disconnect_pg_server(ConnCacheEntry*entry)
318+
{
319+
if (entry->conn!=NULL)
320+
{
321+
PQfinish(entry->conn);
322+
entry->conn=NULL;
323+
}
324+
}
325+
288326
/*
289327
* For non-superusers, insist that the connstr specify a password. This
290328
* prevents a password from being picked up from .pgpass, a service file,
@@ -786,9 +824,7 @@ pgfdw_xact_callback(XactEvent event, void *arg)
786824
entry->changing_xact_state)
787825
{
788826
elog(DEBUG3,"discarding connection %p",entry->conn);
789-
PQfinish(entry->conn);
790-
entry->conn=NULL;
791-
entry->changing_xact_state= false;
827+
disconnect_pg_server(entry);
792828
}
793829
}
794830

@@ -905,6 +941,47 @@ pgfdw_subxact_callback(SubXactEvent event, SubTransactionId mySubid,
905941
}
906942
}
907943

944+
/*
945+
* Connection invalidation callback function
946+
*
947+
* After a change to a pg_foreign_server or pg_user_mapping catalog entry,
948+
* mark connections depending on that entry as needing to be remade.
949+
* We can't immediately destroy them, since they might be in the midst of
950+
* a transaction, but we'll remake them at the next opportunity.
951+
*
952+
* Although most cache invalidation callbacks blow away all the related stuff
953+
* regardless of the given hashvalue, connections are expensive enough that
954+
* it's worth trying to avoid that.
955+
*
956+
* NB: We could avoid unnecessary disconnection more strictly by examining
957+
* individual option values, but it seems too much effort for the gain.
958+
*/
959+
staticvoid
960+
pgfdw_inval_callback(Datumarg,intcacheid,uint32hashvalue)
961+
{
962+
HASH_SEQ_STATUSscan;
963+
ConnCacheEntry*entry;
964+
965+
Assert(cacheid==FOREIGNSERVEROID||cacheid==USERMAPPINGOID);
966+
967+
/* ConnectionHash must exist already, if we're registered */
968+
hash_seq_init(&scan,ConnectionHash);
969+
while ((entry= (ConnCacheEntry*)hash_seq_search(&scan)))
970+
{
971+
/* Ignore invalid entries */
972+
if (entry->conn==NULL)
973+
continue;
974+
975+
/* hashvalue == 0 means a cache reset, must clear all state */
976+
if (hashvalue==0||
977+
(cacheid==FOREIGNSERVEROID&&
978+
entry->server_hashvalue==hashvalue)||
979+
(cacheid==USERMAPPINGOID&&
980+
entry->mapping_hashvalue==hashvalue))
981+
entry->invalidated= true;
982+
}
983+
}
984+
908985
/*
909986
* Raise an error if the given connection cache entry is marked as being
910987
* in the middle of an xact state change. This should be called at which no
@@ -922,9 +999,14 @@ pgfdw_reject_incomplete_xact_state_change(ConnCacheEntry *entry)
922999
Form_pg_user_mappingumform;
9231000
ForeignServer*server;
9241001

925-
if (!entry->changing_xact_state)
1002+
/* nothing to do for inactive entries and entries of sane state */
1003+
if (entry->conn==NULL|| !entry->changing_xact_state)
9261004
return;
9271005

1006+
/* make sure this entry is inactive */
1007+
disconnect_pg_server(entry);
1008+
1009+
/* find server name to be shown in the message below */
9281010
tup=SearchSysCache1(USERMAPPINGOID,
9291011
ObjectIdGetDatum(entry->key));
9301012
if (!HeapTupleIsValid(tup))

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp