NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commitd7018ab

committed

Make record_out and record_send extract type information from the passed

record object itself, rather than relying on a second OID argument to becorrect. This patch just changes the function behavior and not thecatalogs, so it's OK to back-patch to 8.0. Will remove the now-redundantsecond argument in pg_proc in a separate patch in HEAD only.

1 parent93b2477 commitd7018abCopy full SHA for d7018ab

File tree

1 file changed

-27

lines changed

src/backend/utils/adt
- rowtypes.c

1 file changed

-27

lines changed

`‎src/backend/utils/adt/rowtypes.c`

Lines changed: 9 additions & 27 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/utils/adt/rowtypes.c,v 1.9 2005/04/18 17:11:05 tgl Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/utils/adt/rowtypes.c,v 1.10 2005/04/30 20:04:33 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -268,7 +268,7 @@ Datum`
`268`	`268`	`record_out(PG_FUNCTION_ARGS)`
`269`	`269`	`{`
`270`	`270`	`HeapTupleHeaderrec=PG_GETARG_HEAPTUPLEHEADER(0);`
`271`		`-OidtupType=PG_GETARG_OID(1);`
	`271`	`+OidtupType;`
`272`	`272`	`int32tupTypmod;`
`273`	`273`	`TupleDesctupdesc;`
`274`	`274`	`HeapTupleDatatuple;`
`@@ -280,18 +280,9 @@ record_out(PG_FUNCTION_ARGS)`
`280`	`280`	`char*nulls;`
`281`	`281`	`StringInfoDatabuf;`
`282`	`282`
`283`		`-/*`
`284`		`- * Use the passed type unless it's RECORD; in that case, we'd better`
`285`		`- * get the type info out of the datum itself. Note that for RECORD,`
`286`		`- * what we'll probably actually get is RECORD's typelem, ie, zero.`
`287`		`- */`
`288`		`-if (tupType==InvalidOid\|\|tupType==RECORDOID)`
`289`		`-{`
`290`		`-tupType=HeapTupleHeaderGetTypeId(rec);`
`291`		`-tupTypmod=HeapTupleHeaderGetTypMod(rec);`
`292`		`-}`
`293`		`-else`
`294`		`-tupTypmod=-1;`
	`283`	`+/* Extract type info from the tuple itself */`
	`284`	`+tupType=HeapTupleHeaderGetTypeId(rec);`
	`285`	`+tupTypmod=HeapTupleHeaderGetTypMod(rec);`
`295`	`286`	`tupdesc=lookup_rowtype_tupdesc(tupType,tupTypmod);`
`296`	`287`	`ncolumns=tupdesc->natts;`
`297`	`288`
`@@ -613,7 +604,7 @@ Datum`
`613`	`604`	`record_send(PG_FUNCTION_ARGS)`
`614`	`605`	`{`
`615`	`606`	`HeapTupleHeaderrec=PG_GETARG_HEAPTUPLEHEADER(0);`
`616`		`-OidtupType=PG_GETARG_OID(1);`
	`607`	`+OidtupType;`
`617`	`608`	`int32tupTypmod;`
`618`	`609`	`TupleDesctupdesc;`
`619`	`610`	`HeapTupleDatatuple;`
`@@ -625,18 +616,9 @@ record_send(PG_FUNCTION_ARGS)`
`625`	`616`	`char*nulls;`
`626`	`617`	`StringInfoDatabuf;`
`627`	`618`
`628`		`-/*`
`629`		`- * Use the passed type unless it's RECORD; in that case, we'd better`
`630`		`- * get the type info out of the datum itself. Note that for RECORD,`
`631`		`- * what we'll probably actually get is RECORD's typelem, ie, zero.`
`632`		`- */`
`633`		`-if (tupType==InvalidOid\|\|tupType==RECORDOID)`
`634`		`-{`
`635`		`-tupType=HeapTupleHeaderGetTypeId(rec);`
`636`		`-tupTypmod=HeapTupleHeaderGetTypMod(rec);`
`637`		`-}`
`638`		`-else`
`639`		`-tupTypmod=-1;`
	`619`	`+/* Extract type info from the tuple itself */`
	`620`	`+tupType=HeapTupleHeaderGetTypeId(rec);`
	`621`	`+tupTypmod=HeapTupleHeaderGetTypMod(rec);`
`640`	`622`	`tupdesc=lookup_rowtype_tupdesc(tupType,tupTypmod);`
`641`	`623`	`ncolumns=tupdesc->natts;`
`642`	`624`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitd7018ab

File tree

1 file changed

1 file changed

`‎src/backend/utils/adt/rowtypes.c`

0 commit comments