Merge pull request #1684 from citusdata/remove_binary_copy_tests

Remove separate citus.binary_worker_copy_format regression tests

src/test/regress/Makefile

@@ -37,7 +37,7 @@ output_files := $(patsubst $(citus_abs_srcdir)/output/%.source,expected/%.out, $
 # intermediate, for muscle memory backward compatibility.
 check: check-full
 # check-full triggers all tests that ought to be run routinely
-check-full: check-multi check-multi-mx check-multi-task-tracker-extra check-multi-binary check-worker check-follower-cluster
+check-full: check-multi check-multi-mx check-multi-task-tracker-extra check-worker check-follower-cluster
 
 # using pg_regress_multi_check unnecessarily starts up multiple nodes, which isn't needed
 # for check-worker. But that's harmless besides a few cycles.
@@ -71,11 +71,6 @@ check-multi-task-tracker-extra: all tempinstall-main
 	--server-option=citus.large_table_shard_count=1 \
 	-- $(MULTI_REGRESS_OPTS) --schedule=$(citus_abs_srcdir)/multi_task_tracker_extra_schedule $(EXTRA_TESTS)
 
-check-multi-binary: all tempinstall-main
-	$(pg_regress_multi_check) --load-extension=citus \
-	--server-option=citus.binary_worker_copy_format=on \
-	-- $(MULTI_REGRESS_OPTS) --schedule=$(citus_abs_srcdir)/multi_binary_schedule $(EXTRA_TESTS)
-
 check-follower-cluster: all
 	$(pg_regress_multi_check) --load-extension=citus --follower-cluster \
 	-- $(MULTI_REGRESS_OPTS) --schedule=$(citus_abs_srcdir)/multi_follower_schedule $(EXTRA_TESTS)

src/test/regress/input/multi_load_more_data.source

@@ -13,3 +13,7 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 280000;
 \copy customer FROM '@abs_srcdir@/data/customer.2.data' with delimiter '|'
 \copy customer FROM '@abs_srcdir@/data/customer.3.data' with delimiter '|'
 \copy part FROM '@abs_srcdir@/data/part.more.data' with delimiter '|'
+
+-- Exchange partition files in binary format in remaining tests
+SELECT success FROM run_command_on_workers('ALTER SYSTEM SET citus.binary_worker_copy_format TO on');
+SELECT success FROM run_command_on_workers('SELECT pg_reload_conf()');

src/test/regress/multi_binary_schedule

@@ -1,35 +0,0 @@
-# ----------
-# $Id$
-#
-# Regression tests that test binary mode data transfer between workers.
-# No new tests are expected here unless they are specifically testing for changes
-# in binary mode data transfer
-#
-# ----------
-
-# ---
-# Tests around schema changes, these are run first, so there's no preexisting objects.
-# ---
-test: multi_extension
-test: multi_cluster_management
-test: multi_test_helpers
-test: multi_table_ddl
-
-# ----------
-# The following distributed tests depend on creating a partitioned table and
-# uploading data to it.
-# ----------
-test: multi_create_table
-test: multi_load_data
-
-test: multi_basic_queries multi_complex_expressions 
-test: multi_single_relation_subquery
-test: multi_binary_master_copy_format
-
-test: multi_simple_queries
-
-# ---------
-# multi_copy creates hash and range-partitioned tables and performs COPY
-# ---------
-test: multi_copy
-

src/test/regress/output/multi_load_more_data.source

@@ -8,3 +8,18 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 280000;
 \copy customer FROM '@abs_srcdir@/data/customer.2.data' with delimiter '|'
 \copy customer FROM '@abs_srcdir@/data/customer.3.data' with delimiter '|'
 \copy part FROM '@abs_srcdir@/data/part.more.data' with delimiter '|'
+-- Exchange partition files in binary format in remaining tests
+SELECT success FROM run_command_on_workers('ALTER SYSTEM SET citus.binary_worker_copy_format TO on');
+ success 
+---------
+ t
+ t
+(2 rows)
+
+SELECT success FROM run_command_on_workers('SELECT pg_reload_conf()');
+ success 
+---------
+ t
+ t
+(2 rows)
+