Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit0d44460

Browse files
committed
Use heap_modify_tuple not SPI_modifytuple in pl/perl triggers.
The code here would need some change anyway given planned change inSPI_modifytuple semantics, since this executes after we've exited theSPI environment. But really it's better to just use heap_modify_tuple.The code's actually shorter this way, and this avoids depending on somerather indirect reasoning about why the temporary arrays can't be overrun.(I think the old code is safe, as long as Perl hashes can't containduplicate keys; but with this way we don't need that assumption, onlythe assumption that SPI_fnumber doesn't return an out-of-range attnum.)While at it, normalize use of SPI_fnumber: make error messages distinguishno-such-column from can't-set-system-column, and remove test for deletedcolumn which is going to migrate into SPI_fnumber.
1 parentf0e72a2 commit0d44460

File tree

1 file changed

+25
-31
lines changed

1 file changed

+25
-31
lines changed

‎src/pl/plperl/plperl.c

Lines changed: 25 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1670,23 +1670,19 @@ plperl_event_trigger_build_args(FunctionCallInfo fcinfo)
16701670
returnnewRV_noinc((SV*)hv);
16711671
}
16721672

1673-
/* Set up the new tuple returned from a trigger. */
1674-
1673+
/* Construct the modified new tuple to be returned from a trigger. */
16751674
staticHeapTuple
16761675
plperl_modify_tuple(HV*hvTD,TriggerData*tdata,HeapTupleotup)
16771676
{
16781677
SV**svp;
16791678
HV*hvNew;
16801679
HE*he;
16811680
HeapTuplertup;
1682-
intslotsused;
1683-
int*modattrs;
1684-
Datum*modvalues;
1685-
char*modnulls;
1686-
16871681
TupleDesctupdesc;
1688-
1689-
tupdesc=tdata->tg_relation->rd_att;
1682+
intnatts;
1683+
Datum*modvalues;
1684+
bool*modnulls;
1685+
bool*modrepls;
16901686

16911687
svp=hv_fetch_string(hvTD,"new");
16921688
if (!svp)
@@ -1699,51 +1695,49 @@ plperl_modify_tuple(HV *hvTD, TriggerData *tdata, HeapTuple otup)
16991695
errmsg("$_TD->{new} is not a hash reference")));
17001696
hvNew= (HV*)SvRV(*svp);
17011697

1702-
modattrs=palloc(tupdesc->natts*sizeof(int));
1703-
modvalues=palloc(tupdesc->natts*sizeof(Datum));
1704-
modnulls=palloc(tupdesc->natts*sizeof(char));
1705-
slotsused=0;
1698+
tupdesc=tdata->tg_relation->rd_att;
1699+
natts=tupdesc->natts;
1700+
1701+
modvalues= (Datum*)palloc0(natts*sizeof(Datum));
1702+
modnulls= (bool*)palloc0(natts*sizeof(bool));
1703+
modrepls= (bool*)palloc0(natts*sizeof(bool));
17061704

17071705
hv_iterinit(hvNew);
17081706
while ((he=hv_iternext(hvNew)))
17091707
{
1710-
boolisnull;
17111708
char*key=hek2cstr(he);
17121709
SV*val=HeVAL(he);
17131710
intattn=SPI_fnumber(tupdesc,key);
17141711

1715-
if (attn<=0||tupdesc->attrs[attn-1]->attisdropped)
1712+
if (attn==SPI_ERROR_NOATTRIBUTE)
17161713
ereport(ERROR,
17171714
(errcode(ERRCODE_UNDEFINED_COLUMN),
17181715
errmsg("Perl hash contains nonexistent column \"%s\"",
17191716
key)));
1717+
if (attn <=0)
1718+
ereport(ERROR,
1719+
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
1720+
errmsg("cannot set system attribute \"%s\"",
1721+
key)));
17201722

1721-
modvalues[slotsused]=plperl_sv_to_datum(val,
1723+
modvalues[attn-1]=plperl_sv_to_datum(val,
17221724
tupdesc->attrs[attn-1]->atttypid,
17231725
tupdesc->attrs[attn-1]->atttypmod,
1724-
NULL,
1725-
NULL,
1726-
InvalidOid,
1727-
&isnull);
1728-
1729-
modnulls[slotsused]=isnull ?'n' :' ';
1730-
modattrs[slotsused]=attn;
1731-
slotsused++;
1726+
NULL,
1727+
NULL,
1728+
InvalidOid,
1729+
&modnulls[attn-1]);
1730+
modrepls[attn-1]= true;
17321731

17331732
pfree(key);
17341733
}
17351734
hv_iterinit(hvNew);
17361735

1737-
rtup=SPI_modifytuple(tdata->tg_relation,otup,slotsused,
1738-
modattrs,modvalues,modnulls);
1736+
rtup=heap_modify_tuple(otup,tupdesc,modvalues,modnulls,modrepls);
17391737

1740-
pfree(modattrs);
17411738
pfree(modvalues);
17421739
pfree(modnulls);
1743-
1744-
if (rtup==NULL)
1745-
elog(ERROR,"SPI_modifytuple failed: %s",
1746-
SPI_result_code_string(SPI_result));
1740+
pfree(modrepls);
17471741

17481742
returnrtup;
17491743
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp