From 0b4b63e647055a704a0ec2306dbf843cf5f14f91 Mon Sep 17 00:00:00 2001
From: Marco Slot <marco.slot@gmail.com>
Date: Thu, 3 Oct 2019 16:08:58 +0200
Subject: [PATCH] Drop the rebalancer before creating new UDFs

---
 .../distributed/sql/citus--8.3-1--9.0-1.sql       | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/backend/distributed/sql/citus--8.3-1--9.0-1.sql b/src/backend/distributed/sql/citus--8.3-1--9.0-1.sql
index ce700fbe3..cd3ec64ad 100644
--- a/src/backend/distributed/sql/citus--8.3-1--9.0-1.sql
+++ b/src/backend/distributed/sql/citus--8.3-1--9.0-1.sql
@@ -1,5 +1,7 @@
 /* citus--8.3-1--9.0-1 */
 
+SET search_path = 'pg_catalog';
+
 -- We swapped the groupid and nodeid sequences when creating pg_dist_node
 ALTER TABLE pg_dist_node ALTER COLUMN groupid SET DEFAULT nextval ('pg_dist_groupid_seq');
 ALTER TABLE pg_dist_node ALTER COLUMN nodeid SET DEFAULT nextval('pg_dist_node_nodeid_seq');
@@ -74,14 +76,13 @@ CREATE TRIGGER dist_object_cache_invalidate
  */
 ALTER TABLE pg_dist_poolinfo DROP CONSTRAINT pg_dist_poolinfo_nodeid_fkey;
 
+/* if the rebalancer extension is still around, drop it before creating Citus functions */
+DROP EXTENSION IF EXISTS shard_rebalancer;
+
 #include "udfs/get_rebalance_table_shards_plan/9.0-1.sql"
 #include "udfs/replicate_table_shards/9.0-1.sql"
 #include "udfs/rebalance_table_shards/9.0-1.sql"
 
-SET search_path = 'pg_catalog';
-
-DROP EXTENSION IF EXISTS shard_rebalancer;
-
 -- get_rebalance_progress returns the list of shard placement move operations along with
 -- their progressions for ongoing rebalance operations.
 --
@@ -127,8 +128,6 @@ COMMENT ON FUNCTION master_add_inactive_node(nodename text,nodeport integer,
                                              nodecluster name)
   IS 'prepare node by adding it to pg_dist_node';
 
-SET search_path = 'pg_catalog';
-
 DROP FUNCTION master_activate_node(text, integer);
 CREATE FUNCTION master_activate_node(nodename text,
                                      nodeport integer)
@@ -170,6 +169,6 @@ CREATE FUNCTION worker_apply_sequence_command(create_sequence_command text,
 COMMENT ON FUNCTION worker_apply_sequence_command(text,regtype)
     IS 'create a sequence which produces globally unique values';
 
-RESET search_path;
-
 #include "udfs/citus_isolation_test_session_is_blocked/9.0-1.sql"
+
+RESET search_path;