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

Avoid segfault in logging queries

pull/2859/head
Philip Dubé 2019-07-30 00:00:56 +00:00
parent e88cb8335f
commit 064bd66a20
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/backend/distributed/executor/multi_executor.c
View File

@ -442,7 +442,7 @@ ExecuteQueryIntoDestReceiver(Query *query, ParamListInfo params, DestReceiver *d
/* /*
* ExecuteIntoDestReceiver plans and executes a query and sends results to the given * ExecutePlanIntoDestReceiver executes a query plan and sends results to the given
* DestReceiver. * DestReceiver.
*/ */
void void

1
src/backend/distributed/planner/deparse_shard_query.c
View File

@ -111,6 +111,7 @@ RebuildQueryStrings(Query *originalQuery, List *taskList)
} }
ereport(DEBUG4, (errmsg("query before rebuilding: %s", ereport(DEBUG4, (errmsg("query before rebuilding: %s",
task->queryString == NULL ? "(null)" :
ApplyLogRedaction(task->queryString)))); ApplyLogRedaction(task->queryString))));
UpdateTaskQueryString(query, relationId, valuesRTE, task); UpdateTaskQueryString(query, relationId, valuesRTE, task);

5
src/backend/distributed/shared_library_init.c
View File

@ -175,9 +175,8 @@ _PG_init(void)
* (thus as the innermost/last running hook) to be able to do our * (thus as the innermost/last running hook) to be able to do our
* duties. For simplicity insist that all hooks are previously unused. * duties. For simplicity insist that all hooks are previously unused.
*/ */
if (planner_hook != NULL || ProcessUtility_hook != NULL || ExecutorStart_hook != if (planner_hook != NULL || ProcessUtility_hook != NULL ||
NULL || ExecutorStart_hook != NULL || ExecutorRun_hook != NULL)
ExecutorRun_hook != NULL)
{ {
ereport(ERROR, (errmsg("Citus has to be loaded first"), ereport(ERROR, (errmsg("Citus has to be loaded first"),
errhint("Place citus at the beginning of " errhint("Place citus at the beginning of "