Skip to content

Commit e6ea61b

Browse files
vbwagnervbwagner
committed
Merge branch 'REL9_6_STABLE' into PGPRO9_6
2 parents f23efc3 + b971a98 commit e6ea61b

File tree

26 files changed

+739
-664
lines changed

26 files changed

+739
-664
lines changed

‎doc/src/sgml/ref/create_database.sgml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,8 @@ CREATE DATABASE <replaceable class="PARAMETER">name</replaceable>
258258
The <literal>CONNECTION LIMIT</> option is only enforced approximately;
259259
if two new sessions start at about the same time when just one
260260
connection <quote>slot</> remains for the database, it is possible that
261-
both will fail. Also, the limit is not enforced against superusers.
261+
both will fail. Also, the limit is not enforced against superusers or
262+
background worker processes.
262263
</para>
263264
</refsect1>
264265

‎doc/src/sgml/ref/create_role.sgml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,10 @@ CREATE ROLE <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <replac
198198
<listitem>
199199
<para>
200200
If role can log in, this specifies how many concurrent connections
201-
the role can make. -1 (the default) means no limit.
201+
the role can make. -1 (the default) means no limit. Note that only
202+
normal connections are counted towards this limit. Neither prepared
203+
transactions nor background worker connections are counted towards
204+
this limit.
202205
</para>
203206
</listitem>
204207
</varlistentry>

‎src/backend/access/transam/twophase.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -420,6 +420,7 @@ MarkAsPreparing(TransactionId xid, const char *gid,
420420
proc->backendId = InvalidBackendId;
421421
proc->databaseId = databaseid;
422422
proc->roleId = owner;
423+
proc->isBackgroundWorker = false;
423424
proc->lwWaiting = false;
424425
proc->lwWaitMode = 0;
425426
proc->waitLock = NULL;

‎src/backend/optimizer/plan/createplan.c

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5634,6 +5634,16 @@ materialize_finished_plan(Plan *subplan)
56345634

56355635
matplan = (Plan *) make_material(subplan);
56365636

5637+
/*
5638+
* XXX horrid kluge: if there are any initPlans attached to the subplan,
5639+
* move them up to the Material node, which is now effectively the top
5640+
* plan node in its query level. This prevents failure in
5641+
* SS_finalize_plan(), which see for comments. We don't bother adjusting
5642+
* the subplan's cost estimate for this.
5643+
*/
5644+
matplan->initPlan = subplan->initPlan;
5645+
subplan->initPlan = NIL;
5646+
56375647
/* Set cost data */
56385648
cost_material(&matpath,
56395649
subplan->startup_cost,

‎src/backend/optimizer/plan/planner.c

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -305,21 +305,7 @@ standard_planner(Query *parse, int cursorOptions, ParamListInfo boundParams)
305305
if (cursorOptions & CURSOR_OPT_SCROLL)
306306
{
307307
if (!ExecSupportsBackwardScan(top_plan))
308-
{
309-
Plan *sub_plan = top_plan;
310-
311-
top_plan = materialize_finished_plan(sub_plan);
312-
313-
/*
314-
* XXX horrid kluge: if there are any initPlans attached to the
315-
* formerly-top plan node, move them up to the Material node. This
316-
* prevents failure in SS_finalize_plan, which see for comments.
317-
* We don't bother adjusting the sub_plan's cost estimate for
318-
* this.
319-
*/
320-
top_plan->initPlan = sub_plan->initPlan;
321-
sub_plan->initPlan = NIL;
322-
}
308+
top_plan = materialize_finished_plan(top_plan);
323309
}
324310

325311
/*

‎src/backend/storage/ipc/procarray.c

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2751,6 +2751,38 @@ CountDBBackends(Oid databaseid)
27512751
return count;
27522752
}
27532753

2754+
/*
2755+
* CountDBConnections --- counts database backends ignoring any background
2756+
* worker processes
2757+
*/
2758+
int
2759+
CountDBConnections(Oid databaseid)
2760+
{
2761+
ProcArrayStruct *arrayP = procArray;
2762+
int count = 0;
2763+
int index;
2764+
2765+
LWLockAcquire(ProcArrayLock, LW_SHARED);
2766+
2767+
for (index = 0; index < arrayP->numProcs; index++)
2768+
{
2769+
int pgprocno = arrayP->pgprocnos[index];
2770+
volatile PGPROC *proc = &allProcs[pgprocno];
2771+
2772+
if (proc->pid == 0)
2773+
continue; /* do not count prepared xacts */
2774+
if (proc->isBackgroundWorker)
2775+
continue; /* do not count background workers */
2776+
if (!OidIsValid(databaseid) ||
2777+
proc->databaseId == databaseid)
2778+
count++;
2779+
}
2780+
2781+
LWLockRelease(ProcArrayLock);
2782+
2783+
return count;
2784+
}
2785+
27542786
/*
27552787
* CancelDBBackends --- cancel backends that are using specified database
27562788
*/
@@ -2810,6 +2842,8 @@ CountUserBackends(Oid roleid)
28102842

28112843
if (proc->pid == 0)
28122844
continue; /* do not count prepared xacts */
2845+
if (proc->isBackgroundWorker)
2846+
continue; /* do not count background workers */
28132847
if (proc->roleId == roleid)
28142848
count++;
28152849
}

‎src/backend/storage/lmgr/proc.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -372,6 +372,7 @@ InitProcess(void)
372372
MyProc->backendId = InvalidBackendId;
373373
MyProc->databaseId = InvalidOid;
374374
MyProc->roleId = InvalidOid;
375+
MyProc->isBackgroundWorker = IsBackgroundWorker;
375376
MyPgXact->delayChkpt = false;
376377
MyPgXact->vacuumFlags = 0;
377378
/* NB -- autovac launcher intentionally does not set IS_AUTOVACUUM */
@@ -544,6 +545,7 @@ InitAuxiliaryProcess(void)
544545
MyProc->backendId = InvalidBackendId;
545546
MyProc->databaseId = InvalidOid;
546547
MyProc->roleId = InvalidOid;
548+
MyProc->isBackgroundWorker = IsBackgroundWorker;
547549
MyPgXact->delayChkpt = false;
548550
MyPgXact->vacuumFlags = 0;
549551
MyProc->lwWaiting = false;

‎src/backend/utils/init/postinit.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ CheckMyDatabase(const char *name, bool am_superuser)
351351
*/
352352
if (dbform->datconnlimit >= 0 &&
353353
!am_superuser &&
354-
CountDBBackends(MyDatabaseId) > dbform->datconnlimit)
354+
CountDBConnections(MyDatabaseId) > dbform->datconnlimit)
355355
ereport(FATAL,
356356
(errcode(ERRCODE_TOO_MANY_CONNECTIONS),
357357
errmsg("too many connections for database \"%s\"",

‎src/backend/utils/mb/Unicode/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ GENERICMAPS = $(ISO8859MAPS) $(WINMAPS) \
4242
johab_to_utf8.map utf8_to_johab.map \
4343
uhc_to_utf8.map utf8_to_uhc.map \
4444
gbk_to_utf8.map utf8_to_gbk.map \
45-
koi8r_to_utf8.map utf8_to_koi8r.map
45+
koi8r_to_utf8.map utf8_to_koi8r.map \
46+
koi8u_to_utf8.map utf8_to_koi8u.map
4647

4748
SPECIALMAPS = euc_cn_to_utf8.map utf8_to_euc_cn.map \
4849
euc_jp_to_utf8.map utf8_to_euc_jp.map \

‎src/bin/pg_dump/dumputils.c

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -368,11 +368,12 @@ buildACLCommands(const char *name, const char *subname,
368368
*/
369369
bool
370370
buildDefaultACLCommands(const char *type, const char *nspname,
371-
const char *acls, const char *owner,
371+
const char *acls, const char *racls,
372+
const char *initacls, const char *initracls,
373+
const char *owner,
372374
int remoteVersion,
373375
PQExpBuffer sql)
374376
{
375-
bool result;
376377
PQExpBuffer prefix;
377378

378379
prefix = createPQExpBuffer();
@@ -388,14 +389,22 @@ buildDefaultACLCommands(const char *type, const char *nspname,
388389
if (nspname)
389390
appendPQExpBuffer(prefix, "IN SCHEMA %s ", fmtId(nspname));
390391

391-
result = buildACLCommands("", NULL,
392-
type, acls, "", owner,
393-
prefix->data, remoteVersion,
394-
sql);
392+
if (strlen(initacls) != 0 || strlen(initracls) != 0)
393+
{
394+
appendPQExpBuffer(sql, "SELECT pg_catalog.binary_upgrade_set_record_init_privs(true);\n");
395+
if (!buildACLCommands("", NULL, type, initacls, initracls, owner,
396+
prefix->data, remoteVersion, sql))
397+
return false;
398+
appendPQExpBuffer(sql, "SELECT pg_catalog.binary_upgrade_set_record_init_privs(false);\n");
399+
}
400+
401+
if (!buildACLCommands("", NULL, type, acls, racls, owner,
402+
prefix->data, remoteVersion, sql))
403+
return false;
395404

396405
destroyPQExpBuffer(prefix);
397406

398-
return result;
407+
return true;
399408
}
400409

401410
/*

‎src/bin/pg_dump/dumputils.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@ extern bool buildACLCommands(const char *name, const char *subname,
4141
const char *owner, const char *prefix, int remoteVersion,
4242
PQExpBuffer sql);
4343
extern bool buildDefaultACLCommands(const char *type, const char *nspname,
44-
const char *acls, const char *owner,
44+
const char *acls, const char *racls,
45+
const char *initacls, const char *initracls,
46+
const char *owner,
4547
int remoteVersion,
4648
PQExpBuffer sql);
4749
extern void buildShSecLabelQuery(PGconn *conn, const char *catalog_name,

‎src/bin/pg_dump/pg_dump.c

Lines changed: 56 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9006,6 +9006,9 @@ getDefaultACLs(Archive *fout, int *numDefaultACLs)
90069006
int i_defaclnamespace;
90079007
int i_defaclobjtype;
90089008
int i_defaclacl;
9009+
int i_rdefaclacl;
9010+
int i_initdefaclacl;
9011+
int i_initrdefaclacl;
90099012
int i,
90109013
ntups;
90119014

@@ -9020,13 +9023,50 @@ getDefaultACLs(Archive *fout, int *numDefaultACLs)
90209023
/* Make sure we are in proper schema */
90219024
selectSourceSchema(fout, "pg_catalog");
90229025

9023-
appendPQExpBuffer(query, "SELECT oid, tableoid, "
9024-
"(%s defaclrole) AS defaclrole, "
9025-
"defaclnamespace, "
9026-
"defaclobjtype, "
9027-
"defaclacl "
9028-
"FROM pg_default_acl",
9029-
username_subquery);
9026+
if (fout->remoteVersion >= 90600)
9027+
{
9028+
PQExpBuffer acl_subquery = createPQExpBuffer();
9029+
PQExpBuffer racl_subquery = createPQExpBuffer();
9030+
PQExpBuffer initacl_subquery = createPQExpBuffer();
9031+
PQExpBuffer initracl_subquery = createPQExpBuffer();
9032+
9033+
buildACLQueries(acl_subquery, racl_subquery, initacl_subquery,
9034+
initracl_subquery, "defaclacl", "defaclrole",
9035+
"CASE WHEN defaclobjtype = 'S' THEN 's' ELSE defaclobjtype END::\"char\"",
9036+
dopt->binary_upgrade);
9037+
9038+
appendPQExpBuffer(query, "SELECT d.oid, d.tableoid, "
9039+
"(%s d.defaclrole) AS defaclrole, "
9040+
"d.defaclnamespace, "
9041+
"d.defaclobjtype, "
9042+
"%s AS defaclacl, "
9043+
"%s AS rdefaclacl, "
9044+
"%s AS initdefaclacl, "
9045+
"%s AS initrdefaclacl "
9046+
"FROM pg_default_acl d "
9047+
"LEFT JOIN pg_init_privs pip ON "
9048+
"(d.oid = pip.objoid "
9049+
"AND pip.classoid = 'pg_default_acl'::regclass "
9050+
"AND pip.objsubid = 0) ",
9051+
username_subquery,
9052+
acl_subquery->data,
9053+
racl_subquery->data,
9054+
initacl_subquery->data,
9055+
initracl_subquery->data);
9056+
}
9057+
else
9058+
{
9059+
appendPQExpBuffer(query, "SELECT oid, tableoid, "
9060+
"(%s defaclrole) AS defaclrole, "
9061+
"defaclnamespace, "
9062+
"defaclobjtype, "
9063+
"defaclacl, "
9064+
"NULL AS rdefaclacl, "
9065+
"NULL AS initdefaclacl, "
9066+
"NULL AS initrdefaclacl "
9067+
"FROM pg_default_acl",
9068+
username_subquery);
9069+
}
90309070

90319071
res = ExecuteSqlQuery(fout, query->data, PGRES_TUPLES_OK);
90329072

@@ -9041,6 +9081,9 @@ getDefaultACLs(Archive *fout, int *numDefaultACLs)
90419081
i_defaclnamespace = PQfnumber(res, "defaclnamespace");
90429082
i_defaclobjtype = PQfnumber(res, "defaclobjtype");
90439083
i_defaclacl = PQfnumber(res, "defaclacl");
9084+
i_rdefaclacl = PQfnumber(res, "rdefaclacl");
9085+
i_initdefaclacl = PQfnumber(res, "initdefaclacl");
9086+
i_initrdefaclacl = PQfnumber(res, "initrdefaclacl");
90449087

90459088
for (i = 0; i < ntups; i++)
90469089
{
@@ -9062,6 +9105,9 @@ getDefaultACLs(Archive *fout, int *numDefaultACLs)
90629105
daclinfo[i].defaclrole = pg_strdup(PQgetvalue(res, i, i_defaclrole));
90639106
daclinfo[i].defaclobjtype = *(PQgetvalue(res, i, i_defaclobjtype));
90649107
daclinfo[i].defaclacl = pg_strdup(PQgetvalue(res, i, i_defaclacl));
9108+
daclinfo[i].rdefaclacl = pg_strdup(PQgetvalue(res, i, i_rdefaclacl));
9109+
daclinfo[i].initdefaclacl = pg_strdup(PQgetvalue(res, i, i_initdefaclacl));
9110+
daclinfo[i].initrdefaclacl = pg_strdup(PQgetvalue(res, i, i_initrdefaclacl));
90659111

90669112
/* Decide whether we want to dump it */
90679113
selectDumpableDefaultACL(&(daclinfo[i]), dopt);
@@ -14667,6 +14713,9 @@ dumpDefaultACL(Archive *fout, DefaultACLInfo *daclinfo)
1466714713
daclinfo->dobj.namespace != NULL ?
1466814714
daclinfo->dobj.namespace->dobj.name : NULL,
1466914715
daclinfo->defaclacl,
14716+
daclinfo->rdefaclacl,
14717+
daclinfo->initdefaclacl,
14718+
daclinfo->initrdefaclacl,
1467014719
daclinfo->defaclrole,
1467114720
fout->remoteVersion,
1467214721
q))

‎src/bin/pg_dump/pg_dump.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -526,6 +526,9 @@ typedef struct _defaultACLInfo
526526
char *defaclrole;
527527
char defaclobjtype;
528528
char *defaclacl;
529+
char *rdefaclacl;
530+
char *initdefaclacl;
531+
char *initrdefaclacl;
529532
} DefaultACLInfo;
530533

531534
typedef struct _blobInfo

‎src/include/storage/proc.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,8 @@ struct PGPROC
102102
Oid databaseId; /* OID of database this backend is using */
103103
Oid roleId; /* OID of role using this backend */
104104

105+
bool isBackgroundWorker; /* true if background worker. */
106+
105107
/*
106108
* While in hot standby mode, shows that a conflict signal has been sent
107109
* for the current transaction. Set/cleared while holding ProcArrayLock,

‎src/include/storage/procarray.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ extern pid_t CancelVirtualTransaction(VirtualTransactionId vxid, ProcSignalReaso
7373

7474
extern bool MinimumActiveBackends(int min);
7575
extern int CountDBBackends(Oid databaseid);
76+
extern int CountDBConnections(Oid databaseid);
7677
extern void CancelDBBackends(Oid databaseid, ProcSignalReason sigmode, bool conflictPending);
7778
extern int CountUserBackends(Oid roleid);
7879
extern bool CountOtherDBBackends(Oid databaseId,

0 commit comments

Comments
 (0)