Clean up #included files in src/include directories (apache#1518)

jrgemignani · jrgemignani · commit 05fdeda161d0 · 2024-02-01T15:32:45.000-08:00
Cleaned up #included files in the .h files in the src/include
directories.

Additionally, deleted 1 unnecessary header file.

    modified:   src/include/catalog/ag_catalog.h
    modified:   src/include/catalog/ag_graph.h
    modified:   src/include/catalog/ag_label.h
    modified:   src/include/catalog/ag_namespace.h
    modified:   src/include/commands/graph_commands.h
    modified:   src/include/commands/label_commands.h
    modified:   src/include/executor/cypher_executor.h
    modified:   src/include/executor/cypher_utils.h
    modified:   src/include/nodes/ag_nodes.h
    modified:   src/include/nodes/cypher_copyfuncs.h
    modified:   src/include/nodes/cypher_nodes.h
    modified:   src/include/nodes/cypher_outfuncs.h
    modified:   src/include/nodes/cypher_readfuncs.h
    modified:   src/include/optimizer/cypher_createplan.h
    modified:   src/include/optimizer/cypher_pathnode.h
    modified:   src/include/parser/cypher_clause.h
    modified:   src/include/parser/cypher_expr.h
    modified:   src/include/parser/cypher_gram.h
    modified:   src/include/parser/cypher_item.h
    modified:   src/include/parser/cypher_parse_node.h
    modified:   src/include/parser/cypher_parser.h
    modified:   src/include/parser/cypher_transform_entity.h
    modified:   src/include/utils/ag_cache.h
    modified:   src/include/utils/ag_float8_supp.h
    modified:   src/include/utils/ag_func.h
    modified:   src/include/utils/age_global_graph.h
    modified:   src/include/utils/agtype.h
    modified:   src/include/utils/agtype_parser.h
    modified:   src/include/utils/agtype_raw.h
    modified:   src/include/utils/graphid.h
    modified:   src/include/utils/load/ag_load_edges.h
    modified:   src/include/utils/load/ag_load_labels.h
    modified:   src/include/utils/load/age_load.h

    deleted:    src/include/utils/ag_load.h
diff --git a/src/backend/utils/load/age_load.c b/src/backend/utils/load/age_load.c
@@ -19,6 +19,7 @@
 
 #include "postgres.h"
 
+#include "access/xact.h"
 #include "utils/load/ag_load_edges.h"
 #include "utils/load/ag_load_labels.h"
 #include "utils/load/age_load.h"
diff --git a/src/include/catalog/ag_catalog.h b/src/include/catalog/ag_catalog.h
@@ -23,7 +23,6 @@
 #include "postgres.h"
 
 #include "utils/agtype.h"
-#include "utils/graphid.h"
 
 void object_access_hook_init(void);
 void object_access_hook_fini(void);
diff --git a/src/include/catalog/ag_graph.h b/src/include/catalog/ag_graph.h
@@ -20,8 +20,6 @@
 #ifndef AG_AG_GRAPH_H
 #define AG_AG_GRAPH_H
 
-#include "postgres.h"
-
 #include "catalog/ag_catalog.h"
 
 #define Anum_ag_graph_oid 1
diff --git a/src/include/catalog/ag_label.h b/src/include/catalog/ag_label.h
@@ -20,12 +20,8 @@
 #ifndef AG_AG_LABEL_H
 #define AG_AG_LABEL_H
 
-#include "postgres.h"
-
 #include "nodes/execnodes.h"
 
-#include "catalog/ag_catalog.h"
-
 #define Anum_ag_label_vertex_table_id 1
 #define Anum_ag_label_vertex_table_properties 2
 
diff --git a/src/include/catalog/ag_namespace.h b/src/include/catalog/ag_namespace.h
@@ -20,8 +20,6 @@
 #ifndef AG_AG_NAMESPACE_H
 #define AG_AG_NAMESPACE_H
 
-#include "postgres.h"
-
 Oid ag_catalog_namespace_id(void);
 Oid pg_catalog_namespace_id(void);
 
diff --git a/src/include/commands/graph_commands.h b/src/include/commands/graph_commands.h
@@ -20,8 +20,6 @@
 #ifndef AG_GRAPH_COMMANDS_H
 #define AG_GRAPH_COMMANDS_H
 
-#include "postgres.h"
-
 Datum create_graph(PG_FUNCTION_ARGS);
 
-#endif
+#endif
diff --git a/src/include/commands/label_commands.h b/src/include/commands/label_commands.h
@@ -20,8 +20,6 @@
 #ifndef AG_LABEL_COMMANDS_H
 #define AG_LABEL_COMMANDS_H
 
-#include "postgres.h"
-
 #define LABEL_TYPE_VERTEX 'v'
 #define LABEL_TYPE_EDGE 'e'
 
diff --git a/src/include/executor/cypher_executor.h b/src/include/executor/cypher_executor.h
@@ -21,8 +21,6 @@
 #define AG_CYPHER_EXECUTOR_H
 
 #include "nodes/extensible.h"
-#include "nodes/nodes.h"
-#include "nodes/plannodes.h"
 
 #define DELETE_SCAN_STATE_NAME "Cypher Delete"
 #define SET_SCAN_STATE_NAME "Cypher Set"
diff --git a/src/include/executor/cypher_utils.h b/src/include/executor/cypher_utils.h
@@ -21,12 +21,6 @@
 #define AG_CYPHER_UTILS_H
 
 #include "access/heapam.h"
-#include "access/table.h"
-#include "access/tableam.h"
-#include "nodes/execnodes.h"
-#include "nodes/extensible.h"
-#include "nodes/nodes.h"
-#include "nodes/plannodes.h"
 
 #include "nodes/cypher_nodes.h"
 #include "utils/agtype.h"
diff --git a/src/include/nodes/ag_nodes.h b/src/include/nodes/ag_nodes.h
@@ -20,10 +20,7 @@
 #ifndef AG_AG_NODES_H
 #define AG_AG_NODES_H
 
-#include "postgres.h"
-
 #include "nodes/extensible.h"
-#include "nodes/nodes.h"
 
 // This list must match node_names and node_methods.
 typedef enum ag_node_tag
diff --git a/src/include/nodes/cypher_copyfuncs.h b/src/include/nodes/cypher_copyfuncs.h
@@ -20,33 +20,36 @@
 #ifndef AG_CYPHER_COPYFUNCS_H
 #define AG_CYPHER_COPYFUNCS_H
 
-#include "postgres.h"
-
-#include "nodes/nodes.h"
-
 /*
  * Functions that let AGE's ExtensibleNodes be compatible with
  * Postgres' copyObject. We assign each node to its copy function
  * in the DEFINE_NODE_METHODS and DEFINE_NODE_METHODS_EXTENDED
  * macros in ag_nodes.c
  */
 
-void copy_ag_node(ExtensibleNode *newnode,
-                         const ExtensibleNode *oldnode);
+void copy_ag_node(ExtensibleNode *newnode, const ExtensibleNode *oldnode);
 
 // create data structures
-void copy_cypher_create_target_nodes(ExtensibleNode *newnode, const ExtensibleNode *from);
-void copy_cypher_create_path(ExtensibleNode *newnode, const ExtensibleNode *from);
-void copy_cypher_target_node(ExtensibleNode *newnode, const ExtensibleNode *from);
+void copy_cypher_create_target_nodes(ExtensibleNode *newnode,
+                                     const ExtensibleNode *from);
+void copy_cypher_create_path(ExtensibleNode *newnode,
+                             const ExtensibleNode *from);
+void copy_cypher_target_node(ExtensibleNode *newnode,
+                             const ExtensibleNode *from);
 
 // set/remove data structures
-void copy_cypher_update_information(ExtensibleNode *newnode, const ExtensibleNode *from);
-void copy_cypher_update_item(ExtensibleNode *newnode, const ExtensibleNode *from);
+void copy_cypher_update_information(ExtensibleNode *newnode,
+                                    const ExtensibleNode *from);
+void copy_cypher_update_item(ExtensibleNode *newnode,
+                             const ExtensibleNode *from);
 
 // delete data structures
-void copy_cypher_delete_information(ExtensibleNode *newnode, const ExtensibleNode *from);
-void copy_cypher_delete_item(ExtensibleNode *newnode, const ExtensibleNode *from);
+void copy_cypher_delete_information(ExtensibleNode *newnode,
+                                    const ExtensibleNode *from);
+void copy_cypher_delete_item(ExtensibleNode *newnode,
+                             const ExtensibleNode *from);
 
 // merge data structure
-void copy_cypher_merge_information(ExtensibleNode *newnode, const ExtensibleNode *from);
+void copy_cypher_merge_information(ExtensibleNode *newnode,
+                                   const ExtensibleNode *from);
 #endif
diff --git a/src/include/nodes/cypher_nodes.h b/src/include/nodes/cypher_nodes.h
@@ -20,12 +20,6 @@
 #ifndef AG_CYPHER_NODE_H
 #define AG_CYPHER_NODE_H
 
-#include "postgres.h"
-
-#include "nodes/extensible.h"
-#include "nodes/parsenodes.h"
-#include "nodes/pg_list.h"
-
 #include "nodes/ag_nodes.h"
 
 /* cypher sub patterns */
diff --git a/src/include/nodes/cypher_outfuncs.h b/src/include/nodes/cypher_outfuncs.h
@@ -20,11 +20,6 @@
 #ifndef AG_CYPHER_OUTFUNCS_H
 #define AG_CYPHER_OUTFUNCS_H
 
-#include "postgres.h"
-
-#include "nodes/extensible.h"
-#include "nodes/nodes.h"
-
 /*
  * Serialization functions for AGE's ExtensibleNodes. We assign
  * each node to its serialized function in the DEFINE_NODE_METHODS
diff --git a/src/include/nodes/cypher_readfuncs.h b/src/include/nodes/cypher_readfuncs.h
@@ -20,10 +20,7 @@
 #ifndef AG_CYPHER_READFUNCS_H
 #define AG_CYPHER_READFUNCS_H
 
-#include "postgres.h"
-
 #include "nodes/extensible.h"
-#include "nodes/nodes.h"
 
 /*
  * Deserialization functions for AGE's ExtensibleNodes. We assign
diff --git a/src/include/optimizer/cypher_createplan.h b/src/include/optimizer/cypher_createplan.h
@@ -20,9 +20,6 @@
 #ifndef AG_CYPHER_CREATEPLAN_H
 #define AG_CYPHER_CREATEPLAN_H
 
-#include "nodes/pg_list.h"
-#include "nodes/plannodes.h"
-
 Plan *plan_cypher_create_path(PlannerInfo *root, RelOptInfo *rel,
                               CustomPath *best_path, List *tlist,
                               List *clauses, List *custom_plans);
diff --git a/src/include/optimizer/cypher_pathnode.h b/src/include/optimizer/cypher_pathnode.h
@@ -20,8 +20,6 @@
 #ifndef AG_CYPHER_PATHNODE_H
 #define AG_CYPHER_PATHNODE_H
 
-#include "nodes/pg_list.h"
-
 #define CREATE_PATH_NAME "Cypher Create"
 #define SET_PATH_NAME "Cypher Set"
 #define DELETE_PATH_NAME "Cypher Delete"
diff --git a/src/include/parser/cypher_clause.h b/src/include/parser/cypher_clause.h
@@ -20,10 +20,6 @@
 #ifndef AG_CYPHER_CLAUSE_H
 #define AG_CYPHER_CLAUSE_H
 
-#include "nodes/parsenodes.h"
-#include "nodes/pg_list.h"
-#include "parser/parse_node.h"
-
 #include "parser/cypher_parse_node.h"
 
 typedef struct cypher_clause cypher_clause;
diff --git a/src/include/parser/cypher_expr.h b/src/include/parser/cypher_expr.h
@@ -25,9 +25,6 @@
 #ifndef AG_CYPHER_EXPR_H
 #define AG_CYPHER_EXPR_H
 
-#include "nodes/nodes.h"
-#include "parser/parse_node.h"
-
 #include "parser/cypher_parse_node.h"
 
 Node *transform_cypher_expr(cypher_parsestate *cpstate, Node *expr,
diff --git a/src/include/parser/cypher_gram.h b/src/include/parser/cypher_gram.h
@@ -27,7 +27,6 @@
 #ifndef AG_CYPHER_GRAM_H
 #define AG_CYPHER_GRAM_H
 
-#include "nodes/nodes.h"
 #include "nodes/pg_list.h"
 
 #include "parser/ag_scanner.h"
diff --git a/src/include/parser/cypher_item.h b/src/include/parser/cypher_item.h
@@ -20,15 +20,6 @@
 #ifndef AG_CYPHER_ITEM_H
 #define AG_CYPHER_ITEM_H
 
-#include "postgres.h"
-
-#include "nodes/nodes.h"
-#include "nodes/pg_list.h"
-#include "nodes/primnodes.h"
-#include "parser/parse_node.h"
-
-#include "parser/cypher_parse_node.h"
-
 TargetEntry *transform_cypher_item(cypher_parsestate *cpstate, Node *node,
                                    Node *expr, ParseExprKind expr_kind,
                                    char *colname, bool resjunk);
diff --git a/src/include/parser/cypher_parse_node.h b/src/include/parser/cypher_parse_node.h
@@ -20,9 +20,6 @@
 #ifndef AG_CYPHER_PARSE_NODE_H
 #define AG_CYPHER_PARSE_NODE_H
 
-#include "nodes/primnodes.h"
-#include "parser/parse_node.h"
-
 #include "nodes/cypher_nodes.h"
 
 /*
diff --git a/src/include/parser/cypher_parser.h b/src/include/parser/cypher_parser.h
@@ -20,8 +20,6 @@
 #ifndef AG_CYPHER_PARSER_H
 #define AG_CYPHER_PARSER_H
 
-#include "nodes/pg_list.h"
-
 List *parse_cypher(const char *s);
 
 #endif
diff --git a/src/include/parser/cypher_transform_entity.h b/src/include/parser/cypher_transform_entity.h
@@ -20,10 +20,6 @@
 #ifndef AG_CYPHER_TRANSFORM_ENTITY_H
 #define AG_CYPHER_TRANSFORM_ENTITY_H
 
-#include "nodes/primnodes.h"
-#include "parser/parse_node.h"
-
-#include "nodes/cypher_nodes.h"
 #include "nodes/makefuncs.h"
 #include "parser/cypher_parse_node.h"
 
diff --git a/src/include/utils/ag_cache.h b/src/include/utils/ag_cache.h
@@ -20,8 +20,6 @@
 #ifndef AG_AG_CACHE_H
 #define AG_AG_CACHE_H
 
-#include "postgres.h"
-
 // graph_cache_data contains the same fields that ag_graph catalog table has
 typedef struct graph_cache_data
 {
diff --git a/src/include/utils/ag_float8_supp.h b/src/include/utils/ag_float8_supp.h
@@ -25,8 +25,6 @@
 #ifndef AG_FLOAT_H
 #define AG_FLOAT_H
 
-#include "postgres.h"
-
 bool is_float8_special_number(float8 number);
 float8 float8in_internal_null(char *num, char **endptr_p, const char *type_name,
                               const char *orig_string, bool *is_valid);
diff --git a/src/include/utils/ag_func.h b/src/include/utils/ag_func.h
@@ -25,8 +25,6 @@
 #ifndef AG_AG_FUNC_H
 #define AG_AG_FUNC_H
 
-#include "postgres.h"
-
 #define CREATE_CLAUSE_FUNCTION_NAME "_cypher_create_clause"
 #define SET_CLAUSE_FUNCTION_NAME "_cypher_set_clause"
 #define DELETE_CLAUSE_FUNCTION_NAME "_cypher_delete_clause"
diff --git a/src/include/utils/ag_load.h b/src/include/utils/ag_load.h
diff --git a/src/include/utils/age_global_graph.h b/src/include/utils/age_global_graph.h
@@ -20,7 +20,6 @@
 #ifndef AG_AGE_GLOBAL_GRAPH_H
 #define AG_AGE_GLOBAL_GRAPH_H
 
-#include "utils/graphid.h"
 #include "utils/age_graphid_ds.h"
 
 /*
diff --git a/src/include/utils/agtype.h b/src/include/utils/agtype.h
@@ -31,16 +31,9 @@
 #ifndef AG_AGTYPE_H
 #define AG_AGTYPE_H
 
-#include "access/htup_details.h"
-#include "fmgr.h"
-#include "lib/stringinfo.h"
-#include "nodes/pg_list.h"
 #include "utils/array.h"
 #include "utils/numeric.h"
-#include "utils/syscache.h"
 
-#include "catalog/ag_namespace.h"
-#include "catalog/pg_type.h"
 #include "utils/graphid.h"
 
 /* Tokens used when sequentially processing an agtype value */
diff --git a/src/include/utils/agtype_parser.h b/src/include/utils/agtype_parser.h
diff --git a/src/include/utils/agtype_raw.h b/src/include/utils/agtype_raw.h
diff --git a/src/include/utils/graphid.h b/src/include/utils/graphid.h
diff --git a/src/include/utils/load/ag_load_edges.h b/src/include/utils/load/ag_load_edges.h
diff --git a/src/include/utils/load/ag_load_labels.h b/src/include/utils/load/ag_load_labels.h
diff --git a/src/include/utils/load/age_load.h b/src/include/utils/load/age_load.h
