database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-26 12:21:12 +03:00
Code Activity

Move fixes for >8 indexed fields.

Browse Source
This commit is contained in:
Bruce Momjian
2000-01-10 05:20:26 +00:00
parent b99f300675
commit a040281787
5 changed files with 254 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/parser/analyze.c
View File

@ -5,7 +5,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
* $Id: analyze.c,v 1.127 2000/01/06 20:46:49 wieck Exp $
* $Id: analyze.c,v 1.128 2000/01/10 05:20:21 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -1679,7 +1679,7 @@ transformFkeyGetPrimaryKey(FkConstraint *fkconstraint)
* using the attribute names of the PK relation descriptor
* ----------
*/
for (i = 0; i < 8 && indexStruct->indkey[i] != 0; i++)
for (i = 0; i < INDEX_MAX_KEYS && indexStruct->indkey[i] != 0; i++)
{
pkattno = indexStruct->indkey[i];
pkattr = (Ident *)makeNode(Ident);

37
src/backend/utils/adt/int.c
View File

@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/int.c,v 1.27 1999/07/17 20:17:56 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/adt/int.c,v 1.28 2000/01/10 05:20:23 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -76,29 +76,26 @@ int2out(int16 sh)
* Fills any nonexistent digits with NULLs.
*/
int16 *
int28in(char *shs)
int28in(char *intString)
{
int16 *result;
int nums;
int slot;
if (shs == NULL)
if (intString == NULL)
return NULL;
result = (int16 *) palloc(sizeof(int16[8]));
if ((nums = sscanf(shs, "%hd%hd%hd%hd%hd%hd%hd%hd",
&result[0],
&result[1],
&result[2],
&result[3],
&result[4],
&result[5],
&result[6],
&result[7])) != 8)
result = (int16 *) palloc(sizeof(int16[INDEX_MAX_KEYS]));
for (slot=0; *intString && slot < INDEX_MAX_KEYS; slot++)
{
do
result[nums++] = 0;
while (nums < 8);
if (sscanf(intString, "%hd", &result[slot]) != 1)
break;
while (*intString && *intString != ' ')
intString++;
}
while (slot < INDEX_MAX_KEYS)
result[slot++] = 0;
return result;
}
@ -120,10 +117,10 @@ int28out(int16 *shs)
result[1] = '\0';
return result;
}
rp = result = (char *) palloc(8 * 7); /* assumes sign, 5 digits,
* ' ' */
rp = result = (char *) palloc(INDEX_MAX_KEYS * 7);
/* assumes sign, 5 digits, ' ' */
sp = shs;
for (num = 8; num != 0; num--)
for (num = INDEX_MAX_KEYS; num != 0; num--)
{
itoa(*sp++, rp);
while (*++rp != '\0')

2
src/bin/psql/describe.c
View File

@ -541,7 +541,7 @@ xmalloc(size_t size)
bool
describeTableDetails(const char *name, PsqlSettings *pset, bool desc)
{
char buf[512 + 8 * NAMEDATALEN];
char buf[512 + INDEX_MAX_KEYS * NAMEDATALEN];
PGresult *res = NULL;
printTableOpt myopt = pset->popt.topt;
int i;

5
src/include/config.h.in
View File

@ -92,6 +92,11 @@
*/
#define INDEXSCAN_PATCH
/*
* Maximum number of columns in an index.
*/
#define INDEX_MAX_KEYS 8
/*
* Enables debugging print statements in the date/time support routines.
* Particularly useful for porting to a new platform/OS combination.

4
src/include/postgres.h
View File

@ -6,7 +6,7 @@
*
* Copyright (c) 1995, Regents of the University of California
*
* $Id: postgres.h,v 1.32 2000/01/10 04:36:36 momjian Exp $
* $Id: postgres.h,v 1.33 2000/01/10 05:20:26 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -101,8 +101,6 @@ struct varlena
typedef struct varlena bytea;
typedef struct varlena text;
#define INDEX_MAX_KEYS 8 /* maximum number of keys in an index
* definition */
typedef int2 int28[INDEX_MAX_KEYS];
typedef Oid oid8[INDEX_MAX_KEYS];