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

Refactor MultiRouterPlannableQuery (#4350) 

The name of the function is different than the implemantation. Because
the function is designed to only consider SELECT queries. Also this
changes the assert with an error.
pull/4353/head
SaitTalhaNisanci 2020-11-27 18:44:38 +03:00 committed by GitHub
parent 326e6afa53
commit af02ac6cf5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -165,7 +165,8 @@ static Value * MakeDummyColumnString(int dummyColumnId);
static List * BuildRoutesForInsert(Query *query, DeferredErrorMessage **planningError); static List * BuildRoutesForInsert(Query *query, DeferredErrorMessage **planningError);
static List * GroupInsertValuesByShardId(List *insertValuesList); static List * GroupInsertValuesByShardId(List *insertValuesList);
static List * ExtractInsertValuesList(Query *query, Var *partitionColumn); static List * ExtractInsertValuesList(Query *query, Var *partitionColumn);
static DeferredErrorMessage * MultiRouterPlannableQuery(Query *query); static DeferredErrorMessage * DeferErrorIfUnsupportedRouterPlannableSelectQuery(
Query *query);
static DeferredErrorMessage * ErrorIfQueryHasUnroutableModifyingCTE(Query *queryTree); static DeferredErrorMessage * ErrorIfQueryHasUnroutableModifyingCTE(Query *queryTree);
static bool SelectsFromDistributedTable(List *rangeTableList, Query *query); static bool SelectsFromDistributedTable(List *rangeTableList, Query *query);
static ShardPlacement * CreateDummyPlacement(bool hasLocalRelation); static ShardPlacement * CreateDummyPlacement(bool hasLocalRelation);
@ -193,7 +194,8 @@ CreateRouterPlan(Query *originalQuery, Query *query,
{ {
DistributedPlan *distributedPlan = CitusMakeNode(DistributedPlan); DistributedPlan *distributedPlan = CitusMakeNode(DistributedPlan);
distributedPlan->planningError = MultiRouterPlannableQuery(query); distributedPlan->planningError = DeferErrorIfUnsupportedRouterPlannableSelectQuery(
query);
if (distributedPlan->planningError == NULL) if (distributedPlan->planningError == NULL)
{ {
@ -605,7 +607,8 @@ ModifyPartialQuerySupported(Query *queryTree, bool multiShardQuery,
if (cteQuery->commandType == CMD_SELECT) if (cteQuery->commandType == CMD_SELECT)
{ {
DeferredErrorMessage *cteError = MultiRouterPlannableQuery(cteQuery); DeferredErrorMessage *cteError =
DeferErrorIfUnsupportedRouterPlannableSelectQuery(cteQuery);
if (cteError) if (cteError)
{ {
return cteError; return cteError;
@ -3430,20 +3433,25 @@ ExtractInsertPartitionKeyValue(Query *query)
/* /*
* MultiRouterPlannableQuery checks if given select query is router plannable, * DeferErrorIfUnsupportedRouterPlannableSelectQuery checks if given query is router plannable,
* setting distributedPlan->planningError if not. * SELECT query, setting distributedPlan->planningError if not.
* The query is router plannable if it is a modify query, or if it is a select * The query is router plannable if it is a modify query, or if it is a select
* query issued on a hash partitioned distributed table. Router plannable checks * query issued on a hash partitioned distributed table. Router plannable checks
* for select queries can be turned off by setting citus.enable_router_execution * for select queries can be turned off by setting citus.enable_router_execution
* flag to false. * flag to false.
*/ */
static DeferredErrorMessage * static DeferredErrorMessage *
MultiRouterPlannableQuery(Query *query) DeferErrorIfUnsupportedRouterPlannableSelectQuery(Query *query)
{ {
List *rangeTableRelationList = NIL; List *rangeTableRelationList = NIL;
ListCell *rangeTableRelationCell = NULL; ListCell *rangeTableRelationCell = NULL;
Assert(query->commandType == CMD_SELECT); if (query->commandType != CMD_SELECT)
{
return DeferredError(ERRCODE_ASSERT_FAILURE,
"Only SELECT query types are supported in this path",
NULL, NULL);
}
if (!EnableRouterExecution) if (!EnableRouterExecution)
{ {