diff --git a/.circleci/config.yml b/.circleci/config.yml index a88e40094..548de9dae 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -693,6 +693,12 @@ workflows: image_tag: '<< pipeline.parameters.pg14_version >>' make: check-enterprise-failure requires: [build-14] + - test-citus: + name: 'test-14_check-enterprise-split' + pg_major: 14 + image_tag: '<< pipeline.parameters.pg14_version >>' + make: check-enterprise-split + requires: [build-14] - test-citus: name: 'test-14_check-multi' pg_major: 14 diff --git a/src/test/regress/Makefile b/src/test/regress/Makefile index 5b0135fb2..ea4ec148e 100644 --- a/src/test/regress/Makefile +++ b/src/test/regress/Makefile @@ -45,7 +45,7 @@ check: check-full check-enterprise-full # check-full triggers all tests that ought to be run routinely check-full: check-multi check-multi-mx check-multi-1 check-operations check-follower-cluster check-isolation check-failure check-split # check-enterprise-full triggers all enterprise specific tests -check-enterprise-full: check-enterprise check-enterprise-isolation check-enterprise-failure +check-enterprise-full: check-enterprise check-enterprise-isolation check-enterprise-failure check-enterprise-split ISOLATION_DEPDIR=.deps/isolation @@ -232,6 +232,10 @@ check-enterprise-failure: all $(pg_regress_multi_check) --load-extension=citus --mitmproxy \ -- $(MULTI_REGRESS_OPTS) --schedule=$(citus_abs_srcdir)/enterprise_failure_schedule $(EXTRA_TESTS) +check-enterprise-split: all + $(pg_regress_multi_check) --load-extension=citus \ + -- $(MULTI_REGRESS_OPTS) --schedule=$(citus_abs_srcdir)/enterprise_split_schedule $(EXTRA_TESTS) + check-pg-upgrade: $(pg_upgrade_check) --old-bindir=$(old-bindir) --new-bindir=$(new-bindir) --pgxsdir=$(pgxsdir) diff --git a/src/test/regress/enterprise_split_schedule b/src/test/regress/enterprise_split_schedule new file mode 100644 index 000000000..6f216ea44 --- /dev/null +++ b/src/test/regress/enterprise_split_schedule @@ -0,0 +1,9 @@ +# Split Shard tests. +# Include tests from 'minimal_schedule' for setup. +test: multi_test_helpers multi_test_helpers_superuser columnar_test_helpers +test: multi_cluster_management +test: multi_test_catalog_views +test: tablespace +# Split tests go here. +test: citus_split_shard_by_split_points_negative +test: citus_split_shard_by_split_points diff --git a/src/test/regress/expected/multi_extension.out b/src/test/regress/expected/multi_extension.out index 024b27e57..cfc93165a 100644 --- a/src/test/regress/expected/multi_extension.out +++ b/src/test/regress/expected/multi_extension.out @@ -1442,4 +1442,4 @@ DROP TABLE version_mismatch_table; DROP SCHEMA multi_extension; ERROR: cannot drop schema multi_extension because other objects depend on it DETAIL: function multi_extension.print_extension_changes() depends on schema multi_extension -HINT: Use DROP ... CASCADE to drop the dependent objects too. +HINT: Use DROP ... CASCADE to drop the dependent objects too. \ No newline at end of file diff --git a/src/test/regress/expected/upgrade_list_citus_objects.out b/src/test/regress/expected/upgrade_list_citus_objects.out index e361a7040..ef04f2b8c 100644 --- a/src/test/regress/expected/upgrade_list_citus_objects.out +++ b/src/test/regress/expected/upgrade_list_citus_objects.out @@ -113,6 +113,7 @@ ORDER BY 1; function citus_shard_indexes_on_worker() function citus_shard_sizes() function citus_shards_on_worker() + function citus_split_shard_by_split_points(bigint,integer[],integer[]) function citus_stat_activity() function citus_stat_statements() function citus_stat_statements_reset()