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

Commite482462

Browse files
committed
Rename pg_attribute.attnvals to attdisbursion.
1 parentf1edf02 commite482462

File tree

7 files changed

+29
-29
lines changed

7 files changed

+29
-29
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.15 1997/08/21 01:31:24 vadim Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.16 1997/08/2103:01:15 momjian Exp $
1111
*
1212
* NOTES
1313
* some of the executor utility code such as "ExecTypeFromTL" should be
@@ -179,7 +179,7 @@ TupleDescInitEntry(TupleDesc desc,
179179
memset(att->attname.data,0,NAMEDATALEN);
180180

181181

182-
att->attnvals=0;/* dummy value */
182+
att->attdisbursion=0;/* dummy value */
183183
att->attcacheoff=-1;
184184

185185
att->attnum=attributeNumber;

‎src/backend/catalog/heap.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.19 1997/08/2102:27:53 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.20 1997/08/2103:01:21 momjian Exp $
1111
*
1212
* INTERFACE ROUTINES
1313
*heap_creatr()- Create an uncataloged heap relation
@@ -374,7 +374,7 @@ heap_creatr(char *name,
374374
*work? Is it automatic now? Expects the caller to have
375375
*attname, atttypid, atttyparg, attproc, and attlen domains filled.
376376
*Create fills the attnum domains sequentually from zero,
377-
*fills theattnvals domains with zeros, and fills the
377+
*fills theattdisbursion domains with zeros, and fills the
378378
*attrelid fields with the relid.
379379
*
380380
*scan relation catalog for name conflict
@@ -571,7 +571,7 @@ AddNewAttributeTuples(Oid new_rel_oid,
571571
dpp=tupdesc->attrs;
572572
for (i=0;i<natts;i++) {
573573
(*dpp)->attrelid=new_rel_oid;
574-
(*dpp)->attnvals=0;
574+
(*dpp)->attdisbursion=0;
575575

576576
tup=heap_addheader(Natts_pg_attribute,
577577
ATTRIBUTE_TUPLE_SIZE,
@@ -592,7 +592,7 @@ AddNewAttributeTuples(Oid new_rel_oid,
592592
dpp=HeapAtt;
593593
for (i=0;i<-1-FirstLowInvalidHeapAttributeNumber;i++) {
594594
(*dpp)->attrelid=new_rel_oid;
595-
/*(*dpp)->attnvals = 0;unneeded */
595+
/*(*dpp)->attdisbursion = 0;unneeded */
596596

597597
tup=heap_addheader(Natts_pg_attribute,
598598
ATTRIBUTE_TUPLE_SIZE,

‎src/backend/commands/command.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.11 1997/08/21 01:32:19 vadim Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.12 1997/08/2103:01:27 momjian Exp $
1111
*
1212
* NOTES
1313
* The PortalExecutorHeapMemory crap needs to be eliminated
@@ -382,7 +382,7 @@ PerformAddAttribute(char *relationName,
382382
(Datum)NULL);
383383

384384
attributeD.attrelid=reltup->t_oid;
385-
attributeD.attnvals=0;/* XXX temporary */
385+
attributeD.attdisbursion=0;/* XXX temporary */
386386
attributeD.attcacheoff=-1;
387387

388388
attributeTuple=heap_addheader(Natts_pg_attribute,

‎src/backend/commands/vacuum.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.40 1997/08/2102:27:58 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.41 1997/08/2103:01:36 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -1814,7 +1814,7 @@ vc_updstats(Oid relid, int npages, int ntups, bool hasindex, VRelStats *vacrelst
18141814
}
18151815
if (selratio>1.0)
18161816
selratio=1.0;
1817-
attp->attnvals=selratio;
1817+
attp->attdisbursion=selratio;
18181818
WriteNoReleaseBuffer(abuf);
18191819

18201820
/* DO PG_STATISTIC INSERTS */

‎src/backend/executor/execUtils.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/executor/execUtils.c,v 1.12 1997/08/20 14:53:20 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/executor/execUtils.c,v 1.13 1997/08/21 03:01:42 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -507,7 +507,7 @@ ExecSetTypeInfo(int index,
507507

508508
att->atttypid=typeID;
509509
att->attdefrel=0;/* dummy value */
510-
att->attnvals=0;/* dummy value */
510+
att->attdisbursion=0;/* dummy value */
511511
att->atttyparg=0;/* dummy value */
512512
att->attlen=attLen;
513513
att->attnum=attNum;

‎src/backend/utils/adt/selfuncs.c

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*
1313
*
1414
* IDENTIFICATION
15-
* $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.7 1997/08/21 02:28:34 momjian Exp $
15+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.8 1997/08/2103:02:04 momjian Exp $
1616
*
1717
*-------------------------------------------------------------------------
1818
*/
@@ -41,7 +41,7 @@
4141
*/
4242
#defineFunctionalSelectivity(nIndKeys,attNum) (attNum==InvalidAttrNumber)
4343

44-
staticfloat32datagetattnvals(Oidrelid,AttrNumberattnum);
44+
staticfloat32datagetattdisbursion(Oidrelid,AttrNumberattnum);
4545
staticvoidgethilokey(Oidrelid,AttrNumberattnum,Oidopid,
4646
char**high,char**low);
4747

@@ -62,7 +62,7 @@ eqsel(Oid opid,
6262
if (NONVALUE(attno)||NONVALUE(relid))
6363
*result=0.1;
6464
else
65-
*result= (float64data)getattnvals(relid, (int)attno);
65+
*result= (float64data)getattdisbursion(relid, (int)attno);
6666
return(result);
6767
}
6868

@@ -114,7 +114,7 @@ intltsel(Oid opid,
114114
if ((flag&SEL_RIGHT&&val<low)||
115115
(!(flag&SEL_RIGHT)&&val>high)) {
116116
float32datanvals;
117-
nvals=getattnvals(relid, (int)attno);
117+
nvals=getattdisbursion(relid, (int)attno);
118118
if (nvals==0)
119119
*result=1.0 /3.0;
120120
else {
@@ -182,8 +182,8 @@ eqjoinsel(Oid opid,
182182
NONVALUE(attno2)||NONVALUE(relid2))
183183
*result=0.1;
184184
else {
185-
num1=getattnvals(relid1, (int)attno1);
186-
num2=getattnvals(relid2, (int)attno2);
185+
num1=getattdisbursion(relid1, (int)attno1);
186+
num2=getattdisbursion(relid2, (int)attno2);
187187
max= (num1>num2) ?num1 :num2;
188188
if (max==0)
189189
*result=1.0;
@@ -245,10 +245,10 @@ intgtjoinsel(Oid opid,
245245
}
246246

247247
/*
248-
*getattnvals- Retrieves the number of values within an attribute.
248+
*getattdisbursion- Retrieves the number of values within an attribute.
249249
*
250250
*Note:
251-
*getattnvals and gethilokey both currently use keyed
251+
*getattdisbursion and gethilokey both currently use keyed
252252
*relation scans and amgetattr. Alternatively,
253253
*the relation scan could be non-keyed and the tuple
254254
*returned could be cast (struct X *) tuple + tuple->t_hoff.
@@ -259,7 +259,7 @@ intgtjoinsel(Oid opid,
259259
*for gethilokey which accesses stahikey in struct statistic.
260260
*/
261261
staticfloat32data
262-
getattnvals(Oidrelid,AttrNumberattnum)
262+
getattdisbursion(Oidrelid,AttrNumberattnum)
263263
{
264264
HeapTupleatp;
265265
float32datanvals;
@@ -270,11 +270,11 @@ getattnvals(Oid relid, AttrNumber attnum)
270270
Int16GetDatum(attnum),
271271
0,0);
272272
if (!HeapTupleIsValid(atp)) {
273-
elog(WARN,"getattnvals: no attribute tuple %d %d",
273+
elog(WARN,"getattdisbursion: no attribute tuple %d %d",
274274
relid,attnum);
275275
return(0);
276276
}
277-
nvals= ((AttributeTupleForm )GETSTRUCT(atp))->attnvals;
277+
nvals= ((AttributeTupleForm )GETSTRUCT(atp))->attdisbursion;
278278
if (nvals>0)return(nvals);
279279

280280
atp=SearchSysCacheTuple(RELOID,ObjectIdGetDatum(relid),
@@ -283,7 +283,7 @@ getattnvals(Oid relid, AttrNumber attnum)
283283
just for now, in case number of distinctive values is
284284
not cached */
285285
if (!HeapTupleIsValid(atp)) {
286-
elog(WARN,"getattnvals: no relation tuple %d",relid);
286+
elog(WARN,"getattdisbursion: no relation tuple %d",relid);
287287
return(0);
288288
}
289289
ntuples= ((Form_pg_class)GETSTRUCT(atp))->reltuples;

‎src/include/catalog/pg_attribute.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
* Copyright (c) 1994, Regents of the University of California
99
*
10-
* $Id: pg_attribute.h,v 1.10 1997/08/21 02:28:52 momjian Exp $
10+
* $Id: pg_attribute.h,v 1.11 1997/08/2103:02:13 momjian Exp $
1111
*
1212
* NOTES
1313
* the genbki.sh script reads this file and generates .bki
@@ -48,7 +48,7 @@ CATALOG(pg_attribute) BOOTSTRAP {
4848
attributes of this instance, so they had better match or Postgres
4949
will fail.
5050
*/
51-
float4attnvals;
51+
float4attdisbursion;
5252
int2attlen;
5353
/* attlen is a copy of the typlen field from pg_type for this
5454
attribute. See atttypid above. See struct TypeTupleFormData for
@@ -118,7 +118,7 @@ typedef FormData_pg_attribute*AttributeTupleForm;
118118
#defineAnum_pg_attribute_attname2
119119
#defineAnum_pg_attribute_atttypid3
120120

121-
#defineAnum_pg_attribute_attnvals4
121+
#defineAnum_pg_attribute_attdisbursion4
122122

123123
#defineAnum_pg_attribute_attlen5
124124
#defineAnum_pg_attribute_attnum6
@@ -362,7 +362,7 @@ DATA(insert OID = 0 ( 1261 vtype 18 0 1 -11 0 -1 t f c f f));
362362
{ 1249l, {"attrelid"}, 26l, 0l, 4, 1, 0l, -1l, '\001', '\0', 'i', '\0', '\0' }, \
363363
{ 1249l, {"attname"}, 19l, 0l, NAMEDATALEN, 2, 0l, -1l, '\0', '\0', 'i', '\0', '\0' }, \
364364
{ 1249l, {"atttypid"}, 26l, 0l, 4, 3, 0l, -1l, '\001', '\0', 'i', '\0', '\0' }, \
365-
{ 1249l, {"attnvals"}, 700l, 0l, 4, 4, 0l, -1l, '\001', '\0', 'i', '\0', '\0' }, \
365+
{ 1249l, {"attdisbursion"}, 700l, 0l, 4, 4, 0l, -1l, '\001', '\0', 'i', '\0', '\0' }, \
366366
{ 1249l, {"attlen"}, 21l, 0l, 2, 5, 0l, -1l, '\001', '\0', 's', '\0', '\0' }, \
367367
{ 1249l, {"attnum"}, 21l, 0l, 2, 6, 0l, -1l, '\001', '\0', 's', '\0', '\0' }, \
368368
{ 1249l, {"attnelems"}, 23l, 0l, 4, 7, 0l, -1l, '\001', '\0', 'i', '\0', '\0' }, \
@@ -376,7 +376,7 @@ DATA(insert OID = 0 ( 1261 vtype 18 0 1 -11 0 -1 t f c f f));
376376
DATA(insertOID=0 (1249attrelid260410-1tfiff));
377377
DATA(insertOID=0 (1249attname190NAMEDATALEN20-1ffiff));
378378
DATA(insertOID=0 (1249atttypid260430-1tfiff));
379-
DATA(insertOID=0 (1249attnvals7000440-1tfiff));
379+
DATA(insertOID=0 (1249attdisbursion7000440-1tfiff));
380380
DATA(insertOID=0 (1249attlen210250-1tfsff));
381381
DATA(insertOID=0 (1249attnum210260-1tfsff));
382382
DATA(insertOID=0 (1249attnelems230470-1tfiff));

0 commit comments

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