database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-14 18:42:34 +03:00
Code Activity

Fix index_create for multi-column indices

Browse Source
This commit is contained in:
Vadim B. Mikheev
1997-03-19 07:44:45 +00:00
parent 8157c833aa
commit d656e023a1
1 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/backend/catalog/index.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.11 1997/01/10 09:51:38 vadim Exp $ * $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.12 1997/03/19 07:44:45 vadim Exp $
* *
* *
* INTERFACE ROUTINES * INTERFACE ROUTINES
@ -68,7 +68,7 @@ static Oid RelationNameGetObjectId(char *relationName, Relation pg_class,
static Oid GetHeapRelationOid(char *heapRelationName, char *indexRelationName); static Oid GetHeapRelationOid(char *heapRelationName, char *indexRelationName);
static TupleDesc BuildFuncTupleDesc(FuncIndexInfo *funcInfo); static TupleDesc BuildFuncTupleDesc(FuncIndexInfo *funcInfo);
static TupleDesc ConstructTupleDescriptor(Oid heapoid, Relation heapRelation, static TupleDesc ConstructTupleDescriptor(Oid heapoid, Relation heapRelation,
TypeName *IndexKeyType, List *attributeList,
int numatts, AttrNumber attNums[]); int numatts, AttrNumber attNums[]);
static void ConstructIndexReldesc(Relation indexRelation, Oid amoid); static void ConstructIndexReldesc(Relation indexRelation, Oid amoid);
@ -81,7 +81,7 @@ AppendAttributeTuples(Relation indexRelation, int numatts);
static void UpdateIndexRelation(Oid indexoid, Oid heapoid, static void UpdateIndexRelation(Oid indexoid, Oid heapoid,
FuncIndexInfo *funcInfo, int natts, FuncIndexInfo *funcInfo, int natts,
AttrNumber attNums[], Oid classOids[], Node *predicate, AttrNumber attNums[], Oid classOids[], Node *predicate,
TypeName *indexKeyType, bool islossy, bool unique); List *attributeList, bool islossy, bool unique);
static void DefaultBuild(Relation heapRelation, Relation indexRelation, static void DefaultBuild(Relation heapRelation, Relation indexRelation,
int numberOfAttributes, AttrNumber attributeNumber[], int numberOfAttributes, AttrNumber attributeNumber[],
IndexStrategy indexStrategy, uint16 parameterCount, IndexStrategy indexStrategy, uint16 parameterCount,
@ -325,12 +325,14 @@ BuildFuncTupleDesc(FuncIndexInfo *funcInfo)
static TupleDesc static TupleDesc
ConstructTupleDescriptor(Oid heapoid, ConstructTupleDescriptor(Oid heapoid,
Relation heapRelation, Relation heapRelation,
TypeName *IndexKeyType, List *attributeList,
int numatts, int numatts,
AttrNumber attNums[]) AttrNumber attNums[])
{ {
TupleDesc heapTupDesc; TupleDesc heapTupDesc;
TupleDesc indexTupDesc; TupleDesc indexTupDesc;
IndexElem *IndexKey;
TypeName *IndexKeyType;
AttrNumber atnum; /* attributeNumber[attributeOffset] */ AttrNumber atnum; /* attributeNumber[attributeOffset] */
AttrNumber atind; AttrNumber atind;
int natts; /* RelationTupleForm->relnatts */ int natts; /* RelationTupleForm->relnatts */
@ -367,6 +369,9 @@ ConstructTupleDescriptor(Oid heapoid,
if (atnum > natts) if (atnum > natts)
elog(WARN, "Cannot create index: attribute %d does not exist", elog(WARN, "Cannot create index: attribute %d does not exist",
atnum); atnum);
IndexKey = (IndexElem*) lfirst(attributeList);
attributeList = lnext(attributeList);
IndexKeyType = IndexKey->tname;
indexTupDesc->attrs[i] = (AttributeTupleForm) palloc(ATTRIBUTE_TUPLE_SIZE); indexTupDesc->attrs[i] = (AttributeTupleForm) palloc(ATTRIBUTE_TUPLE_SIZE);
@ -693,7 +698,7 @@ AppendAttributeTuples(Relation indexRelation, int numatts)
*/ */
memmove(GETSTRUCT(tuple), memmove(GETSTRUCT(tuple),
(char *)indexTupDesc->attrs[i], (char *)indexTupDesc->attrs[i],
sizeof (AttributeTupleForm)); sizeof (FormData_pg_attribute));
value[ Anum_pg_attribute_attnum - 1 ] = Int16GetDatum(i + 1); value[ Anum_pg_attribute_attnum - 1 ] = Int16GetDatum(i + 1);
@ -741,11 +746,12 @@ UpdateIndexRelation(Oid indexoid,
AttrNumber attNums[], AttrNumber attNums[],
Oid classOids[], Oid classOids[],
Node *predicate, Node *predicate,
TypeName *indexKeyType, List *attributeList,
bool islossy, bool islossy,
bool unique) bool unique)
{ {
IndexTupleForm indexForm; IndexTupleForm indexForm;
IndexElem *IndexKey;
char *predString; char *predString;
text *predText; text *predText;
int predLen, itupLen; int predLen, itupLen;
@ -781,10 +787,18 @@ UpdateIndexRelation(Oid indexoid,
FIgetProcOid(funcInfo) : InvalidOid; FIgetProcOid(funcInfo) : InvalidOid;
indexForm->indislossy = islossy; indexForm->indislossy = islossy;
indexForm->indisunique = unique; indexForm->indisunique = unique;
if (indexKeyType != NULL)
indexForm->indhaskeytype = 1; indexForm->indhaskeytype = 0;
else while (attributeList != NIL )
indexForm->indhaskeytype = 0; {
IndexKey = (IndexElem*) lfirst(attributeList);
if ( IndexKey->tname != NULL )
{
indexForm->indhaskeytype = 1;
break;
}
attributeList = lnext(attributeList);
}
memset((char *)& indexForm->indkey[0], 0, sizeof indexForm->indkey); memset((char *)& indexForm->indkey[0], 0, sizeof indexForm->indkey);
memset((char *)& indexForm->indclass[0], 0, sizeof indexForm->indclass); memset((char *)& indexForm->indclass[0], 0, sizeof indexForm->indclass);
@ -1002,7 +1016,7 @@ void
index_create(char *heapRelationName, index_create(char *heapRelationName,
char *indexRelationName, char *indexRelationName,
FuncIndexInfo *funcInfo, FuncIndexInfo *funcInfo,
TypeName *IndexKeyType, List *attributeList,
Oid accessMethodObjectId, Oid accessMethodObjectId,
int numatts, int numatts,
AttrNumber attNums[], AttrNumber attNums[],
@ -1052,7 +1066,7 @@ index_create(char *heapRelationName,
else else
indexTupDesc = ConstructTupleDescriptor(heapoid, indexTupDesc = ConstructTupleDescriptor(heapoid,
heapRelation, heapRelation,
IndexKeyType, attributeList,
numatts, numatts,
attNums); attNums);
@ -1125,7 +1139,7 @@ index_create(char *heapRelationName,
*/ */
UpdateIndexRelation(indexoid, heapoid, funcInfo, UpdateIndexRelation(indexoid, heapoid, funcInfo,
numatts, attNums, classObjectId, predicate, numatts, attNums, classObjectId, predicate,
IndexKeyType, islossy, unique); attributeList, islossy, unique);
predInfo = (PredInfo*)palloc(sizeof(PredInfo)); predInfo = (PredInfo*)palloc(sizeof(PredInfo));
predInfo->pred = predicate; predInfo->pred = predicate;