From 97ab3f1257c6fe0635281f31e8beaf8850bde882 Mon Sep 17 00:00:00 2001 From: Tatsuo Ishii Date: Fri, 3 Oct 2025 21:10:50 +0900 Subject: [PATCH] Make time calculations always long long. Previously pgpool assumed that time_t to be a simple long. This causes a lot of compile time warnings on certain systems, for example OpenBSD because on the system time_t is __int64, which results in long long. This commit upcasts such calculations to long long to avoid the issue. This way times can't get truncated and for the places where time_t is actually used as a time and not a time diff this would allow pgpool to keep working correctly post Y2038 on 64 bit clean time_t systems (e.g. i386 OpenBSD). Moreover, json_get_long_value_for_key is changed to json_get_llong_value_for_key and changed the parameter to long long. This makes it more in line _json_value's integer, which is defined as int64. This should also give 32 bit platforms proper retrieval of the max value of an integer and may or may not solve some weird integer overflow issues. Backpatch for 4.6 was rebased by Gyorgy Sarvari. Author: Martijn van Duren Reviewed-by: Tatsuo Ishii Reviewed-by: Gyorgy Sarvari Backpatch-through: v4.6 Discussion: https://www.pgpool.net/pipermail/pgpool-hackers/2025-May/004584.html Discussion: https://www.postgresql.org/message-id/20251003.211957.2067537305399895611.ishii%40postgresql.org Discussion: https://github.com/pgpool/pgpool2/pull/128 --- src/include/utils/json.h | 2 +- src/include/watchdog/wd_commands.h | 2 +- src/include/watchdog/wd_json_data.h | 4 ++-- src/main/pgpool_logger.c | 2 +- src/pcp_con/pcp_worker.c | 4 ++-- src/protocol/pool_connection_pool.c | 12 ++++++------ src/query_cache/pool_memqcache.c | 8 ++++---- src/utils/json.c | 2 +- src/utils/pool_process_reporting.c | 2 +- src/utils/pool_relcache.c | 2 +- src/watchdog/watchdog.c | 4 ++-- src/watchdog/wd_commands.c | 4 ++-- src/watchdog/wd_heartbeat.c | 4 ++-- src/watchdog/wd_json_data.c | 20 +++++++++++--------- 14 files changed, 37 insertions(+), 35 deletions(-) diff --git a/src/include/utils/json.h b/src/include/utils/json.h index cb4378a9c..ad9735e32 100644 --- a/src/include/utils/json.h +++ b/src/include/utils/json.h @@ -313,7 +313,7 @@ extern "C" /* pgpool-II extensions */ json_value *json_get_value_for_key(json_value *source, const char *key); int json_get_int_value_for_key(json_value *source, const char *key, int *value); -int json_get_long_value_for_key(json_value *source, const char *key, long *value); +int json_get_llong_value_for_key(json_value * source, const char *key, long long *value); char *json_get_string_value_for_key(json_value *source, const char *key); int json_get_bool_value_for_key(json_value *source, const char *key, bool *value); diff --git a/src/include/watchdog/wd_commands.h b/src/include/watchdog/wd_commands.h index 61326137d..a016772f6 100644 --- a/src/include/watchdog/wd_commands.h +++ b/src/include/watchdog/wd_commands.h @@ -52,7 +52,7 @@ typedef struct WDGenericData char *stringVal; int intVal; bool boolVal; - long longVal; + long long longVal; } data; } WDGenericData; diff --git a/src/include/watchdog/wd_json_data.h b/src/include/watchdog/wd_json_data.h index 1016dcae8..01e40e784 100644 --- a/src/include/watchdog/wd_json_data.h +++ b/src/include/watchdog/wd_json_data.h @@ -51,8 +51,8 @@ extern bool parse_node_status_json(char *json_data, int data_len, int *nodeID, i extern bool parse_beacon_message_json(char *json_data, int data_len, int *state, - long *seconds_since_node_startup, - long *seconds_since_current_state, + long long *seconds_since_node_startup, + long long *seconds_since_current_state, int *quorumStatus, int *standbyNodesCount, bool *escalated); diff --git a/src/main/pgpool_logger.c b/src/main/pgpool_logger.c index 89980c95b..d57a0d000 100644 --- a/src/main/pgpool_logger.c +++ b/src/main/pgpool_logger.c @@ -50,7 +50,7 @@ #include "main/pgpool_logger.h" #define DEVNULL "/dev/null" -typedef int64 pg_time_t; +typedef time_t pg_time_t; /* * We read() into a temp buffer twice as big as a chunk, so that any fragment diff --git a/src/pcp_con/pcp_worker.c b/src/pcp_con/pcp_worker.c index a9d02e011..6c95f98e4 100644 --- a/src/pcp_con/pcp_worker.c +++ b/src/pcp_con/pcp_worker.c @@ -933,9 +933,9 @@ inform_node_info(PCP_CONNECTION *frontend, char *buf) snprintf(standby_delay_by_time_str, sizeof(standby_delay_by_time_str), "%d", bi->standby_delay_by_time); - snprintf(standby_delay_str, sizeof(standby_delay_str), UINT64_FORMAT, bi->standby_delay); + snprintf(standby_delay_str, sizeof(standby_delay_str), "%lld", (long long)bi->standby_delay); - snprintf(status_changed_time_str, sizeof(status_changed_time_str), UINT64_FORMAT, bi->status_changed_time); + snprintf(status_changed_time_str, sizeof(status_changed_time_str), "%lld", (long long)bi->status_changed_time); pcp_write(frontend, "i", 1); wsize = htonl(sizeof(code) + diff --git a/src/protocol/pool_connection_pool.c b/src/protocol/pool_connection_pool.c index c3b369dc2..97ded29f3 100644 --- a/src/protocol/pool_connection_pool.c +++ b/src/protocol/pool_connection_pool.c @@ -302,10 +302,10 @@ pool_create_cp(void) ereport(DEBUG1, (errmsg("creating connection pool"), - errdetail("user: %s database: %s closetime: %ld", + errdetail("user: %s database: %s closetime: %lld", CONNECTION_SLOT(p, main_node_id)->sp->user, CONNECTION_SLOT(p, main_node_id)->sp->database, - CONNECTION_SLOT(p, main_node_id)->closetime))); + (long long)CONNECTION_SLOT(p, main_node_id)->closetime))); if (CONNECTION_SLOT(p, main_node_id)->closetime < closetime) { @@ -366,7 +366,7 @@ pool_connection_pool_timer(POOL_CONNECTION_POOL *backend) ereport(DEBUG1, (errmsg("setting backend connection close timer"), - errdetail("close time %ld", time(NULL)))); + errdetail("close time %lld", (long long)time(NULL)))); /* Set connection close time */ for (i = 0; i < NUM_BACKENDS; i++) @@ -424,7 +424,7 @@ pool_backend_timer(void) now = time(NULL); ereport(DEBUG1, - (errmsg("backend timer handler called at %ld", now))); + (errmsg("backend timer handler called at %lld", (long long)now))); for (i = 0; i < pool_config->max_pool; i++, p++) { @@ -442,8 +442,8 @@ pool_backend_timer(void) ereport(DEBUG1, (errmsg("backend timer handler called"), - errdetail("expire time: %ld", - MAIN_CONNECTION(p)->closetime + pool_config->connection_life_time))); + errdetail("expire time: %lld", + (long long)(MAIN_CONNECTION(p)->closetime + pool_config->connection_life_time)))); if (now >= (MAIN_CONNECTION(p)->closetime + pool_config->connection_life_time)) { diff --git a/src/query_cache/pool_memqcache.c b/src/query_cache/pool_memqcache.c index 088ad051a..dc2ce911e 100644 --- a/src/query_cache/pool_memqcache.c +++ b/src/query_cache/pool_memqcache.c @@ -280,7 +280,7 @@ pool_commit_cache(POOL_CONNECTION_POOL *backend, char *query, char *data, size_t memqcache_expire = pool_config->memqcache_expire; ereport(DEBUG1, (errmsg("committing SELECT results to cache storage"), - errdetail("memqcache_expire = %ld", memqcache_expire))); + errdetail("memqcache_expire = %lld", (long long)memqcache_expire))); if (pool_is_shmem_cache()) { @@ -390,7 +390,7 @@ pool_catalog_commit_cache(POOL_CONNECTION_POOL *backend, char *query, char *data memqcache_expire = pool_config->relcache_expire; ereport(DEBUG1, (errmsg("committing relation cache to cache storage"), - errdetail("memqcache_expire = %ld", memqcache_expire))); + errdetail("memqcache_expire = %lld", (long long)memqcache_expire))); if (pool_is_shmem_cache()) { @@ -2902,8 +2902,8 @@ pool_find_item_on_shmem_cache(POOL_QUERY_HASH *query_hash) { ereport(DEBUG1, (errmsg("memcache finding item"), - errdetail("cache expired: now: %ld timestamp: %ld", - now, cih->timestamp + cih->expire))); + errdetail("cache expired: now: %lld timestamp: %lld", + (long long)now, (long long)(cih->timestamp + cih->expire)))); pool_delete_item_shmem_cache(c); return NULL; } diff --git a/src/utils/json.c b/src/utils/json.c index 8d156439c..9c4629861 100644 --- a/src/utils/json.c +++ b/src/utils/json.c @@ -1191,7 +1191,7 @@ json_get_int_value_for_key(json_value *source, const char *key, int *value) } int -json_get_long_value_for_key(json_value *source, const char *key, long *value) +json_get_llong_value_for_key(json_value * source, const char *key, long long *value) { json_value *jNode; diff --git a/src/utils/pool_process_reporting.c b/src/utils/pool_process_reporting.c index 8e41ccafd..99c0cc006 100644 --- a/src/utils/pool_process_reporting.c +++ b/src/utils/pool_process_reporting.c @@ -2071,7 +2071,7 @@ get_health_check_stats(int *nrows) /* status last changed */ t = bi->status_changed_time; - ereport(LOG, (errmsg("status_changed_time %ld", t))); + ereport(LOG,(errmsg("status_changed_time %lld", (long long)t))); strftime(stats[i].last_status_change, POOLCONFIG_MAXDATELEN, "%F %T", localtime(&t)); snprintf(stats[i].total_count, POOLCONFIG_MAXLONGCOUNTLEN, UINT64_FORMAT, health_check_stats[i].total_count); diff --git a/src/utils/pool_relcache.c b/src/utils/pool_relcache.c index 2ffe970e9..ca19c0d29 100644 --- a/src/utils/pool_relcache.c +++ b/src/utils/pool_relcache.c @@ -187,7 +187,7 @@ pool_search_relcache(POOL_RELCACHE *relcache, POOL_CONNECTION_POOL *backend, cha { ereport(DEBUG1, (errmsg("searching relcache"), - errdetail("relcache for database:%s table:%s expired. now:%ld expiration time:%ld", dbname, table, now, relcache->cache[i].expire))); + errdetail("relcache for database:%s table:%s expired. now:%lld expiration time:%lld", dbname, table, (long long)now, (long long)relcache->cache[i].expire))); relcache->cache[i].refcnt = 0; break; diff --git a/src/watchdog/watchdog.c b/src/watchdog/watchdog.c index c37984331..48d05b1f8 100644 --- a/src/watchdog/watchdog.c +++ b/src/watchdog/watchdog.c @@ -6763,8 +6763,8 @@ watchdog_state_machine_nw_isolation(WD_EVENTS event, WatchdogNode *wdNode, WDPac static bool beacon_message_received_from_node(WatchdogNode *wdNode, WDPacketData *pkt) { - long seconds_since_node_startup; - long seconds_since_current_state; + long long seconds_since_node_startup; + long long seconds_since_current_state; int quorum_status; int standby_nodes_count; bool escalated; diff --git a/src/watchdog/wd_commands.c b/src/watchdog/wd_commands.c index 1539ef675..4b313e6c7 100644 --- a/src/watchdog/wd_commands.c +++ b/src/watchdog/wd_commands.c @@ -193,9 +193,9 @@ get_wd_runtime_variable_value(char *wd_authkey, char *varName) case VALUE_DATA_TYPE_LONG: { - long longVal; + long long longVal; - if (json_get_long_value_for_key(root, WD_JSON_KEY_VALUE_DATA, &longVal)) + if (json_get_llong_value_for_key(root, WD_JSON_KEY_VALUE_DATA, &longVal)) { ereport(WARNING, (errmsg("get runtime variable value from watchdog failed"), diff --git a/src/watchdog/wd_heartbeat.c b/src/watchdog/wd_heartbeat.c index 5d08abec0..8de160ed3 100644 --- a/src/watchdog/wd_heartbeat.c +++ b/src/watchdog/wd_heartbeat.c @@ -850,8 +850,8 @@ packet_to_string_hb(WdHbPacket *pkt, char *str, int maxlen) { int len; - len = snprintf(str, maxlen, "tv_sec=%ld tv_usec=%ld from=%s", - pkt->send_time.tv_sec, pkt->send_time.tv_usec, pkt->from); + len = snprintf(str, maxlen, "tv_sec=%lld tv_usec=%lld from=%s", + (long long)pkt->send_time.tv_sec, (long long)pkt->send_time.tv_usec, pkt->from); return len; } diff --git a/src/watchdog/wd_json_data.c b/src/watchdog/wd_json_data.c index d5741b3e7..91dd26a86 100644 --- a/src/watchdog/wd_json_data.c +++ b/src/watchdog/wd_json_data.c @@ -533,6 +533,7 @@ get_watchdog_node_from_json(char *json_data, int data_len, char **authkey) { json_value *root = NULL; char *ptr; + long long longVal; WatchdogNode *wdNode = palloc0(sizeof(WatchdogNode)); root = json_parse(json_data, data_len); @@ -540,19 +541,20 @@ get_watchdog_node_from_json(char *json_data, int data_len, char **authkey) if (root == NULL || root->type != json_object) goto ERROR_EXIT; - if (json_get_long_value_for_key(root, "StartupTimeSecs", &wdNode->startup_time.tv_sec)) + if (json_get_llong_value_for_key(root, "StartupTimeSecs", &longVal)) { bool escalated; - long seconds_since_node_startup; - long seconds_since_current_state; + long long seconds_since_node_startup; + long long seconds_since_current_state; struct timeval current_time; + wdNode->startup_time.tv_sec = longVal; gettimeofday(¤t_time, NULL); /* The new version does not have StartupTimeSecs Key */ - if (json_get_long_value_for_key(root, "SecondsSinceStartup", &seconds_since_node_startup)) + if (json_get_llong_value_for_key(root, "SecondsSinceStartup", &seconds_since_node_startup)) goto ERROR_EXIT; - if (json_get_long_value_for_key(root, "SecondsSinceCurrentState", &seconds_since_current_state)) + if (json_get_llong_value_for_key(root, "SecondsSinceCurrentState", &seconds_since_current_state)) goto ERROR_EXIT; if (json_get_bool_value_for_key(root, "Escalated", &escalated)) goto ERROR_EXIT; @@ -643,8 +645,8 @@ ERROR_EXIT: bool parse_beacon_message_json(char *json_data, int data_len, int *state, - long *seconds_since_node_startup, - long *seconds_since_current_state, + long long *seconds_since_node_startup, + long long *seconds_since_current_state, int *quorumStatus, int *standbyNodesCount, bool *escalated) @@ -658,9 +660,9 @@ parse_beacon_message_json(char *json_data, int data_len, if (json_get_int_value_for_key(root, "State", state)) goto ERROR_EXIT; - if (json_get_long_value_for_key(root, "SecondsSinceStartup", seconds_since_node_startup)) + if (json_get_llong_value_for_key(root, "SecondsSinceStartup", seconds_since_node_startup)) goto ERROR_EXIT; - if (json_get_long_value_for_key(root, "SecondsSinceCurrentState", seconds_since_current_state)) + if (json_get_llong_value_for_key(root, "SecondsSinceCurrentState", seconds_since_current_state)) goto ERROR_EXIT; if (json_get_bool_value_for_key(root, "Escalated", escalated)) goto ERROR_EXIT; -- 2.39.5