This is an automated email from the ASF dual-hosted git repository. djwang pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cloudberry.git
commit 9f1c3292faf6aecaa27df9aa4a0c0d28b959450a Author: NJrslv <[email protected]> AuthorDate: Tue Mar 31 14:33:20 2026 +0300 [gp_stats_collector] Adapt namings for Cloudberry Rename ON MASTER to ON COORDINATOR in test SQL. Prefer pg_usleep() over std::this_thread::sleep_for(). Add pg_unreachable() after ereport(ERROR). Widen motion stats fields to uint64. --- .../gp_stats_collector/gp_stats_collector--1.0--1.1.sql | 10 +++++----- gpcontrib/gp_stats_collector/gp_stats_collector--1.0.sql | 6 +++--- gpcontrib/gp_stats_collector/gp_stats_collector--1.1.sql | 16 ++++++++-------- gpcontrib/gp_stats_collector/protos/gpsc_metrics.proto | 6 +++--- gpcontrib/gp_stats_collector/src/UDSConnector.cpp | 4 +--- gpcontrib/gp_stats_collector/src/hook_wrappers.cpp | 1 + 6 files changed, 21 insertions(+), 22 deletions(-) diff --git a/gpcontrib/gp_stats_collector/gp_stats_collector--1.0--1.1.sql b/gpcontrib/gp_stats_collector/gp_stats_collector--1.0--1.1.sql index 4e0157117e9..398f03b4fa9 100644 --- a/gpcontrib/gp_stats_collector/gp_stats_collector--1.0--1.1.sql +++ b/gpcontrib/gp_stats_collector/gp_stats_collector--1.0--1.1.sql @@ -25,7 +25,7 @@ DROP FUNCTION __gpsc_stat_messages_reset_f_on_master(); CREATE FUNCTION gpsc.__stat_messages_reset_f_on_master() RETURNS SETOF void AS 'MODULE_PATHNAME', 'gpsc_stat_messages_reset' -LANGUAGE C EXECUTE ON MASTER; +LANGUAGE C EXECUTE ON COORDINATOR; CREATE FUNCTION gpsc.__stat_messages_reset_f_on_segments() RETURNS SETOF void @@ -39,12 +39,12 @@ $$ SELECT gpsc.__stat_messages_reset_f_on_master(); SELECT gpsc.__stat_messages_reset_f_on_segments(); $$ -LANGUAGE SQL EXECUTE ON MASTER; +LANGUAGE SQL EXECUTE ON COORDINATOR; CREATE FUNCTION gpsc.__stat_messages_f_on_master() RETURNS SETOF record AS 'MODULE_PATHNAME', 'gpsc_stat_messages' -LANGUAGE C STRICT VOLATILE EXECUTE ON MASTER; +LANGUAGE C STRICT VOLATILE EXECUTE ON COORDINATOR; CREATE FUNCTION gpsc.__stat_messages_f_on_segments() RETURNS SETOF record @@ -77,7 +77,7 @@ ORDER BY segid; CREATE FUNCTION gpsc.__init_log_on_master() RETURNS SETOF void AS 'MODULE_PATHNAME', 'gpsc_init_log' -LANGUAGE C STRICT VOLATILE EXECUTE ON MASTER; +LANGUAGE C STRICT VOLATILE EXECUTE ON COORDINATOR; CREATE FUNCTION gpsc.__init_log_on_segments() RETURNS SETOF void @@ -97,7 +97,7 @@ CREATE VIEW gpsc.log AS CREATE FUNCTION gpsc.__truncate_log_on_master() RETURNS SETOF void AS 'MODULE_PATHNAME', 'gpsc_truncate_log' -LANGUAGE C STRICT VOLATILE EXECUTE ON MASTER; +LANGUAGE C STRICT VOLATILE EXECUTE ON COORDINATOR; CREATE FUNCTION gpsc.__truncate_log_on_segments() RETURNS SETOF void diff --git a/gpcontrib/gp_stats_collector/gp_stats_collector--1.0.sql b/gpcontrib/gp_stats_collector/gp_stats_collector--1.0.sql index ec902b02e02..e4a50aa2133 100644 --- a/gpcontrib/gp_stats_collector/gp_stats_collector--1.0.sql +++ b/gpcontrib/gp_stats_collector/gp_stats_collector--1.0.sql @@ -6,7 +6,7 @@ CREATE FUNCTION __gpsc_stat_messages_reset_f_on_master() RETURNS SETOF void AS 'MODULE_PATHNAME', 'gpsc_stat_messages_reset' -LANGUAGE C EXECUTE ON MASTER; +LANGUAGE C EXECUTE ON COORDINATOR; CREATE FUNCTION __gpsc_stat_messages_reset_f_on_segments() RETURNS SETOF void @@ -20,12 +20,12 @@ $$ SELECT __gpsc_stat_messages_reset_f_on_master(); SELECT __gpsc_stat_messages_reset_f_on_segments(); $$ -LANGUAGE SQL EXECUTE ON MASTER; +LANGUAGE SQL EXECUTE ON COORDINATOR; CREATE FUNCTION __gpsc_stat_messages_f_on_master() RETURNS SETOF record AS 'MODULE_PATHNAME', 'gpsc_stat_messages' -LANGUAGE C STRICT VOLATILE EXECUTE ON MASTER; +LANGUAGE C STRICT VOLATILE EXECUTE ON COORDINATOR; CREATE FUNCTION __gpsc_stat_messages_f_on_segments() RETURNS SETOF record diff --git a/gpcontrib/gp_stats_collector/gp_stats_collector--1.1.sql b/gpcontrib/gp_stats_collector/gp_stats_collector--1.1.sql index 6e24207e913..3ebdad14b06 100644 --- a/gpcontrib/gp_stats_collector/gp_stats_collector--1.1.sql +++ b/gpcontrib/gp_stats_collector/gp_stats_collector--1.1.sql @@ -8,7 +8,7 @@ CREATE SCHEMA gpsc; CREATE FUNCTION gpsc.__stat_messages_reset_f_on_master() RETURNS SETOF void AS 'MODULE_PATHNAME', 'gpsc_stat_messages_reset' -LANGUAGE C EXECUTE ON MASTER; +LANGUAGE C EXECUTE ON COORDINATOR; CREATE FUNCTION gpsc.__stat_messages_reset_f_on_segments() RETURNS SETOF void @@ -22,12 +22,12 @@ $$ SELECT gpsc.__stat_messages_reset_f_on_master(); SELECT gpsc.__stat_messages_reset_f_on_segments(); $$ -LANGUAGE SQL EXECUTE ON MASTER; +LANGUAGE SQL EXECUTE ON COORDINATOR; CREATE FUNCTION gpsc.__stat_messages_f_on_master() RETURNS SETOF record AS 'MODULE_PATHNAME', 'gpsc_stat_messages' -LANGUAGE C STRICT VOLATILE EXECUTE ON MASTER; +LANGUAGE C STRICT VOLATILE EXECUTE ON COORDINATOR; CREATE FUNCTION gpsc.__stat_messages_f_on_segments() RETURNS SETOF record @@ -59,7 +59,7 @@ ORDER BY segid; CREATE FUNCTION gpsc.__init_log_on_master() RETURNS SETOF void AS 'MODULE_PATHNAME', 'gpsc_init_log' -LANGUAGE C STRICT VOLATILE EXECUTE ON MASTER; +LANGUAGE C STRICT VOLATILE EXECUTE ON COORDINATOR; CREATE FUNCTION gpsc.__init_log_on_segments() RETURNS SETOF void @@ -79,7 +79,7 @@ ORDER BY tmid, ssid, ccnt; CREATE FUNCTION gpsc.__truncate_log_on_master() RETURNS SETOF void AS 'MODULE_PATHNAME', 'gpsc_truncate_log' -LANGUAGE C STRICT VOLATILE EXECUTE ON MASTER; +LANGUAGE C STRICT VOLATILE EXECUTE ON COORDINATOR; CREATE FUNCTION gpsc.__truncate_log_on_segments() RETURNS SETOF void @@ -97,14 +97,14 @@ $$ LANGUAGE plpgsql VOLATILE; CREATE FUNCTION gpsc.__test_uds_start_server(path text) RETURNS SETOF void AS 'MODULE_PATHNAME', 'gpsc_test_uds_start_server' -LANGUAGE C STRICT EXECUTE ON MASTER; +LANGUAGE C STRICT EXECUTE ON COORDINATOR; CREATE FUNCTION gpsc.__test_uds_receive(timeout_ms int DEFAULT 2000) RETURNS SETOF bigint AS 'MODULE_PATHNAME', 'gpsc_test_uds_receive' -LANGUAGE C STRICT EXECUTE ON MASTER; +LANGUAGE C STRICT EXECUTE ON COORDINATOR; CREATE FUNCTION gpsc.__test_uds_stop_server() RETURNS SETOF void AS 'MODULE_PATHNAME', 'gpsc_test_uds_stop_server' -LANGUAGE C EXECUTE ON MASTER; +LANGUAGE C EXECUTE ON COORDINATOR; diff --git a/gpcontrib/gp_stats_collector/protos/gpsc_metrics.proto b/gpcontrib/gp_stats_collector/protos/gpsc_metrics.proto index 7853dc58db7..10991301557 100644 --- a/gpcontrib/gp_stats_collector/protos/gpsc_metrics.proto +++ b/gpcontrib/gp_stats_collector/protos/gpsc_metrics.proto @@ -113,9 +113,9 @@ message SystemStat { } message NetworkStat { - uint32 total_bytes = 1; - uint32 tuple_bytes = 2; - uint32 chunks = 3; + uint64 total_bytes = 1; + uint64 tuple_bytes = 2; + uint64 chunks = 3; } message InterconnectStat { diff --git a/gpcontrib/gp_stats_collector/src/UDSConnector.cpp b/gpcontrib/gp_stats_collector/src/UDSConnector.cpp index 16344366456..056fa9071a5 100644 --- a/gpcontrib/gp_stats_collector/src/UDSConnector.cpp +++ b/gpcontrib/gp_stats_collector/src/UDSConnector.cpp @@ -31,13 +31,11 @@ #include "log/LogOps.h" #include "memory/gpdbwrappers.h" -#include <chrono> #include <string> #include <sys/fcntl.h> #include <sys/socket.h> #include <sys/types.h> #include <sys/un.h> -#include <thread> #include <unistd.h> extern "C" { @@ -132,7 +130,7 @@ UDSConnector::report_query(const gpsc::SetQueryReq &req, // if a message does not fit a single packet, we take a nap // before sending the next one. // Otherwise, MSG_DONTWAIT send might overflow the UDS - (std::this_thread::sleep_for(std::chrono::milliseconds(1)), true)); + (pg_usleep(1000), true)); if (sent < 0) { diff --git a/gpcontrib/gp_stats_collector/src/hook_wrappers.cpp b/gpcontrib/gp_stats_collector/src/hook_wrappers.cpp index 3f19d4d9930..38ea117bda2 100644 --- a/gpcontrib/gp_stats_collector/src/hook_wrappers.cpp +++ b/gpcontrib/gp_stats_collector/src/hook_wrappers.cpp @@ -116,6 +116,7 @@ cpp_call(T *obj, R (T::*func)(Args...), Args... args) catch (const std::exception &e) { ereport(ERROR, (errmsg("Unexpected exception in gpsc %s", e.what()))); + pg_unreachable(); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
