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

Commit0b370ea

Browse files
committed
Clean up some minor problems exposed by further thought about Panon's bug
report on old-style functions invoked by RI triggers. We had a number ofother places that were being sloppy about which memory context FmgrInfosubsidiary data will be allocated in. Turns out none of them actuallycause a problem in 7.1, but this is for arcane reasons such as the factthat old-style triggers aren't supported anyway. To avoid getting burntlater, I've restructured the trigger support so that we don't keep triggerFmgrInfo structs in relcache memory. Some other related cleanups too:it's not really necessary to call fmgr_info at all while setting upthe index support info in relcache entries, because those ScanKeyEntrystructs are never used to invoke the functions. This should speed uprelcache initialization a tiny bit.
1 parenta1d9d09 commit0b370ea

File tree

16 files changed

+448
-298
lines changed

16 files changed

+448
-298
lines changed

‎doc/src/sgml/trigger.sgml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,6 @@ typedef struct Trigger
366366
Oid tgoid;
367367
char *tgname;
368368
Oid tgfoid;
369-
FmgrInfo tgfunc;
370369
int16 tgtype;
371370
bool tgenabled;
372371
bool tgisconstraint;

‎src/backend/access/common/scankey.c‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/common/scankey.c,v 1.18 2001/01/24 19:42:47 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/common/scankey.c,v 1.19 2001/06/01 02:41:35 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -40,11 +40,13 @@ ScanKeyEntrySetIllegal(ScanKey entry)
4040
entry->sk_flags=0;/* just in case... */
4141
entry->sk_attno=InvalidAttrNumber;
4242
entry->sk_procedure=0;/* should be InvalidRegProcedure */
43+
entry->sk_func.fn_oid=InvalidOid;
44+
entry->sk_argument= (Datum)0;
4345
}
4446

4547
/*
4648
* ScanKeyEntryInitialize
47-
*Initializesan scan key entry.
49+
*Initializesa scan key entry.
4850
*
4951
* Note:
5052
*Assumes the scan key entry is valid.
@@ -64,7 +66,6 @@ ScanKeyEntryInitialize(ScanKey entry,
6466
entry->sk_procedure=procedure;
6567
entry->sk_argument=argument;
6668
fmgr_info(procedure,&entry->sk_func);
67-
entry->sk_nargs=entry->sk_func.fn_nargs;
6869

6970
Assert(ScanKeyEntryIsLegal(entry));
7071
}

‎src/backend/access/index/indexam.c‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/index/indexam.c,v 1.49 2001/05/31 18:16:54 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/index/indexam.c,v 1.50 2001/06/01 02:41:35 tgl Exp $
1212
*
1313
* INTERFACE ROUTINES
1414
*index_open- open an index relation by relationId
@@ -232,7 +232,7 @@ index_beginscan(Relation relation,
232232
uint16numberOfKeys,
233233
ScanKeykey)
234234
{
235-
IndexScanDescscandesc;
235+
IndexScanDescscan;
236236
RegProcedureprocedure;
237237

238238
RELATION_CHECKS;
@@ -249,14 +249,22 @@ index_beginscan(Relation relation,
249249
*/
250250
LockRelation(relation,AccessShareLock);
251251

252-
scandesc= (IndexScanDesc)
252+
scan= (IndexScanDesc)
253253
DatumGetPointer(OidFunctionCall4(procedure,
254254
PointerGetDatum(relation),
255255
BoolGetDatum(scanFromEnd),
256256
UInt16GetDatum(numberOfKeys),
257257
PointerGetDatum(key)));
258258

259-
returnscandesc;
259+
/*
260+
* We want to look up the amgettuple procedure just once per scan,
261+
* not once per index_getnext call. So do it here and save
262+
* the fmgr info result in the scan descriptor.
263+
*/
264+
GET_SCAN_PROCEDURE(beginscan,amgettuple);
265+
fmgr_info(procedure,&scan->fn_getnext);
266+
267+
returnscan;
260268
}
261269

262270
/* ----------------
@@ -345,19 +353,9 @@ index_getnext(IndexScanDesc scan,
345353

346354
SCAN_CHECKS;
347355

348-
/*
349-
* Look up the access procedure only once per scan.
350-
*/
351-
if (scan->fn_getnext.fn_oid==InvalidOid)
352-
{
353-
RegProcedureprocedure;
354-
355-
GET_SCAN_PROCEDURE(getnext,amgettuple);
356-
fmgr_info(procedure,&scan->fn_getnext);
357-
}
358-
359356
/*
360357
* have the am's gettuple proc do all the work.
358+
* index_beginscan already set up fn_getnext.
361359
*/
362360
result= (RetrieveIndexResult)
363361
DatumGetPointer(FunctionCall2(&scan->fn_getnext,

‎src/backend/access/index/istrat.c‎

Lines changed: 28 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*
1010
*
1111
* IDENTIFICATION
12-
* $Header: /cvsroot/pgsql/src/backend/access/index/Attic/istrat.c,v 1.50 2001/05/30 19:53:40 tgl Exp $
12+
* $Header: /cvsroot/pgsql/src/backend/access/index/Attic/istrat.c,v 1.51 2001/06/01 02:41:35 tgl Exp $
1313
*
1414
*-------------------------------------------------------------------------
1515
*/
@@ -458,6 +458,8 @@ RelationInvokeStrategy(Relation relation,
458458

459459
/* ----------------
460460
*OperatorRelationFillScanKeyEntry
461+
*
462+
* Initialize a ScanKey entry given already-opened pg_operator relation.
461463
* ----------------
462464
*/
463465
staticvoid
@@ -498,6 +500,7 @@ OperatorRelationFillScanKeyEntry(Relation operatorRelation,
498500
operatorObjectId);
499501
}
500502

503+
MemSet(entry,0,sizeof(*entry));
501504
entry->sk_flags=0;
502505
entry->sk_procedure= ((Form_pg_operator)GETSTRUCT(tuple))->oprcode;
503506

@@ -511,14 +514,29 @@ OperatorRelationFillScanKeyEntry(Relation operatorRelation,
511514
"OperatorRelationFillScanKeyEntry: no procedure for operator %u",
512515
operatorObjectId);
513516

514-
fmgr_info(entry->sk_procedure,&entry->sk_func);
515-
entry->sk_nargs=entry->sk_func.fn_nargs;
517+
/*
518+
* Formerly we initialized entry->sk_func here, but that's a waste of
519+
* time because ScanKey entries in strategy maps are never actually
520+
* used to invoke the operator. Furthermore, to do that we'd have to
521+
* worry about setting the proper memory context (the map is probably
522+
* not allocated in the current memory context!)
523+
*/
516524
}
517525

518526

519527
/*
520528
* IndexSupportInitialize
521529
*Initializes an index strategy and associated support procedures.
530+
*
531+
* Data is returned into *indexStrategy, *indexSupport, and *isUnique,
532+
* all of which are objects allocated by the caller.
533+
*
534+
* The primary input keys are indexObjectId and accessMethodObjectId.
535+
* The caller also passes maxStrategyNumber, maxSupportNumber, and
536+
* maxAttributeNumber, since these indicate the size of the indexStrategy
537+
* and indexSupport arrays it has allocated --- but in practice these
538+
* numbers must always match those obtainable from the system catalog
539+
* entries for the index and access method.
522540
*/
523541
void
524542
IndexSupportInitialize(IndexStrategyindexStrategy,
@@ -578,7 +596,7 @@ IndexSupportInitialize(IndexStrategy indexStrategy,
578596
if (!OidIsValid(iform->indkey[attIndex]))
579597
{
580598
if (attIndex==InvalidAttrNumber)
581-
elog(ERROR,"IndexSupportInitialize:no pg_index tuple");
599+
elog(ERROR,"IndexSupportInitialize:bogus pg_index tuple");
582600
break;
583601
}
584602

@@ -637,14 +655,16 @@ IndexSupportInitialize(IndexStrategy indexStrategy,
637655
heap_close(relation,AccessShareLock);
638656
}
639657

658+
/* Now load the strategy information for the index operators */
640659
ScanKeyEntryInitialize(&entry[0],0,
641660
Anum_pg_amop_amopid,
642661
F_OIDEQ,
643662
ObjectIdGetDatum(accessMethodObjectId));
644663

645664
ScanKeyEntryInitialize(&entry[1],0,
646665
Anum_pg_amop_amopclaid,
647-
F_OIDEQ,0);
666+
F_OIDEQ,
667+
0);/* will fill below */
648668

649669
relation=heap_openr(AccessMethodOperatorRelationName,AccessShareLock);
650670
operatorRelation=heap_openr(OperatorRelationName,AccessShareLock);
@@ -670,9 +690,11 @@ IndexSupportInitialize(IndexStrategy indexStrategy,
670690
Form_pg_amopaform;
671691

672692
aform= (Form_pg_amop)GETSTRUCT(tuple);
693+
strategy=aform->amopstrategy;
694+
Assert(strategy>0&&strategy <=maxStrategyNumber);
673695
OperatorRelationFillScanKeyEntry(operatorRelation,
674696
aform->amopopr,
675-
StrategyMapGetScanKeyEntry(map,aform->amopstrategy));
697+
StrategyMapGetScanKeyEntry(map,strategy));
676698
}
677699

678700
heap_endscan(scan);

‎src/backend/catalog/index.c‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.152 2001/05/30 20:52:32 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.153 2001/06/01 02:41:35 tgl Exp $
1212
*
1313
*
1414
* INTERFACE ROUTINES
@@ -722,6 +722,9 @@ UpdateIndexPredicate(Oid indexoid, Node *oldPred, Node *predicate)
722722

723723
/* ----------------------------------------------------------------
724724
*InitIndexStrategy
725+
*
726+
* XXX this is essentially the same as relcache.c's
727+
* IndexedAccessMethodInitialize(), and probably ought to be merged with it.
725728
* ----------------------------------------------------------------
726729
*/
727730
void
@@ -733,18 +736,16 @@ InitIndexStrategy(int numatts,
733736
RegProcedure*support;
734737
uint16amstrategies;
735738
uint16amsupport;
736-
Oidattrelid;
737739
Sizestrsize;
738740

739741
/*
740742
* get information from the index relation descriptor
741743
*/
742-
attrelid=indexRelation->rd_att->attrs[0]->attrelid;
743744
amstrategies=indexRelation->rd_am->amstrategies;
744745
amsupport=indexRelation->rd_am->amsupport;
745746

746747
/*
747-
*get the size of the strategy
748+
*compute the size of the strategy array
748749
*/
749750
strsize=AttributeNumberGetIndexStrategySize(numatts,amstrategies);
750751

@@ -779,7 +780,8 @@ InitIndexStrategy(int numatts,
779780

780781
IndexSupportInitialize(strategy,support,
781782
&indexRelation->rd_uniqueindex,
782-
attrelid,accessMethodObjectId,
783+
RelationGetRelid(indexRelation),
784+
accessMethodObjectId,
783785
amstrategies,amsupport,numatts);
784786

785787
/*

0 commit comments

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