From 0cfe2375b6580f020ca1b8b56a766dead9c34ae1 Mon Sep 17 00:00:00 2001
From: Burak Velioglu <buvelio@microsoft.com>
Date: Thu, 10 Feb 2022 01:35:05 +0300
Subject: [PATCH] Fix operation tests

---
 .../expected/shard_move_deferred_delete.out   | 48 +++++++------------
 .../sql/shard_move_deferred_delete.sql        | 37 +++++++-------
 2 files changed, 32 insertions(+), 53 deletions(-)

diff --git a/src/test/regress/expected/shard_move_deferred_delete.out b/src/test/regress/expected/shard_move_deferred_delete.out
index ed0d46500..179c689f2 100644
--- a/src/test/regress/expected/shard_move_deferred_delete.out
+++ b/src/test/regress/expected/shard_move_deferred_delete.out
@@ -142,22 +142,14 @@ SELECT master_move_shard_placement(20000000, 'localhost', :worker_2_port, 'local
 
 (1 row)
 
-SELECT run_command_on_workers($cmd$
-    -- override the function for testing purpose
-    create or replace function pg_catalog.citus_local_disk_space_stats(OUT available_disk_size bigint, OUT total_disk_size bigint)
-    as $BODY$
-    begin
-        select 20 into available_disk_size;
-        select 8500 into total_disk_size;
-    end
-    $BODY$ language plpgsql;
-$cmd$);
-        run_command_on_workers
----------------------------------------------------------------------
- (localhost,57637,t,"CREATE FUNCTION")
- (localhost,57638,t,"CREATE FUNCTION")
-(2 rows)
-
+-- override the function for testing purpose
+create or replace function pg_catalog.citus_local_disk_space_stats(OUT available_disk_size bigint, OUT total_disk_size bigint)
+as $BODY$
+begin
+    select 20 into available_disk_size;
+    select 8500 into total_disk_size;
+end
+$BODY$ language plpgsql;
 SELECT citus_shard_cost_by_disk_size(20000001);
  citus_shard_cost_by_disk_size
 ---------------------------------------------------------------------
@@ -187,22 +179,14 @@ $cmd$);
  (localhost,57638,t,1)
 (2 rows)
 
-SELECT run_command_on_workers($cmd$
-    -- override the function for testing purpose
-    create or replace function pg_catalog.citus_local_disk_space_stats(OUT available_disk_size bigint, OUT total_disk_size bigint)
-    as $BODY$
-    begin
-        select 8300 into available_disk_size;
-        select 8500 into total_disk_size;
-    end
-    $BODY$ language plpgsql;
-$cmd$);
-        run_command_on_workers
----------------------------------------------------------------------
- (localhost,57637,t,"CREATE FUNCTION")
- (localhost,57638,t,"CREATE FUNCTION")
-(2 rows)
-
+-- override the function for testing purpose
+create or replace function pg_catalog.citus_local_disk_space_stats(OUT available_disk_size bigint, OUT total_disk_size bigint)
+as $BODY$
+begin
+    select 8300 into available_disk_size;
+    select 8500 into total_disk_size;
+end
+$BODY$ language plpgsql;
 -- When there would not be enough free space left after the move, the move should fail
 SELECT master_move_shard_placement(20000001, 'localhost', :worker_2_port, 'localhost', :worker_1_port);
 ERROR:  not enough empty space on node if the shard is moved, actual available space after move will be 108 bytes, desired available space after move is 850 bytes,estimated size increase on node after move is 8192 bytes.
diff --git a/src/test/regress/sql/shard_move_deferred_delete.sql b/src/test/regress/sql/shard_move_deferred_delete.sql
index a052590d5..3aa52a8f6 100644
--- a/src/test/regress/sql/shard_move_deferred_delete.sql
+++ b/src/test/regress/sql/shard_move_deferred_delete.sql
@@ -80,17 +80,14 @@ $cmd$);
 SELECT master_move_shard_placement(20000000, 'localhost', :worker_2_port, 'localhost', :worker_1_port);
 
 
-SELECT run_command_on_workers($cmd$
-    -- override the function for testing purpose
-    create or replace function pg_catalog.citus_local_disk_space_stats(OUT available_disk_size bigint, OUT total_disk_size bigint)
-    as $BODY$
-    begin
-        select 20 into available_disk_size;
-        select 8500 into total_disk_size;
-    end
-    $BODY$ language plpgsql;
-$cmd$);
-
+-- override the function for testing purpose
+create or replace function pg_catalog.citus_local_disk_space_stats(OUT available_disk_size bigint, OUT total_disk_size bigint)
+as $BODY$
+begin
+    select 20 into available_disk_size;
+    select 8500 into total_disk_size;
+end
+$BODY$ language plpgsql;
 
 SELECT citus_shard_cost_by_disk_size(20000001);
 
@@ -108,16 +105,14 @@ SELECT run_command_on_workers($cmd$
     SELECT count(*) FROM pg_class WHERE relname = 't1_20000000';
 $cmd$);
 
-SELECT run_command_on_workers($cmd$
-    -- override the function for testing purpose
-    create or replace function pg_catalog.citus_local_disk_space_stats(OUT available_disk_size bigint, OUT total_disk_size bigint)
-    as $BODY$
-    begin
-        select 8300 into available_disk_size;
-        select 8500 into total_disk_size;
-    end
-    $BODY$ language plpgsql;
-$cmd$);
+-- override the function for testing purpose
+create or replace function pg_catalog.citus_local_disk_space_stats(OUT available_disk_size bigint, OUT total_disk_size bigint)
+as $BODY$
+begin
+    select 8300 into available_disk_size;
+    select 8500 into total_disk_size;
+end
+$BODY$ language plpgsql;
 
 -- When there would not be enough free space left after the move, the move should fail
 SELECT master_move_shard_placement(20000001, 'localhost', :worker_2_port, 'localhost', :worker_1_port);