Fix contrib/bloom to not fail under CLOBBER_CACHE_ALWAYS.

tglsfdc · tglsfdc · commit 8f75fd1f402a · 2016-04-03T15:16:07.000-04:00
The code was supposing that rd_amcache wouldn't disappear from under it
during a scan; which is wrong.  Copy the data out of the relcache rather
than trying to reference it there.
diff --git a/contrib/bloom/bloom.h b/contrib/bloom/bloom.h
@@ -110,12 +110,11 @@ typedef struct BloomMetaPageData
 typedef struct BloomState
 {
 	FmgrInfo	hashFn[INDEX_MAX_KEYS];
-	BloomOptions *opts;			/* stored in rd_amcache and defined at
-								 * creation time */
+	BloomOptions opts;			/* copy of options on index's metapage */
 	int32		nColumns;
 
 	/*
-	 * sizeOfBloomTuple is index's specific, and it depends on reloptions, so
+	 * sizeOfBloomTuple is index-specific, and it depends on reloptions, so
 	 * precompute it
 	 */
 	Size		sizeOfBloomTuple;
diff --git a/contrib/bloom/blscan.c b/contrib/bloom/blscan.c
@@ -99,7 +99,7 @@ blgetbitmap(IndexScanDesc scan, TIDBitmap *tbm)
 		/* New search: have to calculate search signature */
 		ScanKey		skey = scan->keyData;
 
-		so->sign = palloc0(sizeof(SignType) * so->state.opts->bloomLength);
+		so->sign = palloc0(sizeof(SignType) * so->state.opts.bloomLength);
 
 		for (i = 0; i < scan->numberOfKeys; i++)
 		{
@@ -151,7 +151,7 @@ blgetbitmap(IndexScanDesc scan, TIDBitmap *tbm)
 				bool		res = true;
 
 				/* Check index signature with scan signature */
-				for (i = 0; i < so->state.opts->bloomLength; i++)
+				for (i = 0; i < so->state.opts.bloomLength; i++)
 				{
 					if ((itup->sign[i] & so->sign[i]) != so->sign[i])
 					{
diff --git a/contrib/bloom/blutils.c b/contrib/bloom/blutils.c
@@ -155,9 +155,9 @@ initBloomState(BloomState *state, Relation index)
 		index->rd_amcache = (void *) opts;
 	}
 
-	state->opts = (BloomOptions *) index->rd_amcache;
+	memcpy(&state->opts, index->rd_amcache, sizeof(state->opts));
 	state->sizeOfBloomTuple = BLOOMTUPLEHDRSZ +
-		sizeof(SignType) * state->opts->bloomLength;
+		sizeof(SignType) * state->opts.bloomLength;
 }
 
 /*
@@ -228,10 +228,10 @@ signValue(BloomState *state, SignType *sign, Datum value, int attno)
 	hashVal = DatumGetInt32(FunctionCall1(&state->hashFn[attno], value));
 	mySrand(hashVal ^ myRand());
 
-	for (j = 0; j < state->opts->bitSize[attno]; j++)
+	for (j = 0; j < state->opts.bitSize[attno]; j++)
 	{
 		/* prevent mutiple evaluation */
-		nBit = myRand() % (state->opts->bloomLength * BITSIGNTYPE);
+		nBit = myRand() % (state->opts.bloomLength * BITSIGNTYPE);
 		SETBIT(sign, nBit);
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ blgetbitmap(IndexScanDesc scan, TIDBitmap *tbm)`
`99`	`99`	`/* New search: have to calculate search signature */`
`100`	`100`	`ScanKey skey = scan->keyData;`
`101`	`101`
`102`		`- so->sign = palloc0(sizeof(SignType) * so->state.opts->bloomLength);`
	`102`	`+ so->sign = palloc0(sizeof(SignType) * so->state.opts.bloomLength);`
`103`	`103`
`104`	`104`	`for (i = 0; i < scan->numberOfKeys; i++)`
`105`	`105`	`{`
`@@ -151,7 +151,7 @@ blgetbitmap(IndexScanDesc scan, TIDBitmap *tbm)`
`151`	`151`	`bool res = true;`
`152`	`152`
`153`	`153`	`/* Check index signature with scan signature */`
`154`		`- for (i = 0; i < so->state.opts->bloomLength; i++)`
	`154`	`+ for (i = 0; i < so->state.opts.bloomLength; i++)`
`155`	`155`	`{`
`156`	`156`	`if ((itup->sign[i] & so->sign[i]) != so->sign[i])`
`157`	`157`	`{`
Original file line number	Diff line number	Diff line change
`@@ -155,9 +155,9 @@ initBloomState(BloomState *state, Relation index)`
`155`	`155`	`index->rd_amcache = (void *) opts;`
`156`	`156`	`}`
`157`	`157`
`158`		`- state->opts = (BloomOptions *) index->rd_amcache;`
	`158`	`+ memcpy(&state->opts, index->rd_amcache, sizeof(state->opts));`
`159`	`159`	`state->sizeOfBloomTuple = BLOOMTUPLEHDRSZ +`
`160`		`- sizeof(SignType) * state->opts->bloomLength;`
	`160`	`+ sizeof(SignType) * state->opts.bloomLength;`
`161`	`161`	`}`
`162`	`162`
`163`	`163`	`/*`
`@@ -228,10 +228,10 @@ signValue(BloomState state, SignType sign, Datum value, int attno)`
`228`	`228`	`hashVal = DatumGetInt32(FunctionCall1(&state->hashFn[attno], value));`
`229`	`229`	`mySrand(hashVal ^ myRand());`
`230`	`230`
`231`		`- for (j = 0; j < state->opts->bitSize[attno]; j++)`
	`231`	`+ for (j = 0; j < state->opts.bitSize[attno]; j++)`
`232`	`232`	`{`
`233`	`233`	`/* prevent mutiple evaluation */`
`234`		`- nBit = myRand() % (state->opts->bloomLength * BITSIGNTYPE);`
	`234`	`+ nBit = myRand() % (state->opts.bloomLength * BITSIGNTYPE);`
`235`	`235`	`SETBIT(sign, nBit);`
`236`	`236`	`}`
`237`	`237`	`}`