Commit ed6998d0 authored by Bruce Momjian's avatar Bruce Momjian

Re-add pg_index.indhaskeytype.

parent f756acf8
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/gist/gist.c,v 1.74 2001/05/14 21:53:16 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/access/gist/gist.c,v 1.75 2001/05/15 03:49:34 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -1127,6 +1127,7 @@ initGISTstate(GISTSTATE *giststate, Relation index) ...@@ -1127,6 +1127,7 @@ initGISTstate(GISTSTATE *giststate, Relation index)
elog(ERROR, "initGISTstate: index %u not found", elog(ERROR, "initGISTstate: index %u not found",
RelationGetRelid(index)); RelationGetRelid(index));
itupform = (Form_pg_index) GETSTRUCT(htup); itupform = (Form_pg_index) GETSTRUCT(htup);
giststate->haskeytype = itupform->indhaskeytype;
indexrelid = itupform->indexrelid; indexrelid = itupform->indexrelid;
ReleaseSysCache(htup); ReleaseSysCache(htup);
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.148 2001/05/15 01:12:58 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.149 2001/05/15 03:49:34 momjian Exp $
* *
* *
* INTERFACE ROUTINES * INTERFACE ROUTINES
...@@ -589,6 +589,7 @@ UpdateIndexRelation(Oid indexoid, ...@@ -589,6 +589,7 @@ UpdateIndexRelation(Oid indexoid,
indexForm->indproc = indexInfo->ii_FuncOid; indexForm->indproc = indexInfo->ii_FuncOid;
indexForm->indisclustered = false; /* not used */ indexForm->indisclustered = false; /* not used */
indexForm->indislossy = islossy; indexForm->indislossy = islossy;
indexForm->indhaskeytype = true; /* used by GIST */
indexForm->indisunique = indexInfo->ii_Unique; indexForm->indisunique = indexInfo->ii_Unique;
indexForm->indisprimary = primary; indexForm->indisprimary = primary;
memcpy((char *) &indexForm->indpred, (char *) predText, predLen); memcpy((char *) &indexForm->indpred, (char *) predText, predLen);
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Id: catversion.h,v 1.77 2001/05/15 01:12:59 momjian Exp $ * $Id: catversion.h,v 1.78 2001/05/15 03:49:35 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -53,6 +53,6 @@ ...@@ -53,6 +53,6 @@
*/ */
/* yyyymmddN */ /* yyyymmddN */
#define CATALOG_VERSION_NO 200105144 #define CATALOG_VERSION_NO 200105145
#endif #endif
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Id: pg_index.h,v 1.18 2001/05/15 01:12:59 momjian Exp $ * $Id: pg_index.h,v 1.19 2001/05/15 03:49:35 momjian Exp $
* *
* NOTES * NOTES
* the genbki.sh script reads this file and generates .bki * the genbki.sh script reads this file and generates .bki
...@@ -73,7 +73,7 @@ typedef FormData_pg_index *Form_pg_index; ...@@ -73,7 +73,7 @@ typedef FormData_pg_index *Form_pg_index;
* compiler constants for pg_index * compiler constants for pg_index
* ---------------- * ----------------
*/ */
#define Natts_pg_index 11 #define Natts_pg_index 12
#define Anum_pg_index_indexrelid 1 #define Anum_pg_index_indexrelid 1
#define Anum_pg_index_indrelid 2 #define Anum_pg_index_indrelid 2
#define Anum_pg_index_indproc 3 #define Anum_pg_index_indproc 3
...@@ -81,9 +81,10 @@ typedef FormData_pg_index *Form_pg_index; ...@@ -81,9 +81,10 @@ typedef FormData_pg_index *Form_pg_index;
#define Anum_pg_index_indclass 5 #define Anum_pg_index_indclass 5
#define Anum_pg_index_indisclustered 6 #define Anum_pg_index_indisclustered 6
#define Anum_pg_index_indislossy 7 #define Anum_pg_index_indislossy 7
#define Anum_pg_index_indisunique 8 #define Anum_pg_index_indhaskeytype 8
#define Anum_pg_index_indisprimary 9 #define Anum_pg_index_indisunique 9
#define Anum_pg_index_indreference 10 #define Anum_pg_index_indisprimary 10
#define Anum_pg_index_indpred 11 #define Anum_pg_index_indreference 11
#define Anum_pg_index_indpred 12
#endif /* PG_INDEX_H */ #endif /* PG_INDEX_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment