diff options
Diffstat (limited to 'src/backend/utils/cache')
| -rw-r--r-- | src/backend/utils/cache/catcache.c | 6 | ||||
| -rw-r--r-- | src/backend/utils/cache/inval.c | 12 | ||||
| -rw-r--r-- | src/backend/utils/cache/lsyscache.c | 23 | ||||
| -rw-r--r-- | src/backend/utils/cache/relcache.c | 72 | ||||
| -rw-r--r-- | src/backend/utils/cache/syscache.c | 5 | ||||
| -rw-r--r-- | src/backend/utils/cache/typcache.c | 16 |
6 files changed, 68 insertions, 66 deletions
diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c index 20b83e196a3..0d1ae15b39c 100644 --- a/src/backend/utils/cache/catcache.c +++ b/src/backend/utils/cache/catcache.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/cache/catcache.c,v 1.132 2006/07/31 20:09:05 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/cache/catcache.c,v 1.133 2006/10/04 00:30:00 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -786,8 +786,8 @@ InitCatCache(int id, /* * nbuckets is the number of hash buckets to use in this catcache. - * Currently we just use a hard-wired estimate of an appropriate size - * for each cache; maybe later make them dynamically resizable? + * Currently we just use a hard-wired estimate of an appropriate size for + * each cache; maybe later make them dynamically resizable? * * nbuckets must be a power of two. We check this via Assert rather than * a full runtime check because the values will be coming from constant diff --git a/src/backend/utils/cache/inval.c b/src/backend/utils/cache/inval.c index 247c6bf5a68..899c8e202b3 100644 --- a/src/backend/utils/cache/inval.c +++ b/src/backend/utils/cache/inval.c @@ -80,7 +80,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/cache/inval.c,v 1.77 2006/07/14 14:52:25 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/cache/inval.c,v 1.78 2006/10/04 00:30:00 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -633,11 +633,11 @@ AcceptInvalidationMessages(void) * However, it also makes the system unbelievably slow --- the regression * tests take about 100 times longer than normal. * - * If you're a glutton for punishment, try CLOBBER_CACHE_RECURSIVELY. - * This slows things by at least a factor of 10000, so I wouldn't suggest - * trying to run the entire regression tests that way. It's useful to - * try a few simple tests, to make sure that cache reload isn't subject - * to internal cache-flush hazards, but after you've done a few thousand + * If you're a glutton for punishment, try CLOBBER_CACHE_RECURSIVELY. This + * slows things by at least a factor of 10000, so I wouldn't suggest + * trying to run the entire regression tests that way. It's useful to try + * a few simple tests, to make sure that cache reload isn't subject to + * internal cache-flush hazards, but after you've done a few thousand * recursive reloads it's unlikely you'll learn more. */ #if defined(CLOBBER_CACHE_ALWAYS) diff --git a/src/backend/utils/cache/lsyscache.c b/src/backend/utils/cache/lsyscache.c index 53e3a5bf552..fdc31e0d977 100644 --- a/src/backend/utils/cache/lsyscache.c +++ b/src/backend/utils/cache/lsyscache.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/cache/lsyscache.c,v 1.137 2006/09/28 20:51:42 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/cache/lsyscache.c,v 1.138 2006/10/04 00:30:00 momjian Exp $ * * NOTES * Eventually, the index information should go through here, too. @@ -206,9 +206,9 @@ get_op_btree_interpretation(Oid opno, List **opclasses, List **opstrats) /* * Get the nominal left-hand input type of the operator; we will ignore - * opclasses that don't have that as the expected input datatype. This - * is a kluge to avoid being confused by binary-compatible opclasses - * (such as text_ops and varchar_ops, which share the same operators). + * opclasses that don't have that as the expected input datatype. This is + * a kluge to avoid being confused by binary-compatible opclasses (such as + * text_ops and varchar_ops, which share the same operators). */ op_input_types(opno, &lefttype, &righttype); Assert(OidIsValid(lefttype)); @@ -219,14 +219,15 @@ get_op_btree_interpretation(Oid opno, List **opclasses, List **opstrats) catlist = SearchSysCacheList(AMOPOPID, 1, ObjectIdGetDatum(opno), 0, 0, 0); + /* - * If we can't find any opclass containing the op, perhaps it is a - * <> operator. See if it has a negator that is in an opclass. + * If we can't find any opclass containing the op, perhaps it is a <> + * operator. See if it has a negator that is in an opclass. */ op_negated = false; if (catlist->n_members == 0) { - Oid op_negator = get_negator(opno); + Oid op_negator = get_negator(opno); if (OidIsValid(op_negator)) { @@ -1395,13 +1396,13 @@ get_type_io_data(Oid typid, Form_pg_type typeStruct; /* - * In bootstrap mode, pass it off to bootstrap.c. This hack allows - * us to use array_in and array_out during bootstrap. + * In bootstrap mode, pass it off to bootstrap.c. This hack allows us to + * use array_in and array_out during bootstrap. */ if (IsBootstrapProcessingMode()) { - Oid typinput; - Oid typoutput; + Oid typinput; + Oid typoutput; boot_get_type_io_data(typid, typlen, diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c index 190543e2bd7..40e71d513d2 100644 --- a/src/backend/utils/cache/relcache.c +++ b/src/backend/utils/cache/relcache.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/cache/relcache.c,v 1.248 2006/09/05 21:08:36 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/cache/relcache.c,v 1.249 2006/10/04 00:30:00 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -182,7 +182,7 @@ static void RelationReloadClassinfo(Relation relation); static void RelationFlushRelation(Relation relation); static bool load_relcache_init_file(void); static void write_relcache_init_file(void); -static void write_item(const void *data, Size len, FILE *fp); +static void write_item(const void *data, Size len, FILE *fp); static void formrdesc(const char *relationName, Oid relationReltype, bool hasoids, int natts, FormData_pg_attribute *att); @@ -298,14 +298,14 @@ AllocateRelationDesc(Relation relation, Form_pg_class relp) /* * Copy the relation tuple form * - * We only allocate space for the fixed fields, ie, CLASS_TUPLE_SIZE. - * The variable-length fields (relacl, reloptions) are NOT stored in the + * We only allocate space for the fixed fields, ie, CLASS_TUPLE_SIZE. The + * variable-length fields (relacl, reloptions) are NOT stored in the * relcache --- there'd be little point in it, since we don't copy the * tuple's nulls bitmap and hence wouldn't know if the values are valid. - * Bottom line is that relacl *cannot* be retrieved from the relcache. - * Get it from the syscache if you need it. The same goes for the - * original form of reloptions (however, we do store the parsed form - * of reloptions in rd_options). + * Bottom line is that relacl *cannot* be retrieved from the relcache. Get + * it from the syscache if you need it. The same goes for the original + * form of reloptions (however, we do store the parsed form of reloptions + * in rd_options). */ relationForm = (Form_pg_class) palloc(CLASS_TUPLE_SIZE); @@ -355,9 +355,9 @@ RelationParseRelOptions(Relation relation, HeapTuple tuple) } /* - * Fetch reloptions from tuple; have to use a hardwired descriptor - * because we might not have any other for pg_class yet (consider - * executing this code for pg_class itself) + * Fetch reloptions from tuple; have to use a hardwired descriptor because + * we might not have any other for pg_class yet (consider executing this + * code for pg_class itself) */ datum = fastgetattr(tuple, Anum_pg_class_reloptions, @@ -620,8 +620,8 @@ RelationBuildRuleLock(Relation relation) * * Note: since we scan the rules using RewriteRelRulenameIndexId, we will * be reading the rules in name order, except possibly during - * emergency-recovery operations (ie, IgnoreSystemIndexes). This in - * turn ensures that rules will be fired in name order. + * emergency-recovery operations (ie, IgnoreSystemIndexes). This in turn + * ensures that rules will be fired in name order. */ rewrite_desc = heap_open(RewriteRelationId, AccessShareLock); rewrite_tupdesc = RelationGetDescr(rewrite_desc); @@ -649,10 +649,10 @@ RelationBuildRuleLock(Relation relation) rule->isInstead = rewrite_form->is_instead; /* - * Must use heap_getattr to fetch ev_action and ev_qual. Also, - * the rule strings are often large enough to be toasted. To avoid - * leaking memory in the caller's context, do the detoasting here - * so we can free the detoasted version. + * Must use heap_getattr to fetch ev_action and ev_qual. Also, the + * rule strings are often large enough to be toasted. To avoid + * leaking memory in the caller's context, do the detoasting here so + * we can free the detoasted version. */ rule_datum = heap_getattr(rewrite_tuple, Anum_pg_rewrite_ev_action, @@ -686,16 +686,16 @@ RelationBuildRuleLock(Relation relation) /* * We want the rule's table references to be checked as though by the - * table owner, not the user referencing the rule. Therefore, scan + * table owner, not the user referencing the rule. Therefore, scan * through the rule's actions and set the checkAsUser field on all - * rtable entries. We have to look at the qual as well, in case it + * rtable entries. We have to look at the qual as well, in case it * contains sublinks. * - * The reason for doing this when the rule is loaded, rather than - * when it is stored, is that otherwise ALTER TABLE OWNER would have - * to grovel through stored rules to update checkAsUser fields. - * Scanning the rule tree during load is relatively cheap (compared - * to constructing it in the first place), so we do it here. + * The reason for doing this when the rule is loaded, rather than when + * it is stored, is that otherwise ALTER TABLE OWNER would have to + * grovel through stored rules to update checkAsUser fields. Scanning + * the rule tree during load is relatively cheap (compared to + * constructing it in the first place), so we do it here. */ setRuleCheckAsUser((Node *) rule->actions, relation->rd_rel->relowner); setRuleCheckAsUser(rule->qual, relation->rd_rel->relowner); @@ -1626,14 +1626,14 @@ RelationClearRelation(Relation relation, bool rebuild) * Even non-system indexes should not be blown away if they are open and * have valid index support information. This avoids problems with active * use of the index support information. As with nailed indexes, we - * re-read the pg_class row to handle possible physical relocation of - * the index. + * re-read the pg_class row to handle possible physical relocation of the + * index. */ if (relation->rd_rel->relkind == RELKIND_INDEX && relation->rd_refcnt > 0 && relation->rd_indexcxt != NULL) { - relation->rd_isvalid = false; /* needs to be revalidated */ + relation->rd_isvalid = false; /* needs to be revalidated */ RelationReloadClassinfo(relation); return; } @@ -2140,9 +2140,9 @@ RelationBuildLocalRelation(const char *relname, /* * check that hardwired list of shared rels matches what's in the - * bootstrap .bki file. If you get a failure here during initdb, - * you probably need to fix IsSharedRelation() to match whatever - * you've done to the set of shared relations. + * bootstrap .bki file. If you get a failure here during initdb, you + * probably need to fix IsSharedRelation() to match whatever you've done + * to the set of shared relations. */ if (shared_relation != IsSharedRelation(relid)) elog(ERROR, "shared_relation flag for \"%s\" does not match IsSharedRelation(%u)", @@ -2308,7 +2308,7 @@ RelationCacheInitialize(void) * the system catalogs. We first try to read pre-computed relcache * entries from the pg_internal.init file. If that's missing or * broken, make phony entries for the minimum set of nailed-in-cache - * relations. Then (unless bootstrapping) make sure we have entries + * relations. Then (unless bootstrapping) make sure we have entries * for the critical system indexes. Once we've done all this, we * have enough infrastructure to open any system catalog or use any * catcache. The last step is to rewrite pg_internal.init if needed. @@ -2319,7 +2319,7 @@ RelationCacheInitializePhase2(void) HASH_SEQ_STATUS status; RelIdCacheEnt *idhentry; MemoryContext oldcxt; - bool needNewCacheFile = false; + bool needNewCacheFile = false; /* * switch to cache memory context @@ -2375,7 +2375,7 @@ RelationCacheInitializePhase2(void) * RewriteRelRulenameIndexId and TriggerRelidNameIndexId are not critical * in the same way as the others, because the critical catalogs don't * (currently) have any rules or triggers, and so these indexes can be - * rebuilt without inducing recursion. However they are used during + * rebuilt without inducing recursion. However they are used during * relcache load when a rel does have rules or triggers, so we choose to * nail them for performance reasons. */ @@ -2505,7 +2505,7 @@ BuildHardcodedDescriptor(int natts, Form_pg_attribute attrs, bool hasoids) oldcxt = MemoryContextSwitchTo(CacheMemoryContext); result = CreateTemplateTupleDesc(natts, hasoids); - result->tdtypeid = RECORDOID; /* not right, but we don't care */ + result->tdtypeid = RECORDOID; /* not right, but we don't care */ result->tdtypmod = -1; for (i = 0; i < natts; i++) @@ -3166,7 +3166,7 @@ load_relcache_init_file(void) if ((nread = fread(rel->rd_options, 1, len, fp)) != len) goto read_failed; if (len != VARATT_SIZE(rel->rd_options)) - goto read_failed; /* sanity check */ + goto read_failed; /* sanity check */ } else { @@ -3457,7 +3457,7 @@ write_relcache_init_file(void) /* finally, write the vector of support procedures */ write_item(rel->rd_support, - relform->relnatts * (am->amsupport * sizeof(RegProcedure)), + relform->relnatts * (am->amsupport * sizeof(RegProcedure)), fp); } diff --git a/src/backend/utils/cache/syscache.c b/src/backend/utils/cache/syscache.c index 2eaa9ee0969..79aba4ebc82 100644 --- a/src/backend/utils/cache/syscache.c +++ b/src/backend/utils/cache/syscache.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/cache/syscache.c,v 1.106 2006/07/14 14:52:25 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/cache/syscache.c,v 1.107 2006/10/04 00:30:00 momjian Exp $ * * NOTES * These routines allow the parser/planner/executor to perform @@ -516,7 +516,8 @@ static const struct cachedesc cacheinfo[] = { } }; -static CatCache *SysCache[lengthof(cacheinfo)]; +static CatCache *SysCache[ + lengthof(cacheinfo)]; static int SysCacheSize = lengthof(cacheinfo); static bool CacheInitialized = false; diff --git a/src/backend/utils/cache/typcache.c b/src/backend/utils/cache/typcache.c index ee91c9fe411..c5a0272414d 100644 --- a/src/backend/utils/cache/typcache.c +++ b/src/backend/utils/cache/typcache.c @@ -36,7 +36,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/cache/typcache.c,v 1.21 2006/07/14 14:52:25 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/cache/typcache.c,v 1.22 2006/10/04 00:30:01 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -268,9 +268,9 @@ lookup_type_cache(Oid type_id, int flags) Assert(rel->rd_rel->reltype == typentry->type_id); /* - * Link to the tupdesc and increment its refcount (we assert it's - * a refcounted descriptor). We don't use IncrTupleDescRefCount() - * for this, because the reference mustn't be entered in the current + * Link to the tupdesc and increment its refcount (we assert it's a + * refcounted descriptor). We don't use IncrTupleDescRefCount() for + * this, because the reference mustn't be entered in the current * resource owner; it can outlive the current query. */ typentry->tupDesc = RelationGetDescr(rel); @@ -372,7 +372,7 @@ lookup_rowtype_tupdesc_noerror(Oid type_id, int32 typmod, bool noError) TupleDesc lookup_rowtype_tupdesc_copy(Oid type_id, int32 typmod) { - TupleDesc tmp; + TupleDesc tmp; tmp = lookup_rowtype_tupdesc_internal(type_id, typmod, false); return CreateTupleDescCopyConstr(tmp); @@ -501,9 +501,9 @@ flush_rowtype_cache(Oid type_id) return; /* tupdesc hasn't been requested */ /* - * Release our refcount and free the tupdesc if none remain. - * (Can't use DecrTupleDescRefCount because this reference is not - * logged in current resource owner.) + * Release our refcount and free the tupdesc if none remain. (Can't use + * DecrTupleDescRefCount because this reference is not logged in current + * resource owner.) */ Assert(typentry->tupDesc->tdrefcount > 0); if (--typentry->tupDesc->tdrefcount == 0) |