[PATCH] Remove unused #include's in src/backend/utils/adt/*

Started by Aleksander Alekseev7 months ago4 messages

Aleksander Alekseev

aleksander@timescale.com

7 months ago

1 attachment(s)

Hi,

clangd indicates that certain #include's are redundant. Removing them
will speed up the build process a bit.

--
Best regards,
Aleksander Alekseev

Attachments:

v1-0001-Remove-unused-include-s-in-src-backend-utils-adt.patchapplication/octet-stream; name=v1-0001-Remove-unused-include-s-in-src-backend-utils-adt.patchDownload

From 7b07dbad2134443b59541d1db12d8243b8d2dab6 Mon Sep 17 00:00:00 2001
From: Aleksander Alekseev <aleksander@timescale.com>
Date: Mon, 16 Jun 2025 13:52:53 +0300
Subject: [PATCH v1] Remove unused #include's in src/backend/utils/adt/*

Aleksander Alekseev, reviewed by TODO FIXME
Discussion: TODO FIXME
---
 src/backend/utils/adt/network.c           | 2 --
 src/backend/utils/adt/network_spgist.c    | 1 -
 src/backend/utils/adt/numutils.c          | 1 -
 src/backend/utils/adt/pg_locale.c         | 1 -
 src/backend/utils/adt/pg_locale_builtin.c | 1 -
 src/backend/utils/adt/ri_triggers.c       | 2 --
 src/backend/utils/adt/selfuncs.c          | 1 -
 src/backend/utils/adt/tid.c               | 1 -
 8 files changed, 10 deletions(-)

diff --git a/src/backend/utils/adt/network.c b/src/backend/utils/adt/network.c
index f03fcc1147b..9fd211b2d45 100644
--- a/src/backend/utils/adt/network.c
+++ b/src/backend/utils/adt/network.c
@@ -12,8 +12,6 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include "access/stratnum.h"
-#include "catalog/pg_opfamily.h"
 #include "catalog/pg_type.h"
 #include "common/hashfn.h"
 #include "common/ip.h"
diff --git a/src/backend/utils/adt/network_spgist.c b/src/backend/utils/adt/network_spgist.c
index a84747d9275..602276a35c3 100644
--- a/src/backend/utils/adt/network_spgist.c
+++ b/src/backend/utils/adt/network_spgist.c
@@ -37,7 +37,6 @@
 #include "catalog/pg_type.h"
 #include "utils/fmgrprotos.h"
 #include "utils/inet.h"
-#include "varatt.h"
 
 
 static int	inet_spg_node_number(const inet *val, int commonbits);
diff --git a/src/backend/utils/adt/numutils.c b/src/backend/utils/adt/numutils.c
index 3bf30774a0c..59d66340078 100644
--- a/src/backend/utils/adt/numutils.c
+++ b/src/backend/utils/adt/numutils.c
@@ -14,7 +14,6 @@
  */
 #include "postgres.h"
 
-#include <math.h>
 #include <limits.h>
 #include <ctype.h>
 
diff --git a/src/backend/utils/adt/pg_locale.c b/src/backend/utils/adt/pg_locale.c
index f5e31c433a0..bf1afb24d7d 100644
--- a/src/backend/utils/adt/pg_locale.c
+++ b/src/backend/utils/adt/pg_locale.c
@@ -41,7 +41,6 @@
 #include "mb/pg_wchar.h"
 #include "miscadmin.h"
 #include "utils/builtins.h"
-#include "utils/formatting.h"
 #include "utils/guc_hooks.h"
 #include "utils/lsyscache.h"
 #include "utils/memutils.h"
diff --git a/src/backend/utils/adt/pg_locale_builtin.c b/src/backend/utils/adt/pg_locale_builtin.c
index f51768830cd..ce4914a76a1 100644
--- a/src/backend/utils/adt/pg_locale_builtin.c
+++ b/src/backend/utils/adt/pg_locale_builtin.c
@@ -18,7 +18,6 @@
 #include "mb/pg_wchar.h"
 #include "miscadmin.h"
 #include "utils/builtins.h"
-#include "utils/memutils.h"
 #include "utils/pg_locale.h"
 #include "utils/syscache.h"
 
diff --git a/src/backend/utils/adt/ri_triggers.c b/src/backend/utils/adt/ri_triggers.c
index 6239900fa28..059fc5ebf60 100644
--- a/src/backend/utils/adt/ri_triggers.c
+++ b/src/backend/utils/adt/ri_triggers.c
@@ -30,7 +30,6 @@
 #include "access/xact.h"
 #include "catalog/pg_collation.h"
 #include "catalog/pg_constraint.h"
-#include "catalog/pg_proc.h"
 #include "commands/trigger.h"
 #include "executor/executor.h"
 #include "executor/spi.h"
@@ -46,7 +45,6 @@
 #include "utils/inval.h"
 #include "utils/lsyscache.h"
 #include "utils/memutils.h"
-#include "utils/rangetypes.h"
 #include "utils/rel.h"
 #include "utils/rls.h"
 #include "utils/ruleutils.h"
diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c
index a96b1b9c0bc..1e0f2de0336 100644
--- a/src/backend/utils/adt/selfuncs.c
+++ b/src/backend/utils/adt/selfuncs.c
@@ -103,7 +103,6 @@
 #include "access/table.h"
 #include "access/tableam.h"
 #include "access/visibilitymap.h"
-#include "catalog/pg_am.h"
 #include "catalog/pg_collation.h"
 #include "catalog/pg_operator.h"
 #include "catalog/pg_statistic.h"
diff --git a/src/backend/utils/adt/tid.c b/src/backend/utils/adt/tid.c
index 1b0df111717..6b3c6fd8ea6 100644
--- a/src/backend/utils/adt/tid.c
+++ b/src/backend/utils/adt/tid.c
@@ -17,7 +17,6 @@
  */
 #include "postgres.h"
 
-#include <math.h>
 #include <limits.h>
 
 #include "access/sysattr.h"
-- 
2.49.0

Tom Lane

tgl@sss.pgh.pa.us

7 months ago

In reply to: Aleksander Alekseev (#1)

Re: [PATCH] Remove unused #include's in src/backend/utils/adt/*

Aleksander Alekseev <aleksander@timescale.com> writes:

clangd indicates that certain #include's are redundant. Removing them
will speed up the build process a bit.

The removals of <math.h> bother me a bit; I believe those used
to be necessary on some platforms. Maybe nowadays everybody is
close enough to POSIX that you can safely extrapolate from what
clangd says on your own machine, but it's not zero-risk.

regards, tom lane

Aleksander Alekseev

aleksander@timescale.com

7 months ago

In reply to: Tom Lane (#2)

1 attachment(s)

Re: [PATCH] Remove unused #include's in src/backend/utils/adt/*

Hi Tom,

The removals of <math.h> bother me a bit; I believe those used
to be necessary on some platforms. Maybe nowadays everybody is
close enough to POSIX that you can safely extrapolate from what
clangd says on your own machine, but it's not zero-risk.

Sounds good to me, let's keep <math.h>.

--
Best regards,
Aleksander Alekseev

Attachments:

v2-0001-Remove-unused-include-s-in-src-backend-utils-adt.patchapplication/octet-stream; name=v2-0001-Remove-unused-include-s-in-src-backend-utils-adt.patchDownload

From 176abca1ae1ccf97c456a0754b80fa0d64fed45f Mon Sep 17 00:00:00 2001
From: Aleksander Alekseev <aleksander@timescale.com>
Date: Mon, 16 Jun 2025 13:52:53 +0300
Subject: [PATCH v2] Remove unused #include's in src/backend/utils/adt/*

Aleksander Alekseev, reviewed by Tom Lane
Discussion: https://postgr.es/m/CAJ7c6TOowVbR-0NEvvDm6a_mag18krR0XJ2FKrc9DHXj7hFRtQ%40mail.gmail.com
---
 src/backend/utils/adt/network.c           | 2 --
 src/backend/utils/adt/network_spgist.c    | 1 -
 src/backend/utils/adt/pg_locale.c         | 1 -
 src/backend/utils/adt/pg_locale_builtin.c | 1 -
 src/backend/utils/adt/ri_triggers.c       | 2 --
 src/backend/utils/adt/selfuncs.c          | 1 -
 6 files changed, 8 deletions(-)

diff --git a/src/backend/utils/adt/network.c b/src/backend/utils/adt/network.c
index f03fcc1147b..9fd211b2d45 100644
--- a/src/backend/utils/adt/network.c
+++ b/src/backend/utils/adt/network.c
@@ -12,8 +12,6 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include "access/stratnum.h"
-#include "catalog/pg_opfamily.h"
 #include "catalog/pg_type.h"
 #include "common/hashfn.h"
 #include "common/ip.h"
diff --git a/src/backend/utils/adt/network_spgist.c b/src/backend/utils/adt/network_spgist.c
index a84747d9275..602276a35c3 100644
--- a/src/backend/utils/adt/network_spgist.c
+++ b/src/backend/utils/adt/network_spgist.c
@@ -37,7 +37,6 @@
 #include "catalog/pg_type.h"
 #include "utils/fmgrprotos.h"
 #include "utils/inet.h"
-#include "varatt.h"
 
 
 static int	inet_spg_node_number(const inet *val, int commonbits);
diff --git a/src/backend/utils/adt/pg_locale.c b/src/backend/utils/adt/pg_locale.c
index f5e31c433a0..bf1afb24d7d 100644
--- a/src/backend/utils/adt/pg_locale.c
+++ b/src/backend/utils/adt/pg_locale.c
@@ -41,7 +41,6 @@
 #include "mb/pg_wchar.h"
 #include "miscadmin.h"
 #include "utils/builtins.h"
-#include "utils/formatting.h"
 #include "utils/guc_hooks.h"
 #include "utils/lsyscache.h"
 #include "utils/memutils.h"
diff --git a/src/backend/utils/adt/pg_locale_builtin.c b/src/backend/utils/adt/pg_locale_builtin.c
index f51768830cd..ce4914a76a1 100644
--- a/src/backend/utils/adt/pg_locale_builtin.c
+++ b/src/backend/utils/adt/pg_locale_builtin.c
@@ -18,7 +18,6 @@
 #include "mb/pg_wchar.h"
 #include "miscadmin.h"
 #include "utils/builtins.h"
-#include "utils/memutils.h"
 #include "utils/pg_locale.h"
 #include "utils/syscache.h"
 
diff --git a/src/backend/utils/adt/ri_triggers.c b/src/backend/utils/adt/ri_triggers.c
index 6239900fa28..059fc5ebf60 100644
--- a/src/backend/utils/adt/ri_triggers.c
+++ b/src/backend/utils/adt/ri_triggers.c
@@ -30,7 +30,6 @@
 #include "access/xact.h"
 #include "catalog/pg_collation.h"
 #include "catalog/pg_constraint.h"
-#include "catalog/pg_proc.h"
 #include "commands/trigger.h"
 #include "executor/executor.h"
 #include "executor/spi.h"
@@ -46,7 +45,6 @@
 #include "utils/inval.h"
 #include "utils/lsyscache.h"
 #include "utils/memutils.h"
-#include "utils/rangetypes.h"
 #include "utils/rel.h"
 #include "utils/rls.h"
 #include "utils/ruleutils.h"
diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c
index a96b1b9c0bc..1e0f2de0336 100644
--- a/src/backend/utils/adt/selfuncs.c
+++ b/src/backend/utils/adt/selfuncs.c
@@ -103,7 +103,6 @@
 #include "access/table.h"
 #include "access/tableam.h"
 #include "access/visibilitymap.h"
-#include "catalog/pg_am.h"
 #include "catalog/pg_collation.h"
 #include "catalog/pg_operator.h"
 #include "catalog/pg_statistic.h"
-- 
2.49.0

Peter Eisentraut

peter@eisentraut.org

7 months ago

In reply to: Aleksander Alekseev (#3)

Re: [PATCH] Remove unused #include's in src/backend/utils/adt/*

On 16.06.25 16:20, Aleksander Alekseev wrote:

The removals of <math.h> bother me a bit; I believe those used
to be necessary on some platforms. Maybe nowadays everybody is
close enough to POSIX that you can safely extrapolate from what
clangd says on your own machine, but it's not zero-risk.

Sounds good to me, let's keep <math.h>.

committed