diff options
| author | Peter Eisentraut <peter@eisentraut.org> | 2022-07-01 10:51:45 +0200 |
|---|---|---|
| committer | Peter Eisentraut <peter@eisentraut.org> | 2022-07-01 11:23:15 +0200 |
| commit | d746021de18baf0f29eff0388204a0664f41eb8b (patch) | |
| tree | 21074e7935e62cd054e702d79e5c1fe7c8544733 /src/backend/catalog/pg_constraint.c | |
| parent | 7c2d6f8d3400edab2b91de7765db9ec71235fac9 (diff) | |
| download | postgresql-d746021de18baf0f29eff0388204a0664f41eb8b.tar.gz postgresql-d746021de18baf0f29eff0388204a0664f41eb8b.zip | |
Add construct_array_builtin, deconstruct_array_builtin
There were many calls to construct_array() and deconstruct_array() for
built-in types, for example, when dealing with system catalog columns.
These all hardcoded the type attributes necessary to pass to these
functions.
To simplify this a bit, add construct_array_builtin(),
deconstruct_array_builtin() as wrappers that centralize this hardcoded
knowledge. This simplifies many call sites and reduces the amount of
hardcoded stuff that is spread around.
Reviewed-by: Tom Lane <tgl@sss.pgh.pa.us>
Discussion: https://www.postgresql.org/message-id/flat/2914356f-9e5f-8c59-2995-5997fc48bcba%40enterprisedb.com
Diffstat (limited to 'src/backend/catalog/pg_constraint.c')
| -rw-r--r-- | src/backend/catalog/pg_constraint.c | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/src/backend/catalog/pg_constraint.c b/src/backend/catalog/pg_constraint.c index 489f0b2818e..bb65fb1e0ae 100644 --- a/src/backend/catalog/pg_constraint.c +++ b/src/backend/catalog/pg_constraint.c @@ -112,8 +112,7 @@ CreateConstraintEntry(const char *constraintName, conkey = (Datum *) palloc(constraintNKeys * sizeof(Datum)); for (i = 0; i < constraintNKeys; i++) conkey[i] = Int16GetDatum(constraintKey[i]); - conkeyArray = construct_array(conkey, constraintNKeys, - INT2OID, 2, true, TYPALIGN_SHORT); + conkeyArray = construct_array_builtin(conkey, constraintNKeys, INT2OID); } else conkeyArray = NULL; @@ -125,27 +124,22 @@ CreateConstraintEntry(const char *constraintName, fkdatums = (Datum *) palloc(foreignNKeys * sizeof(Datum)); for (i = 0; i < foreignNKeys; i++) fkdatums[i] = Int16GetDatum(foreignKey[i]); - confkeyArray = construct_array(fkdatums, foreignNKeys, - INT2OID, 2, true, TYPALIGN_SHORT); + confkeyArray = construct_array_builtin(fkdatums, foreignNKeys, INT2OID); for (i = 0; i < foreignNKeys; i++) fkdatums[i] = ObjectIdGetDatum(pfEqOp[i]); - conpfeqopArray = construct_array(fkdatums, foreignNKeys, - OIDOID, sizeof(Oid), true, TYPALIGN_INT); + conpfeqopArray = construct_array_builtin(fkdatums, foreignNKeys, OIDOID); for (i = 0; i < foreignNKeys; i++) fkdatums[i] = ObjectIdGetDatum(ppEqOp[i]); - conppeqopArray = construct_array(fkdatums, foreignNKeys, - OIDOID, sizeof(Oid), true, TYPALIGN_INT); + conppeqopArray = construct_array_builtin(fkdatums, foreignNKeys, OIDOID); for (i = 0; i < foreignNKeys; i++) fkdatums[i] = ObjectIdGetDatum(ffEqOp[i]); - conffeqopArray = construct_array(fkdatums, foreignNKeys, - OIDOID, sizeof(Oid), true, TYPALIGN_INT); + conffeqopArray = construct_array_builtin(fkdatums, foreignNKeys, OIDOID); if (numFkDeleteSetCols > 0) { for (i = 0; i < numFkDeleteSetCols; i++) fkdatums[i] = Int16GetDatum(fkDeleteSetCols[i]); - confdelsetcolsArray = construct_array(fkdatums, numFkDeleteSetCols, - INT2OID, 2, true, TYPALIGN_SHORT); + confdelsetcolsArray = construct_array_builtin(fkdatums, numFkDeleteSetCols, INT2OID); } else confdelsetcolsArray = NULL; @@ -166,8 +160,7 @@ CreateConstraintEntry(const char *constraintName, opdatums = (Datum *) palloc(constraintNKeys * sizeof(Datum)); for (i = 0; i < constraintNKeys; i++) opdatums[i] = ObjectIdGetDatum(exclOp[i]); - conexclopArray = construct_array(opdatums, constraintNKeys, - OIDOID, sizeof(Oid), true, TYPALIGN_INT); + conexclopArray = construct_array_builtin(opdatums, constraintNKeys, OIDOID); } else conexclopArray = NULL; |