Skip to content

Commit 9f1c329

Browse files
NJrslvtuhaihe
authored andcommitted
[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.
1 parent 5cfde24 commit 9f1c329

File tree

6 files changed

+21
-22
lines changed

6 files changed

+21
-22
lines changed

gpcontrib/gp_stats_collector/gp_stats_collector--1.0--1.1.sql

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ DROP FUNCTION __gpsc_stat_messages_reset_f_on_master();
2525
CREATE FUNCTION gpsc.__stat_messages_reset_f_on_master()
2626
RETURNS SETOF void
2727
AS 'MODULE_PATHNAME', 'gpsc_stat_messages_reset'
28-
LANGUAGE C EXECUTE ON MASTER;
28+
LANGUAGE C EXECUTE ON COORDINATOR;
2929

3030
CREATE FUNCTION gpsc.__stat_messages_reset_f_on_segments()
3131
RETURNS SETOF void
@@ -39,12 +39,12 @@ $$
3939
SELECT gpsc.__stat_messages_reset_f_on_master();
4040
SELECT gpsc.__stat_messages_reset_f_on_segments();
4141
$$
42-
LANGUAGE SQL EXECUTE ON MASTER;
42+
LANGUAGE SQL EXECUTE ON COORDINATOR;
4343

4444
CREATE FUNCTION gpsc.__stat_messages_f_on_master()
4545
RETURNS SETOF record
4646
AS 'MODULE_PATHNAME', 'gpsc_stat_messages'
47-
LANGUAGE C STRICT VOLATILE EXECUTE ON MASTER;
47+
LANGUAGE C STRICT VOLATILE EXECUTE ON COORDINATOR;
4848

4949
CREATE FUNCTION gpsc.__stat_messages_f_on_segments()
5050
RETURNS SETOF record
@@ -77,7 +77,7 @@ ORDER BY segid;
7777
CREATE FUNCTION gpsc.__init_log_on_master()
7878
RETURNS SETOF void
7979
AS 'MODULE_PATHNAME', 'gpsc_init_log'
80-
LANGUAGE C STRICT VOLATILE EXECUTE ON MASTER;
80+
LANGUAGE C STRICT VOLATILE EXECUTE ON COORDINATOR;
8181

8282
CREATE FUNCTION gpsc.__init_log_on_segments()
8383
RETURNS SETOF void
@@ -97,7 +97,7 @@ CREATE VIEW gpsc.log AS
9797
CREATE FUNCTION gpsc.__truncate_log_on_master()
9898
RETURNS SETOF void
9999
AS 'MODULE_PATHNAME', 'gpsc_truncate_log'
100-
LANGUAGE C STRICT VOLATILE EXECUTE ON MASTER;
100+
LANGUAGE C STRICT VOLATILE EXECUTE ON COORDINATOR;
101101

102102
CREATE FUNCTION gpsc.__truncate_log_on_segments()
103103
RETURNS SETOF void

gpcontrib/gp_stats_collector/gp_stats_collector--1.0.sql

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
CREATE FUNCTION __gpsc_stat_messages_reset_f_on_master()
77
RETURNS SETOF void
88
AS 'MODULE_PATHNAME', 'gpsc_stat_messages_reset'
9-
LANGUAGE C EXECUTE ON MASTER;
9+
LANGUAGE C EXECUTE ON COORDINATOR;
1010

1111
CREATE FUNCTION __gpsc_stat_messages_reset_f_on_segments()
1212
RETURNS SETOF void
@@ -20,12 +20,12 @@ $$
2020
SELECT __gpsc_stat_messages_reset_f_on_master();
2121
SELECT __gpsc_stat_messages_reset_f_on_segments();
2222
$$
23-
LANGUAGE SQL EXECUTE ON MASTER;
23+
LANGUAGE SQL EXECUTE ON COORDINATOR;
2424

2525
CREATE FUNCTION __gpsc_stat_messages_f_on_master()
2626
RETURNS SETOF record
2727
AS 'MODULE_PATHNAME', 'gpsc_stat_messages'
28-
LANGUAGE C STRICT VOLATILE EXECUTE ON MASTER;
28+
LANGUAGE C STRICT VOLATILE EXECUTE ON COORDINATOR;
2929

3030
CREATE FUNCTION __gpsc_stat_messages_f_on_segments()
3131
RETURNS SETOF record

gpcontrib/gp_stats_collector/gp_stats_collector--1.1.sql

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ CREATE SCHEMA gpsc;
88
CREATE FUNCTION gpsc.__stat_messages_reset_f_on_master()
99
RETURNS SETOF void
1010
AS 'MODULE_PATHNAME', 'gpsc_stat_messages_reset'
11-
LANGUAGE C EXECUTE ON MASTER;
11+
LANGUAGE C EXECUTE ON COORDINATOR;
1212

1313
CREATE FUNCTION gpsc.__stat_messages_reset_f_on_segments()
1414
RETURNS SETOF void
@@ -22,12 +22,12 @@ $$
2222
SELECT gpsc.__stat_messages_reset_f_on_master();
2323
SELECT gpsc.__stat_messages_reset_f_on_segments();
2424
$$
25-
LANGUAGE SQL EXECUTE ON MASTER;
25+
LANGUAGE SQL EXECUTE ON COORDINATOR;
2626

2727
CREATE FUNCTION gpsc.__stat_messages_f_on_master()
2828
RETURNS SETOF record
2929
AS 'MODULE_PATHNAME', 'gpsc_stat_messages'
30-
LANGUAGE C STRICT VOLATILE EXECUTE ON MASTER;
30+
LANGUAGE C STRICT VOLATILE EXECUTE ON COORDINATOR;
3131

3232
CREATE FUNCTION gpsc.__stat_messages_f_on_segments()
3333
RETURNS SETOF record
@@ -59,7 +59,7 @@ ORDER BY segid;
5959
CREATE FUNCTION gpsc.__init_log_on_master()
6060
RETURNS SETOF void
6161
AS 'MODULE_PATHNAME', 'gpsc_init_log'
62-
LANGUAGE C STRICT VOLATILE EXECUTE ON MASTER;
62+
LANGUAGE C STRICT VOLATILE EXECUTE ON COORDINATOR;
6363

6464
CREATE FUNCTION gpsc.__init_log_on_segments()
6565
RETURNS SETOF void
@@ -79,7 +79,7 @@ ORDER BY tmid, ssid, ccnt;
7979
CREATE FUNCTION gpsc.__truncate_log_on_master()
8080
RETURNS SETOF void
8181
AS 'MODULE_PATHNAME', 'gpsc_truncate_log'
82-
LANGUAGE C STRICT VOLATILE EXECUTE ON MASTER;
82+
LANGUAGE C STRICT VOLATILE EXECUTE ON COORDINATOR;
8383

8484
CREATE FUNCTION gpsc.__truncate_log_on_segments()
8585
RETURNS SETOF void
@@ -97,14 +97,14 @@ $$ LANGUAGE plpgsql VOLATILE;
9797
CREATE FUNCTION gpsc.__test_uds_start_server(path text)
9898
RETURNS SETOF void
9999
AS 'MODULE_PATHNAME', 'gpsc_test_uds_start_server'
100-
LANGUAGE C STRICT EXECUTE ON MASTER;
100+
LANGUAGE C STRICT EXECUTE ON COORDINATOR;
101101

102102
CREATE FUNCTION gpsc.__test_uds_receive(timeout_ms int DEFAULT 2000)
103103
RETURNS SETOF bigint
104104
AS 'MODULE_PATHNAME', 'gpsc_test_uds_receive'
105-
LANGUAGE C STRICT EXECUTE ON MASTER;
105+
LANGUAGE C STRICT EXECUTE ON COORDINATOR;
106106

107107
CREATE FUNCTION gpsc.__test_uds_stop_server()
108108
RETURNS SETOF void
109109
AS 'MODULE_PATHNAME', 'gpsc_test_uds_stop_server'
110-
LANGUAGE C EXECUTE ON MASTER;
110+
LANGUAGE C EXECUTE ON COORDINATOR;

gpcontrib/gp_stats_collector/protos/gpsc_metrics.proto

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,9 @@ message SystemStat {
113113
}
114114

115115
message NetworkStat {
116-
uint32 total_bytes = 1;
117-
uint32 tuple_bytes = 2;
118-
uint32 chunks = 3;
116+
uint64 total_bytes = 1;
117+
uint64 tuple_bytes = 2;
118+
uint64 chunks = 3;
119119
}
120120

121121
message InterconnectStat {

gpcontrib/gp_stats_collector/src/UDSConnector.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,11 @@
3131
#include "log/LogOps.h"
3232
#include "memory/gpdbwrappers.h"
3333

34-
#include <chrono>
3534
#include <string>
3635
#include <sys/fcntl.h>
3736
#include <sys/socket.h>
3837
#include <sys/types.h>
3938
#include <sys/un.h>
40-
#include <thread>
4139
#include <unistd.h>
4240

4341
extern "C" {
@@ -132,7 +130,7 @@ UDSConnector::report_query(const gpsc::SetQueryReq &req,
132130
// if a message does not fit a single packet, we take a nap
133131
// before sending the next one.
134132
// Otherwise, MSG_DONTWAIT send might overflow the UDS
135-
(std::this_thread::sleep_for(std::chrono::milliseconds(1)), true));
133+
(pg_usleep(1000), true));
136134

137135
if (sent < 0)
138136
{

gpcontrib/gp_stats_collector/src/hook_wrappers.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ cpp_call(T *obj, R (T::*func)(Args...), Args... args)
116116
catch (const std::exception &e)
117117
{
118118
ereport(ERROR, (errmsg("Unexpected exception in gpsc %s", e.what())));
119+
pg_unreachable();
119120
}
120121
}
121122

0 commit comments

Comments
 (0)