mirror of
https://github.com/postgres/postgres.git
synced 2025-06-05 23:56:58 +03:00
ATExecSetRelOptions: Reduce scope of 'isnull' variable
Author: Nikolay Shaplov <dhyan@nataraj.su> Reviewed-by: Timur Magomedov <t.magomedov@postgrespro.ru> Discussion: https://postgr.es/m/1913854.tdWV9SEqCh@thinkpad-pgpro
This commit is contained in:
parent
da0f0582e8
commit
c7fc8808a9
@ -15919,7 +15919,6 @@ ATExecSetRelOptions(Relation rel, List *defList, AlterTableType operation,
|
||||
HeapTuple tuple;
|
||||
HeapTuple newtuple;
|
||||
Datum datum;
|
||||
bool isnull;
|
||||
Datum newOptions;
|
||||
Datum repl_val[Natts_pg_class];
|
||||
bool repl_null[Natts_pg_class];
|
||||
@ -15944,18 +15943,20 @@ ATExecSetRelOptions(Relation rel, List *defList, AlterTableType operation,
|
||||
* there were none before.
|
||||
*/
|
||||
datum = (Datum) 0;
|
||||
isnull = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
bool isnull;
|
||||
|
||||
/* Get the old reloptions */
|
||||
datum = SysCacheGetAttr(RELOID, tuple, Anum_pg_class_reloptions,
|
||||
&isnull);
|
||||
if (isnull)
|
||||
datum = (Datum) 0;
|
||||
}
|
||||
|
||||
/* Generate new proposed reloptions (text array) */
|
||||
newOptions = transformRelOptions(isnull ? (Datum) 0 : datum,
|
||||
defList, NULL, validnsps, false,
|
||||
newOptions = transformRelOptions(datum, defList, NULL, validnsps, false,
|
||||
operation == AT_ResetRelOptions);
|
||||
|
||||
/* Validate */
|
||||
@ -16065,18 +16066,20 @@ ATExecSetRelOptions(Relation rel, List *defList, AlterTableType operation,
|
||||
* pretend there were none before.
|
||||
*/
|
||||
datum = (Datum) 0;
|
||||
isnull = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
bool isnull;
|
||||
|
||||
/* Get the old reloptions */
|
||||
datum = SysCacheGetAttr(RELOID, tuple, Anum_pg_class_reloptions,
|
||||
&isnull);
|
||||
if (isnull)
|
||||
datum = (Datum) 0;
|
||||
}
|
||||
|
||||
newOptions = transformRelOptions(isnull ? (Datum) 0 : datum,
|
||||
defList, "toast", validnsps, false,
|
||||
operation == AT_ResetRelOptions);
|
||||
newOptions = transformRelOptions(datum, defList, "toast", validnsps,
|
||||
false, operation == AT_ResetRelOptions);
|
||||
|
||||
(void) heap_reloptions(RELKIND_TOASTVALUE, newOptions, true);
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user