opensourcemirror
/
postgresql
mirror of git://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Releases Wiki Activity

More cleanups. Still doesn't work.

This commit is contained in:
Bruce Momjian 2000-01-11 03:33:14 +00:00
parent aadd14b8f2
commit bd52f4bffd
5 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/backend/access/common/indextuple.c
View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.39 1999/10/23 03:13:20 tgl Exp $
* $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.40 2000/01/11 03:33:11 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -44,9 +44,8 @@ index_formtuple(TupleDesc tupleDescriptor,
uint16 tupmask = 0;
int numberOfAttributes = tupleDescriptor->natts;
/* XXX shouldn't this test be '>' ? */
if (numberOfAttributes >= INDEX_MAX_KEYS)
elog(ERROR, "index_formtuple: numberOfAttributes %d >= %d",
if (numberOfAttributes > INDEX_MAX_KEYS)
elog(ERROR, "index_formtuple: numberOfAttributes %d > %d",
numberOfAttributes, INDEX_MAX_KEYS);
for (i = 0; i < numberOfAttributes && !hasnull; i++)

6
src/backend/commands/indexcmds.c
View File

@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/indexcmds.c,v 1.17 2000/01/10 17:14:32 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/commands/indexcmds.c,v 1.18 2000/01/11 03:33:11 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -258,10 +258,10 @@ ExtendIndex(char *indexRelationName, Expr *predicate, List *rangetable)
relationId = index->indrelid;
indproc = index->indproc;
for (i = 0; i < INDEX_MAX_KEYS; i++)
for (i = INDEX_MAX_KEYS-1; i >= 0; i--)
if (index->indkey[i] == InvalidAttrNumber)
break;
numberOfAttributes = i;
numberOfAttributes = i+1;
if (VARSIZE(&index->indpred) != 0)
{

6
src/backend/libpq/be-pqexec.c
View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-pqexec.c,v 1.27 2000/01/11 02:30:06 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-pqexec.c,v 1.28 2000/01/11 03:33:12 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -80,8 +80,8 @@ PQfn(int fnid,
*/
retval = (char *)
fmgr(fnid, arg[0], arg[1], arg[2], arg[3],
arg[4], arg[5], arg[6], arg[7]);
arg[8], arg[9], arg[10], arg[11]);
arg[4], arg[5], arg[6], arg[7],
arg[8], arg[9], arg[10], arg[11],
arg[12], arg[13], arg[14], arg[15]);
/* ----------------

4
src/backend/optimizer/util/plancat.c
View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/optimizer/util/plancat.c,v 1.41 2000/01/09 00:26:40 tgl Exp $
* $Header: /cvsroot/pgsql/src/backend/optimizer/util/plancat.c,v 1.42 2000/01/11 03:33:13 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -120,10 +120,8 @@ find_secondary_indexes(Query *root, Index relid)
for (i = 0; i < INDEX_MAX_KEYS; i++)
info->indexkeys[i] = index->indkey[i];
info->indexkeys[INDEX_MAX_KEYS] = 0;
for (i = 0; i < INDEX_MAX_KEYS; i++)
info->classlist[i] = index->indclass[i];
info->classlist[INDEX_MAX_KEYS] = (Oid) 0;
/* Extract info from the relation descriptor for the index */
indexRelation = index_open(index->indexrelid);

6
src/backend/tcop/fastpath.c
View File

@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/tcop/fastpath.c,v 1.34 2000/01/11 02:46:48 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/tcop/fastpath.c,v 1.35 2000/01/11 03:33:14 momjian Exp $
*
* NOTES
* This cruft is the server side of PQfn.
@ -363,8 +363,8 @@ HandleFunctionRequest()
#ifndef NO_FASTPATH
retval = fmgr(fid,
arg[0], arg[1], arg[2], arg[3],
arg[4], arg[5], arg[6], arg[7]);
arg[8], arg[9], arg[10], arg[11]);
arg[4], arg[5], arg[6], arg[7],
arg[8], arg[9], arg[10], arg[11],
arg[12], arg[13], arg[14], arg[15]);
#else