external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes indentation

pull/7240/head
gindibay 2023-10-24 14:18:10 +03:00
parent 87f694ec0f
commit e9e64a69c1
6 changed files with 34 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/backend/distributed/commands/common.c
View File

@ -341,4 +341,3 @@ DropTextSearchConfigObjectAddress(Node *node, bool missing_ok, bool isPostproces
return objectAddresses;
}

12
src/backend/distributed/commands/database.c
View File

@ -347,6 +347,7 @@ citus_internal_database_command(PG_FUNCTION_ARGS)
PG_RETURN_VOID();
}
List *
PreprocessDropDatabaseStmt(Node *node, const char *queryString,
ProcessUtilityContext processUtilityContext)
@ -361,7 +362,8 @@ PreprocessDropDatabaseStmt(Node *node, const char *queryString,
DropdbStmt *stmt = (DropdbStmt *) node;
List *addresses = GetObjectAddressListFromParseTree(node, stmt->missing_ok, isPostProcess);
List *addresses = GetObjectAddressListFromParseTree(node, stmt->missing_ok,
isPostProcess);
if (list_length(addresses) == 0)
{
@ -369,7 +371,7 @@ PreprocessDropDatabaseStmt(Node *node, const char *queryString,
}
ObjectAddress *address = (ObjectAddress *) linitial(addresses);
if (address->objectId == InvalidOid ||!IsObjectDistributed(address))
if (address->objectId == InvalidOid || !IsObjectDistributed(address))
{
return NIL;
}
@ -384,7 +386,9 @@ PreprocessDropDatabaseStmt(Node *node, const char *queryString,
return NontransactionalNodeDDLTask(NON_COORDINATOR_NODES, commands);
}
static ObjectAddress *GetDatabaseAddressFromDatabaseName(char *databaseName)
static ObjectAddress *
GetDatabaseAddressFromDatabaseName(char *databaseName)
{
Oid databaseOid = get_database_oid(databaseName, false);
ObjectAddress *dbAddress = palloc0(sizeof(ObjectAddress));
@ -392,6 +396,7 @@ static ObjectAddress *GetDatabaseAddressFromDatabaseName(char *databaseName)
return dbAddress;
}
List *
DropDatabaseStmtObjectAddress(Node *node, bool missing_ok, bool isPostprocess)
{
@ -400,6 +405,7 @@ DropDatabaseStmtObjectAddress(Node *node, bool missing_ok, bool isPostprocess)
return list_make1(dbAddress);
}
List *
CreateDatabaseStmtObjectAddress(Node *node, bool missing_ok, bool isPostprocess)
{

27
src/backend/distributed/commands/utility_hook.c
View File

@ -581,7 +581,6 @@ ProcessUtilityInternal(PlannedStmt *pstmt,
}
/*
* We only process ALTER TABLE ... ATTACH PARTITION commands in the function below
* and distribute the partition if necessary.
@ -1482,31 +1481,35 @@ DDLTaskList(Oid relationId, const char *commandString)
return taskList;
}
/*
* NontransactionalNodeDDLTask builds a list of tasks to execute a DDL command on a
* given target set of nodes with cannotBeExecutedInTransction is set to make sure
* that list is being executed without a transaction.
*/
List * NontransactionalNodeDDLTask(TargetWorkerSet targets, List *commands ){
List *
NontransactionalNodeDDLTask(TargetWorkerSet targets, List *commands)
{
List *ddlJobs = NodeDDLTaskList(NON_COORDINATOR_NODES, commands);
DDLJob *ddlJob = NULL;
foreach_ptr(ddlJob, ddlJobs)
{
Task *task = NULL;
foreach_ptr(task, ddlJob->taskList)
{
task->cannotBeExecutedInTransction = true;
}
}
DDLJob *ddlJob = NULL;
foreach_ptr(ddlJob, ddlJobs)
{
Task *task = NULL;
foreach_ptr(task, ddlJob->taskList)
{
task->cannotBeExecutedInTransction = true;
}
}
return ddlJobs;
}
/*
* NodeDDLTaskList builds a list of tasks to execute a DDL command on a
* given target set of nodes.
*/
List *
NodeDDLTaskList(TargetWorkerSet targets, List *commands )
NodeDDLTaskList(TargetWorkerSet targets, List *commands)
{
DDLJob *ddlJob = palloc0(sizeof(DDLJob));
ddlJob->targetObjectAddress = InvalidObjectAddress;

8
src/backend/distributed/metadata/distobject.c
View File

@ -357,7 +357,9 @@ ExecuteCommandAsSuperuser(char *query, int paramCount, Oid *paramTypes,
return spiStatus;
}
void UnmarkRolesAndDatabaseDistributed(Node *node)
void
UnmarkRolesAndDatabaseDistributed(Node *node)
{
if (IsA(node, DropRoleStmt))
{
@ -369,12 +371,11 @@ void UnmarkRolesAndDatabaseDistributed(Node *node)
{
UnmarkRolesDistributed(distributedDropRoles);
}
}
else if (IsA(node, DropdbStmt))
{
DropdbStmt *stmt = castNode(DropdbStmt, node);
char *dbName = stmt->dbname;
char *dbName = stmt->dbname;
Oid dbOid = get_database_oid(dbName, stmt->missing_ok);
ObjectAddress *dbAddress = palloc0(sizeof(ObjectAddress));
@ -383,6 +384,7 @@ void UnmarkRolesAndDatabaseDistributed(Node *node)
}
}
/*
* UnmarkObjectDistributed removes the entry from pg_dist_object that marks this object as
* distributed. This will prevent updates to that object to be propagated to the worker.

6
src/include/distributed/commands.h
View File

@ -240,8 +240,10 @@ extern List * PreprocessAlterDatabaseSetStmt(Node *node, const char *queryString
extern List * PostprocessCreateDatabaseStmt(Node *node, const char *queryString);
extern List * PreprocessDropDatabaseStmt(Node *node, const char *queryString,
ProcessUtilityContext processUtilityContext);
extern List * DropDatabaseStmtObjectAddress(Node *node, bool missing_ok, bool isPostprocess);
extern List * CreateDatabaseStmtObjectAddress(Node *node, bool missing_ok, bool isPostprocess);
extern List * DropDatabaseStmtObjectAddress(Node *node, bool missing_ok, bool
isPostprocess);
extern List * CreateDatabaseStmtObjectAddress(Node *node, bool missing_ok, bool
isPostprocess);
/* domain.c - forward declarations */

2
src/include/distributed/commands/utility_hook.h
View File

@ -94,7 +94,7 @@ extern void ProcessUtilityParseTree(Node *node, const char *queryString,
extern void MarkInvalidateForeignKeyGraph(void);
extern void InvalidateForeignKeyGraphForDDL(void);
extern List * DDLTaskList(Oid relationId, const char *commandString);
extern List * NontransactionalNodeDDLTask(TargetWorkerSet targets, List *commands );
extern List * NontransactionalNodeDDLTask(TargetWorkerSet targets, List *commands);
extern List * NodeDDLTaskList(TargetWorkerSet targets, List *commands);
extern bool AlterTableInProgress(void);
extern bool DropSchemaOrDBInProgress(void);