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

Fix inserting multiple values with row expression partition column causing the insert to be ignored 

Raise an error instead of silently inserting nothing if we hit this condition in the future
pull/3387/head
Philip Dubé 2020-01-14 23:57:06 +00:00
parent f6d4df6da9
commit 4d9a733c2f
5 changed files with 84 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2559,8 +2559,9 @@ BuildRoutesForInsert(Query *query, DeferredErrorMessage **planningError)
if (!IsA(insertValues->partitionValueExpr, Const))
{
/* shard pruning not possible right now */
return NIL;
ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
errmsg("failed to evaluate partition key in insert"),
errhint("try using constant values for partition column")));
}
Const *partitionValueConst = (Const *) insertValues->partitionValueExpr;

1
src/backend/distributed/utils/citus_clauses.c
View File

@ -92,6 +92,7 @@ PartiallyEvaluateExpression(Node *expression, PlanState *planState)
case T_CoerceViaIO:
case T_ArrayCoerceExpr:
case T_ScalarArrayOpExpr:
case T_RowExpr:
case T_RowCompareExpr:
case T_RelabelType:
case T_CoerceToDomain:

50
src/test/regress/expected/multi_row_insert.out Normal file
View File

@ -0,0 +1,50 @@
-- Test multi row insert with composite type as partition key
-- https://github.com/citusdata/citus/issues/3357
SET citus.next_shard_id TO 4213581;
SET citus.shard_replication_factor TO 1;
CREATE TYPE composite_key_type AS (f1 int, f2 text);
CREATE TABLE source_table_xyz(key composite_key_type, value int, mapped_key composite_key_type);
SELECT create_distributed_table('source_table_xyz', 'key', 'range');
create_distributed_table
---------------------------------------------------------------------
(1 row)
CALL public.create_range_partitioned_shards('source_table_xyz', '{"(0,a)","(25,z)"}','{"(24,a)","(49,z)"}');
SELECT * FROM pg_dist_shard WHERE logicalrelid='source_table_xyz'::regclass::oid;
logicalrelid | shardid | shardstorage | shardminvalue | shardmaxvalue
---------------------------------------------------------------------
source_table_xyz | 4213581 | t | (0,a) | (24,a)
source_table_xyz | 4213582 | t | (25,z) | (49,z)
(2 rows)
SELECT shardid, nodename, nodeport FROM pg_dist_shard_placement WHERE EXISTS(SELECT shardid FROM pg_dist_shard WHERE shardid=pg_dist_shard_placement.shardid AND logicalrelid='source_table_xyz'::regclass::oid);
shardid | nodename | nodeport
---------------------------------------------------------------------
4213581 | localhost | 57637
4213582 | localhost | 57638
(2 rows)
INSERT INTO source_table_xyz VALUES ((0, 'a'), 1, (0, 'a')),
((1, 'b'), 2, (26, 'b')),
((2, 'c'), 3, (3, 'c')),
('(4,d)', 4, (27, 'd')),
((30, 'e'), 5, (30, 'e')),
((31, 'f'), 6, (31, 'f')),
((32, 'g'), 7, (8, 'g'));
INSERT INTO source_table_xyz VALUES ((27, 'h'), 8, (26, 'b'));
SELECT * FROM source_table_xyz ORDER BY 1;
key | value | mapped_key
---------------------------------------------------------------------
(0,a) | 1 | (0,a)
(1,b) | 2 | (26,b)
(2,c) | 3 | (3,c)
(4,d) | 4 | (27,d)
(27,h) | 8 | (26,b)
(30,e) | 5 | (30,e)
(31,f) | 6 | (31,f)
(32,g) | 7 | (8,g)
(8 rows)
DROP TABLE source_table_xyz;
DROP TYPE composite_key_type;

1
src/test/regress/multi_schedule
View File

@ -44,6 +44,7 @@ test: multi_create_table_constraints multi_master_protocol multi_load_data multi
test: multi_behavioral_analytics_basics multi_behavioral_analytics_single_shard_queries multi_insert_select_non_pushable_queries multi_insert_select
test: multi_insert_select_window multi_shard_update_delete window_functions dml_recursive recursive_dml_with_different_planners_executors
test: multi_insert_select_conflict
test: multi_row_insert
# ---------
# at the end of the regression tests regaring recursively planned modifications

29
src/test/regress/sql/multi_row_insert.sql Normal file
View File

@ -0,0 +1,29 @@
-- Test multi row insert with composite type as partition key
-- https://github.com/citusdata/citus/issues/3357
SET citus.next_shard_id TO 4213581;
SET citus.shard_replication_factor TO 1;
CREATE TYPE composite_key_type AS (f1 int, f2 text);
CREATE TABLE source_table_xyz(key composite_key_type, value int, mapped_key composite_key_type);
SELECT create_distributed_table('source_table_xyz', 'key', 'range');
CALL public.create_range_partitioned_shards('source_table_xyz', '{"(0,a)","(25,z)"}','{"(24,a)","(49,z)"}');
SELECT * FROM pg_dist_shard WHERE logicalrelid='source_table_xyz'::regclass::oid;
SELECT shardid, nodename, nodeport FROM pg_dist_shard_placement WHERE EXISTS(SELECT shardid FROM pg_dist_shard WHERE shardid=pg_dist_shard_placement.shardid AND logicalrelid='source_table_xyz'::regclass::oid);
INSERT INTO source_table_xyz VALUES ((0, 'a'), 1, (0, 'a')),
((1, 'b'), 2, (26, 'b')),
((2, 'c'), 3, (3, 'c')),
('(4,d)', 4, (27, 'd')),
((30, 'e'), 5, (30, 'e')),
((31, 'f'), 6, (31, 'f')),
((32, 'g'), 7, (8, 'g'));
INSERT INTO source_table_xyz VALUES ((27, 'h'), 8, (26, 'b'));
SELECT * FROM source_table_xyz ORDER BY 1;
DROP TABLE source_table_xyz;
DROP TYPE composite_key_type;