Rename foreach_ macros to foreach_declared_ macros

src/backend/columnar/columnar_customscan.c

@@ -363,7 +363,7 @@ ColumnarGetRelationInfoHook(PlannerInfo *root, Oid relationObjectId,
 
 		/* disable index-only scan */
 		IndexOptInfo *indexOptInfo = NULL;
-		foreach_ptr(indexOptInfo, rel->indexlist)
+		foreach_declared_ptr(indexOptInfo, rel->indexlist)
 		{
 			memset(indexOptInfo->canreturn, false, indexOptInfo->ncolumns * sizeof(bool));
 		}
@@ -381,7 +381,7 @@ RemovePathsByPredicate(RelOptInfo *rel, PathPredicate removePathPredicate)
 	List *filteredPathList = NIL;
 
 	Path *path = NULL;
-	foreach_ptr(path, rel->pathlist)
+	foreach_declared_ptr(path, rel->pathlist)
 	{
 		if (!removePathPredicate(path))
 		{
@@ -428,7 +428,7 @@ static void
 CostColumnarPaths(PlannerInfo *root, RelOptInfo *rel, Oid relationId)
 {
 	Path *path = NULL;
-	foreach_ptr(path, rel->pathlist)
+	foreach_declared_ptr(path, rel->pathlist)
 	{
 		if (IsA(path, IndexPath))
 		{
@@ -783,7 +783,7 @@ ExtractPushdownClause(PlannerInfo *root, RelOptInfo *rel, Node *node)
 		List *pushdownableArgs = NIL;
 
 		Node *boolExprArg = NULL;
-		foreach_ptr(boolExprArg, boolExpr->args)
+		foreach_declared_ptr(boolExprArg, boolExpr->args)
 		{
 			Expr *pushdownableArg = ExtractPushdownClause(root, rel,
 														  (Node *) boolExprArg);
@@ -1550,7 +1550,7 @@ ColumnarPerStripeScanCost(RelOptInfo *rel, Oid relationId, int numberOfColumnsRe
 	uint32 maxColumnCount = 0;
 	uint64 totalStripeSize = 0;
 	StripeMetadata *stripeMetadata = NULL;
-	foreach_ptr(stripeMetadata, stripeList)
+	foreach_declared_ptr(stripeMetadata, stripeList)
 	{
 		totalStripeSize += stripeMetadata->dataLength;
 		maxColumnCount = Max(maxColumnCount, stripeMetadata->columnCount);

src/backend/columnar/columnar_metadata.c

@@ -2042,7 +2042,7 @@
 	List *stripeMetadataList = ReadDataFileStripeList(storageId,
 													  GetTransactionSnapshot());
 	StripeMetadata *stripeMetadata = NULL;
-	foreach_ptr(stripeMetadata, stripeMetadataList)
+	foreach_declared_ptr(stripeMetadata, stripeMetadataList)
 	{
 		highestRowNumber = Max(highestRowNumber,
 							   StripeGetHighestRowNumber(stripeMetadata));

src/backend/columnar/columnar_reader.c

@@ -880,7 +880,7 @@ ReadChunkGroupNextRow(ChunkGroupReadState *chunkGroupReadState, Datum *columnVal
 	memset(columnNulls, true, sizeof(bool) * chunkGroupReadState->columnCount);
 
 	int attno;
-	foreach_int(attno, chunkGroupReadState->projectedColumnList)
+	foreach_declared_int(attno, chunkGroupReadState->projectedColumnList)
 	{
 		const ChunkData *chunkGroupData = chunkGroupReadState->chunkGroupData;
 		const int rowIndex = chunkGroupReadState->currentRow;
@@ -1489,7 +1489,7 @@ ProjectedColumnMask(uint32 columnCount, List *projectedColumnList)
 	bool *projectedColumnMask = palloc0(columnCount * sizeof(bool));
 	int attno;
 
-	foreach_int(attno, projectedColumnList)
+	foreach_declared_int(attno, projectedColumnList)
 	{
 		/* attno is 1-indexed; projectedColumnMask is 0-indexed */
 		int columnIndex = attno - 1;

src/backend/columnar/columnar_tableam.c

@@ -3083,7 +3083,7 @@
 GetExtensionOption(List *extensionOptions, const char *defname)
 {
 	DefElem *defElement = NULL;
-	foreach_ptr(defElement, extensionOptions)
+	foreach_declared_ptr(defElement, extensionOptions)
 	{
 		if (IsA(defElement, DefElem) &&
 			strncmp(defElement->defname, defname, NAMEDATALEN) == 0)

src/backend/distributed/clock/causal_clock.c

@@ -328,7 +328,7 @@ GetHighestClockInTransaction(List *nodeConnectionList)
 {
 	MultiConnection *connection = NULL;
 
-	foreach_ptr(connection, nodeConnectionList)
+	foreach_declared_ptr(connection, nodeConnectionList)
 	{
 		int querySent =
 			SendRemoteCommand(connection, "SELECT citus_get_node_clock();");
@@ -349,7 +349,7 @@ GetHighestClockInTransaction(List *nodeConnectionList)
 							globalClockValue->counter)));
 
 	/* fetch the results and pick the highest clock value of all the nodes */
-	foreach_ptr(connection, nodeConnectionList)
+	foreach_declared_ptr(connection, nodeConnectionList)
 	{
 		bool raiseInterrupts = true;
 

src/backend/distributed/commands/alter_table.c

@@ -417,7 +417,7 @@ UndistributeTables(List *relationIdList)
 	 */
 	List *originalForeignKeyRecreationCommands = NIL;
 	Oid relationId = InvalidOid;
-	foreach_oid(relationId, relationIdList)
+	foreach_declared_oid(relationId, relationIdList)
 	{
 		List *fkeyCommandsForRelation =
 			GetFKeyCreationCommandsRelationInvolvedWithTableType(relationId,
@@ -803,7 +803,7 @@ ConvertTableInternal(TableConversionState *con)
 		List *partitionList = PartitionList(con->relationId);
 
 		Oid partitionRelationId = InvalidOid;
-		foreach_oid(partitionRelationId, partitionList)
+		foreach_declared_oid(partitionRelationId, partitionList)
 		{
 			char *tableQualifiedName = generate_qualified_relation_name(
 				partitionRelationId);
@@ -876,7 +876,7 @@ ConvertTableInternal(TableConversionState *con)
 	}
 
 	TableDDLCommand *tableCreationCommand = NULL;
-	foreach_ptr(tableCreationCommand, preLoadCommands)
+	foreach_declared_ptr(tableCreationCommand, preLoadCommands)
 	{
 		Assert(CitusIsA(tableCreationCommand, TableDDLCommand));
 
@@ -950,7 +950,7 @@ ConvertTableInternal(TableConversionState *con)
 				 con->suppressNoticeMessages);
 
 	TableDDLCommand *tableConstructionCommand = NULL;
-	foreach_ptr(tableConstructionCommand, postLoadCommands)
+	foreach_declared_ptr(tableConstructionCommand, postLoadCommands)
 	{
 		Assert(CitusIsA(tableConstructionCommand, TableDDLCommand));
 		char *tableConstructionSQL = GetTableDDLCommand(tableConstructionCommand);
@@ -968,7 +968,7 @@ ConvertTableInternal(TableConversionState *con)
 	MemoryContext oldContext = MemoryContextSwitchTo(citusPerPartitionContext);
 
 	char *attachPartitionCommand = NULL;
-	foreach_ptr(attachPartitionCommand, attachPartitionCommands)
+	foreach_declared_ptr(attachPartitionCommand, attachPartitionCommands)
 	{
 		MemoryContextReset(citusPerPartitionContext);
 
@@ -993,7 +993,7 @@ ConvertTableInternal(TableConversionState *con)
 
 		/* For now we only support cascade to colocation for alter_distributed_table UDF */
 		Assert(con->conversionType == ALTER_DISTRIBUTED_TABLE);
-		foreach_oid(colocatedTableId, con->colocatedTableList)
+		foreach_declared_oid(colocatedTableId, con->colocatedTableList)
 		{
 			if (colocatedTableId == con->relationId)
 			{
@@ -1023,7 +1023,7 @@ ConvertTableInternal(TableConversionState *con)
 		if (con->cascadeToColocated != CASCADE_TO_COLOCATED_NO_ALREADY_CASCADED)
 		{
 			char *foreignKeyCommand = NULL;
-			foreach_ptr(foreignKeyCommand, foreignKeyCommands)
+			foreach_declared_ptr(foreignKeyCommand, foreignKeyCommands)
 			{
 				ExecuteQueryViaSPI(foreignKeyCommand, SPI_OK_UTILITY);
 			}
@@ -1059,7 +1059,7 @@ CopyTableConversionReturnIntoCurrentContext(TableConversionReturn *tableConversi
 		tableConversionReturnCopy = palloc0(sizeof(TableConversionReturn));
 		List *copyForeignKeyCommands = NIL;
 		char *foreignKeyCommand = NULL;
-		foreach_ptr(foreignKeyCommand, tableConversionReturn->foreignKeyCommands)
+		foreach_declared_ptr(foreignKeyCommand, tableConversionReturn->foreignKeyCommands)
 		{
 			char *copyForeignKeyCommand = MemoryContextStrdup(CurrentMemoryContext,
 															  foreignKeyCommand);
@@ -1134,7 +1134,7 @@ DropIndexesNotSupportedByColumnar(Oid relationId, bool suppressNoticeMessages)
 	RelationClose(columnarRelation);
 
 	Oid indexId = InvalidOid;
-	foreach_oid(indexId, indexIdList)
+	foreach_declared_oid(indexId, indexIdList)
 	{
 		char *indexAmName = GetIndexAccessMethodName(indexId);
 		if (extern_ColumnarSupportsIndexAM(indexAmName))
@@ -1394,7 +1394,7 @@ CreateTableConversion(TableConversionParameters *params)
 		 * since they will be handled separately.
 		 */
 		Oid colocatedTableId = InvalidOid;
-		foreach_oid(colocatedTableId, colocatedTableList)
+		foreach_declared_oid(colocatedTableId, colocatedTableList)
 		{
 			if (PartitionTable(colocatedTableId))
 			{
@@ -1610,7 +1610,7 @@ DoesCascadeDropUnsupportedObject(Oid classId, Oid objectId, HTAB *nodeMap)
 																	 targetObjectId);
 
 	HeapTuple depTup = NULL;
-	foreach_ptr(depTup, dependencyTupleList)
+	foreach_declared_ptr(depTup, dependencyTupleList)
 	{
 		Form_pg_depend pg_depend = (Form_pg_depend) GETSTRUCT(depTup);
 
@@ -1650,7 +1650,7 @@ GetViewCreationCommandsOfTable(Oid relationId)
 	List *commands = NIL;
 
 	Oid viewOid = InvalidOid;
-	foreach_oid(viewOid, views)
+	foreach_declared_oid(viewOid, views)
 	{
 		StringInfo query = makeStringInfo();
 
@@ -1688,7 +1688,7 @@ WrapTableDDLCommands(List *commandStrings)
 	List *tableDDLCommands = NIL;
 
 	char *command = NULL;
-	foreach_ptr(command, commandStrings)
+	foreach_declared_ptr(command, commandStrings)
 	{
 		tableDDLCommands = lappend(tableDDLCommands, makeTableDDLCommandString(command));
 	}
@@ -1851,7 +1851,7 @@ ReplaceTable(Oid sourceId, Oid targetId, List *justBeforeDropCommands,
 	 */
 	List *ownedSequences = getOwnedSequences_internal(sourceId, 0, DEPENDENCY_AUTO);
 	Oid sequenceOid = InvalidOid;
-	foreach_oid(sequenceOid, ownedSequences)
+	foreach_declared_oid(sequenceOid, ownedSequences)
 	{
 		changeDependencyFor(RelationRelationId, sequenceOid,
 							RelationRelationId, sourceId, targetId);
@@ -1887,7 +1887,7 @@ ReplaceTable(Oid sourceId, Oid targetId, List *justBeforeDropCommands,
 	}
 
 	char *justBeforeDropCommand = NULL;
-	foreach_ptr(justBeforeDropCommand, justBeforeDropCommands)
+	foreach_declared_ptr(justBeforeDropCommand, justBeforeDropCommands)
 	{
 		ExecuteQueryViaSPI(justBeforeDropCommand, SPI_OK_UTILITY);
 	}
@@ -2003,7 +2003,7 @@ CheckAlterDistributedTableConversionParameters(TableConversionState *con)
 		Oid colocatedTableOid = InvalidOid;
 		text *colocateWithText = cstring_to_text(con->colocateWith);
 		Oid colocateWithTableOid = ResolveRelationId(colocateWithText, false);
-		foreach_oid(colocatedTableOid, con->colocatedTableList)
+		foreach_declared_oid(colocatedTableOid, con->colocatedTableList)
 		{
 			if (colocateWithTableOid == colocatedTableOid)
 			{
@@ -2235,7 +2235,7 @@ WillRecreateForeignKeyToReferenceTable(Oid relationId,
 	{
 		List *colocatedTableList = ColocatedTableList(relationId);
 		Oid colocatedTableOid = InvalidOid;
-		foreach_oid(colocatedTableOid, colocatedTableList)
+		foreach_declared_oid(colocatedTableOid, colocatedTableList)
 		{
 			if (HasForeignKeyToReferenceTable(colocatedTableOid))
 			{
@@ -2263,7 +2263,7 @@ WarningsForDroppingForeignKeysWithDistributedTables(Oid relationId)
 	List *foreignKeys = list_concat(referencingForeingKeys, referencedForeignKeys);
 
 	Oid foreignKeyOid = InvalidOid;
-	foreach_oid(foreignKeyOid, foreignKeys)
+	foreach_declared_oid(foreignKeyOid, foreignKeys)
 	{
 		ereport(WARNING, (errmsg("foreign key %s will be dropped",
 								 get_constraint_name(foreignKeyOid))));

src/backend/distributed/commands/begin.c

@@ -33,7 +33,7 @@ SaveBeginCommandProperties(TransactionStmt *transactionStmt)
 	 *
 	 * While BEGIN can be quite frequent it will rarely have options set.
 	 */
-	foreach_ptr(item, transactionStmt->options)
+	foreach_declared_ptr(item, transactionStmt->options)
 	{
 		A_Const *constant = (A_Const *) item->arg;
 

src/backend/distributed/commands/cascade_table_operation_for_connected_relations.c

@@ -168,7 +168,7 @@ GetPartitionRelationIds(List *relationIdList)
 	List *partitionRelationIdList = NIL;
 
 	Oid relationId = InvalidOid;
-	foreach_oid(relationId, relationIdList)
+	foreach_declared_oid(relationId, relationIdList)
 	{
 		if (PartitionTable(relationId))
 		{
@@ -189,7 +189,7 @@ LockRelationsWithLockMode(List *relationIdList, LOCKMODE lockMode)
 {
 	Oid relationId;
 	relationIdList = SortList(relationIdList, CompareOids);
-	foreach_oid(relationId, relationIdList)
+	foreach_declared_oid(relationId, relationIdList)
 	{
 		LockRelationOid(relationId, lockMode);
 	}
@@ -207,7 +207,7 @@ static void
 ErrorIfConvertingMultiLevelPartitionedTable(List *relationIdList)
 {
 	Oid relationId;
-	foreach_oid(relationId, relationIdList)
+	foreach_declared_oid(relationId, relationIdList)
 	{
 		if (PartitionedTable(relationId) && PartitionTable(relationId))
 		{
@@ -236,7 +236,7 @@ void
 ErrorIfAnyPartitionRelationInvolvedInNonInheritedFKey(List *relationIdList)
 {
 	Oid relationId = InvalidOid;
-	foreach_oid(relationId, relationIdList)
+	foreach_declared_oid(relationId, relationIdList)
 	{
 		if (!PartitionTable(relationId))
 		{
@@ -300,7 +300,7 @@ bool
 RelationIdListHasReferenceTable(List *relationIdList)
 {
 	Oid relationId = InvalidOid;
-	foreach_oid(relationId, relationIdList)
+	foreach_declared_oid(relationId, relationIdList)
 	{
 		if (IsCitusTableType(relationId, REFERENCE_TABLE))
 		{
@@ -322,7 +322,7 @@ GetFKeyCreationCommandsForRelationIdList(List *relationIdList)
 	List *fKeyCreationCommands = NIL;
 
 	Oid relationId = InvalidOid;
-	foreach_oid(relationId, relationIdList)
+	foreach_declared_oid(relationId, relationIdList)
 	{
 		List *relationFKeyCreationCommands =
 			GetReferencingForeignConstaintCommands(relationId);
@@ -342,7 +342,7 @@ static void
 DropRelationIdListForeignKeys(List *relationIdList, int fKeyFlags)
 {
 	Oid relationId = InvalidOid;
-	foreach_oid(relationId, relationIdList)
+	foreach_declared_oid(relationId, relationIdList)
 	{
 		DropRelationForeignKeys(relationId, fKeyFlags);
 	}
@@ -399,7 +399,7 @@ GetRelationDropFkeyCommands(Oid relationId, int fKeyFlags)
 	List *relationFKeyIdList = GetForeignKeyOids(relationId, fKeyFlags);
 
 	Oid foreignKeyId;
-	foreach_oid(foreignKeyId, relationFKeyIdList)
+	foreach_declared_oid(foreignKeyId, relationFKeyIdList)
 	{
 		char *dropFkeyCascadeCommand = GetDropFkeyCascadeCommand(foreignKeyId);
 		dropFkeyCascadeCommandList = lappend(dropFkeyCascadeCommandList,
@@ -450,7 +450,7 @@ ExecuteCascadeOperationForRelationIdList(List *relationIdList,
 										 cascadeOperationType)
 {
 	Oid relationId = InvalidOid;
-	foreach_oid(relationId, relationIdList)
+	foreach_declared_oid(relationId, relationIdList)
 	{
 		/*
 		 * The reason behind skipping certain table types in below loop is
@@ -531,7 +531,7 @@ ExecuteAndLogUtilityCommandListInTableTypeConversionViaSPI(List *utilityCommandL
 	PG_TRY();
 	{
 		char *utilityCommand = NULL;
-		foreach_ptr(utilityCommand, utilityCommandList)
+		foreach_declared_ptr(utilityCommand, utilityCommandList)
 		{
 			/*
 			 * CREATE MATERIALIZED VIEW commands need to be parsed/transformed,
@@ -569,7 +569,7 @@ void
 ExecuteAndLogUtilityCommandList(List *utilityCommandList)
 {
 	char *utilityCommand = NULL;
-	foreach_ptr(utilityCommand, utilityCommandList)
+	foreach_declared_ptr(utilityCommand, utilityCommandList)
 	{
 		ExecuteAndLogUtilityCommand(utilityCommand);
 	}
@@ -597,7 +597,7 @@ void
 ExecuteForeignKeyCreateCommandList(List *ddlCommandList, bool skip_validation)
 {
 	char *ddlCommand = NULL;
-	foreach_ptr(ddlCommand, ddlCommandList)
+	foreach_declared_ptr(ddlCommand, ddlCommandList)
 	{
 		ExecuteForeignKeyCreateCommand(ddlCommand, skip_validation);
 	}