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

Merge pull request #1320 from citusdata/prepared_update_delete 

Support UPDATE/DELETE with parameterised partition column qual
pull/1326/head
Marco Slot 2017-04-17 16:32:37 +02:00 committed by GitHub
parent 87426b95be 4615100da5
commit acb84d9ca3
6 changed files with 56 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/backend/distributed/planner/multi_router_planner.c
View File

@ -100,8 +100,9 @@ static bool MasterIrreducibleExpressionWalker(Node *expression, WalkerState *sta
static char MostPermissiveVolatileFlag(char left, char right);
static bool TargetEntryChangesValue(TargetEntry *targetEntry, Var *column,
FromExpr *joinTree);
static Task * RouterModifyTask(Query *originalQuery, Query *query);
static ShardInterval * TargetShardIntervalForModify(Query *query);
static Task * RouterModifyTask(Query *originalQuery, ShardInterval *shardInterval);
static ShardInterval * TargetShardIntervalForModify(Query *query,
DeferredErrorMessage **planningError);
static List * QueryRestrictList(Query *query);
static bool FastShardPruningPossible(CmdType commandType, char partitionMethod);
static Const * ExtractInsertPartitionValue(Query *query, Var *partitionColumn);
@ -213,13 +214,25 @@ CreateSingleTaskRouterPlan(Query *originalQuery, Query *query,
if (modifyTask)
{
ShardInterval *targetShardInterval = NULL;
DeferredErrorMessage *planningError = NULL;
/* FIXME: this should probably rather be inlined into CreateModifyPlan */
multiPlan->planningError = ModifyQuerySupported(query);
if (multiPlan->planningError)
planningError = ModifyQuerySupported(query);
if (planningError != NULL)
{
multiPlan->planningError = planningError;
return multiPlan;
}
task = RouterModifyTask(originalQuery, query);
targetShardInterval = TargetShardIntervalForModify(query, &planningError);
if (planningError != NULL)
{
multiPlan->planningError = planningError;
return multiPlan;
}
task = RouterModifyTask(originalQuery, targetShardInterval);
Assert(task);
}
else
@ -1803,9 +1816,8 @@ TargetEntryChangesValue(TargetEntry *targetEntry, Var *column, FromExpr *joinTre
* shard-extended deparsed SQL to be run during execution.
*/
static Task *
RouterModifyTask(Query *originalQuery, Query *query)
RouterModifyTask(Query *originalQuery, ShardInterval *shardInterval)
{
ShardInterval *shardInterval = TargetShardIntervalForModify(query);
uint64 shardId = shardInterval->shardId;
Oid distributedTableId = shardInterval->relationId;
StringInfo queryString = makeStringInfo();
@ -1851,11 +1863,12 @@ RouterModifyTask(Query *originalQuery, Query *query)
/*
* TargetShardIntervalForModify determines the single shard targeted by a provided
* modify command. If no matching shards exist, or if the modification targets more
* than one shard, this function raises an error depending on the command type.
* modify command. If no matching shards exist, it throws an error. If the modification
* targets more than one shard, this function sets the deferred error and returns NULL,
* to handle cases in which we cannot prune down to one shard due to a parameter.
*/
static ShardInterval *
TargetShardIntervalForModify(Query *query)
TargetShardIntervalForModify(Query *query, DeferredErrorMessage **planningError)
{
List *prunedShardList = NIL;
int prunedShardCount = 0;
@ -1930,6 +1943,7 @@ TargetShardIntervalForModify(Query *query)
Oid relationId = cacheEntry->relationId;
char *partitionKeyString = cacheEntry->partitionKeyString;
char *partitionColumnName = ColumnNameToColumn(relationId, partitionKeyString);
StringInfo errorMessage = makeStringInfo();
StringInfo errorHint = makeStringInfo();
const char *targetCountType = NULL;
bool showHint = false;
@ -1973,10 +1987,14 @@ TargetShardIntervalForModify(Query *query)
showHint = errorHint->len > 0;
ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
errmsg("cannot run %s command which targets %s shards",
commandName, targetCountType),
showHint ? errhint("%s", errorHint->data) : 0));
appendStringInfo(errorMessage, "cannot run %s command which targets %s shards",
commandName, targetCountType);
(*planningError) = DeferredError(ERRCODE_FEATURE_NOT_SUPPORTED,
errorMessage->data, NULL,
showHint ? errorHint->data : NULL);
return NULL;
}
return (ShardInterval *) linitial(prunedShardList);

26
src/test/regress/expected/multi_prepare_plsql.out
View File

@ -917,10 +917,11 @@ SELECT partition_parameter_update(5, 51);
(1 row)
SELECT partition_parameter_update(6, 61);
ERROR: cannot run UPDATE command which targets multiple shards
HINT: Consider using an equality filter on partition column "key" to target a single shard. If you'd like to run a multi-shard operation, use master_modify_multiple_shards().
CONTEXT: SQL statement "UPDATE plpgsql_table SET value = $2 WHERE key = $1"
PL/pgSQL function partition_parameter_update(integer,integer) line 3 at SQL statement
partition_parameter_update
----------------------------
(1 row)
CREATE FUNCTION non_partition_parameter_update(int, int) RETURNS void as $$
BEGIN
UPDATE plpgsql_table SET value = $2 WHERE key = 0 AND value = $1;
@ -989,8 +990,8 @@ SELECT * FROM plpgsql_table ORDER BY key, value;
4 | 41
5 | 51
5 | 51
6 | 60
6 |
6 | 61
6 | 61
(24 rows)
-- check deletes
@ -1031,10 +1032,11 @@ SELECT partition_parameter_delete(5, 51);
(1 row)
SELECT partition_parameter_delete(6, 61);
ERROR: cannot run DELETE command which targets multiple shards
HINT: Consider using an equality filter on partition column "key" to target a single shard. If you'd like to run a multi-shard operation, use master_modify_multiple_shards().
CONTEXT: SQL statement "DELETE FROM plpgsql_table WHERE key = $1 AND value = $2"
PL/pgSQL function partition_parameter_delete(integer,integer) line 3 at SQL statement
partition_parameter_delete
----------------------------
(1 row)
CREATE FUNCTION non_partition_parameter_delete(int) RETURNS void as $$
BEGIN
DELETE FROM plpgsql_table WHERE key = 0 AND value = $1;
@ -1087,9 +1089,7 @@ SELECT * FROM plpgsql_table ORDER BY key, value;
0 |
0 |
0 |
6 | 60
6 |
(8 rows)
(6 rows)
-- check whether we can handle execute parameters
CREATE TABLE execute_parameter_test (key int, val date);

13
src/test/regress/expected/multi_prepare_sql.out
View File

@ -776,8 +776,6 @@ EXECUTE prepared_partition_parameter_update(3, 31);
EXECUTE prepared_partition_parameter_update(4, 41);
EXECUTE prepared_partition_parameter_update(5, 51);
EXECUTE prepared_partition_parameter_update(6, 61);
ERROR: cannot run UPDATE command which targets multiple shards
HINT: Consider using an equality filter on partition column "key" to target a single shard. If you'd like to run a multi-shard operation, use master_modify_multiple_shards().
PREPARE prepared_non_partition_parameter_update(int, int) AS
UPDATE prepare_table SET value = $2 WHERE key = 0 AND value = $1;
-- execute 6 times to trigger prepared statement usage
@ -813,8 +811,8 @@ SELECT * FROM prepare_table ORDER BY key, value;
4 | 41
5 | 51
5 | 51
6 | 60
6 |
6 | 61
6 | 61
(24 rows)
-- check deletes
@ -826,8 +824,6 @@ EXECUTE prepared_partition_parameter_delete(3, 31);
EXECUTE prepared_partition_parameter_delete(4, 41);
EXECUTE prepared_partition_parameter_delete(5, 51);
EXECUTE prepared_partition_parameter_delete(6, 61);
ERROR: cannot run DELETE command which targets multiple shards
HINT: Consider using an equality filter on partition column "key" to target a single shard. If you'd like to run a multi-shard operation, use master_modify_multiple_shards().
PREPARE prepared_non_partition_parameter_delete(int) AS
DELETE FROM prepare_table WHERE key = 0 AND value = $1;
-- execute 6 times to trigger prepared statement usage
@ -847,9 +843,7 @@ SELECT * FROM prepare_table ORDER BY key, value;
0 |
0 |
0 |
6 | 60
6 |
(8 rows)
(6 rows)
-- Testing parameters + function evaluation
CREATE TABLE prepare_func_table (
@ -999,3 +993,4 @@ EXECUTE countsome; -- no replanning
\set VERBOSITY default
-- clean-up prepared statements
DEALLOCATE ALL;
DROP TABLE prepare_table;

8
src/test/regress/expected/multi_sql_function.out
View File

@ -253,7 +253,7 @@ SELECT * FROM temp_table ORDER BY key, value;
-- check deletes
CREATE FUNCTION non_partition_parameter_delete_sql(int) RETURNS void AS $$
DELETE FROM prepare_table WHERE key = 0 AND value = $1;
DELETE FROM temp_table WHERE key = 0 AND value = $1;
$$ LANGUAGE SQL;
-- execute 6 times to trigger prepared statement usage
SELECT non_partition_parameter_delete_sql(12);
@ -293,7 +293,7 @@ SELECT non_partition_parameter_delete_sql(62);
(1 row)
-- check after deletes
SELECT * FROM prepare_table ORDER BY key, value;
SELECT * FROM temp_table ORDER BY key, value;
key | value
-----+-------
0 |
@ -302,9 +302,7 @@ SELECT * FROM prepare_table ORDER BY key, value;
0 |
0 |
0 |
6 | 60
6 |
(8 rows)
(6 rows)
-- test running parameterized SQL function
CREATE TABLE test_parameterized_sql(id integer, org_id integer);

2
src/test/regress/sql/multi_prepare_sql.sql
View File

@ -529,3 +529,5 @@ EXECUTE countsome; -- no replanning
-- clean-up prepared statements
DEALLOCATE ALL;
DROP TABLE prepare_table;

4
src/test/regress/sql/multi_sql_function.sql
View File

@ -111,7 +111,7 @@ SELECT * FROM temp_table ORDER BY key, value;
-- check deletes
CREATE FUNCTION non_partition_parameter_delete_sql(int) RETURNS void AS $$
DELETE FROM prepare_table WHERE key = 0 AND value = $1;
DELETE FROM temp_table WHERE key = 0 AND value = $1;
$$ LANGUAGE SQL;
-- execute 6 times to trigger prepared statement usage
@ -123,7 +123,7 @@ SELECT non_partition_parameter_delete_sql(52);
SELECT non_partition_parameter_delete_sql(62);
-- check after deletes
SELECT * FROM prepare_table ORDER BY key, value;
SELECT * FROM temp_table ORDER BY key, value;
-- test running parameterized SQL function
CREATE TABLE test_parameterized_sql(id integer, org_id integer);