public inbox for [email protected]help / color / mirror / Atom feed
[PATCH 1/3] bootstrap: convert Typ to a List* 3+ messages / 3 participants [nested] [flat]
* [PATCH 1/3] bootstrap: convert Typ to a List* @ 2020-11-20 02:48 Justin Pryzby <[email protected]> 0 siblings, 0 replies; 3+ messages in thread From: Justin Pryzby @ 2020-11-20 02:48 UTC (permalink / raw) --- src/backend/bootstrap/bootstrap.c | 69 ++++++++++++++----------------- 1 file changed, 31 insertions(+), 38 deletions(-) diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c index a7ed93fdc1..9a9fa7fd38 100644 --- a/src/backend/bootstrap/bootstrap.c +++ b/src/backend/bootstrap/bootstrap.c @@ -159,7 +159,7 @@ struct typmap FormData_pg_type am_typ; }; -static struct typmap **Typ = NULL; +static List *Typ = NIL; /* List of struct typmap* */ static struct typmap *Ap = NULL; static Datum values[MAXATTR]; /* current row's attribute values */ @@ -597,7 +597,7 @@ boot_openrel(char *relname) * pg_type must be filled before any OPEN command is executed, hence we * can now populate the Typ array if we haven't yet. */ - if (Typ == NULL) + if (Typ == NIL) populate_typ_array(); if (boot_reldesc != NULL) @@ -688,7 +688,7 @@ DefineAttr(char *name, char *type, int attnum, int nullness) typeoid = gettype(type); - if (Typ != NULL) + if (Typ != NIL) { attrtypes[attnum]->atttypid = Ap->am_oid; attrtypes[attnum]->attlen = Ap->am_typ.typlen; @@ -877,36 +877,25 @@ populate_typ_array(void) Relation rel; TableScanDesc scan; HeapTuple tup; - int nalloc; - int i; - - Assert(Typ == NULL); - nalloc = 512; - Typ = (struct typmap **) - MemoryContextAlloc(TopMemoryContext, nalloc * sizeof(struct typmap *)); + Assert(Typ == NIL); rel = table_open(TypeRelationId, NoLock); scan = table_beginscan_catalog(rel, 0, NULL); - i = 0; while ((tup = heap_getnext(scan, ForwardScanDirection)) != NULL) { Form_pg_type typForm = (Form_pg_type) GETSTRUCT(tup); + struct typmap *newtyp; + MemoryContext old; - /* make sure there will be room for a trailing NULL pointer */ - if (i >= nalloc - 1) - { - nalloc *= 2; - Typ = (struct typmap **) - repalloc(Typ, nalloc * sizeof(struct typmap *)); - } - Typ[i] = (struct typmap *) - MemoryContextAlloc(TopMemoryContext, sizeof(struct typmap)); - Typ[i]->am_oid = typForm->oid; - memcpy(&(Typ[i]->am_typ), typForm, sizeof(Typ[i]->am_typ)); - i++; + old = MemoryContextSwitchTo(TopMemoryContext); + newtyp = (struct typmap *) palloc(sizeof(struct typmap)); + Typ = lappend(Typ, newtyp); + MemoryContextSwitchTo(old); + + newtyp->am_oid = typForm->oid; + memcpy(&newtyp->am_typ, typForm, sizeof(newtyp->am_typ)); } - Typ[i] = NULL; /* Fill trailing NULL pointer */ table_endscan(scan); table_close(rel, NoLock); } @@ -925,16 +914,17 @@ populate_typ_array(void) static Oid gettype(char *type) { - if (Typ != NULL) + if (Typ != NIL) { - struct typmap **app; + ListCell *lc; - for (app = Typ; *app != NULL; app++) + foreach (lc, Typ) { - if (strncmp(NameStr((*app)->am_typ.typname), type, NAMEDATALEN) == 0) + struct typmap *app = lfirst(lc); + if (strncmp(NameStr(app->am_typ.typname), type, NAMEDATALEN) == 0) { - Ap = *app; - return (*app)->am_oid; + Ap = app; + return app->am_oid; } } } @@ -980,14 +970,17 @@ boot_get_type_io_data(Oid typid, if (Typ != NULL) { /* We have the boot-time contents of pg_type, so use it */ - struct typmap **app; - struct typmap *ap; - - app = Typ; - while (*app && (*app)->am_oid != typid) - ++app; - ap = *app; - if (ap == NULL) + struct typmap *ap = NULL; + ListCell *lc; + + foreach (lc, Typ) + { + ap = lfirst(lc); + if (ap->am_oid == typid) + break; + } + + if (!ap || ap->am_oid != typid) elog(ERROR, "type OID %u not found in Typ list", typid); *typlen = ap->am_typ.typlen; -- 2.26.2 --------------8917F6B7186C9FBB138CED7B Content-Type: text/x-patch; charset=UTF-8; name="0002-Allow-composite-types-in-bootstrap-20201203.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0002-Allow-composite-types-in-bootstrap-20201203.patch" ^ permalink raw reply [nested|flat] 3+ messages in thread
* Re: pgsql: Add contrib/pg_walinspect. @ 2022-04-27 02:10 Thomas Munro <[email protected]> 0 siblings, 1 reply; 3+ messages in thread From: Thomas Munro @ 2022-04-27 02:10 UTC (permalink / raw) To: Tom Lane <[email protected]>; +Cc: Michael Paquier <[email protected]>; Noah Misch <[email protected]>; Jeff Davis <[email protected]>; Postgres hackers <[email protected]> On Wed, Apr 27, 2022 at 1:54 PM Thomas Munro <[email protected]> wrote: > On Wed, Apr 27, 2022 at 1:47 PM Tom Lane <[email protected]> wrote: > > Thomas Munro <[email protected]> writes: > > > Hrmph... Are you sure you rebuilt the contrib module? Assuming so, > > > maybe it's failing in a different way for you and me. For me, it > > > always fails after this break is reached in xlogutil.c: > > > > > /* If asked, let's not wait for future WAL. */ > > > if (!wait_for_wal) > > > break; > > > > Hmm. For me, that statement is not reached at all in successful > > (make installcheck) runs. In a failing run, it's reached with > > wait_for_wal = false, after which we get the "could not read WAL" > > failure. Usually that happens twice, as per attached. > > Ok, that's the same for me. Next question: why does the patch I > posted not help? For me, the error "could not read WAL at %X/%X", > seen on the BF log, is raised by ReadNextXLogRecord() in > pg_walinspect.c. The patch removes that ereport() entirely (and > handles NULL in a couple of places). BTW If you had your local change from debug.patch (upthread), that'd defeat the patch. I mean this: + if(!*errormsg) + *errormsg = "decode_queue_head is null"; ^ permalink raw reply [nested|flat] 3+ messages in thread
* Re: pgsql: Add contrib/pg_walinspect. @ 2022-04-27 02:15 Tom Lane <[email protected]> parent: Thomas Munro <[email protected]> 0 siblings, 0 replies; 3+ messages in thread From: Tom Lane @ 2022-04-27 02:15 UTC (permalink / raw) To: Thomas Munro <[email protected]>; +Cc: Michael Paquier <[email protected]>; Noah Misch <[email protected]>; Jeff Davis <[email protected]>; Postgres hackers <[email protected]> Thomas Munro <[email protected]> writes: > BTW If you had your local change from debug.patch (upthread), that'd > defeat the patch. I mean this: > + if(!*errormsg) > + *errormsg = "decode_queue_head is null"; Oh! Okay, I'll retry without that. regards, tom lane ^ permalink raw reply [nested|flat] 3+ messages in thread
end of thread, other threads:[~2022-04-27 02:15 UTC | newest] Thread overview: 3+ messages (download: mbox mbox.gz follow: Atom feed) -- links below jump to the message on this page -- 2020-11-20 02:48 [PATCH 1/3] bootstrap: convert Typ to a List* Justin Pryzby <[email protected]> 2022-04-27 02:10 Re: pgsql: Add contrib/pg_walinspect. Thomas Munro <[email protected]> 2022-04-27 02:15 ` Re: pgsql: Add contrib/pg_walinspect. Tom Lane <[email protected]>
This inbox is served by agora; see mirroring instructions for how to clone and mirror all data and code used for this inbox