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

Commit8bfc437

Browse files
committed
Clean up a bunch of ScanKeyEntryInitialize calls that weren't bothering
to apply the proper Datum conversion macros to search key values.
1 parent801a1ac commit8bfc437

File tree

3 files changed

+22
-20
lines changed

3 files changed

+22
-20
lines changed

‎src/backend/catalog/heap.c

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.180 2001/11/02 20:23:02 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.181 2001/11/12 00:00:55 tgl Exp $
1212
*
1313
*
1414
* INTERFACE ROUTINES
@@ -438,7 +438,7 @@ RelnameFindRelid(const char *relname)
438438
0,
439439
(AttrNumber)Anum_pg_class_relname,
440440
(RegProcedure)F_NAMEEQ,
441-
(Datum)relname);
441+
PointerGetDatum(relname));
442442

443443
/*
444444
* begin the scan
@@ -1200,7 +1200,7 @@ DeleteTypeTuple(Relation rel)
12001200
0,
12011201
Anum_pg_attribute_atttypid,
12021202
F_OIDEQ,
1203-
typoid);
1203+
ObjectIdGetDatum(typoid));
12041204

12051205
pg_attribute_scan=heap_beginscan(pg_attribute_desc,
12061206
0,
@@ -1883,7 +1883,8 @@ RemoveAttrDefault(Relation rel)
18831883
adrel=heap_openr(AttrDefaultRelationName,RowExclusiveLock);
18841884

18851885
ScanKeyEntryInitialize(&key,0,Anum_pg_attrdef_adrelid,
1886-
F_OIDEQ,RelationGetRelid(rel));
1886+
F_OIDEQ,
1887+
ObjectIdGetDatum(RelationGetRelid(rel)));
18871888

18881889
adscan=heap_beginscan(adrel,0,SnapshotNow,1,&key);
18891890

@@ -1905,7 +1906,8 @@ RemoveRelCheck(Relation rel)
19051906
rcrel=heap_openr(RelCheckRelationName,RowExclusiveLock);
19061907

19071908
ScanKeyEntryInitialize(&key,0,Anum_pg_relcheck_rcrelid,
1908-
F_OIDEQ,RelationGetRelid(rel));
1909+
F_OIDEQ,
1910+
ObjectIdGetDatum(RelationGetRelid(rel)));
19091911

19101912
rcscan=heap_beginscan(rcrel,0,SnapshotNow,1,&key);
19111913

@@ -1983,10 +1985,12 @@ RemoveCheckConstraint(Relation rel, const char *constrName, bool inh)
19831985
* constraint.
19841986
*/
19851987
ScanKeyEntryInitialize(&key[0],0,Anum_pg_relcheck_rcrelid,
1986-
F_OIDEQ,RelationGetRelid(rel));
1988+
F_OIDEQ,
1989+
ObjectIdGetDatum(RelationGetRelid(rel)));
19871990

19881991
ScanKeyEntryInitialize(&key[1],0,Anum_pg_relcheck_rcname,
1989-
F_NAMEEQ,PointerGetDatum(constrName));
1992+
F_NAMEEQ,
1993+
PointerGetDatum(constrName));
19901994

19911995
/* Begin scanning the heap */
19921996
rcscan=heap_beginscan(rcrel,0,SnapshotNow,2,key);

‎src/backend/commands/trigger.c

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1994, Regents of the University of California
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/commands/trigger.c,v 1.97 2001/10/25 05:49:25 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/commands/trigger.c,v 1.98 2001/11/12 00:00:55 tgl Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -145,7 +145,8 @@ CreateTrigger(CreateTrigStmt *stmt)
145145
*/
146146
tgrel=heap_openr(TriggerRelationName,RowExclusiveLock);
147147
ScanKeyEntryInitialize(&key,0,Anum_pg_trigger_tgrelid,
148-
F_OIDEQ,RelationGetRelid(rel));
148+
F_OIDEQ,
149+
ObjectIdGetDatum(RelationGetRelid(rel)));
149150
tgscan=heap_beginscan(tgrel,0,SnapshotNow,1,&key);
150151
while (HeapTupleIsValid(tuple=heap_getnext(tgscan,0)))
151152
{
@@ -327,7 +328,8 @@ DropTrigger(DropTrigStmt *stmt)
327328
*/
328329
tgrel=heap_openr(TriggerRelationName,RowExclusiveLock);
329330
ScanKeyEntryInitialize(&key,0,Anum_pg_trigger_tgrelid,
330-
F_OIDEQ,RelationGetRelid(rel));
331+
F_OIDEQ,
332+
ObjectIdGetDatum(RelationGetRelid(rel)));
331333
tgscan=heap_beginscan(tgrel,0,SnapshotNow,1,&key);
332334
while (HeapTupleIsValid(tuple=heap_getnext(tgscan,0)))
333335
{
@@ -398,7 +400,8 @@ RelationRemoveTriggers(Relation rel)
398400

399401
tgrel=heap_openr(TriggerRelationName,RowExclusiveLock);
400402
ScanKeyEntryInitialize(&key,0,Anum_pg_trigger_tgrelid,
401-
F_OIDEQ,RelationGetRelid(rel));
403+
F_OIDEQ,
404+
ObjectIdGetDatum(RelationGetRelid(rel)));
402405

403406
tgscan=heap_beginscan(tgrel,0,SnapshotNow,1,&key);
404407

@@ -450,7 +453,8 @@ RelationRemoveTriggers(Relation rel)
450453
* Also drop all constraint triggers referencing this relation
451454
*/
452455
ScanKeyEntryInitialize(&key,0,Anum_pg_trigger_tgconstrrelid,
453-
F_OIDEQ,RelationGetRelid(rel));
456+
F_OIDEQ,
457+
ObjectIdGetDatum(RelationGetRelid(rel)));
454458

455459
tgscan=heap_beginscan(tgrel,0,SnapshotNow,1,&key);
456460
while (HeapTupleIsValid(tup=heap_getnext(tgscan,0)))
@@ -585,12 +589,6 @@ RelationBuildTriggers(Relation relation)
585589
build->tgnargs=pg_trigger->tgnargs;
586590
memcpy(build->tgattr,&(pg_trigger->tgattr),
587591
FUNC_MAX_ARGS*sizeof(int16));
588-
val= (structvarlena*)fastgetattr(htup,
589-
Anum_pg_trigger_tgargs,
590-
tgrel->rd_att,&isnull);
591-
if (isnull)
592-
elog(ERROR,"RelationBuildTriggers: tgargs IS NULL for rel %s",
593-
RelationGetRelationName(relation));
594592
if (build->tgnargs>0)
595593
{
596594
char*p;

‎src/backend/parser/parse_func.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.113 2001/11/02 16:30:29 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.114 2001/11/12 00:00:55 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -695,7 +695,7 @@ func_get_candidates(char *funcname, int nargs)
695695
(bits16)0x0,
696696
(AttrNumber)Anum_pg_proc_proname,
697697
(RegProcedure)F_NAMEEQ,
698-
(Datum)funcname);
698+
PointerGetDatum(funcname));
699699

700700
idesc=index_openr(ProcedureNameIndex);
701701

0 commit comments

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