From 308622edf1743aa407df0044cc4529aed8de15e6 Mon Sep 17 00:00:00 2001 From: Amit Kapila Date: Mon, 23 Feb 2026 10:19:05 +0530 Subject: [PATCH] Avoid including utils/timestamp.h in conflict.h. conflict.h currently includes utils/timestamp.h despite only requiring basic timestamp type definitions. This creates unnecessary overhead. Replace the include with datatype/timestamp.h to provide the necessary types. This change requires explicitly including utils/timestamp.h in test_custom_fixed_stats.c, which previously relied on the indirect inclusion. Extracted from the larger patch by Andres Freund. Discussion: https://postgr.es/m/aY-UE-4t7FiYgH3t@alap3.anarazel.de --- src/include/replication/conflict.h | 2 +- src/test/modules/test_custom_stats/test_custom_fixed_stats.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/include/replication/conflict.h b/src/include/replication/conflict.h index 1cade336c91..2d9dbcf4d0d 100644 --- a/src/include/replication/conflict.h +++ b/src/include/replication/conflict.h @@ -10,8 +10,8 @@ #define CONFLICT_H #include "access/xlogdefs.h" +#include "datatype/timestamp.h" #include "nodes/pg_list.h" -#include "utils/timestamp.h" /* Avoid including execnodes.h here */ typedef struct EState EState; diff --git a/src/test/modules/test_custom_stats/test_custom_fixed_stats.c b/src/test/modules/test_custom_stats/test_custom_fixed_stats.c index 908bd18a7c7..485e08e5c19 100644 --- a/src/test/modules/test_custom_stats/test_custom_fixed_stats.c +++ b/src/test/modules/test_custom_stats/test_custom_fixed_stats.c @@ -18,6 +18,7 @@ #include "pgstat.h" #include "utils/builtins.h" #include "utils/pgstat_internal.h" +#include "utils/timestamp.h" PG_MODULE_MAGIC_EXT( .name = "test_custom_fixed_stats",