From: Tomas Vondra <tomas@2ndquadrant.com>
Date: Sat, 14 Oct 2017 10:26:13 +0000 (+0200)
Subject: Remember queryId for queries executed using FQS
X-Git-Tag: XL_10_R1BETA1~104
X-Git-Url: http://git.postgresql.org/gitweb/?a=commitdiff_plain;h=1c7637f35f5f8b4566c4483f02041e7fc89a83cc;p=postgres-xl.git

Remember queryId for queries executed using FQS

pgxc_FQS_planner() was not copying queryId, so extensions relying on
it did not work properly. For example the pg_stat_statements extension
was ignoring queries executed using FQS entirely.

Backpatch to Postgres-XL 9.5.
---

diff --git a/src/backend/pgxc/plan/planner.c b/src/backend/pgxc/plan/planner.c
index 6f602cd7b0..e86a945c25 100644
--- a/src/backend/pgxc/plan/planner.c
+++ b/src/backend/pgxc/plan/planner.c
@@ -329,6 +329,7 @@ pgxc_FQS_planner(Query *query, int cursorOptions, ParamListInfo boundParams)
 		result->resultRelations = list_make1_int(query->resultRelation);
 	result->planTree = top_plan;
 	result->rtable = query->rtable;
+	result->queryId = query->queryId;
 	result->relationOids = glob->relationOids;
 	result->invalItems = glob->invalItems;