Repair logic error for multi-key indexes. From Oleg Bartunov.

tglsfdc · tglsfdc · commit fb2c3289ff1b · 2001-06-28T16:00:07.000Z
diff --git a/src/backend/access/gist/gistscan.c b/src/backend/access/gist/gistscan.c
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/gist/gistscan.c,v 1.36 2001/06/09 18:16:55 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/gist/gistscan.c,v 1.37 2001/06/28 16:00:07 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -117,7 +117,7 @@ gistrescan(PG_FUNCTION_ARGS)
 			s->keyData[i].sk_procedure
 				= RelationGetGISTStrategy(s->relation, s->keyData[i].sk_attno,
 										  s->keyData[i].sk_procedure);
-			s->keyData[i].sk_func = p->giststate->consistentFn[i];
+			s->keyData[i].sk_func = p->giststate->consistentFn[s->keyData[i].sk_attno-1];
 		}
 	}
 	else
@@ -148,7 +148,7 @@ gistrescan(PG_FUNCTION_ARGS)
 				s->keyData[i].sk_procedure
 					= RelationGetGISTStrategy(s->relation, s->keyData[i].sk_attno,
 											  s->keyData[i].sk_procedure);
-				s->keyData[i].sk_func = p->giststate->consistentFn[i];
+				s->keyData[i].sk_func = p->giststate->consistentFn[s->keyData[i].sk_attno-1];
 			}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`* Portions Copyright (c) 1994, Regents of the University of California`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/access/gist/gistscan.c,v 1.36 2001/06/09 18:16:55 tgl Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/access/gist/gistscan.c,v 1.37 2001/06/28 16:00:07 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -117,7 +117,7 @@ gistrescan(PG_FUNCTION_ARGS)`
`117`	`117`	`s->keyData[i].sk_procedure`
`118`	`118`	`= RelationGetGISTStrategy(s->relation, s->keyData[i].sk_attno,`
`119`	`119`	`s->keyData[i].sk_procedure);`
`120`		`- s->keyData[i].sk_func = p->giststate->consistentFn[i];`
	`120`	`+ s->keyData[i].sk_func = p->giststate->consistentFn[s->keyData[i].sk_attno-1];`
`121`	`121`	`}`
`122`	`122`	`}`
`123`	`123`	`else`
`@@ -148,7 +148,7 @@ gistrescan(PG_FUNCTION_ARGS)`
`148`	`148`	`s->keyData[i].sk_procedure`
`149`	`149`	`= RelationGetGISTStrategy(s->relation, s->keyData[i].sk_attno,`
`150`	`150`	`s->keyData[i].sk_procedure);`
`151`		`- s->keyData[i].sk_func = p->giststate->consistentFn[i];`
	`151`	`+ s->keyData[i].sk_func = p->giststate->consistentFn[s->keyData[i].sk_attno-1];`
`152`	`152`	`}`
`153`	`153`	`}`
`154`	`154`