mirror of https://github.com/citusdata/citus.git
Fix crash caused by EXPLAIN EXECUTE INSERT ... SELECT
Hadi Moshayedi
parent
4e8d79998e
commit
cd25a27174
|
|
@ -210,7 +210,13 @@ CoordinatorInsertSelectExplainScan(CustomScanState *node, List *ancestors,
|
|||
DistributedPlan *distributedPlan = scanState->distributedPlan;
|
||||
Query *insertSelectQuery = distributedPlan->insertSelectQuery;
|
||||
RangeTblEntry *selectRte = ExtractSelectRangeTableEntry(insertSelectQuery);
|
||||
Query *query = selectRte->subquery;
|
||||
|
||||
/*
|
||||
* Create a copy because ExplainOneQuery can modify the query, and later
|
||||
* executions of prepared statements might require it. See
|
||||
* https://github.com/citusdata/citus/issues/3947 for what can happen.
|
||||
*/
|
||||
Query *queryCopy = copyObject(selectRte->subquery);
|
||||
|
||||
bool repartition = distributedPlan->insertSelectMethod == INSERT_SELECT_REPARTITION;
|
||||
|
||||
|
|
@ -236,7 +242,7 @@ CoordinatorInsertSelectExplainScan(CustomScanState *node, List *ancestors,
|
|||
IntoClause *into = NULL;
|
||||
ParamListInfo params = NULL;
|
||||
char *queryString = NULL;
|
||||
ExplainOneQuery(query, 0, into, es, queryString, params, NULL);
|
||||
ExplainOneQuery(queryCopy, 0, into, es, queryString, params, NULL);
|
||||
|
||||
ExplainCloseGroup("Select Query", "Select Query", false, es);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -660,6 +660,96 @@ SELECT a, count(*), count(distinct b) distinct_values FROM target_table GROUP BY
|
|||
4 | 6 | 1
|
||||
(5 rows)
|
||||
|
||||
DEALLOCATE insert_plan;
|
||||
--
|
||||
-- Prepared router INSERT/SELECT. We currently use pull to coordinator when the
|
||||
-- distributed query has a single task.
|
||||
--
|
||||
TRUNCATE target_table;
|
||||
PREPARE insert_plan(int) AS
|
||||
INSERT INTO target_table
|
||||
SELECT a, max(b) FROM source_table
|
||||
WHERE a=$1 GROUP BY a;
|
||||
SET client_min_messages TO DEBUG1;
|
||||
EXECUTE insert_plan(0);
|
||||
DEBUG: INSERT target table and the source relation of the SELECT partition column value must be colocated in distributed INSERT ... SELECT
|
||||
DEBUG: Collecting INSERT ... SELECT results on coordinator
|
||||
EXECUTE insert_plan(0);
|
||||
DEBUG: INSERT target table and the source relation of the SELECT partition column value must be colocated in distributed INSERT ... SELECT
|
||||
DEBUG: Collecting INSERT ... SELECT results on coordinator
|
||||
EXECUTE insert_plan(0);
|
||||
DEBUG: INSERT target table and the source relation of the SELECT partition column value must be colocated in distributed INSERT ... SELECT
|
||||
DEBUG: Collecting INSERT ... SELECT results on coordinator
|
||||
EXECUTE insert_plan(0);
|
||||
DEBUG: INSERT target table and the source relation of the SELECT partition column value must be colocated in distributed INSERT ... SELECT
|
||||
DEBUG: Collecting INSERT ... SELECT results on coordinator
|
||||
EXECUTE insert_plan(0);
|
||||
DEBUG: INSERT target table and the source relation of the SELECT partition column value must be colocated in distributed INSERT ... SELECT
|
||||
DEBUG: Collecting INSERT ... SELECT results on coordinator
|
||||
EXECUTE insert_plan(0);
|
||||
DEBUG: INSERT target table and the source relation of the SELECT partition column value must be colocated in distributed INSERT ... SELECT
|
||||
DEBUG: Collecting INSERT ... SELECT results on coordinator
|
||||
EXECUTE insert_plan(0);
|
||||
DEBUG: INSERT target table and the source relation of the SELECT partition column value must be colocated in distributed INSERT ... SELECT
|
||||
DEBUG: Collecting INSERT ... SELECT results on coordinator
|
||||
RESET client_min_messages;
|
||||
SELECT a, count(*), count(distinct b) distinct_values FROM target_table GROUP BY a ORDER BY a;
|
||||
a | count | distinct_values
|
||||
---------------------------------------------------------------------
|
||||
0 | 7 | 1
|
||||
(1 row)
|
||||
|
||||
DEALLOCATE insert_plan;
|
||||
--
|
||||
-- Prepared INSERT/SELECT with no parameters.
|
||||
--
|
||||
TRUNCATE target_table;
|
||||
PREPARE insert_plan AS
|
||||
INSERT INTO target_table
|
||||
SELECT a, max(b) FROM source_table
|
||||
WHERE a BETWEEN 1 AND 2 GROUP BY a;
|
||||
EXPLAIN EXECUTE insert_plan;
|
||||
QUERY PLAN
|
||||
---------------------------------------------------------------------
|
||||
Custom Scan (Citus INSERT ... SELECT) (cost=0.00..0.00 rows=0 width=0)
|
||||
INSERT/SELECT method: repartition
|
||||
-> Custom Scan (Citus Adaptive) (cost=0.00..0.00 rows=100000 width=8)
|
||||
Task Count: 4
|
||||
Tasks Shown: One of 4
|
||||
-> Task
|
||||
Node: host=localhost port=xxxxx dbname=regression
|
||||
-> GroupAggregate (cost=44.09..44.28 rows=11 width=8)
|
||||
Group Key: a
|
||||
-> Sort (cost=44.09..44.12 rows=11 width=8)
|
||||
Sort Key: a
|
||||
-> Seq Scan on source_table_4213606 source_table (cost=0.00..43.90 rows=11 width=8)
|
||||
Filter: ((a >= 1) AND (a <= 2))
|
||||
(13 rows)
|
||||
|
||||
SET client_min_messages TO DEBUG1;
|
||||
EXECUTE insert_plan;
|
||||
DEBUG: performing repartitioned INSERT ... SELECT
|
||||
EXECUTE insert_plan;
|
||||
DEBUG: performing repartitioned INSERT ... SELECT
|
||||
EXECUTE insert_plan;
|
||||
DEBUG: performing repartitioned INSERT ... SELECT
|
||||
EXECUTE insert_plan;
|
||||
DEBUG: performing repartitioned INSERT ... SELECT
|
||||
EXECUTE insert_plan;
|
||||
DEBUG: performing repartitioned INSERT ... SELECT
|
||||
EXECUTE insert_plan;
|
||||
DEBUG: performing repartitioned INSERT ... SELECT
|
||||
EXECUTE insert_plan;
|
||||
DEBUG: performing repartitioned INSERT ... SELECT
|
||||
RESET client_min_messages;
|
||||
SELECT a, count(*), count(distinct b) distinct_values FROM target_table GROUP BY a ORDER BY a;
|
||||
a | count | distinct_values
|
||||
---------------------------------------------------------------------
|
||||
1 | 7 | 1
|
||||
2 | 7 | 1
|
||||
(2 rows)
|
||||
|
||||
DEALLOCATE insert_plan;
|
||||
--
|
||||
-- INSERT/SELECT in CTE
|
||||
--
|
||||
|
|
|
|||
|
|
@ -317,6 +317,60 @@ RESET client_min_messages;
|
|||
|
||||
SELECT a, count(*), count(distinct b) distinct_values FROM target_table GROUP BY a ORDER BY a;
|
||||
|
||||
DEALLOCATE insert_plan;
|
||||
|
||||
--
|
||||
-- Prepared router INSERT/SELECT. We currently use pull to coordinator when the
|
||||
-- distributed query has a single task.
|
||||
--
|
||||
TRUNCATE target_table;
|
||||
|
||||
PREPARE insert_plan(int) AS
|
||||
INSERT INTO target_table
|
||||
SELECT a, max(b) FROM source_table
|
||||
WHERE a=$1 GROUP BY a;
|
||||
|
||||
SET client_min_messages TO DEBUG1;
|
||||
EXECUTE insert_plan(0);
|
||||
EXECUTE insert_plan(0);
|
||||
EXECUTE insert_plan(0);
|
||||
EXECUTE insert_plan(0);
|
||||
EXECUTE insert_plan(0);
|
||||
EXECUTE insert_plan(0);
|
||||
EXECUTE insert_plan(0);
|
||||
RESET client_min_messages;
|
||||
|
||||
SELECT a, count(*), count(distinct b) distinct_values FROM target_table GROUP BY a ORDER BY a;
|
||||
|
||||
DEALLOCATE insert_plan;
|
||||
|
||||
--
|
||||
-- Prepared INSERT/SELECT with no parameters.
|
||||
--
|
||||
|
||||
TRUNCATE target_table;
|
||||
|
||||
PREPARE insert_plan AS
|
||||
INSERT INTO target_table
|
||||
SELECT a, max(b) FROM source_table
|
||||
WHERE a BETWEEN 1 AND 2 GROUP BY a;
|
||||
|
||||
EXPLAIN EXECUTE insert_plan;
|
||||
|
||||
SET client_min_messages TO DEBUG1;
|
||||
EXECUTE insert_plan;
|
||||
EXECUTE insert_plan;
|
||||
EXECUTE insert_plan;
|
||||
EXECUTE insert_plan;
|
||||
EXECUTE insert_plan;
|
||||
EXECUTE insert_plan;
|
||||
EXECUTE insert_plan;
|
||||
RESET client_min_messages;
|
||||
|
||||
SELECT a, count(*), count(distinct b) distinct_values FROM target_table GROUP BY a ORDER BY a;
|
||||
|
||||
DEALLOCATE insert_plan;
|
||||
|
||||
--
|
||||
-- INSERT/SELECT in CTE
|
||||
--
|
||||
|
|
|
|||
Loading…
Reference in New Issue