Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitbd52f4b

Browse files
committed
More cleanups. Still doesn't work.
1 parentaadd14b commitbd52f4b

File tree

5 files changed

+13
-16
lines changed

5 files changed

+13
-16
lines changed

‎src/backend/access/common/indextuple.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.39 1999/10/23 03:13:20 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.40 2000/01/11 03:33:11 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -44,9 +44,8 @@ index_formtuple(TupleDesc tupleDescriptor,
4444
uint16tupmask=0;
4545
intnumberOfAttributes=tupleDescriptor->natts;
4646

47-
/* XXX shouldn't this test be '>' ? */
48-
if (numberOfAttributes >=INDEX_MAX_KEYS)
49-
elog(ERROR,"index_formtuple: numberOfAttributes %d >= %d",
47+
if (numberOfAttributes>INDEX_MAX_KEYS)
48+
elog(ERROR,"index_formtuple: numberOfAttributes %d > %d",
5049
numberOfAttributes,INDEX_MAX_KEYS);
5150

5251
for (i=0;i<numberOfAttributes&& !hasnull;i++)

‎src/backend/commands/indexcmds.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/commands/indexcmds.c,v 1.17 2000/01/10 17:14:32 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/commands/indexcmds.c,v 1.18 2000/01/11 03:33:11 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -258,10 +258,10 @@ ExtendIndex(char *indexRelationName, Expr *predicate, List *rangetable)
258258
relationId=index->indrelid;
259259
indproc=index->indproc;
260260

261-
for (i=0;i<INDEX_MAX_KEYS;i++)
261+
for (i=INDEX_MAX_KEYS-1;i>=0;i--)
262262
if (index->indkey[i]==InvalidAttrNumber)
263263
break;
264-
numberOfAttributes=i;
264+
numberOfAttributes=i+1;
265265

266266
if (VARSIZE(&index->indpred)!=0)
267267
{

‎src/backend/libpq/be-pqexec.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-pqexec.c,v 1.27 2000/01/1102:30:06 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-pqexec.c,v 1.28 2000/01/1103:33:12 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -80,8 +80,8 @@ PQfn(int fnid,
8080
*/
8181
retval= (char*)
8282
fmgr(fnid,arg[0],arg[1],arg[2],arg[3],
83-
arg[4],arg[5],arg[6],arg[7]);
84-
arg[8],arg[9],arg[10],arg[11]);
83+
arg[4],arg[5],arg[6],arg[7],
84+
arg[8],arg[9],arg[10],arg[11],
8585
arg[12],arg[13],arg[14],arg[15]);
8686

8787
/* ----------------

‎src/backend/optimizer/util/plancat.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/optimizer/util/plancat.c,v 1.41 2000/01/09 00:26:40 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/optimizer/util/plancat.c,v 1.42 2000/01/11 03:33:13 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -120,10 +120,8 @@ find_secondary_indexes(Query *root, Index relid)
120120

121121
for (i=0;i<INDEX_MAX_KEYS;i++)
122122
info->indexkeys[i]=index->indkey[i];
123-
info->indexkeys[INDEX_MAX_KEYS]=0;
124123
for (i=0;i<INDEX_MAX_KEYS;i++)
125124
info->classlist[i]=index->indclass[i];
126-
info->classlist[INDEX_MAX_KEYS]= (Oid)0;
127125

128126
/* Extract info from the relation descriptor for the index */
129127
indexRelation=index_open(index->indexrelid);

‎src/backend/tcop/fastpath.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/tcop/fastpath.c,v 1.34 2000/01/1102:46:48 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/tcop/fastpath.c,v 1.35 2000/01/1103:33:14 momjian Exp $
1111
*
1212
* NOTES
1313
* This cruft is the server side of PQfn.
@@ -363,8 +363,8 @@ HandleFunctionRequest()
363363
#ifndefNO_FASTPATH
364364
retval=fmgr(fid,
365365
arg[0],arg[1],arg[2],arg[3],
366-
arg[4],arg[5],arg[6],arg[7]);
367-
arg[8],arg[9],arg[10],arg[11]);
366+
arg[4],arg[5],arg[6],arg[7],
367+
arg[8],arg[9],arg[10],arg[11],
368368
arg[12],arg[13],arg[14],arg[15]);
369369

370370
#else

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp