Commit308da17

committed

Add COPY_ARRAY_FIELD and COMPARE_ARRAY_FIELD

These handle node fields that are inline arrays (as opposed todynamically allocated arrays handled by COPY_POINTER_FIELD andCOMPARE_POINTER_FIELD). These cases were hand-coded until now.Reviewed-by: Jacob Champion <pchampion@vmware.com>Discussion:https://www.postgresql.org/message-id/c091e5cd-45f8-69ee-6a9b-de86912cc7e7@enterprisedb.com

1 parent8539929 commit308da17Copy full SHA for 308da17

File tree

+14

-4

lines changed

+14

-4

lines changed

Lines changed: 7 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,10 @@`
`53`	`53`	`#defineCOPY_STRING_FIELD(fldname) \`
`54`	`54`	`(newnode->fldname = from->fldname ? pstrdup(from->fldname) : (char *) NULL)`
`55`	`55`
	`56`	`+/* Copy a field that is an inline array */`
	`57`	`+#defineCOPY_ARRAY_FIELD(fldname) \`
	`58`	`+memcpy(newnode->fldname, from->fldname, sizeof(newnode->fldname))`
	`59`	`+`
`56`	`60`	`/* Copy a field that is a pointer to a simple palloc'd object of size sz */`
`57`	`61`	`#defineCOPY_POINTER_FIELD(fldname,sz) \`
`58`	`62`	`do { \`
`@@ -4947,10 +4951,9 @@ _copyForeignKeyCacheInfo(const ForeignKeyCacheInfo *from)`
`4947`	`4951`	`COPY_SCALAR_FIELD(conrelid);`
`4948`	`4952`	`COPY_SCALAR_FIELD(confrelid);`
`4949`	`4953`	`COPY_SCALAR_FIELD(nkeys);`
`4950`		`-/* COPY_SCALAR_FIELD might work for these, but let's not assume that */`
`4951`		`-memcpy(newnode->conkey,from->conkey,sizeof(newnode->conkey));`
`4952`		`-memcpy(newnode->confkey,from->confkey,sizeof(newnode->confkey));`
`4953`		`-memcpy(newnode->conpfeqop,from->conpfeqop,sizeof(newnode->conpfeqop));`
	`4954`	`+COPY_ARRAY_FIELD(conkey);`
	`4955`	`+COPY_ARRAY_FIELD(confkey);`
	`4956`	`+COPY_ARRAY_FIELD(conpfeqop);`
`4954`	`4957`
`4955`	`4958`	`returnnewnode;`
`4956`	`4959`	`}`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,13 @@`
`74`	`74`	`#defineequalstr(a,b)\`
`75`	`75`	`(((a) != NULL && (b) != NULL) ? (strcmp(a, b) == 0) : (a) == (b))`
`76`	`76`
	`77`	`+/* Compare a field that is an inline array */`
	`78`	`+#defineCOMPARE_ARRAY_FIELD(fldname) \`
	`79`	`+do { \`
	`80`	`+if (memcmp(a->fldname, b->fldname, sizeof(a->fldname)) != 0) \`
	`81`	`+return false; \`
	`82`	`+} while (0)`
	`83`	`+`
`77`	`84`	`/* Compare a field that is a pointer to a simple palloc'd object of size sz */`
`78`	`85`	`#defineCOMPARE_POINTER_FIELD(fldname,sz) \`
`79`	`86`	`do { \`

Comments

(0)