From f4e031c662a6b600b786c4849968a099c58fcce7 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Fri, 28 Nov 2014 13:37:25 -0500 Subject: Add bms_next_member(), and use it where appropriate. This patch adds a way of iterating through the members of a bitmapset nondestructively, unlike the old way with bms_first_member(). While bms_next_member() is very slightly slower than bms_first_member() (at least for typical-size bitmapsets), eliminating the need to palloc and pfree a temporary copy of the target bitmapset is a significant win. So this method should be preferred in all cases where a temporary copy would be necessary. Tom Lane, with suggestions from Dean Rasheed and David Rowley --- src/backend/rewrite/rewriteHandler.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/backend/rewrite/rewriteHandler.c') diff --git a/src/backend/rewrite/rewriteHandler.c b/src/backend/rewrite/rewriteHandler.c index ad983c7158b..2ed64279f07 100644 --- a/src/backend/rewrite/rewriteHandler.c +++ b/src/backend/rewrite/rewriteHandler.c @@ -2456,11 +2456,10 @@ static Bitmapset * adjust_view_column_set(Bitmapset *cols, List *targetlist) { Bitmapset *result = NULL; - Bitmapset *tmpcols; - AttrNumber col; + int col; - tmpcols = bms_copy(cols); - while ((col = bms_first_member(tmpcols)) >= 0) + col = -1; + while ((col = bms_next_member(cols, col)) >= 0) { /* bit numbers are offset by FirstLowInvalidHeapAttributeNumber */ AttrNumber attno = col + FirstLowInvalidHeapAttributeNumber; @@ -2510,7 +2509,6 @@ adjust_view_column_set(Bitmapset *cols, List *targetlist) attno); } } - bms_free(tmpcols); return result; } -- cgit v1.2.3