diff --git a/src/backend/distributed/sql/citus--10.2-4--11.0-1.sql b/src/backend/distributed/sql/citus--10.2-4--11.0-1.sql index feea26e7c..c840b3f9f 100644 --- a/src/backend/distributed/sql/citus--10.2-4--11.0-1.sql +++ b/src/backend/distributed/sql/citus--10.2-4--11.0-1.sql @@ -17,8 +17,8 @@ #include "udfs/get_all_active_transactions/11.0-1.sql" #include "udfs/get_global_active_transactions/11.0-1.sql" -#include "udfs/dump_local_blocked_processes/11.0-1.sql" -#include "udfs/dump_global_blocked_processes/11.0-1.sql" +#include "udfs/citus_internal_local_blocked_processes/11.0-1.sql" +#include "udfs/citus_internal_global_blocked_processes/11.0-1.sql" #include "udfs/citus_worker_stat_activity/11.0-1.sql" #include "udfs/citus_isolation_test_session_is_blocked/11.0-1.sql" diff --git a/src/backend/distributed/sql/downgrades/citus--11.0-1--10.2-4.sql b/src/backend/distributed/sql/downgrades/citus--11.0-1--10.2-4.sql index 49967ddf5..161f64b91 100644 --- a/src/backend/distributed/sql/downgrades/citus--11.0-1--10.2-4.sql +++ b/src/backend/distributed/sql/downgrades/citus--11.0-1--10.2-4.sql @@ -113,8 +113,8 @@ CREATE FUNCTION get_global_active_transactions(OUT datid oid, OUT process_id int RESET search_path; -DROP FUNCTION dump_local_blocked_processes CASCADE; -DROP FUNCTION dump_global_blocked_processes CASCADE; +DROP FUNCTION citus_internal_local_blocked_processes CASCADE; +DROP FUNCTION citus_internal_global_blocked_processes CASCADE; DROP FUNCTION pg_catalog.citus_dist_stat_activity CASCADE; diff --git a/src/backend/distributed/sql/udfs/citus_blocking_pids/11.0-1.sql b/src/backend/distributed/sql/udfs/citus_blocking_pids/11.0-1.sql index c63d98ec9..c7e607c1c 100644 --- a/src/backend/distributed/sql/udfs/citus_blocking_pids/11.0-1.sql +++ b/src/backend/distributed/sql/udfs/citus_blocking_pids/11.0-1.sql @@ -20,7 +20,7 @@ RETURNS int4[] AS $$ WITH activeTransactions AS ( SELECT global_pid FROM get_all_active_transactions() ), blockingTransactions AS ( - SELECT blocking_global_pid FROM dump_global_blocked_processes() + SELECT blocking_global_pid FROM citus_internal_global_blocked_processes() WHERE waiting_global_pid = mLocalGlobalPid ) SELECT activeTransactions.global_pid FROM activeTransactions, blockingTransactions diff --git a/src/backend/distributed/sql/udfs/citus_blocking_pids/latest.sql b/src/backend/distributed/sql/udfs/citus_blocking_pids/latest.sql index c63d98ec9..c7e607c1c 100644 --- a/src/backend/distributed/sql/udfs/citus_blocking_pids/latest.sql +++ b/src/backend/distributed/sql/udfs/citus_blocking_pids/latest.sql @@ -20,7 +20,7 @@ RETURNS int4[] AS $$ WITH activeTransactions AS ( SELECT global_pid FROM get_all_active_transactions() ), blockingTransactions AS ( - SELECT blocking_global_pid FROM dump_global_blocked_processes() + SELECT blocking_global_pid FROM citus_internal_global_blocked_processes() WHERE waiting_global_pid = mLocalGlobalPid ) SELECT activeTransactions.global_pid FROM activeTransactions, blockingTransactions diff --git a/src/backend/distributed/sql/udfs/dump_global_blocked_processes/11.0-1.sql b/src/backend/distributed/sql/udfs/citus_internal_global_blocked_processes/11.0-1.sql similarity index 100% rename from src/backend/distributed/sql/udfs/dump_global_blocked_processes/11.0-1.sql rename to src/backend/distributed/sql/udfs/citus_internal_global_blocked_processes/11.0-1.sql diff --git a/src/backend/distributed/sql/udfs/dump_global_blocked_processes/latest.sql b/src/backend/distributed/sql/udfs/citus_internal_global_blocked_processes/latest.sql similarity index 100% rename from src/backend/distributed/sql/udfs/dump_global_blocked_processes/latest.sql rename to src/backend/distributed/sql/udfs/citus_internal_global_blocked_processes/latest.sql diff --git a/src/backend/distributed/sql/udfs/dump_local_blocked_processes/11.0-1.sql b/src/backend/distributed/sql/udfs/citus_internal_local_blocked_processes/11.0-1.sql similarity index 100% rename from src/backend/distributed/sql/udfs/dump_local_blocked_processes/11.0-1.sql rename to src/backend/distributed/sql/udfs/citus_internal_local_blocked_processes/11.0-1.sql diff --git a/src/backend/distributed/sql/udfs/dump_local_blocked_processes/latest.sql b/src/backend/distributed/sql/udfs/citus_internal_local_blocked_processes/latest.sql similarity index 100% rename from src/backend/distributed/sql/udfs/dump_local_blocked_processes/latest.sql rename to src/backend/distributed/sql/udfs/citus_internal_local_blocked_processes/latest.sql diff --git a/src/backend/distributed/sql/udfs/citus_isolation_test_session_is_blocked/11.0-1.sql b/src/backend/distributed/sql/udfs/citus_isolation_test_session_is_blocked/11.0-1.sql index 94071a86f..64b89ec0e 100644 --- a/src/backend/distributed/sql/udfs/citus_isolation_test_session_is_blocked/11.0-1.sql +++ b/src/backend/distributed/sql/udfs/citus_isolation_test_session_is_blocked/11.0-1.sql @@ -24,7 +24,7 @@ RETURNS boolean AS $$ END IF; RETURN EXISTS ( - SELECT 1 FROM dump_global_blocked_processes() + SELECT 1 FROM citus_internal_global_blocked_processes() WHERE waiting_global_pid = mBlockedGlobalPid ) OR EXISTS ( -- Check on the workers if any logical replication job spawned by the diff --git a/src/backend/distributed/sql/udfs/citus_isolation_test_session_is_blocked/latest.sql b/src/backend/distributed/sql/udfs/citus_isolation_test_session_is_blocked/latest.sql index 94071a86f..64b89ec0e 100644 --- a/src/backend/distributed/sql/udfs/citus_isolation_test_session_is_blocked/latest.sql +++ b/src/backend/distributed/sql/udfs/citus_isolation_test_session_is_blocked/latest.sql @@ -24,7 +24,7 @@ RETURNS boolean AS $$ END IF; RETURN EXISTS ( - SELECT 1 FROM dump_global_blocked_processes() + SELECT 1 FROM citus_internal_global_blocked_processes() WHERE waiting_global_pid = mBlockedGlobalPid ) OR EXISTS ( -- Check on the workers if any logical replication job spawned by the diff --git a/src/backend/distributed/sql/udfs/citus_lock_waits/11.0-1.sql b/src/backend/distributed/sql/udfs/citus_lock_waits/11.0-1.sql index 8b19fad18..779341657 100644 --- a/src/backend/distributed/sql/udfs/citus_lock_waits/11.0-1.sql +++ b/src/backend/distributed/sql/udfs/citus_lock_waits/11.0-1.sql @@ -8,7 +8,7 @@ citus_dist_stat_activity AS ), unique_global_wait_edges AS ( - SELECT DISTINCT ON(waiting_global_pid, blocking_global_pid) * FROM dump_global_blocked_processes() + SELECT DISTINCT ON(waiting_global_pid, blocking_global_pid) * FROM citus_internal_global_blocked_processes() ), citus_dist_stat_activity_with_node_id AS ( diff --git a/src/backend/distributed/sql/udfs/citus_lock_waits/latest.sql b/src/backend/distributed/sql/udfs/citus_lock_waits/latest.sql index 8b19fad18..779341657 100644 --- a/src/backend/distributed/sql/udfs/citus_lock_waits/latest.sql +++ b/src/backend/distributed/sql/udfs/citus_lock_waits/latest.sql @@ -8,7 +8,7 @@ citus_dist_stat_activity AS ), unique_global_wait_edges AS ( - SELECT DISTINCT ON(waiting_global_pid, blocking_global_pid) * FROM dump_global_blocked_processes() + SELECT DISTINCT ON(waiting_global_pid, blocking_global_pid) * FROM citus_internal_global_blocked_processes() ), citus_dist_stat_activity_with_node_id AS ( diff --git a/src/backend/distributed/transaction/lock_graph.c b/src/backend/distributed/transaction/lock_graph.c index d1ff733da..92ef7c164 100644 --- a/src/backend/distributed/transaction/lock_graph.c +++ b/src/backend/distributed/transaction/lock_graph.c @@ -69,8 +69,8 @@ static bool IsConflictingLockMask(int holdMask, int conflictMask); * We almost have 2 sets of identical functions. The first set (e.g., dump_wait_edges) * functions are intended for distributed deadlock detection purposes. * - * The second set of functions (e.g., dump_blocked_processes) are intended for - * citus_lock_waits view. + * The second set of functions (e.g., citus_internal_local_blocked_processes) are + * intended for citus_lock_waits view. * * The main difference is that the former functions only show processes that are blocked * inside a distributed transaction (e.g., see AssignDistributedTransactionId()). @@ -86,8 +86,8 @@ static bool IsConflictingLockMask(int holdMask, int conflictMask); PG_FUNCTION_INFO_V1(dump_local_wait_edges); PG_FUNCTION_INFO_V1(dump_global_wait_edges); -PG_FUNCTION_INFO_V1(dump_local_blocked_processes); -PG_FUNCTION_INFO_V1(dump_global_blocked_processes); +PG_FUNCTION_INFO_V1(citus_internal_local_blocked_processes); +PG_FUNCTION_INFO_V1(citus_internal_global_blocked_processes); /* @@ -108,11 +108,11 @@ dump_global_wait_edges(PG_FUNCTION_ARGS) /* - * dump_global_blocked_processes returns global wait edges including all processes - * running on the cluster. + * citus_internal_global_blocked_processes returns global wait edges + * including all processes running on the cluster. */ Datum -dump_global_blocked_processes(PG_FUNCTION_ARGS) +citus_internal_global_blocked_processes(PG_FUNCTION_ARGS) { bool onlyDistributedTx = false; @@ -183,7 +183,7 @@ BuildGlobalWaitGraph(bool onlyDistributedTx) else { appendStringInfo(queryString, - "SELECT * FROM dump_local_blocked_processes()"); + "SELECT * FROM citus_internal_local_blocked_processes()"); } int querySent = SendRemoteCommand(connection, queryString->data); @@ -217,7 +217,7 @@ BuildGlobalWaitGraph(bool onlyDistributedTx) else if (!onlyDistributedTx && colCount != 11) { ereport(WARNING, (errmsg("unexpected number of columns from " - "dump_local_blocked_processes"))); + "citus_internal_local_blocked_processes"))); continue; } @@ -364,11 +364,11 @@ dump_local_wait_edges(PG_FUNCTION_ARGS) /* - * dump_local_blocked_processes returns global wait edges including - * all processes running on the node. + * citus_internal_local_blocked_processes returns global wait edges + * including all processes running on the node. */ Datum -dump_local_blocked_processes(PG_FUNCTION_ARGS) +citus_internal_local_blocked_processes(PG_FUNCTION_ARGS) { bool onlyDistributedTx = false; diff --git a/src/test/regress/expected/multi_extension.out b/src/test/regress/expected/multi_extension.out index ee064dd90..25253aa20 100644 --- a/src/test/regress/expected/multi_extension.out +++ b/src/test/regress/expected/multi_extension.out @@ -1007,12 +1007,12 @@ SELECT * FROM multi_extension.print_extension_changes(); | function citus_check_connection_to_node(text,integer) boolean | function citus_disable_node(text,integer,boolean) void | function citus_internal_add_object_metadata(text,text[],text[],integer,integer,boolean) void + | function citus_internal_local_blocked_processes() SETOF record + | function citus_internal_global_blocked_processes() SETOF record | function citus_run_local_command(text) void | function citus_shard_indexes_on_worker() SETOF record | function citus_shards_on_worker() SETOF record | function create_distributed_function(regprocedure,text,text,boolean) void - | function dump_global_blocked_processes() SETOF record - | function dump_local_blocked_processes() SETOF record | function worker_drop_sequence_dependency(text) void | function worker_drop_shell_table(text) void (17 rows) diff --git a/src/test/regress/expected/upgrade_list_citus_objects.out b/src/test/regress/expected/upgrade_list_citus_objects.out index 3244266be..e3844c061 100644 --- a/src/test/regress/expected/upgrade_list_citus_objects.out +++ b/src/test/regress/expected/upgrade_list_citus_objects.out @@ -74,6 +74,8 @@ ORDER BY 1; function citus_internal_add_placement_metadata(bigint,integer,bigint,integer,bigint) function citus_internal_add_shard_metadata(regclass,bigint,"char",text,text) function citus_internal_delete_shard_metadata(bigint) + function citus_internal_global_blocked_processes() + function citus_internal_local_blocked_processes() function citus_internal_update_placement_metadata(bigint,integer,integer) function citus_internal_update_relation_colocation(oid,integer) function citus_isolation_test_session_is_blocked(integer,integer[]) @@ -127,9 +129,7 @@ ORDER BY 1; function create_time_partitions(regclass,interval,timestamp with time zone,timestamp with time zone) function distributed_tables_colocated(regclass,regclass) function drop_old_time_partitions(regclass,timestamp with time zone) - function dump_global_blocked_processes() function dump_global_wait_edges() - function dump_local_blocked_processes() function dump_local_wait_edges() function fetch_intermediate_results(text[],text,integer) function fix_all_partition_shard_index_names()