NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitd656e02

committed

Fix index_create for multi-column indices

1 parent8157c83 commitd656e02Copy full SHA for d656e02

File tree

1 file changed

+27

-13

lines changed

src/backend/catalog
- index.c

1 file changed

+27

-13

lines changed

`‎src/backend/catalog/index.c`

Lines changed: 27 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.11 1997/01/10 09:51:38 vadim Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.12 1997/03/19 07:44:45 vadim Exp $`
`11`	`11`	`*`
`12`	`12`	`*`
`13`	`13`	`* INTERFACE ROUTINES`
`@@ -68,7 +68,7 @@ static Oid RelationNameGetObjectId(char *relationName, Relation pg_class,`
`68`	`68`	`staticOidGetHeapRelationOid(charheapRelationName,charindexRelationName);`
`69`	`69`	`staticTupleDescBuildFuncTupleDesc(FuncIndexInfo*funcInfo);`
`70`	`70`	`staticTupleDescConstructTupleDescriptor(Oidheapoid,RelationheapRelation,`
`71`		`-TypeName*IndexKeyType,`
	`71`	`+List*attributeList,`
`72`	`72`	`intnumatts,AttrNumberattNums[]);`
`73`	`73`
`74`	`74`	`staticvoidConstructIndexReldesc(RelationindexRelation,Oidamoid);`
`@@ -81,7 +81,7 @@ AppendAttributeTuples(Relation indexRelation, int numatts);`
`81`	`81`	`staticvoidUpdateIndexRelation(Oidindexoid,Oidheapoid,`
`82`	`82`	`FuncIndexInfo*funcInfo,intnatts,`
`83`	`83`	`AttrNumberattNums[],OidclassOids[],Node*predicate,`
`84`		`-TypeName*indexKeyType,boolislossy,boolunique);`
	`84`	`+List*attributeList,boolislossy,boolunique);`
`85`	`85`	`staticvoidDefaultBuild(RelationheapRelation,RelationindexRelation,`
`86`	`86`	`intnumberOfAttributes,AttrNumberattributeNumber[],`
`87`	`87`	`IndexStrategyindexStrategy,uint16parameterCount,`
`@@ -325,12 +325,14 @@ BuildFuncTupleDesc(FuncIndexInfo *funcInfo)`
`325`	`325`	`staticTupleDesc`
`326`	`326`	`ConstructTupleDescriptor(Oidheapoid,`
`327`	`327`	`RelationheapRelation,`
`328`		`-TypeName*IndexKeyType,`
	`328`	`+List*attributeList,`
`329`	`329`	`intnumatts,`
`330`	`330`	`AttrNumberattNums[])`
`331`	`331`	`{`
`332`	`332`	`TupleDescheapTupDesc;`
`333`	`333`	`TupleDescindexTupDesc;`
	`334`	`+IndexElem*IndexKey;`
	`335`	`+TypeName*IndexKeyType;`
`334`	`336`	`AttrNumberatnum;/* attributeNumber[attributeOffset] */`
`335`	`337`	`AttrNumberatind;`
`336`	`338`	`intnatts;/* RelationTupleForm->relnatts */`
`@@ -367,6 +369,9 @@ ConstructTupleDescriptor(Oid heapoid,`
`367`	`369`	`if (atnum>natts)`
`368`	`370`	`elog(WARN,"Cannot create index: attribute %d does not exist",`
`369`	`371`	`atnum);`
	`372`	`+IndexKey= (IndexElem*)lfirst(attributeList);`
	`373`	`+attributeList=lnext(attributeList);`
	`374`	`+IndexKeyType=IndexKey->tname;`
`370`	`375`
`371`	`376`	`indexTupDesc->attrs[i]= (AttributeTupleForm)palloc(ATTRIBUTE_TUPLE_SIZE);`
`372`	`377`
`@@ -693,7 +698,7 @@ AppendAttributeTuples(Relation indexRelation, int numatts)`
`693`	`698`	`*/`
`694`	`699`	`memmove(GETSTRUCT(tuple),`
`695`	`700`	`(char*)indexTupDesc->attrs[i],`
`696`		`-sizeof (AttributeTupleForm));`
	`701`	`+sizeof (FormData_pg_attribute));`
`697`	`702`
`698`	`703`	`value[Anum_pg_attribute_attnum-1 ]=Int16GetDatum(i+1);`
`699`	`704`
`@@ -741,11 +746,12 @@ UpdateIndexRelation(Oid indexoid,`
`741`	`746`	`AttrNumberattNums[],`
`742`	`747`	`OidclassOids[],`
`743`	`748`	`Node*predicate,`
`744`		`-TypeName*indexKeyType,`
	`749`	`+List*attributeList,`
`745`	`750`	`boolislossy,`
`746`	`751`	`boolunique)`
`747`	`752`	`{`
`748`	`753`	`IndexTupleFormindexForm;`
	`754`	`+IndexElem*IndexKey;`
`749`	`755`	`char*predString;`
`750`	`756`	`text*predText;`
`751`	`757`	`intpredLen,itupLen;`
`@@ -781,10 +787,18 @@ UpdateIndexRelation(Oid indexoid,`
`781`	`787`	`FIgetProcOid(funcInfo) :InvalidOid;`
`782`	`788`	`indexForm->indislossy=islossy;`
`783`	`789`	`indexForm->indisunique=unique;`
`784`		`-if (indexKeyType!=NULL)`
`785`		`-indexForm->indhaskeytype=1;`
`786`		`-else`
`787`		`-indexForm->indhaskeytype=0;`
	`790`	`+`
	`791`	`+indexForm->indhaskeytype=0;`
	`792`	`+while (attributeList!=NIL )`
	`793`	`+ {`
	`794`	`+IndexKey= (IndexElem*)lfirst(attributeList);`
	`795`	`+if (IndexKey->tname!=NULL )`
	`796`	`+{`
	`797`	`+indexForm->indhaskeytype=1;`
	`798`	`+break;`
	`799`	`+ }`
	`800`	`+attributeList=lnext(attributeList);`
	`801`	`+ }`
`788`	`802`
`789`	`803`	`memset((char*)&indexForm->indkey[0],0,sizeofindexForm->indkey);`
`790`	`804`	`memset((char*)&indexForm->indclass[0],0,sizeofindexForm->indclass);`
`@@ -1002,7 +1016,7 @@ void`
`1002`	`1016`	`index_create(char*heapRelationName,`
`1003`	`1017`	`char*indexRelationName,`
`1004`	`1018`	`FuncIndexInfo*funcInfo,`
`1005`		`-TypeName*IndexKeyType,`
	`1019`	`+List*attributeList,`
`1006`	`1020`	`OidaccessMethodObjectId,`
`1007`	`1021`	`intnumatts,`
`1008`	`1022`	`AttrNumberattNums[],`
`@@ -1052,7 +1066,7 @@ index_create(char *heapRelationName,`
`1052`	`1066`	`else`
`1053`	`1067`	`indexTupDesc=ConstructTupleDescriptor(heapoid,`
`1054`	`1068`	`heapRelation,`
`1055`		`-IndexKeyType,`
	`1069`	`+attributeList,`
`1056`	`1070`	`numatts,`
`1057`	`1071`	`attNums);`
`1058`	`1072`
`@@ -1125,7 +1139,7 @@ index_create(char *heapRelationName,`
`1125`	`1139`	`*/`
`1126`	`1140`	`UpdateIndexRelation(indexoid,heapoid,funcInfo,`
`1127`	`1141`	`numatts,attNums,classObjectId,predicate,`
`1128`		`-IndexKeyType,islossy,unique);`
	`1142`	`+attributeList,islossy,unique);`
`1129`	`1143`
`1130`	`1144`	`predInfo= (PredInfo*)palloc(sizeof(PredInfo));`
`1131`	`1145`	`predInfo->pred=predicate;`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitd656e02

File tree

1 file changed

1 file changed

`‎src/backend/catalog/index.c`

0 commit comments