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

Make local VACUUM occur first; rework prototypes 

As part of review feedback.
pull/1013/head
Jason Petersen 2016-12-12 15:27:21 -07:00
parent 10236564fa
commit 1b98b3ef72
No known key found for this signature in database
GPG Key ID: 9F1D3510D110ABA9
1 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/backend/distributed/executor/multi_utility.c
View File

@ -110,8 +110,7 @@ static Node * ProcessAlterTableStmt(AlterTableStmt *alterTableStatement,
static Node * ProcessAlterObjectSchemaStmt(AlterObjectSchemaStmt *alterObjectSchemaStmt,
const char *alterObjectSchemaCommand,
bool isTopLevel);
static Node * ProcessVacuumStmt(VacuumStmt *vacuumStmt, const char *vacuumCommand,
bool isTopLevel);
static void ProcessVacuumStmt(VacuumStmt *vacuumStmt, const char *vacuumCommand);
static List * VacuumTaskList(Oid relationId, VacuumStmt *vacuumStmt);
static StringInfo DeparseVacuumStmtPrefix(VacuumStmt *vacuumStmt);
@ -287,17 +286,6 @@ multi_ProcessUtility(Node *parsetree,
errhint("Connect to worker nodes directly to manually "
"move all tables.")));
}
if (IsA(parsetree, VacuumStmt))
{
VacuumStmt *vacuumStmt = (VacuumStmt *) parsetree;
/* must check fields to know whether actually a vacuum */
if (vacuumStmt->options | VACOPT_VACUUM)
{
parsetree = ProcessVacuumStmt(vacuumStmt, queryString, isTopLevel);
}
}
}
/*
@ -383,6 +371,18 @@ multi_ProcessUtility(Node *parsetree,
{
SetUserIdAndSecContext(savedUserId, savedSecurityContext);
}
/* we run VacuumStmt after standard processing to benefit from its checks */
if (IsA(parsetree, VacuumStmt))
{
VacuumStmt *vacuumStmt = (VacuumStmt *) parsetree;
/* must check fields to know whether actually a vacuum */
if (vacuumStmt->options | VACOPT_VACUUM)
{
ProcessVacuumStmt(vacuumStmt, queryString);
}
}
}
@ -900,15 +900,15 @@ ProcessAlterObjectSchemaStmt(AlterObjectSchemaStmt *alterObjectSchemaStmt,
/* TODO: Write function comments */
static Node *
ProcessVacuumStmt(VacuumStmt *vacuumStmt, const char *vacuumCommand, bool isTopLevel)
static void
ProcessVacuumStmt(VacuumStmt *vacuumStmt, const char *vacuumCommand)
{
Oid relationId = InvalidOid;
List *taskList = NIL;
if (vacuumStmt->relation == NULL)
{
return (Node *) vacuumStmt;
return;
}
relationId = RangeVarGetRelid(vacuumStmt->relation, NoLock, false);
@ -916,7 +916,7 @@ ProcessVacuumStmt(VacuumStmt *vacuumStmt, const char *vacuumCommand, bool isTopL
/* first check whether a distributed relation is affected */
if (!OidIsValid(relationId) || !IsDistributedTable(relationId))
{
return (Node *) vacuumStmt;
return;
}
taskList = VacuumTaskList(relationId, vacuumStmt);
@ -924,8 +924,6 @@ ProcessVacuumStmt(VacuumStmt *vacuumStmt, const char *vacuumCommand, bool isTopL
SavedMultiShardCommitProtocol = MultiShardCommitProtocol;
MultiShardCommitProtocol = COMMIT_PROTOCOL_BARE;
ExecuteModifyTasksWithoutResults(taskList);
return (Node *) vacuumStmt;
}