diff --git a/src/backend/distributed/commands/alter_table.c b/src/backend/distributed/commands/alter_table.c index fef1f41da..f0efe3c00 100644 --- a/src/backend/distributed/commands/alter_table.c +++ b/src/backend/distributed/commands/alter_table.c @@ -629,8 +629,8 @@ ConvertTable(TableConversionState *con) Node *parseTree = ParseTreeNode(tableCreationSql); RelayEventExtendNames(parseTree, con->schemaName, con->hashOfName); - CitusProcessUtility(parseTree, tableCreationSql, PROCESS_UTILITY_TOPLEVEL, - NULL, None_Receiver, NULL); + ProcessUtilityParseTree(parseTree, tableCreationSql, PROCESS_UTILITY_TOPLEVEL, + NULL, None_Receiver, NULL); } /* set columnar options */ @@ -682,8 +682,9 @@ ConvertTable(TableConversionState *con) { Node *parseTree = ParseTreeNode(attachPartitionCommand); - CitusProcessUtility(parseTree, attachPartitionCommand, PROCESS_UTILITY_TOPLEVEL, - NULL, None_Receiver, NULL); + ProcessUtilityParseTree(parseTree, attachPartitionCommand, + PROCESS_UTILITY_TOPLEVEL, + NULL, None_Receiver, NULL); } if (isPartitionTable) diff --git a/src/backend/distributed/commands/cascade_table_operation_for_connected_relations.c b/src/backend/distributed/commands/cascade_table_operation_for_connected_relations.c index 1afc4598d..5c91970b9 100644 --- a/src/backend/distributed/commands/cascade_table_operation_for_connected_relations.c +++ b/src/backend/distributed/commands/cascade_table_operation_for_connected_relations.c @@ -426,8 +426,8 @@ ExecuteAndLogDDLCommand(const char *commandString) ereport(DEBUG4, (errmsg("executing \"%s\"", commandString))); Node *parseTree = ParseTreeNode(commandString); - CitusProcessUtility(parseTree, commandString, PROCESS_UTILITY_TOPLEVEL, - NULL, None_Receiver, NULL); + ProcessUtilityParseTree(parseTree, commandString, PROCESS_UTILITY_TOPLEVEL, + NULL, None_Receiver, NULL); } @@ -478,6 +478,6 @@ ExecuteForeignKeyCreateCommand(const char *commandString, bool skip_validation) "command \"%s\"", commandString))); } - CitusProcessUtility(parseTree, commandString, PROCESS_UTILITY_TOPLEVEL, - NULL, None_Receiver, NULL); + ProcessUtilityParseTree(parseTree, commandString, PROCESS_UTILITY_TOPLEVEL, + NULL, None_Receiver, NULL); } diff --git a/src/backend/distributed/commands/utility_hook.c b/src/backend/distributed/commands/utility_hook.c index fd2527c73..2c4aab9c4 100644 --- a/src/backend/distributed/commands/utility_hook.c +++ b/src/backend/distributed/commands/utility_hook.c @@ -84,13 +84,14 @@ static bool IsDropSchemaOrDB(Node *parsetree); /* - * CitusProcessUtility is a convenience method to create a PlannedStmt out of pieces of a - * utility statement before invoking ProcessUtility. + * ProcessUtilityForParseTree is a convenience method to create a PlannedStmt out of + * pieces of a utility statement before invoking ProcessUtility. */ void -CitusProcessUtility(Node *node, const char *queryString, ProcessUtilityContext context, - ParamListInfo params, DestReceiver *dest, - QueryCompletionCompat *completionTag) +ProcessUtilityParseTree(Node *node, const char *queryString, ProcessUtilityContext + context, + ParamListInfo params, DestReceiver *dest, + QueryCompletionCompat *completionTag) { PlannedStmt *plannedStmt = makeNode(PlannedStmt); plannedStmt->commandType = CMD_UTILITY; diff --git a/src/backend/distributed/executor/local_executor.c b/src/backend/distributed/executor/local_executor.c index 767dc7f27..ca12d8c4e 100644 --- a/src/backend/distributed/executor/local_executor.c +++ b/src/backend/distributed/executor/local_executor.c @@ -409,8 +409,9 @@ LocallyExecuteUtilityTask(const char *localTaskQueryCommand) * It is a regular utility command we should execute it locally via * process utility. */ - CitusProcessUtility(localTaskRawParseTree, localTaskQueryCommand, - PROCESS_UTILITY_TOPLEVEL, NULL, None_Receiver, NULL); + ProcessUtilityParseTree(localTaskRawParseTree, localTaskQueryCommand, + PROCESS_UTILITY_TOPLEVEL, NULL, None_Receiver, + NULL); } } } diff --git a/src/backend/distributed/utils/role.c b/src/backend/distributed/utils/role.c index 365b6eaa4..21ea68d5a 100644 --- a/src/backend/distributed/utils/role.c +++ b/src/backend/distributed/utils/role.c @@ -41,8 +41,8 @@ alter_role_if_exists(PG_FUNCTION_ARGS) Node *parseTree = ParseTreeNode(utilityQuery); - CitusProcessUtility(parseTree, utilityQuery, PROCESS_UTILITY_TOPLEVEL, NULL, - None_Receiver, NULL); + ProcessUtilityParseTree(parseTree, utilityQuery, PROCESS_UTILITY_TOPLEVEL, NULL, + None_Receiver, NULL); PG_RETURN_BOOL(true); } @@ -96,11 +96,11 @@ worker_create_or_alter_role(PG_FUNCTION_ARGS) quote_literal_cstr(createRoleUtilityQuery)))); } - CitusProcessUtility(parseTree, - createRoleUtilityQuery, - PROCESS_UTILITY_TOPLEVEL, - NULL, - None_Receiver, NULL); + ProcessUtilityParseTree(parseTree, + createRoleUtilityQuery, + PROCESS_UTILITY_TOPLEVEL, + NULL, + None_Receiver, NULL); PG_RETURN_BOOL(true); } @@ -124,11 +124,11 @@ worker_create_or_alter_role(PG_FUNCTION_ARGS) quote_literal_cstr(alterRoleUtilityQuery)))); } - CitusProcessUtility(parseTree, - alterRoleUtilityQuery, - PROCESS_UTILITY_TOPLEVEL, - NULL, - None_Receiver, NULL); + ProcessUtilityParseTree(parseTree, + alterRoleUtilityQuery, + PROCESS_UTILITY_TOPLEVEL, + NULL, + None_Receiver, NULL); PG_RETURN_BOOL(true); } diff --git a/src/backend/distributed/worker/worker_create_or_replace.c b/src/backend/distributed/worker/worker_create_or_replace.c index da8b2f93c..9c875e827 100644 --- a/src/backend/distributed/worker/worker_create_or_replace.c +++ b/src/backend/distributed/worker/worker_create_or_replace.c @@ -110,14 +110,14 @@ worker_create_or_replace_object(PG_FUNCTION_ARGS) RenameStmt *renameStmt = CreateRenameStatement(&address, newName); const char *sqlRenameStmt = DeparseTreeNode((Node *) renameStmt); - CitusProcessUtility((Node *) renameStmt, sqlRenameStmt, - PROCESS_UTILITY_TOPLEVEL, - NULL, None_Receiver, NULL); + ProcessUtilityParseTree((Node *) renameStmt, sqlRenameStmt, + PROCESS_UTILITY_TOPLEVEL, + NULL, None_Receiver, NULL); } /* apply create statement locally */ - CitusProcessUtility(parseTree, sqlStatement, PROCESS_UTILITY_TOPLEVEL, NULL, - None_Receiver, NULL); + ProcessUtilityParseTree(parseTree, sqlStatement, PROCESS_UTILITY_TOPLEVEL, NULL, + None_Receiver, NULL); /* type has been created */ PG_RETURN_BOOL(true); diff --git a/src/backend/distributed/worker/worker_data_fetch_protocol.c b/src/backend/distributed/worker/worker_data_fetch_protocol.c index 9c9982a6f..a56015a3e 100644 --- a/src/backend/distributed/worker/worker_data_fetch_protocol.c +++ b/src/backend/distributed/worker/worker_data_fetch_protocol.c @@ -396,8 +396,8 @@ worker_apply_shard_ddl_command(PG_FUNCTION_ARGS) /* extend names in ddl command and apply extended command */ RelayEventExtendNames(ddlCommandNode, schemaName, shardId); - CitusProcessUtility(ddlCommandNode, ddlCommand, PROCESS_UTILITY_TOPLEVEL, NULL, - None_Receiver, NULL); + ProcessUtilityParseTree(ddlCommandNode, ddlCommand, PROCESS_UTILITY_TOPLEVEL, NULL, + None_Receiver, NULL); PG_RETURN_VOID(); } @@ -428,8 +428,8 @@ worker_apply_inter_shard_ddl_command(PG_FUNCTION_ARGS) RelayEventExtendNamesForInterShardCommands(ddlCommandNode, leftShardId, leftShardSchemaName, rightShardId, rightShardSchemaName); - CitusProcessUtility(ddlCommandNode, ddlCommand, PROCESS_UTILITY_TOPLEVEL, NULL, - None_Receiver, NULL); + ProcessUtilityParseTree(ddlCommandNode, ddlCommand, PROCESS_UTILITY_TOPLEVEL, NULL, + None_Receiver, NULL); PG_RETURN_VOID(); } @@ -461,8 +461,8 @@ worker_apply_sequence_command(PG_FUNCTION_ARGS) } /* run the CREATE SEQUENCE command */ - CitusProcessUtility(commandNode, commandString, PROCESS_UTILITY_TOPLEVEL, NULL, - None_Receiver, NULL); + ProcessUtilityParseTree(commandNode, commandString, PROCESS_UTILITY_TOPLEVEL, NULL, + None_Receiver, NULL); CommandCounterIncrement(); CreateSeqStmt *createSequenceStatement = (CreateSeqStmt *) commandNode; @@ -668,8 +668,8 @@ worker_append_table_to_shard(PG_FUNCTION_ARGS) GetUserIdAndSecContext(&savedUserId, &savedSecurityContext); SetUserIdAndSecContext(CitusExtensionOwner(), SECURITY_LOCAL_USERID_CHANGE); - CitusProcessUtility((Node *) localCopyCommand, queryString->data, - PROCESS_UTILITY_TOPLEVEL, NULL, None_Receiver, NULL); + ProcessUtilityParseTree((Node *) localCopyCommand, queryString->data, + PROCESS_UTILITY_TOPLEVEL, NULL, None_Receiver, NULL); SetUserIdAndSecContext(savedUserId, savedSecurityContext); @@ -781,8 +781,8 @@ AlterSequenceMinMax(Oid sequenceId, char *schemaName, char *sequenceName, SetDefElemArg(alterSequenceStatement, "restart", startFloatArg); /* since the command is an AlterSeqStmt, a dummy command string works fine */ - CitusProcessUtility((Node *) alterSequenceStatement, dummyString, - PROCESS_UTILITY_TOPLEVEL, NULL, None_Receiver, NULL); + ProcessUtilityParseTree((Node *) alterSequenceStatement, dummyString, + PROCESS_UTILITY_TOPLEVEL, NULL, None_Receiver, NULL); } } diff --git a/src/include/distributed/commands/utility_hook.h b/src/include/distributed/commands/utility_hook.h index dc3cb3d71..e8dd59801 100644 --- a/src/include/distributed/commands/utility_hook.h +++ b/src/include/distributed/commands/utility_hook.h @@ -65,11 +65,12 @@ extern void multi_ProcessUtility(PlannedStmt *pstmt, const char *queryString, struct QueryEnvironment *queryEnv, DestReceiver *dest, QueryCompletionCompat *completionTag ); -extern void CitusProcessUtility(Node *node, const char *queryString, - ProcessUtilityContext context, ParamListInfo params, - DestReceiver *dest, - QueryCompletionCompat *completionTag - ); +extern void ProcessUtilityParseTree(Node *node, const char *queryString, + ProcessUtilityContext context, ParamListInfo + params, + DestReceiver *dest, + QueryCompletionCompat *completionTag + ); extern void MarkInvalidateForeignKeyGraph(void); extern void InvalidateForeignKeyGraphForDDL(void); extern List * DDLTaskList(Oid relationId, const char *commandString);