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

Commit783fbda

Browse files
committed
Remove columns pg_index.haskeytype and pg_index.indisclustered. Not used.
1 parentc87bc77 commit783fbda

File tree

6 files changed

+15
-45
lines changed

6 files changed

+15
-45
lines changed

‎src/backend/access/gist/gist.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
*
88
* IDENTIFICATION
9-
* $Header: /cvsroot/pgsql/src/backend/access/gist/gist.c,v 1.73 2001/05/07 00:43:15 tgl Exp $
9+
* $Header: /cvsroot/pgsql/src/backend/access/gist/gist.c,v 1.74 2001/05/14 21:53:16 momjian Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -1127,7 +1127,6 @@ initGISTstate(GISTSTATE *giststate, Relation index)
11271127
elog(ERROR,"initGISTstate: index %u not found",
11281128
RelationGetRelid(index));
11291129
itupform= (Form_pg_index)GETSTRUCT(htup);
1130-
giststate->haskeytype=itupform->indhaskeytype;
11311130
indexrelid=itupform->indexrelid;
11321131
ReleaseSysCache(htup);
11331132

‎src/backend/catalog/index.c

Lines changed: 1 addition & 3 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.146 2001/05/07 00:43:17 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.147 2001/05/14 21:53:16 momjian Exp $
1212
*
1313
*
1414
* INTERFACE ROUTINES
@@ -587,9 +587,7 @@ UpdateIndexRelation(Oid indexoid,
587587
indexForm->indexrelid=indexoid;
588588
indexForm->indrelid=heapoid;
589589
indexForm->indproc=indexInfo->ii_FuncOid;
590-
indexForm->indisclustered= false;
591590
indexForm->indislossy=islossy;
592-
indexForm->indhaskeytype= true;/* not actually used anymore */
593591
indexForm->indisunique=indexInfo->ii_Unique;
594592
indexForm->indisprimary=primary;
595593
memcpy((char*)&indexForm->indpred, (char*)predText,predLen);

‎src/backend/utils/cache/relcache.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.132 2001/05/1420:30:20 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.133 2001/05/1421:53:16 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -70,7 +70,6 @@ static FormData_pg_attribute Desc_pg_class[Natts_pg_class] = {Schema_pg_class};
7070
staticFormData_pg_attributeDesc_pg_attribute[Natts_pg_attribute]= {Schema_pg_attribute};
7171
staticFormData_pg_attributeDesc_pg_proc[Natts_pg_proc]= {Schema_pg_proc};
7272
staticFormData_pg_attributeDesc_pg_type[Natts_pg_type]= {Schema_pg_type};
73-
staticFormData_pg_attributeDesc_pg_variable[Natts_pg_variable]= {Schema_pg_variable};
7473
staticFormData_pg_attributeDesc_pg_log[Natts_pg_log]= {Schema_pg_log};
7574

7675
/*

‎src/include/catalog/catversion.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
3838
* Portions Copyright (c) 1994, Regents of the University of California
3939
*
40-
* $Id: catversion.h,v 1.73 2001/05/1420:30:21 momjian Exp $
40+
* $Id: catversion.h,v 1.74 2001/05/1421:53:16 momjian Exp $
4141
*
4242
*-------------------------------------------------------------------------
4343
*/
@@ -53,6 +53,6 @@
5353
*/
5454

5555
/*yyyymmddN */
56-
#defineCATALOG_VERSION_NO2001051401
56+
#defineCATALOG_VERSION_NO2001051402
5757

5858
#endif

‎src/include/catalog/pg_index.h

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
99
* Portions Copyright (c) 1994, Regents of the University of California
1010
*
11-
* $Id: pg_index.h,v 1.16 2001/01/24 19:43:21 momjian Exp $
11+
* $Id: pg_index.h,v 1.17 2001/05/14 21:53:16 momjian Exp $
1212
*
1313
* NOTES
1414
* the genbki.sh script reads this file and generates .bki
@@ -48,7 +48,6 @@ CATALOG(pg_index)
4848
* index */
4949
int2vectorindkey;
5050
oidvectorindclass;
51-
boolindisclustered;
5251
boolindislossy;/* do we fetch false tuples (lossy
5352
* compression)? */
5453
boolindhaskeytype;/* does key type != attribute type? */
@@ -70,18 +69,16 @@ typedef FormData_pg_index *Form_pg_index;
7069
*compiler constants for pg_index
7170
* ----------------
7271
*/
73-
#defineNatts_pg_index12
72+
#defineNatts_pg_index10
7473
#defineAnum_pg_index_indexrelid1
7574
#defineAnum_pg_index_indrelid2
7675
#defineAnum_pg_index_indproc3
7776
#defineAnum_pg_index_indkey4
7877
#defineAnum_pg_index_indclass5
79-
#defineAnum_pg_index_indisclustered6
80-
#defineAnum_pg_index_indislossy7
81-
#defineAnum_pg_index_indhaskeytype8
82-
#defineAnum_pg_index_indisunique9
83-
#defineAnum_pg_index_indisprimary10
84-
#defineAnum_pg_index_indreference11
85-
#defineAnum_pg_index_indpred12
78+
#defineAnum_pg_index_indislossy6
79+
#defineAnum_pg_index_indisunique7
80+
#defineAnum_pg_index_indisprimary8
81+
#defineAnum_pg_index_indreference9
82+
#defineAnum_pg_index_indpred10
8683

8784
#endif/* PG_INDEX_H */

‎src/interfaces/odbc/info.c

Lines changed: 3 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2009,8 +2009,7 @@ SQLStatistics(
20092009
char*table_name;
20102010
charindex_name[MAX_INFO_STRING];
20112011
shortfields_vector[16];
2012-
charisunique[10],
2013-
isclustered[10];
2012+
charisunique[10];
20142013
SDWORDindex_name_len,
20152014
fields_vector_len;
20162015
TupleNode*row;
@@ -2170,15 +2169,14 @@ SQLStatistics(
21702169
indx_stmt= (StatementClass*)hindx_stmt;
21712170

21722171
sprintf(index_query,"select c.relname, i.indkey, i.indisunique"
2173-
",i.indisclustered,c.relhasrules"
2172+
", c.relhasrules"
21742173
" from pg_index i, pg_class c, pg_class d"
21752174
" where c.oid = i.indexrelid and d.relname = '%s'"
21762175
" and d.oid = i.indrelid",table_name);
21772176

21782177
result=SQLExecDirect(hindx_stmt,index_query,strlen(index_query));
21792178
if ((result!=SQL_SUCCESS)&& (result!=SQL_SUCCESS_WITH_INFO))
21802179
{
2181-
21822180
/*
21832181
* "Couldn't execute index query (w/SQLExecDirect) in
21842182
* SQLStatistics.";
@@ -2226,20 +2224,7 @@ SQLStatistics(
22262224
gotoSEEYA;
22272225
}
22282226

2229-
/* bind the "is clustered" column */
22302227
result=SQLBindCol(hindx_stmt,4,SQL_C_CHAR,
2231-
isclustered,sizeof(isclustered),NULL);
2232-
if ((result!=SQL_SUCCESS)&& (result!=SQL_SUCCESS_WITH_INFO))
2233-
{
2234-
stmt->errormsg=indx_stmt->errormsg;/* "Couldn't bind column
2235-
* in SQLStatistics."; */
2236-
stmt->errornumber=indx_stmt->errornumber;
2237-
SQLFreeStmt(hindx_stmt,SQL_DROP);
2238-
gotoSEEYA;
2239-
2240-
}
2241-
2242-
result=SQLBindCol(hindx_stmt,5,SQL_C_CHAR,
22432228
relhasrules,MAX_INFO_STRING,NULL);
22442229
if ((result!=SQL_SUCCESS)&& (result!=SQL_SUCCESS_WITH_INFO))
22452230
{
@@ -2270,10 +2255,6 @@ SQLStatistics(
22702255
sprintf(buf,"%s_idx_fake_oid",table_name);
22712256
set_tuplefield_string(&row->tuple[5],buf);
22722257

2273-
/*
2274-
* Clustered index? I think non-clustered should be type OTHER
2275-
* not HASHED
2276-
*/
22772258
set_tuplefield_int2(&row->tuple[6], (Int2)SQL_INDEX_OTHER);
22782259
set_tuplefield_int2(&row->tuple[7], (Int2)1);
22792260

@@ -2316,11 +2297,7 @@ SQLStatistics(
23162297
set_tuplefield_string(&row->tuple[4],"");
23172298
set_tuplefield_string(&row->tuple[5],index_name);
23182299

2319-
/*
2320-
* Clustered index? I think non-clustered should be type
2321-
* OTHER not HASHED
2322-
*/
2323-
set_tuplefield_int2(&row->tuple[6], (Int2) (atoi(isclustered) ?SQL_INDEX_CLUSTERED :SQL_INDEX_OTHER));
2300+
set_tuplefield_int2(&row->tuple[6], (Int2)SQL_INDEX_OTHER);
23242301
set_tuplefield_int2(&row->tuple[7], (Int2) (i+1));
23252302

23262303
if (fields_vector[i]==OID_ATTNUM)

0 commit comments

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