rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

indexing.c cleanups.

This commit is contained in:
Bruce Momjian 1998-08-31 17:49:18 +00:00
parent 24a05f5b3e
commit 2aa080fc93
3 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.57 1998/08/28 04:57:19 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.58 1998/08/31 17:49:16 momjian Exp $
* *
* *
* INTERFACE ROUTINES * INTERFACE ROUTINES
@ -1281,8 +1281,7 @@ FormIndexDatum(int numberOfAttributes,
{ {
offset = AttrNumberGetAttrOffset(i); offset = AttrNumberGetAttrOffset(i);
datum[offset] = datum[offset] = PointerGetDatum(GetIndexValue(heapTuple,
PointerGetDatum(GetIndexValue(heapTuple,
heapDescriptor, heapDescriptor,
offset, offset,
attributeNumber, attributeNumber,

7
src/backend/catalog/indexing.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/catalog/indexing.c,v 1.23 1998/08/30 23:25:55 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/catalog/indexing.c,v 1.24 1998/08/31 17:49:17 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -132,8 +132,7 @@ CatalogIndexInsert(Relation *idescs,
pgIndexP = (IndexTupleForm) GETSTRUCT(pgIndexTup); pgIndexP = (IndexTupleForm) GETSTRUCT(pgIndexTup);
/* /*
* Compute the number of attributes we are indexing upon. very * Compute the number of attributes we are indexing upon.
* important - can't assume one if this is a functional index.
*/ */
for (attnumP = (&pgIndexP->indkey[0]), natts = 0; for (attnumP = (&pgIndexP->indkey[0]), natts = 0;
*attnumP != InvalidAttrNumber; *attnumP != InvalidAttrNumber;
@ -301,7 +300,7 @@ AttributeNumIndexScan(Relation heapRelation,
(bits16) 0x0, (bits16) 0x0,
(AttrNumber) 1, (AttrNumber) 1,
(RegProcedure)F_OIDEQ, (RegProcedure)F_OIDEQ,
Int32GetDatum(relid)); ObjectIdGetDatum(relid));
ScanKeyEntryInitialize(&skey[1], ScanKeyEntryInitialize(&skey[1],
(bits16) 0x0, (bits16) 0x0,

7
src/backend/catalog/pg_proc.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.20 1998/08/24 01:37:47 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.21 1998/08/31 17:49:18 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -129,7 +129,6 @@ ProcedureCreate(char *procedureName,
if (!strcmp(languageName, "sql")) if (!strcmp(languageName, "sql"))
{ {
/* /*
* If this call is defining a set, check if the set is already * If this call is defining a set, check if the set is already
* defined by looking to see whether this call's function text * defined by looking to see whether this call's function text
@ -142,6 +141,7 @@ ProcedureCreate(char *procedureName,
tup = SearchSysCacheTuple(PROSRC, tup = SearchSysCacheTuple(PROSRC,
PointerGetDatum(prosrctext), PointerGetDatum(prosrctext),
0, 0, 0); 0, 0, 0);
pfree(prosrctext);
if (HeapTupleIsValid(tup)) if (HeapTupleIsValid(tup))
return tup->t_oid; return tup->t_oid;
} }
@ -152,8 +152,7 @@ ProcedureCreate(char *procedureName,
0, 0, 0); 0, 0, 0);
if (!HeapTupleIsValid(tup)) if (!HeapTupleIsValid(tup))
elog(ERROR, "ProcedureCreate: no such language %s", elog(ERROR, "ProcedureCreate: no such language %s", languageName);
languageName);
languageObjectId = tup->t_oid; languageObjectId = tup->t_oid;