This is an automated email from the ASF dual-hosted git repository.
rafsun42 pushed a commit to branch PG11
in repository https://gitbox.apache.org/repos/asf/age.git
The following commit(s) were added to refs/heads/PG11 by this push:
new 207513c0 Remove unnecessary #include in src/backend/utils (#1397)
207513c0 is described below
commit 207513c0eb6e6ae05c14bf21c546df03961dec62
Author: John Gemignani <[email protected]>
AuthorDate: Tue Nov 14 09:06:52 2023 -0800
Remove unnecessary #include in src/backend/utils (#1397)
Removed unnecessary #includes in src/backend/utils files.
Resolved -
Conflicts:
src/backend/utils/adt/ag_float8_supp.c
src/backend/utils/adt/age_global_graph.c
src/backend/utils/adt/age_vle.c
src/backend/utils/adt/agtype.c
src/backend/utils/adt/agtype_gin.c
src/backend/utils/cache/ag_cache.c
src/backend/utils/load/age_load.c
---
src/backend/utils/adt/age_global_graph.c | 3 ---
src/backend/utils/adt/age_graphid_ds.c | 1 -
src/backend/utils/adt/age_vle.c | 2 --
src/backend/utils/adt/agtype.c | 13 ++--------
src/backend/utils/adt/agtype_ext.c | 2 --
src/backend/utils/adt/agtype_gin.c | 5 +---
src/backend/utils/adt/agtype_ops.c | 4 +--
src/backend/utils/adt/agtype_raw.c | 3 +--
src/backend/utils/adt/agtype_util.c | 4 +--
src/backend/utils/adt/graphid.c | 1 -
src/backend/utils/ag_func.c | 1 -
src/backend/utils/ag_guc.c | 1 +
src/backend/utils/cache/ag_cache.c | 16 +-----------
src/backend/utils/graph_generation.c | 25 -------------------
src/backend/utils/load/ag_load_labels.c | 42 --------------------------------
src/backend/utils/load/age_load.c | 37 +---------------------------
src/include/utils/age_graphid_ds.h | 2 ++
17 files changed, 11 insertions(+), 151 deletions(-)
diff --git a/src/backend/utils/adt/age_global_graph.c
b/src/backend/utils/adt/age_global_graph.c
index b906d539..79e878d2 100644
--- a/src/backend/utils/adt/age_global_graph.c
+++ b/src/backend/utils/adt/age_global_graph.c
@@ -28,11 +28,8 @@
#include "commands/label_commands.h"
#include "utils/age_global_graph.h"
-#include "utils/agtype.h"
#include "catalog/ag_graph.h"
#include "catalog/ag_label.h"
-#include "utils/graphid.h"
-#include "utils/age_graphid_ds.h"
/* defines */
#define VERTEX_HTAB_NAME "Vertex to edge lists " /* added a space at end for */
diff --git a/src/backend/utils/adt/age_graphid_ds.c
b/src/backend/utils/adt/age_graphid_ds.c
index a0b50ab7..8c632b6d 100644
--- a/src/backend/utils/adt/age_graphid_ds.c
+++ b/src/backend/utils/adt/age_graphid_ds.c
@@ -19,7 +19,6 @@
#include "postgres.h"
-#include "utils/graphid.h"
#include "utils/age_graphid_ds.h"
/* defines */
diff --git a/src/backend/utils/adt/age_vle.c b/src/backend/utils/adt/age_vle.c
index ca4876db..1dae95e0 100644
--- a/src/backend/utils/adt/age_vle.c
+++ b/src/backend/utils/adt/age_vle.c
@@ -25,8 +25,6 @@
#include "utils/age_vle.h"
#include "catalog/ag_graph.h"
-#include "utils/graphid.h"
-#include "utils/age_graphid_ds.h"
#include "nodes/cypher_nodes.h"
/* defines */
diff --git a/src/backend/utils/adt/agtype.c b/src/backend/utils/adt/agtype.c
index 496ecaf3..c12a1c5f 100644
--- a/src/backend/utils/adt/agtype.c
+++ b/src/backend/utils/adt/agtype.c
@@ -33,35 +33,26 @@
#include <math.h>
#include <float.h>
-#include "access/htup_details.h"
-#include "catalog/namespace.h"
#include "catalog/pg_type.h"
-#include "catalog/pg_aggregate_d.h"
+#include "catalog/namespace.h"
#include "catalog/pg_collation_d.h"
#include "catalog/pg_operator_d.h"
-#include "executor/nodeAgg.h"
#include "funcapi.h"
#include "libpq/pqformat.h"
#include "miscadmin.h"
#include "parser/parse_coerce.h"
-#include "nodes/pg_list.h"
#include "utils/builtins.h"
-#include "utils/fmgroids.h"
+#include "utils/rel.h"
#include "utils/int8.h"
#include "utils/lsyscache.h"
-#include "utils/rel.h"
#include "utils/snapmgr.h"
#include "utils/typcache.h"
-
#include "utils/age_vle.h"
-#include "utils/agtype.h"
#include "utils/agtype_parser.h"
#include "utils/ag_float8_supp.h"
#include "utils/agtype_raw.h"
#include "catalog/ag_graph.h"
#include "catalog/ag_label.h"
-#include "utils/graphid.h"
-#include "utils/numeric.h"
/* State structure for Percentile aggregate functions */
typedef struct PercentileGroupAggState
diff --git a/src/backend/utils/adt/agtype_ext.c
b/src/backend/utils/adt/agtype_ext.c
index 86dd647d..29cf40bb 100644
--- a/src/backend/utils/adt/agtype_ext.c
+++ b/src/backend/utils/adt/agtype_ext.c
@@ -18,8 +18,6 @@
*/
#include "utils/agtype_ext.h"
-#include "utils/agtype.h"
-#include "utils/graphid.h"
/* define the type and size of the agt_header */
#define AGT_HEADER_TYPE uint32
diff --git a/src/backend/utils/adt/agtype_gin.c
b/src/backend/utils/adt/agtype_gin.c
index 9066a952..47e94e56 100644
--- a/src/backend/utils/adt/agtype_gin.c
+++ b/src/backend/utils/adt/agtype_gin.c
@@ -30,14 +30,11 @@
#include "access/gin.h"
#include "access/hash.h"
-#include "access/stratnum.h"
#include "catalog/pg_collation.h"
-#include "catalog/pg_type.h"
+#include "utils/agtype.h"
#include "utils/builtins.h"
#include "utils/varlena.h"
-#include "utils/agtype.h"
-
typedef struct PathHashStack
{
uint32 hash;
diff --git a/src/backend/utils/adt/agtype_ops.c
b/src/backend/utils/adt/agtype_ops.c
index ea59568c..d0f63eaf 100644
--- a/src/backend/utils/adt/agtype_ops.c
+++ b/src/backend/utils/adt/agtype_ops.c
@@ -27,11 +27,9 @@
#include <limits.h>
#include "catalog/pg_type_d.h"
-#include "fmgr.h"
-#include "utils/builtins.h"
-#include "utils/numeric.h"
#include "utils/agtype.h"
+#include "utils/builtins.h"
static void ereport_op_str(const char *op, agtype *lhs, agtype *rhs);
static agtype *agtype_concat_impl(agtype *agt1, agtype *agt2);
diff --git a/src/backend/utils/adt/agtype_raw.c
b/src/backend/utils/adt/agtype_raw.c
index 8321d973..f5406806 100644
--- a/src/backend/utils/adt/agtype_raw.c
+++ b/src/backend/utils/adt/agtype_raw.c
@@ -18,8 +18,7 @@
*/
#include "postgres.h"
-#include "utils/agtype.h"
-#include "utils/agtype_ext.h"
+
#include "utils/agtype_raw.h"
/*
diff --git a/src/backend/utils/adt/agtype_util.c
b/src/backend/utils/adt/agtype_util.c
index 107d2d0d..8dbdca06 100644
--- a/src/backend/utils/adt/agtype_util.c
+++ b/src/backend/utils/adt/agtype_util.c
@@ -39,9 +39,7 @@
#include "utils/memutils.h"
#include "utils/varlena.h"
-#include "utils/agtype.h"
#include "utils/agtype_ext.h"
-#include "utils/graphid.h"
/*
* Maximum number of elements in an array (or key/value pairs in an object).
@@ -2486,4 +2484,4 @@ void copy_agtype_value(agtype_parse_state* pstate,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("invalid type provided for copy_agtype_value")));
}
-}
\ No newline at end of file
+}
diff --git a/src/backend/utils/adt/graphid.c b/src/backend/utils/adt/graphid.c
index bd65b957..6fae21a5 100644
--- a/src/backend/utils/adt/graphid.c
+++ b/src/backend/utils/adt/graphid.c
@@ -19,7 +19,6 @@
#include "postgres.h"
-#include "fmgr.h"
#include "utils/builtins.h"
#include "utils/sortsupport.h"
diff --git a/src/backend/utils/ag_func.c b/src/backend/utils/ag_func.c
index cbd2167e..cc99ae29 100644
--- a/src/backend/utils/ag_func.c
+++ b/src/backend/utils/ag_func.c
@@ -24,7 +24,6 @@
#include "postgres.h"
-#include "access/htup.h"
#include "access/htup_details.h"
#include "catalog/pg_proc.h"
#include "fmgr.h"
diff --git a/src/backend/utils/ag_guc.c b/src/backend/utils/ag_guc.c
index efbc6167..d9a99f66 100644
--- a/src/backend/utils/ag_guc.c
+++ b/src/backend/utils/ag_guc.c
@@ -18,6 +18,7 @@
*/
#include "postgres.h"
+
#include "utils/guc.h"
#include "utils/ag_guc.h"
diff --git a/src/backend/utils/cache/ag_cache.c
b/src/backend/utils/cache/ag_cache.c
index 6501476c..6f44b20c 100644
--- a/src/backend/utils/cache/ag_cache.c
+++ b/src/backend/utils/cache/ag_cache.c
@@ -19,31 +19,17 @@
#include "postgres.h"
-#include "access/attnum.h"
#include "access/genam.h"
#include "access/heapam.h"
-#include "access/htup.h"
-#include "access/htup_details.h"
-#include "access/skey.h"
-#include "access/stratnum.h"
#include "access/sysattr.h"
-#include "access/tupdesc.h"
-#include "fmgr.h"
-#include "storage/lockdefs.h"
+#include "utils/rel.h"
#include "utils/builtins.h"
#include "utils/catcache.h"
-#include "utils/fmgroids.h"
-#include "utils/hsearch.h"
#include "utils/inval.h"
-#include "utils/memutils.h"
-#include "utils/rel.h"
-#include "utils/relcache.h"
-#include "utils/syscache.h"
#include "catalog/ag_graph.h"
#include "catalog/ag_label.h"
#include "utils/ag_cache.h"
-#include "utils/graphid.h"
typedef struct graph_name_cache_entry
{
diff --git a/src/backend/utils/graph_generation.c
b/src/backend/utils/graph_generation.c
index 436b703e..30a1a68c 100644
--- a/src/backend/utils/graph_generation.c
+++ b/src/backend/utils/graph_generation.c
@@ -19,34 +19,9 @@
#include "postgres.h"
-#include "access/xact.h"
#include "access/genam.h"
-#include "access/heapam.h"
-#include "catalog/dependency.h"
-#include "catalog/objectaddress.h"
-#include "commands/defrem.h"
-#include "commands/schemacmds.h"
-#include "commands/tablecmds.h"
-#include "fmgr.h"
-#include "miscadmin.h"
-#include "nodes/makefuncs.h"
-#include "nodes/nodes.h"
-#include "nodes/parsenodes.h"
-#include "nodes/pg_list.h"
-#include "nodes/value.h"
-#include "parser/parser.h"
-#include "utils/fmgroids.h"
-#include "utils/relcache.h"
-#include "utils/rel.h"
-
-#include "catalog/ag_graph.h"
-#include "catalog/ag_label.h"
#include "commands/graph_commands.h"
-#include "commands/label_commands.h"
-#include "utils/graphid.h"
#include "utils/load/age_load.h"
-#include "utils/load/ag_load_edges.h"
-#include "utils/load/ag_load_labels.h"
int64 get_nextval_internal(graph_cache_data* graph_cache,
diff --git a/src/backend/utils/load/ag_load_labels.c
b/src/backend/utils/load/ag_load_labels.c
index 01d63cb3..a7cc68e7 100644
--- a/src/backend/utils/load/ag_load_labels.c
+++ b/src/backend/utils/load/ag_load_labels.c
@@ -16,50 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <unistd.h>
-
#include "postgres.h"
-#include "access/heapam.h"
-#include "access/xact.h"
-#include "catalog/dependency.h"
-#include "catalog/namespace.h"
-#include "catalog/objectaddress.h"
-#include "catalog/pg_class_d.h"
-#include "commands/defrem.h"
-#include "commands/sequence.h"
-#include "commands/tablecmds.h"
-#include "miscadmin.h"
-#include "nodes/makefuncs.h"
-#include "nodes/nodes.h"
-#include "nodes/parsenodes.h"
-#include "nodes/pg_list.h"
-#include "nodes/plannodes.h"
-#include "nodes/primnodes.h"
-#include "nodes/value.h"
-#include "parser/parse_node.h"
-#include "parser/parser.h"
-#include "storage/lockdefs.h"
-#include "tcop/dest.h"
-#include "tcop/utility.h"
-#include "utils/acl.h"
-#include "utils/builtins.h"
-#include "utils/inval.h"
-#include "utils/lsyscache.h"
-#include "utils/rel.h"
-
-#include "catalog/ag_graph.h"
-#include "catalog/ag_label.h"
-#include "commands/label_commands.h"
-#include "utils/ag_cache.h"
-#include "utils/agtype.h"
-#include "utils/graphid.h"
-
#include "utils/load/ag_load_labels.h"
#include "utils/load/age_load.h"
#include "utils/load/csv.h"
diff --git a/src/backend/utils/load/age_load.c
b/src/backend/utils/load/age_load.c
index 9348f5c7..99c3eaee 100644
--- a/src/backend/utils/load/age_load.c
+++ b/src/backend/utils/load/age_load.c
@@ -19,41 +19,6 @@
#include "postgres.h"
-#include "access/heapam.h"
-#include "access/xact.h"
-#include "catalog/dependency.h"
-#include "catalog/namespace.h"
-#include "catalog/objectaddress.h"
-#include "catalog/pg_class_d.h"
-#include "commands/defrem.h"
-#include "commands/sequence.h"
-#include "commands/tablecmds.h"
-#include "miscadmin.h"
-#include "nodes/makefuncs.h"
-#include "nodes/nodes.h"
-#include "nodes/parsenodes.h"
-#include "nodes/pg_list.h"
-#include "nodes/plannodes.h"
-#include "nodes/primnodes.h"
-#include "nodes/value.h"
-#include "parser/parse_node.h"
-#include "parser/parser.h"
-#include "storage/lockdefs.h"
-#include "tcop/dest.h"
-#include "tcop/utility.h"
-#include "utils/acl.h"
-#include "utils/builtins.h"
-#include "utils/inval.h"
-#include "utils/lsyscache.h"
-#include "utils/rel.h"
-
-#include "catalog/ag_graph.h"
-#include "catalog/ag_label.h"
-#include "commands/label_commands.h"
-#include "utils/ag_cache.h"
-#include "utils/agtype.h"
-#include "utils/graphid.h"
-
#include "utils/load/age_load.h"
#include "utils/load/ag_load_labels.h"
#include "utils/load/ag_load_edges.h"
@@ -334,4 +299,4 @@ Datum load_edges_from_file(PG_FUNCTION_ARGS)
graph_id, label_name_str, label_id);
PG_RETURN_VOID();
-}
\ No newline at end of file
+}
diff --git a/src/include/utils/age_graphid_ds.h
b/src/include/utils/age_graphid_ds.h
index cfacfc1d..ea9dabdc 100644
--- a/src/include/utils/age_graphid_ds.h
+++ b/src/include/utils/age_graphid_ds.h
@@ -20,6 +20,8 @@
#ifndef AG_AGE_GRAPHID_DS_H
#define AG_AGE_GRAPHID_DS_H
+#include "utils/graphid.h"
+
#define IS_GRAPHID_STACK_EMPTY(stack) \
get_stack_size(stack) == 0
#define PEEK_GRAPHID_STACK(stack) \
