From 70c0d96507a376460cec66e91b9dbdfd72820c89 Mon Sep 17 00:00:00 2001
From: Marco Slot <marco.slot@gmail.com>
Date: Sat, 29 Jun 2019 21:37:15 +0200
Subject: [PATCH] Track partition key for adaptive executor in CitusEndScan

---
 src/backend/distributed/executor/citus_custom_scan.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/backend/distributed/executor/citus_custom_scan.c b/src/backend/distributed/executor/citus_custom_scan.c
index 85b9b6b1a..6399c3e57 100644
--- a/src/backend/distributed/executor/citus_custom_scan.c
+++ b/src/backend/distributed/executor/citus_custom_scan.c
@@ -357,7 +357,8 @@ CitusEndScan(CustomScanState *node)
 	/* queryId is not set if pg_stat_statements is not installed */
 	if (queryId != 0)
 	{
-		if (executorType == MULTI_EXECUTOR_ROUTER && partitionKeyConst != NULL)
+		if (partitionKeyConst != NULL && (executorType == MULTI_EXECUTOR_ROUTER ||
+										  executorType == MULTI_EXECUTOR_ADAPTIVE))
 		{
 			partitionKeyString = DatumToString(partitionKeyConst->constvalue,
 											   partitionKeyConst->consttype);