Commit6d85003

committed

Update crypto with patch for computation.

1 parent6099009 commit6d85003Copy full SHA for 6d85003

File tree

+18

-11

lines changed

+18

-11

lines changed

Lines changed: 10 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`*`
`7`	`7`	`*`
`8`	`8`	`* IDENTIFICATION`
`9`		`- * $Header: /cvsroot/pgsql/src/backend/access/gist/gist.c,v 1.72 2001/03/22 03:59:12 momjian Exp $`
	`9`	`+ * $Header: /cvsroot/pgsql/src/backend/access/gist/gist.c,v 1.72.2.1 2001/05/15 17:05:28 momjian Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -1199,13 +1199,17 @@ gistdentryinit(GISTSTATE giststate, GISTENTRY e, char *pr, Relation r,`
`1199`	`1199`	`gistentryinit(*e,pr,r,pg,o,b,l);`
`1200`	`1200`	`if (giststate->haskeytype)`
`1201`	`1201`	`{`
`1202`		`-dep= (GISTENTRY*)`
`1203`		`-DatumGetPointer(FunctionCall1(&giststate->decompressFn,`
	`1202`	`+if (b ) {`
	`1203`	`+dep= (GISTENTRY*)`
	`1204`	`+DatumGetPointer(FunctionCall1(&giststate->decompressFn,`
`1204`	`1205`	`PointerGetDatum(e)));`
`1205`		`-gistentryinit(*e,dep->pred,dep->rel,dep->page,dep->offset,dep->bytes,`
	`1206`	`+gistentryinit(*e,dep->pred,dep->rel,dep->page,dep->offset,dep->bytes,`
`1206`	`1207`	`dep->leafkey);`
`1207`		`-if (dep!=e)`
`1208`		`-pfree(dep);`
	`1208`	`+if (dep!=e)`
	`1209`	`+pfree(dep);`
	`1210`	`+}else {`
	`1211`	`+gistentryinit(e, (char)NULL,r,pg,o,0,l);`
	`1212`	`+}`
`1209`	`1213`	`}`
`1210`	`1214`	`}`
`1211`	`1215`

Lines changed: 8 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -241,16 +241,16 @@ gistindex_keytest(IndexTuple tuple,`
`241`	`241`	`1,`
`242`	`242`	`tupdesc,`
`243`	`243`	`&isNull);`
`244`		`-gistdentryinit(giststate,&de, (char*)datum,r,p,offset,`
`245`		`-IndexTupleSize(tuple)-sizeof(IndexTupleData),`
`246`		`- FALSE);`
`247`		`-`
`248`		`-if (isNull)`
	`244`	`+if (isNull\|\|IndexTupleSize(tuple)==sizeof(IndexTupleData) )`
`249`	`245`	`{`
`250`	`246`	`/* XXX eventually should check if SK_ISNULL */`
`251`	`247`	`return false;`
`252`	`248`	`}`
`253`	`249`
	`250`	`+gistdentryinit(giststate,&de, (char*)datum,r,p,offset,`
	`251`	`+IndexTupleSize(tuple)-sizeof(IndexTupleData),`
	`252`	`+ FALSE);`
	`253`	`+`
`254`	`254`	`if (key[0].sk_flags&SK_COMMUTE)`
`255`	`255`	`{`
`256`	`256`	`test=FunctionCall3(&key[0].sk_func,`
`@@ -266,6 +266,9 @@ gistindex_keytest(IndexTuple tuple,`
`266`	`266`	`ObjectIdGetDatum(key[0].sk_procedure));`
`267`	`267`	`}`
`268`	`268`
	`269`	`+if ( (char)de.pred!= (char)datum )`
	`270`	`+if (de.pred )pfree(de.pred );`
	`271`	`+`
`269`	`272`	`if (DatumGetBool(test)== !!(key[0].sk_flags&SK_NEGATE))`
`270`	`273`	`return false;`
`271`	`274`

Comments

(0)