Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PG16-PG17: rename macros foreach_... to foreach_decl_... #276

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+23 −23
Open

PG16-PG17: rename macros foreach_... to foreach_decl_... #276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e55ee9
PG17: rename foreach... to foreach_..._ptr
ivan-v-kush Jan 15, 2025
f81067b
Update configure
ivan-v-kush Jan 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions columnar/src/backend/columnar/columnar_customscan.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@ ColumnarGetRelationInfoHook(PlannerInfo *root, Oid relationObjectId,

/* disable index-only scan */
IndexOptInfo *indexOptInfo = NULL;
foreach_ptr(indexOptInfo, rel->indexlist)
foreach_decl_ptr(indexOptInfo, rel->indexlist)
{
memset(indexOptInfo->canreturn, false, indexOptInfo->ncolumns * sizeof(bool));
}
Expand All @@ -426,7 +426,7 @@ RemovePathsByPredicate(RelOptInfo *rel, PathPredicate removePathPredicate)
List *filteredPartialPathList = NIL;

Path *path = NULL;
foreach_ptr(path, rel->pathlist)
foreach_decl_ptr(path, rel->pathlist)
{
if (!removePathPredicate(path))
{
Expand All @@ -436,7 +436,7 @@ RemovePathsByPredicate(RelOptInfo *rel, PathPredicate removePathPredicate)

rel->pathlist = filteredPathList;

foreach_ptr(path, rel->partial_pathlist)
foreach_decl_ptr(path, rel->partial_pathlist)
{
if (!removePathPredicate(path))
{
Expand Down Expand Up @@ -483,7 +483,7 @@ static void
CostColumnarPaths(PlannerInfo *root, RelOptInfo *rel, Oid relationId)
{
Path *path = NULL;
foreach_ptr(path, rel->pathlist)
foreach_decl_ptr(path, rel->pathlist)
{
if (IsA(path, IndexPath))
{
Expand Down Expand Up @@ -833,7 +833,7 @@ ExtractPushdownClause(PlannerInfo *root, RelOptInfo *rel, Node *node)
List *pushdownableArgs = NIL;

Node *boolExprArg = NULL;
foreach_ptr(boolExprArg, boolExpr->args)
foreach_decl_ptr(boolExprArg, boolExpr->args)
{
Expr *pushdownableArg = ExtractPushdownClause(root, rel,
(Node *) boolExprArg);
Expand Down Expand Up @@ -1656,7 +1656,7 @@ ColumnarPerStripeScanCost(RelOptInfo *rel, Oid relationId, int numberOfColumnsRe
uint32 maxColumnCount = 0;
uint64 totalStripeSize = 0;
StripeMetadata *stripeMetadata = NULL;
foreach_ptr(stripeMetadata, stripeList)
foreach_decl_ptr(stripeMetadata, stripeList)
{
totalStripeSize += stripeMetadata->dataLength;
maxColumnCount = Max(maxColumnCount, stripeMetadata->columnCount);
Expand Down Expand Up @@ -2443,7 +2443,7 @@ ColumnarScanNext(ColumnarScanState *columnarScanState)
{
VectorTupleTableSlot *vectorSlot = (VectorTupleTableSlot *) slot;
int attrIndex = -1;
foreach_int(attrIndex, columnarScanState->vectorization.attrNeededList)
foreach_decl_int(attrIndex, columnarScanState->vectorization.attrNeededList)
{
VectorColumn *column = (VectorColumn *) vectorSlot->tts.tts_values[attrIndex];
memset(column->isnull, true, COLUMNAR_VECTOR_COLUMN_SIZE);
Expand Down
2 changes: 1 addition & 1 deletion columnar/src/backend/columnar/columnar_metadata.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2603,7 +2603,7 @@ GetHighestUsedRowNumber(uint64 storageId)
GetTransactionSnapshot(),
ForwardScanDirection);
StripeMetadata *stripeMetadata = NULL;
foreach_ptr(stripeMetadata, stripeMetadataList)
foreach_decl_ptr(stripeMetadata, stripeMetadataList)
{
highestRowNumber = Max(highestRowNumber,
StripeGetHighestRowNumber(stripeMetadata));
Expand Down
6 changes: 3 additions & 3 deletions columnar/src/backend/columnar/columnar_reader.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1092,7 +1092,7 @@ ReadChunkGroupNextRow(ChunkGroupReadState *chunkGroupReadState, Datum *columnVal
}

int attno;
foreach_int(attno, chunkGroupReadState->projectedColumnList)
foreach_decl_int(attno, chunkGroupReadState->projectedColumnList)
{
const ChunkData *chunkGroupData = chunkGroupReadState->chunkGroupData;
const int rowIndex = chunkGroupReadState->currentRow;
Expand Down Expand Up @@ -1793,7 +1793,7 @@ ProjectedColumnMask(uint32 columnCount, List *projectedColumnList)
bool *projectedColumnMask = palloc0(columnCount * sizeof(bool));
int attno;

foreach_int(attno, projectedColumnList)
foreach_decl_int(attno, projectedColumnList)
{
/* attno is 1-indexed; projectedColumnMask is 0-indexed */
int columnIndex = attno - 1;
Expand Down Expand Up @@ -2222,7 +2222,7 @@ ReadChunkGroupNextVector(ChunkGroupReadState *chunkGroupReadState, Datum *column
}

int attno;
foreach_int(attno, chunkGroupReadState->projectedColumnList)
foreach_decl_int(attno, chunkGroupReadState->projectedColumnList)
{
const ChunkData *chunkGroupData = chunkGroupReadState->chunkGroupData;
const int rowIndex = chunkGroupReadState->currentRow;
Expand Down
2 changes: 1 addition & 1 deletion columnar/src/backend/columnar/vectorization/columnar_vector_types.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ ExtractTupleFromVectorSlot(TupleTableSlot *out, VectorTupleTableSlot *vectorSlot
int32 index, List *attrNeededList)
{
int attno;
foreach_int(attno, attrNeededList)
foreach_decl_int(attno, attrNeededList)
{
if (!out->tts_tupleDescriptor->attrs[attno].attisdropped)
{
Expand Down
22 changes: 11 additions & 11 deletions columnar/src/include/columnar/utils/listutils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ typedef struct ListCellAndListWrapper
} ListCellAndListWrapper;

/*
* foreach_ptr -
* foreach_decl_ptr -
* a convenience macro which loops through a pointer list without needing a
* ListCell, just a declared pointer variable to store the pointer of the
* cell in.
Expand All @@ -54,33 +54,33 @@ typedef struct ListCellAndListWrapper
* - || true is used to always enter the loop when cell is not null even if
* var is NULL.
*/
#define foreach_ptr(var, l) \
#define foreach_decl_ptr(var, l) \
for (ListCell *(var ## CellDoNotUse) = list_head(l); \
(var ## CellDoNotUse) != NULL && \
(((var) = lfirst(var ## CellDoNotUse)) || true); \
var ## CellDoNotUse = lnext_compat(l, var ## CellDoNotUse))


/*
* foreach_int -
* foreach_decl_int -
* a convenience macro which loops through an int list without needing a
* ListCell, just a declared int variable to store the int of the cell in.
* For explanation of how it works see foreach_ptr.
* For explanation of how it works see foreach_decl_ptr.
*/
#define foreach_int(var, l) \
#define foreach_decl_int(var, l) \
for (ListCell *(var ## CellDoNotUse) = list_head(l); \
(var ## CellDoNotUse) != NULL && \
(((var) = lfirst_int(var ## CellDoNotUse)) || true); \
var ## CellDoNotUse = lnext_compat(l, var ## CellDoNotUse))


/*
* foreach_oid -
* foreach_decl_oid -
* a convenience macro which loops through an oid list without needing a
* ListCell, just a declared Oid variable to store the oid of the cell in.
* For explanation of how it works see foreach_ptr.
* For explanation of how it works see foreach_decl_ptr.
*/
#define foreach_oid(var, l) \
#define foreach_decl_oid(var, l) \
for (ListCell *(var ## CellDoNotUse) = list_head(l); \
(var ## CellDoNotUse) != NULL && \
(((var) = lfirst_oid(var ## CellDoNotUse)) || true); \
Expand Down Expand Up @@ -140,7 +140,7 @@ typedef struct ListCellAndListWrapper
)

/*
* foreach_ptr_append -
* foreach_decl_ptr_append -
* a convenience macro which loops through a pointer List and can append list
* elements without needing a ListCell or and index variable, just a declared
* pointer variable to store the iterated values.
Expand All @@ -163,13 +163,13 @@ typedef struct ListCellAndListWrapper
* declared there.
* - || true is used to always enter the loop even if var is NULL.
*/
#define foreach_ptr_append(var, l) \
#define foreach_decl_ptr_append(var, l) \
for (int var ## PositionDoNotUse = 0; \
(var ## PositionDoNotUse) < list_length(l) && \
(((var) = list_nth(l, var ## PositionDoNotUse)) || true); \
var ## PositionDoNotUse ++)
#else
#define foreach_ptr_append(var, l) foreach_ptr(var, l)
#define foreach_decl_ptr_append(var, l) foreach_decl_ptr(var, l)
#endif

static inline List*
Expand Down