From ba94269f55b564306b7d7e1eb4b0dcadb84c4861 Mon Sep 17 00:00:00 2001
From: Sait Talha Nisanci <s.talhanisanci@gmail.com>
Date: Tue, 19 May 2020 14:40:52 +0300
Subject: [PATCH] Remove MULTI_EXECUTOR_TASK_TRACKER

---
 .../distributed/executor/citus_custom_scan.c  | 26 -------------------
 .../distributed/executor/query_stats.c        |  5 ----
 .../distributed/planner/distributed_planner.c |  6 -----
 .../distributed/planner/recursive_planning.c  |  9 -------
 src/include/distributed/citus_custom_scan.h   |  1 -
 .../distributed/multi_server_executor.h       |  3 +--
 6 files changed, 1 insertion(+), 49 deletions(-)

diff --git a/src/backend/distributed/executor/citus_custom_scan.c b/src/backend/distributed/executor/citus_custom_scan.c
index 5556b512d..962badf06 100644
--- a/src/backend/distributed/executor/citus_custom_scan.c
+++ b/src/backend/distributed/executor/citus_custom_scan.c
@@ -48,7 +48,6 @@
 
 /* functions for creating custom scan nodes */
 static Node * AdaptiveExecutorCreateScan(CustomScan *scan);
-static Node * TaskTrackerCreateScan(CustomScan *scan);
 static Node * CoordinatorInsertSelectCreateScan(CustomScan *scan);
 static Node * DelayedErrorCreateScan(CustomScan *scan);
 
@@ -72,11 +71,6 @@ CustomScanMethods AdaptiveExecutorCustomScanMethods = {
 	AdaptiveExecutorCreateScan
 };
 
-CustomScanMethods TaskTrackerCustomScanMethods = {
-	"Citus Task-Tracker",
-	TaskTrackerCreateScan
-};
-
 CustomScanMethods CoordinatorInsertSelectCustomScanMethods = {
 	"Citus INSERT ... SELECT",
 	CoordinatorInsertSelectCreateScan
@@ -149,7 +143,6 @@ void
 RegisterCitusCustomScanMethods(void)
 {
 	RegisterCustomScanMethods(&AdaptiveExecutorCustomScanMethods);
-	RegisterCustomScanMethods(&TaskTrackerCustomScanMethods);
 	RegisterCustomScanMethods(&CoordinatorInsertSelectCustomScanMethods);
 	RegisterCustomScanMethods(&DelayedErrorCustomScanMethods);
 }
@@ -573,25 +566,6 @@ AdaptiveExecutorCreateScan(CustomScan *scan)
 	return (Node *) scanState;
 }
 
-
-/*
- * TaskTrackerCreateScan creates the scan state for task-tracker executor queries.
- */
-static Node *
-TaskTrackerCreateScan(CustomScan *scan)
-{
-	CitusScanState *scanState = palloc0(sizeof(CitusScanState));
-
-	scanState->executorType = MULTI_EXECUTOR_TASK_TRACKER;
-	scanState->customScanState.ss.ps.type = T_CustomScanState;
-	scanState->distributedPlan = GetDistributedPlan(scan);
-
-	scanState->customScanState.methods = &TaskTrackerCustomExecMethods;
-
-	return (Node *) scanState;
-}
-
-
 /*
  * CoordinatorInsertSelectCrateScan creates the scan state for executing
  * INSERT..SELECT into a distributed table via the coordinator.
diff --git a/src/backend/distributed/executor/query_stats.c b/src/backend/distributed/executor/query_stats.c
index 7f9493c72..7ceee36f1 100644
--- a/src/backend/distributed/executor/query_stats.c
+++ b/src/backend/distributed/executor/query_stats.c
@@ -94,11 +94,6 @@ CitusExecutorName(MultiExecutorType executorType)
 			return "adaptive";
 		}
 
-		case MULTI_EXECUTOR_TASK_TRACKER:
-		{
-			return "task-tracker";
-		}
-
 		case MULTI_EXECUTOR_COORDINATOR_INSERT_SELECT:
 		{
 			return "insert-select";
diff --git a/src/backend/distributed/planner/distributed_planner.c b/src/backend/distributed/planner/distributed_planner.c
index 68b3a17b7..8b7742056 100644
--- a/src/backend/distributed/planner/distributed_planner.c
+++ b/src/backend/distributed/planner/distributed_planner.c
@@ -1298,12 +1298,6 @@ FinalizePlan(PlannedStmt *localPlan, DistributedPlan *distributedPlan)
 			break;
 		}
 
-		case MULTI_EXECUTOR_TASK_TRACKER:
-		{
-			customScan->methods = &TaskTrackerCustomScanMethods;
-			break;
-		}
-
 		case MULTI_EXECUTOR_COORDINATOR_INSERT_SELECT:
 		{
 			customScan->methods = &CoordinatorInsertSelectCustomScanMethods;
diff --git a/src/backend/distributed/planner/recursive_planning.c b/src/backend/distributed/planner/recursive_planning.c
index d673b1545..3c6d9b5cf 100644
--- a/src/backend/distributed/planner/recursive_planning.c
+++ b/src/backend/distributed/planner/recursive_planning.c
@@ -916,15 +916,6 @@ ShouldRecursivelyPlanSubquery(Query *subquery, RecursivePlanningContext *context
 		 */
 		return false;
 	}
-	else if (TaskExecutorType == MULTI_EXECUTOR_TASK_TRACKER &&
-			 SingleRelationRepartitionSubquery(subquery))
-	{
-		/*
-		 * Citus can plan this and execute via repartitioning. Thus,
-		 * no need to recursively plan.
-		 */
-		return false;
-	}
 
 	return true;
 }
diff --git a/src/include/distributed/citus_custom_scan.h b/src/include/distributed/citus_custom_scan.h
index 497e5db7d..51b1db046 100644
--- a/src/include/distributed/citus_custom_scan.h
+++ b/src/include/distributed/citus_custom_scan.h
@@ -31,7 +31,6 @@ typedef struct CitusScanState
 
 /* custom scan methods for all executors */
 extern CustomScanMethods AdaptiveExecutorCustomScanMethods;
-extern CustomScanMethods TaskTrackerCustomScanMethods;
 extern CustomScanMethods CoordinatorInsertSelectCustomScanMethods;
 extern CustomScanMethods DelayedErrorCustomScanMethods;
 
diff --git a/src/include/distributed/multi_server_executor.h b/src/include/distributed/multi_server_executor.h
index d49f09d0c..40cab9a45 100644
--- a/src/include/distributed/multi_server_executor.h
+++ b/src/include/distributed/multi_server_executor.h
@@ -87,8 +87,7 @@ typedef enum
 {
 	MULTI_EXECUTOR_INVALID_FIRST = 0,
 	MULTI_EXECUTOR_ADAPTIVE = 1,
-	MULTI_EXECUTOR_TASK_TRACKER = 2,
-	MULTI_EXECUTOR_COORDINATOR_INSERT_SELECT = 3
+	MULTI_EXECUTOR_COORDINATOR_INSERT_SELECT = 2
 } MultiExecutorType;