Skip to content

Commit

Permalink
Clean up #included files in parser directory (#1465) (#1471)
Browse files Browse the repository at this point in the history 
Cleaned up #included files in the .c files in the parser directory.
Additionally, fixed one that was at the backend root.

    modified:   src/backend/age.c
    modified:   src/backend/parser/cypher_analyze.c
    modified:   src/backend/parser/cypher_clause.c
    modified:   src/backend/parser/cypher_expr.c
    modified:   src/backend/parser/cypher_gram.y
    modified:   src/backend/parser/cypher_item.c
    modified:   src/backend/parser/cypher_keywords.c
    modified:   src/backend/parser/cypher_parse_node.c
    modified:   src/backend/parser/cypher_parser.c

Added in #include "parser/parse_relation.h" into cypher_clause due
to differences between PostgreSQL 16 and 15.

Resolved -

Conflicts:
	src/backend/parser/cypher_analyze.c
	src/backend/parser/cypher_expr.c
  • Loading branch information
@jrgemignani
jrgemignani authored Dec 31, 2023
1 parent 29bf692 commit 2541273
Show file tree
Hide file tree
Showing 9 changed files with 1 addition and 65 deletions.
4 changes: 0 additions & 4 deletions src/backend/age.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@
* under the License.
*/

#include "postgres.h"

#include "fmgr.h"

#include "catalog/ag_catalog.h"
#include "nodes/ag_nodes.h"
#include "optimizer/cypher_paths.h"
Expand Down
9 changes: 0 additions & 9 deletions src/backend/parser/cypher_analyze.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,30 +19,21 @@

#include "postgres.h"

#include "catalog/pg_type_d.h"
#include "nodes/makefuncs.h"
#include "nodes/nodeFuncs.h"
#include "nodes/nodes.h"
#include "nodes/parsenodes.h"
#include "nodes/pg_list.h"
#include "nodes/primnodes.h"
#include "parser/analyze.h"
#include "parser/parse_coerce.h"
#include "parser/parse_collate.h"
#include "parser/parse_node.h"
#include "parser/parse_relation.h"
#include "parser/parse_target.h"
#include "utils/builtins.h"

#include "catalog/ag_graph.h"
#include "nodes/ag_nodes.h"
#include "parser/cypher_analyze.h"
#include "parser/cypher_clause.h"
#include "parser/cypher_parse_node.h"
#include "parser/cypher_parser.h"
#include "utils/ag_func.h"
#include "utils/age_session_info.h"
#include "utils/agtype.h"

/*
* extra_node is a global variable to this source to store, at the moment, the
Expand Down
16 changes: 0 additions & 16 deletions src/backend/parser/cypher_clause.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,47 +24,31 @@

#include "postgres.h"

#include "access/sysattr.h"
#include "access/heapam.h"
#include "catalog/pg_type_d.h"
#include "miscadmin.h"
#include "nodes/makefuncs.h"
#include "nodes/nodeFuncs.h"
#include "nodes/nodes.h"
#include "nodes/parsenodes.h"
#include "nodes/pg_list.h"
#include "nodes/primnodes.h"
#include "optimizer/optimizer.h"
#include "parser/parse_clause.h"
#include "parser/parse_coerce.h"
#include "parser/parse_collate.h"
#include "parser/parse_expr.h"
#include "parser/parse_func.h"
#include "parser/parse_node.h"
#include "parser/parse_oper.h"
#include "parser/parse_relation.h"
#include "parser/parse_target.h"
#include "parser/parsetree.h"
#include "rewrite/rewriteHandler.h"
#include "utils/typcache.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 "nodes/ag_nodes.h"
#include "nodes/cypher_nodes.h"
#include "parser/cypher_clause.h"
#include "parser/cypher_expr.h"
#include "parser/cypher_item.h"
#include "parser/cypher_parse_agg.h"
#include "parser/cypher_parse_node.h"
#include "parser/cypher_transform_entity.h"
#include "utils/ag_cache.h"
#include "utils/ag_func.h"
#include "utils/agtype.h"
#include "utils/graphid.h"
#include "utils/ag_guc.h"

/*
Expand Down
12 changes: 0 additions & 12 deletions src/backend/parser/cypher_expr.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,32 +24,20 @@

#include "postgres.h"

#include "catalog/pg_type.h"
#include "miscadmin.h"
#include "nodes/makefuncs.h"
#include "nodes/nodeFuncs.h"
#include "nodes/nodes.h"
#include "nodes/parsenodes.h"
#include "nodes/value.h"
#include "optimizer/tlist.h"
#include "parser/parse_coerce.h"
#include "parser/parse_collate.h"
#include "parser/parse_expr.h"
#include "parser/parse_func.h"
#include "parser/cypher_clause.h"
#include "parser/parse_node.h"
#include "parser/parse_oper.h"
#include "parser/parse_relation.h"
#include "utils/builtins.h"
#include "utils/float.h"
#include "utils/int8.h"
#include "utils/lsyscache.h"
#include "utils/syscache.h"

#include "commands/label_commands.h"
#include "nodes/cypher_nodes.h"
#include "parser/cypher_expr.h"
#include "parser/cypher_parse_node.h"
#include "parser/cypher_transform_entity.h"
#include "utils/ag_func.h"
#include "utils/agtype.h"
Expand Down
8 changes: 0 additions & 8 deletions src/backend/parser/cypher_gram.y
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,8 @@
#include "postgres.h"

#include "nodes/makefuncs.h"
#include "nodes/nodes.h"
#include "nodes/parsenodes.h"
#include "nodes/pg_list.h"
#include "nodes/primnodes.h"
#include "nodes/value.h"
#include "parser/parser.h"

#include "nodes/ag_nodes.h"
#include "nodes/cypher_nodes.h"
#include "parser/ag_scanner.h"
#include "parser/cypher_gram.h"
#include "parser/cypher_parse_node.h"
#include "parser/scansup.h"
Expand Down
7 changes: 0 additions & 7 deletions src/backend/parser/cypher_item.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,19 +24,12 @@

#include "postgres.h"

#include "access/attnum.h"
#include "nodes/makefuncs.h"
#include "nodes/nodes.h"
#include "nodes/parsenodes.h"
#include "nodes/pg_list.h"
#include "nodes/primnodes.h"
#include "parser/parse_node.h"
#include "parser/parse_relation.h"
#include "parser/parse_target.h"

#include "parser/cypher_expr.h"
#include "parser/cypher_item.h"
#include "parser/cypher_parse_node.h"

static List *ExpandAllTables(ParseState *pstate, int location);
static List *expand_rel_attrs(ParseState *pstate, RangeTblEntry *rte,
Expand Down
6 changes: 1 addition & 5 deletions src/backend/parser/cypher_keywords.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,8 @@

#include "postgres.h"

#include "access/attnum.h"
#include "access/htup.h"
#include "access/tupdesc.h"
#include "catalog/pg_type.h"
#include "catalog/pg_type_d.h"
#include "common/keywords.h"
#include "fmgr.h"
#include "funcapi.h"

#include "parser/cypher_gram.h"
Expand Down
2 changes: 0 additions & 2 deletions src/backend/parser/cypher_parse_node.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@
#include "postgres.h"

#include "mb/pg_wchar.h"
#include "nodes/primnodes.h"
#include "parser/parse_node.h"

#include "parser/cypher_parse_node.h"

Expand Down
2 changes: 0 additions & 2 deletions src/backend/parser/cypher_parser.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,8 @@

#include "postgres.h"

#include "nodes/pg_list.h"
#include "parser/scansup.h"

#include "parser/ag_scanner.h"
#include "parser/cypher_gram.h"
#include "parser/cypher_keywords.h"
#include "parser/cypher_parser.h"
Expand Down

0 comments on commit 2541273

Please sign in to comment.