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

Merge pull request #1873 from citusdata/fix_partition_lock 

Do not take extra access exclusive lock on partitioned tables
pull/1866/head
Marco Slot 2017-12-15 13:32:42 +01:00 committed by GitHub
parent cf7dda3892 9ee0e68882
commit fbb7d9c894
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/backend/distributed/executor/multi_router_executor.c
View File

@ -100,7 +100,6 @@ static bool StoreQueryResult(CitusScanState *scanState, MultiConnection *connect
bool failOnError, int64 *rows); bool failOnError, int64 *rows);
static bool ConsumeQueryResult(MultiConnection *connection, bool failOnError, static bool ConsumeQueryResult(MultiConnection *connection, bool failOnError,
int64 *rows); int64 *rows);
static LOCKMODE LockModeForModifyTask(Task *task);
/* /*
@ -752,12 +751,13 @@ ExecuteSingleModifyTask(CitusScanState *scanState, Task *task, bool multipleTask
/* /*
* If we are dealing with a partitioned table, we also need to lock its * If we are dealing with a partitioned table, we also need to lock its
* partitions. * partitions.
*
* For DDL commands, we already obtained the appropriate locks in
* ProcessUtility, so we only need to do this for DML commands.
*/ */
if (PartitionedTable(relationId)) if (PartitionedTable(relationId) && task->taskType == MODIFY_TASK)
{ {
LOCKMODE lockMode = LockModeForModifyTask(task); LockPartitionRelations(relationId, RowExclusiveLock);
LockPartitionRelations(relationId, lockMode);
} }
/* prevent replicas of the same shard from diverging */ /* prevent replicas of the same shard from diverging */
@ -1042,14 +1042,16 @@ ExecuteModifyTasks(List *taskList, bool expectResults, ParamListInfo paramListIn
* In multi shard modification, we expect that all tasks operates on the * In multi shard modification, we expect that all tasks operates on the
* same relation, so it is enough to acquire a lock on the first task's * same relation, so it is enough to acquire a lock on the first task's
* anchor relation's partitions. * anchor relation's partitions.
*
* For DDL commands, we already obtained the appropriate locks in
* ProcessUtility, so we only need to do this for DML commands.
*/ */
firstTask = (Task *) linitial(taskList); firstTask = (Task *) linitial(taskList);
firstShardInterval = LoadShardInterval(firstTask->anchorShardId); firstShardInterval = LoadShardInterval(firstTask->anchorShardId);
if (PartitionedTable(firstShardInterval->relationId)) if (PartitionedTable(firstShardInterval->relationId) &&
firstTask->taskType == MODIFY_TASK)
{ {
LOCKMODE lockMode = LockModeForModifyTask(firstTask); LockPartitionRelations(firstShardInterval->relationId, RowExclusiveLock);
LockPartitionRelations(firstShardInterval->relationId, lockMode);
} }
/* ensure that there are no concurrent modifications on the same shards */ /* ensure that there are no concurrent modifications on the same shards */
@ -1559,29 +1561,3 @@ ConsumeQueryResult(MultiConnection *connection, bool failOnError, int64 *rows)
return gotResponse && !commandFailed; return gotResponse && !commandFailed;
} }
/*
* LockModeForRouterModifyTask returns appropriate LOCKMODE for given router
* modify task.
*/
static LOCKMODE
LockModeForModifyTask(Task *task)
{
LOCKMODE lockMode = NoLock;
if (task->taskType == DDL_TASK)
{
lockMode = AccessExclusiveLock;
}
else if (task->taskType == MODIFY_TASK)
{
lockMode = RowExclusiveLock;
}
else
{
/* we do not allow any other task type in these code path */
Assert(false);
}
return lockMode;
}