diff --git a/src/include/distributed/metadata_sync.h b/src/include/distributed/metadata_sync.h index 7c66a787b..0d445081a 100644 --- a/src/include/distributed/metadata_sync.h +++ b/src/include/distributed/metadata_sync.h @@ -69,11 +69,11 @@ extern void GetDependentSequencesWithRelation(Oid relationId, List **attnumList, attnum); extern Oid GetAttributeTypeOid(Oid relationId, AttrNumber attnum); -#define DELETE_ALL_NODES "TRUNCATE pg_dist_node CASCADE" -#define DELETE_ALL_PLACEMENTS "TRUNCATE pg_dist_placement CASCADE" -#define DELETE_ALL_SHARDS "TRUNCATE pg_dist_shard CASCADE" -#define DELETE_ALL_DISTRIBUTED_OBJECTS "TRUNCATE citus.pg_dist_object" -#define DELETE_ALL_PARTITIONS "TRUNCATE pg_dist_partition CASCADE" +#define DELETE_ALL_NODES "DELETE FROM pg_dist_node CASCADE" +#define DELETE_ALL_PLACEMENTS "DELETE FROM pg_dist_placement CASCADE" +#define DELETE_ALL_SHARDS "DELETE FROM pg_dist_shard CASCADE" +#define DELETE_ALL_DISTRIBUTED_OBJECTS "DELETE FROM citus.pg_dist_object" +#define DELETE_ALL_PARTITIONS "DELETE FROM pg_dist_partition CASCADE" #define REMOVE_ALL_CLUSTERED_TABLES_ONLY_COMMAND \ "SELECT worker_drop_distributed_table_only(logicalrelid::regclass::text) FROM pg_dist_partition" #define REMOVE_ALL_CITUS_TABLES_COMMAND \ diff --git a/src/test/regress/spec/isolation_replicate_reference_tables_to_coordinator.spec b/src/test/regress/spec/isolation_replicate_reference_tables_to_coordinator.spec index fcb7eb0a1..ea51574dc 100644 --- a/src/test/regress/spec/isolation_replicate_reference_tables_to_coordinator.spec +++ b/src/test/regress/spec/isolation_replicate_reference_tables_to_coordinator.spec @@ -1,23 +1,12 @@ setup { - SELECT citus_internal.replace_isolation_tester_func(); - SELECT citus_internal.refresh_isolation_tester_prepared_statement(); - - SELECT master_add_node('localhost', 57636); - - CREATE TABLE ref_table(a int primary key); - SELECT create_reference_table('ref_table'); - INSERT INTO ref_table VALUES (1), (3), (5), (7); - - CREATE TABLE dist_table(a int, b int); - SELECT create_distributed_table('dist_table', 'a'); + //SELECT citus_internal.replace_isolation_tester_func(); + //SELECT citus_internal.refresh_isolation_tester_prepared_statement(); } teardown { - SELECT citus_internal.restore_isolation_tester_func(); - DROP TABLE ref_table, dist_table; - SELECT master_remove_node('localhost', 57636); + // SELECT citus_internal.restore_isolation_tester_func(); } session "s1" @@ -123,7 +112,7 @@ step "deadlock-checker-call" // verify that locks on the placement of the reference table on the coordinator is // taken into account when looking for distributed deadlocks -permutation "s1-begin" "s2-begin" "s1-update-dist-table" "s2-lock-ref-table-placement-on-coordinator" "s1-lock-ref-table-placement-on-coordinator" "s2-update-dist-table" "deadlock-checker-call" "s1-end" "s2-end" +// permutation "s1-begin" "s2-begin" "s1-update-dist-table" "s2-lock-ref-table-placement-on-coordinator" "s1-lock-ref-table-placement-on-coordinator" "s2-update-dist-table" "deadlock-checker-call" "s1-end" "s2-end" // verify that *_dist_stat_activity() functions return the correct result when query // has a task on the coordinator.