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

Commit50ad4a7

Browse files
committed
Make 'name' type int aligned, like char/varchar.
1 parent4166f73 commit50ad4a7

File tree

3 files changed

+18
-20
lines changed

3 files changed

+18
-20
lines changed

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

Lines changed: 2 additions & 4 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/indextuple.c,v 1.29 1998/06/15 19:27:44 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.30 1998/08/27 05:06:54 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -66,9 +66,7 @@ index_formtuple(TupleDesc tupleDescriptor,
6666
infomask |=INDEX_NULL_MASK;
6767

6868
hoff=IndexInfoFindDataOffset(infomask);
69-
size=hoff
70-
+ComputeDataSize(tupleDescriptor,
71-
value,null);
69+
size=hoff+ComputeDataSize(tupleDescriptor,value,null);
7270
size=DOUBLEALIGN(size);/* be conservative */
7371

7472
tp= (char*)palloc(size);

‎src/include/catalog/pg_attribute.h

Lines changed: 14 additions & 14 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.40 1998/08/2701:04:23 momjian Exp $
10+
* $Id: pg_attribute.h,v 1.41 1998/08/2705:06:56 momjian Exp $
1111
*
1212
* NOTES
1313
* the genbki.sh script reads this file and generates .bki
@@ -178,7 +178,7 @@ typedef FormData_pg_attribute *AttributeTupleForm;
178178
* ----------------
179179
*/
180180
#defineSchema_pg_type \
181-
{ 1247, {"typname"}, 19, 0, NAMEDATALEN, 1, 0, -1, -1, '\0', '\0', 'd', '\0', '\0' }, \
181+
{ 1247, {"typname"}, 19, 0, NAMEDATALEN, 1, 0, -1, -1, '\0', '\0', 'i', '\0', '\0' }, \
182182
{ 1247, {"typowner"}, 23, 0,4,2, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \
183183
{ 1247, {"typlen"}, 21, 0,2,3, 0, -1, -1, '\001', '\0', 's', '\0', '\0' }, \
184184
{ 1247, {"typprtlen"}, 21, 0,2,4, 0, -1, -1, '\001', '\0', 's', '\0', '\0' }, \
@@ -195,7 +195,7 @@ typedef FormData_pg_attribute *AttributeTupleForm;
195195
{ 1247, {"typalign"}, 18, 0,1, 15, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \
196196
{ 1247, {"typdefault"}, 25, 0, -1, 16, 0, -1, -1, '\0', '\0', 'i', '\0', '\0' }
197197

198-
DATA(insertOID=0 (1247typname190NAMEDATALEN10-1-1ffdff));
198+
DATA(insertOID=0 (1247typname190NAMEDATALEN10-1-1ffiff));
199199
DATA(insertOID=0 (1247typowner230420-1-1tfiff));
200200
DATA(insertOID=0 (1247typlen210230-1-1tfsff));
201201
DATA(insertOID=0 (1247typprtlen210240-1-1tfsff));
@@ -222,7 +222,7 @@ DATA(insert OID = 0 ( 1247 cmax29 0 4 -6 0 -1 -1 t f i f f));
222222
*pg_database
223223
* ----------------
224224
*/
225-
DATA(insertOID=0 (1262datname190NAMEDATALEN10-1-1ffdff));
225+
DATA(insertOID=0 (1262datname190NAMEDATALEN10-1-1ffiff));
226226
DATA(insertOID=0 (1262datdba230420-1-1tfiff));
227227
DATA(insertOID=0 (1262encoding230430-1-1tfiff));
228228
DATA(insertOID=0 (1262datpath250-140-1-1ffiff));
@@ -238,7 +238,7 @@ DATA(insert OID = 0 ( 1262 cmax29 0 4 -6 0 -1 -1 t f i f f));
238238
* ----------------
239239
*/
240240
#defineSchema_pg_proc \
241-
{ 1255, {"proname"},19, 0, NAMEDATALEN, 1, 0, -1, -1, '\0', '\0', 'd', '\0', '\0' }, \
241+
{ 1255, {"proname"},19, 0, NAMEDATALEN, 1, 0, -1, -1, '\0', '\0', 'i', '\0', '\0' }, \
242242
{ 1255, {"proowner"},23, 0, 4, 2, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \
243243
{ 1255, {"prolang"},26, 0, 4, 3, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \
244244
{ 1255, {"proisinh"},16, 0, 1, 4, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \
@@ -255,7 +255,7 @@ DATA(insert OID = 0 ( 1262 cmax29 0 4 -6 0 -1 -1 t f i f f));
255255
{ 1255, {"prosrc"},25, 0, -1, 15,0, -1, -1, '\0', '\0', 'i', '\0', '\0' }, \
256256
{ 1255, {"probin"},17, 0, -1, 16,0, -1, -1, '\0', '\0', 'i', '\0', '\0' }
257257

258-
DATA(insertOID=0 (1255proname190NAMEDATALEN10-1-1ffdff));
258+
DATA(insertOID=0 (1255proname190NAMEDATALEN10-1-1ffiff));
259259
DATA(insertOID=0 (1255proowner230420-1-1tfiff));
260260
DATA(insertOID=0 (1255prolang260430-1-1tfiff));
261261
DATA(insertOID=0 (1255proisinh160140-1-1tfcff));
@@ -282,7 +282,7 @@ DATA(insert OID = 0 ( 1255 cmax29 0 4 -6 0 -1 -1 t f i f f));
282282
*pg_shadow
283283
* ----------------
284284
*/
285-
DATA(insertOID=0 (1260usename190NAMEDATALEN10-1-1ffdff));
285+
DATA(insertOID=0 (1260usename190NAMEDATALEN10-1-1ffiff));
286286
DATA(insertOID=0 (1260usesysid230420-1-1tfiff));
287287
DATA(insertOID=0 (1260usecreatedb160130-1-1tfcff));
288288
DATA(insertOID=0 (1260usetrace160140-1-1tfcff));
@@ -301,7 +301,7 @@ DATA(insert OID = 0 ( 1260 cmax29 0 4 -6 0 -1 -1 t f i f f));
301301
*pg_group
302302
* ----------------
303303
*/
304-
DATA(insertOID=0 (1261groname190NAMEDATALEN10-1-1ffdff));
304+
DATA(insertOID=0 (1261groname190NAMEDATALEN10-1-1ffiff));
305305
DATA(insertOID=0 (1261grosysid230420-1-1tfiff));
306306
DATA(insertOID=0 (1261grolist10070-130-1-1ffiff));
307307
DATA(insertOID=0 (1261ctid2706-10-1-1ffiff));
@@ -317,7 +317,7 @@ DATA(insert OID = 0 ( 1261 cmax29 0 4 -6 0 -1 -1 t f i f f));
317317
*/
318318
#defineSchema_pg_attribute \
319319
{ 1249, {"attrelid"}, 26, 0,4,1, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \
320-
{ 1249, {"attname"}, 19, 0, NAMEDATALEN,2, 0, -1, -1, '\0', '\0', 'd', '\0', '\0' }, \
320+
{ 1249, {"attname"}, 19, 0, NAMEDATALEN,2, 0, -1, -1, '\0', '\0', 'i', '\0', '\0' }, \
321321
{ 1249, {"atttypid"}, 26, 0,4,3, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \
322322
{ 1249, {"attdisbursion"}, 700, 0,4,4, 0, -1, -1, '\0', '\0', 'i', '\0', '\0' }, \
323323
{ 1249, {"attlen"}, 21, 0,2,5, 0, -1, -1, '\001', '\0', 's', '\0', '\0' }, \
@@ -332,7 +332,7 @@ DATA(insert OID = 0 ( 1261 cmax29 0 4 -6 0 -1 -1 t f i f f));
332332
{ 1249, {"atthasdef"}, 16, 0,1, 14, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }
333333

334334
DATA(insertOID=0 (1249attrelid260410-1-1tfiff));
335-
DATA(insertOID=0 (1249attname190NAMEDATALEN20-1-1ffdff));
335+
DATA(insertOID=0 (1249attname190NAMEDATALEN20-1-1ffiff));
336336
DATA(insertOID=0 (1249atttypid260430-1-1tfiff));
337337
DATA(insertOID=0 (1249attdisbursion7000440-1-1ffiff));
338338
DATA(insertOID=0 (1249attlen210250-1-1tfsff));
@@ -357,7 +357,7 @@ DATA(insert OID = 0 ( 1249 cmax29 0 4 -6 0 -1 -1 t f i f f));
357357
* ----------------
358358
*/
359359
#defineSchema_pg_class \
360-
{ 1259, {"relname"}, 19, 0, NAMEDATALEN, 1, 0, -1, -1, '\0', '\0', 'd', '\0', '\0' }, \
360+
{ 1259, {"relname"}, 19, 0, NAMEDATALEN, 1, 0, -1, -1, '\0', '\0', 'i', '\0', '\0' }, \
361361
{ 1259, {"reltype"}, 26, 0,4,2, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \
362362
{ 1259, {"relowner"}, 23, 0,4,3, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \
363363
{ 1259, {"relam"}, 26, 0,4,4, 0, -1, -1, '\001', '\0', 'i', '\0', '\0' }, \
@@ -372,7 +372,7 @@ DATA(insert OID = 0 ( 1249 cmax29 0 4 -6 0 -1 -1 t f i f f));
372372
{ 1259, {"relhasrules"}, 16,0, 1, 13, 0, -1, -1, '\001', '\0', 'c', '\0', '\0' }, \
373373
{ 1259, {"relacl"}, 1034, 0, -1, 14, 0, -1, -1,'\0', '\0', 'i', '\0', '\0' }
374374

375-
DATA(insertOID=0 (1259relname190NAMEDATALEN10-1-1ffdff));
375+
DATA(insertOID=0 (1259relname190NAMEDATALEN10-1-1ffiff));
376376
DATA(insertOID=0 (1259reltype260420-1-1tfiff));
377377
DATA(insertOID=0 (1259relowner230430-1-1tfiff));
378378
DATA(insertOID=0 (1259relam260440-1-1tfiff));
@@ -413,7 +413,7 @@ DATA(insert OID = 0 ( 1215 cmax29 0 4 -6 0 -1 -1 t f i f f));
413413
* ----------------
414414
*/
415415
DATA(insertOID=0 (1216rcrelid260410-1-1tfiff));
416-
DATA(insertOID=0 (1216rcname190NAMEDATALEN20-1-1ffdff));
416+
DATA(insertOID=0 (1216rcname190NAMEDATALEN20-1-1ffiff));
417417
DATA(insertOID=0 (1216rcbin250-130-1-1ffiff));
418418
DATA(insertOID=0 (1216rcsrc250-140-1-1ffiff));
419419
DATA(insertOID=0 (1216ctid2706-10-1-1ffiff));
@@ -428,7 +428,7 @@ DATA(insert OID = 0 ( 1216 cmax29 0 4 -6 0 -1 -1 t f i f f));
428428
* ----------------
429429
*/
430430
DATA(insertOID=0 (1219tgrelid260410-1-1tfiff));
431-
DATA(insertOID=0 (1219tgname190NAMEDATALEN20-1-1ffdff));
431+
DATA(insertOID=0 (1219tgname190NAMEDATALEN20-1-1ffiff));
432432
DATA(insertOID=0 (1219tgfoid260430-1-1tfiff));
433433
DATA(insertOID=0 (1219tgtype210240-1-1tfsff));
434434
DATA(insertOID=0 (1219tgnargs210250-1-1tfsff));

‎src/include/catalog/pg_type.h

Lines changed: 2 additions & 2 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_type.h,v 1.44 1998/08/19 02:03:56 momjian Exp $
10+
* $Id: pg_type.h,v 1.45 1998/08/27 05:06:57 momjian Exp $
1111
*
1212
* NOTES
1313
* the genbki.sh script reads this file and generates .bki
@@ -162,7 +162,7 @@ DATA(insert OID = 18 (char PGUID 1 1 t b t \054 0 0 charin charout char
162162
DESCR("single character");
163163
#defineCHAROID18
164164

165-
DATA(insertOID=19 (namePGUIDNAMEDATALENNAMEDATALENfbt \054018nameinnameoutnameinnameoutd_null_ ));
165+
DATA(insertOID=19 (namePGUIDNAMEDATALENNAMEDATALENfbt \054018nameinnameoutnameinnameouti_null_ ));
166166
DESCR("31-character type for storing system identifiers");
167167
#defineNAMEOID19
168168

0 commit comments

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