Merge pull request #3 from Octonica/crossmatch_cnode

Alexander Korotkov · web-flow · commit fdaba2b4057e · 2017-04-25T15:50:26.000+03:00
remove small allocation from crossmatch()
diff --git a/crossmatch.c b/crossmatch.c
@@ -878,14 +878,12 @@ crossmatch(CrossmatchContext *ctx, ItemPointer values)
 	/* Return next result pair if any. Otherwise close SRF. */
 	if (ctx->resultsPairs != NIL)
 	{
-		ResultPair *itemPointerPair = (ResultPair *) palloc(sizeof(ResultPair));
-
-		*itemPointerPair = *((ResultPair *) linitial(ctx->resultsPairs));
+		ResultPair itemPointerPair = *((ResultPair *) linitial(ctx->resultsPairs));
 		pfree(linitial(ctx->resultsPairs));
 		ctx->resultsPairs = list_delete_first(ctx->resultsPairs);
 
-		values[0] = itemPointerPair->iptr1;
-		values[1] = itemPointerPair->iptr2;
+		values[0] = itemPointerPair.iptr1;
+		values[1] = itemPointerPair.iptr2;
 	}
 	else
 	{

Original file line number	Diff line number	Diff line change
`@@ -878,14 +878,12 @@ crossmatch(CrossmatchContext *ctx, ItemPointer values)`
`878`	`878`	`/* Return next result pair if any. Otherwise close SRF. */`
`879`	`879`	`if (ctx->resultsPairs != NIL)`
`880`	`880`	`{`
`881`		`- ResultPair itemPointerPair = (ResultPair ) palloc(sizeof(ResultPair));`
`882`		`-`
`883`		`- itemPointerPair = ((ResultPair *) linitial(ctx->resultsPairs));`
	`881`	`+ ResultPair itemPointerPair = ((ResultPair ) linitial(ctx->resultsPairs));`
`884`	`882`	`pfree(linitial(ctx->resultsPairs));`
`885`	`883`	`ctx->resultsPairs = list_delete_first(ctx->resultsPairs);`
`886`	`884`
`887`		`- values[0] = itemPointerPair->iptr1;`
`888`		`- values[1] = itemPointerPair->iptr2;`
	`885`	`+ values[0] = itemPointerPair.iptr1;`
	`886`	`+ values[1] = itemPointerPair.iptr2;`
`889`	`887`	`}`
`890`	`888`	`else`
`891`	`889`	`{`