Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit ed6998d

Browse files
committed
Re-add pg_index.indhaskeytype.
1 parent f756acf commit ed6998d

File tree

4 files changed

+13
-10
lines changed

4 files changed

+13
-10
lines changed

src/backend/access/gist/gist.c

Lines changed: 2 additions & 1 deletion
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.74 2001/05/14 21:53:16 momjian Exp $
9+
* $Header: /cvsroot/pgsql/src/backend/access/gist/gist.c,v 1.75 2001/05/15 03:49:34 momjian Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -1127,6 +1127,7 @@ 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;
11301131
indexrelid = itupform->indexrelid;
11311132
ReleaseSysCache(htup);
11321133

src/backend/catalog/index.c

Lines changed: 2 additions & 1 deletion
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.148 2001/05/15 01:12:58 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.149 2001/05/15 03:49:34 momjian Exp $
1212
*
1313
*
1414
* INTERFACE ROUTINES
@@ -589,6 +589,7 @@ UpdateIndexRelation(Oid indexoid,
589589
indexForm->indproc = indexInfo->ii_FuncOid;
590590
indexForm->indisclustered = false; /* not used */
591591
indexForm->indislossy = islossy;
592+
indexForm->indhaskeytype = true; /* used by GIST */
592593
indexForm->indisunique = indexInfo->ii_Unique;
593594
indexForm->indisprimary = primary;
594595
memcpy((char *) &indexForm->indpred, (char *) predText, predLen);

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.77 2001/05/15 01:12:59 momjian Exp $
40+
* $Id: catversion.h,v 1.78 2001/05/15 03:49:35 momjian Exp $
4141
*
4242
*-------------------------------------------------------------------------
4343
*/
@@ -53,6 +53,6 @@
5353
*/
5454

5555
/* yyyymmddN */
56-
#define CATALOG_VERSION_NO 200105144
56+
#define CATALOG_VERSION_NO 200105145
5757

5858
#endif

src/include/catalog/pg_index.h

Lines changed: 7 additions & 6 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.18 2001/05/15 01:12:59 momjian Exp $
11+
* $Id: pg_index.h,v 1.19 2001/05/15 03:49:35 momjian Exp $
1212
*
1313
* NOTES
1414
* the genbki.sh script reads this file and generates .bki
@@ -73,17 +73,18 @@ typedef FormData_pg_index *Form_pg_index;
7373
* compiler constants for pg_index
7474
* ----------------
7575
*/
76-
#define Natts_pg_index 11
76+
#define Natts_pg_index 12
7777
#define Anum_pg_index_indexrelid 1
7878
#define Anum_pg_index_indrelid 2
7979
#define Anum_pg_index_indproc 3
8080
#define Anum_pg_index_indkey 4
8181
#define Anum_pg_index_indclass 5
8282
#define Anum_pg_index_indisclustered 6
8383
#define Anum_pg_index_indislossy 7
84-
#define Anum_pg_index_indisunique 8
85-
#define Anum_pg_index_indisprimary 9
86-
#define Anum_pg_index_indreference 10
87-
#define Anum_pg_index_indpred 11
84+
#define Anum_pg_index_indhaskeytype 8
85+
#define Anum_pg_index_indisunique 9
86+
#define Anum_pg_index_indisprimary 10
87+
#define Anum_pg_index_indreference 11
88+
#define Anum_pg_index_indpred 12
8889

8990
#endif /* PG_INDEX_H */

0 commit comments

Comments
 (0)