Skip to content

Commit dbeb16a

Browse files
jrgemignanijrgemignani
authored
Clean up #included files in nodes, executor, & optimizer directories (#1509) (#1534)
Cleaned up #included files in the .c files in the nodes, executor, and optimizer directories. modified: src/backend/executor/cypher_create.c modified: src/backend/executor/cypher_delete.c modified: src/backend/executor/cypher_merge.c modified: src/backend/executor/cypher_set.c modified: src/backend/executor/cypher_utils.c modified: src/backend/nodes/ag_nodes.c modified: src/backend/nodes/cypher_copyfuncs.c modified: src/backend/nodes/cypher_outfuncs.c modified: src/backend/optimizer/cypher_createplan.c modified: src/backend/optimizer/cypher_pathnode.c modified: src/backend/optimizer/cypher_paths.c Resolved - Conflicts: src/backend/executor/cypher_create.c src/backend/executor/cypher_delete.c src/backend/executor/cypher_merge.c src/backend/executor/cypher_set.c src/backend/executor/cypher_utils.c src/backend/optimizer/cypher_createplan.c src/backend/optimizer/cypher_pathnode.c src/backend/optimizer/cypher_paths.c
1 parent 95bf818 commit dbeb16a

11 files changed

+3
-98
lines changed

‎src/backend/executor/cypher_create.c

-13
Original file line numberDiff line numberDiff line change
@@ -19,25 +19,12 @@
1919

2020
#include "postgres.h"
2121

22-
#include "access/htup_details.h"
2322
#include "access/xact.h"
24-
#include "executor/tuptable.h"
25-
#include "nodes/execnodes.h"
26-
#include "nodes/extensible.h"
27-
#include "nodes/nodes.h"
28-
#include "nodes/plannodes.h"
29-
#include "parser/parse_relation.h"
30-
#include "rewrite/rewriteHandler.h"
3123
#include "utils/rel.h"
32-
#include "utils/tqual.h"
3324

3425
#include "catalog/ag_label.h"
3526
#include "executor/cypher_executor.h"
3627
#include "executor/cypher_utils.h"
37-
#include "nodes/cypher_nodes.h"
38-
#include "utils/agtype.h"
39-
#include "utils/ag_cache.h"
40-
#include "utils/graphid.h"
4128

4229
static void begin_cypher_create(CustomScanState *node, EState *estate,
4330
int eflags);

‎src/backend/executor/cypher_delete.c

+1-17
Original file line numberDiff line numberDiff line change
@@ -19,30 +19,14 @@
1919

2020
#include "postgres.h"
2121

22-
#include "access/sysattr.h"
23-
#include "access/htup_details.h"
24-
#include "access/multixact.h"
2522
#include "access/xact.h"
26-
#include "storage/bufmgr.h"
27-
#include "executor/tuptable.h"
28-
#include "nodes/execnodes.h"
29-
#include "nodes/extensible.h"
30-
#include "nodes/nodes.h"
31-
#include "nodes/plannodes.h"
32-
#include "parser/parsetree.h"
33-
#include "parser/parse_relation.h"
34-
#include "rewrite/rewriteHandler.h"
3523
#include "utils/rel.h"
36-
#include "utils/tqual.h"
24+
#include "storage/bufmgr.h"
3725

3826
#include "catalog/ag_label.h"
3927
#include "commands/label_commands.h"
4028
#include "executor/cypher_executor.h"
4129
#include "executor/cypher_utils.h"
42-
#include "parser/cypher_parse_node.h"
43-
#include "nodes/cypher_nodes.h"
44-
#include "utils/agtype.h"
45-
#include "utils/graphid.h"
4630

4731
static void begin_cypher_delete(CustomScanState *node, EState *estate,
4832
int eflags);

‎src/backend/executor/cypher_merge.c

-13
Original file line numberDiff line numberDiff line change
@@ -19,25 +19,12 @@
1919

2020
#include "postgres.h"
2121

22-
#include "access/htup_details.h"
2322
#include "access/xact.h"
24-
#include "executor/tuptable.h"
25-
#include "nodes/execnodes.h"
26-
#include "nodes/extensible.h"
27-
#include "nodes/nodes.h"
28-
#include "nodes/plannodes.h"
29-
#include "parser/parse_relation.h"
30-
#include "rewrite/rewriteHandler.h"
3123
#include "utils/rel.h"
32-
#include "utils/tqual.h"
3324

3425
#include "catalog/ag_label.h"
3526
#include "executor/cypher_executor.h"
3627
#include "executor/cypher_utils.h"
37-
#include "nodes/cypher_nodes.h"
38-
#include "utils/agtype.h"
39-
#include "utils/ag_cache.h"
40-
#include "utils/graphid.h"
4128

4229
static void begin_cypher_merge(CustomScanState *node, EState *estate,
4330
int eflags);

‎src/backend/executor/cypher_set.c

+1-17
Original file line numberDiff line numberDiff line change
@@ -19,28 +19,12 @@
1919

2020
#include "postgres.h"
2121

22-
#include "access/sysattr.h"
23-
#include "access/htup_details.h"
2422
#include "access/xact.h"
25-
#include "storage/bufmgr.h"
26-
#include "executor/tuptable.h"
27-
#include "nodes/execnodes.h"
28-
#include "nodes/extensible.h"
29-
#include "nodes/nodes.h"
30-
#include "nodes/plannodes.h"
31-
#include "parser/parsetree.h"
32-
#include "parser/parse_relation.h"
33-
#include "rewrite/rewriteHandler.h"
3423
#include "utils/rel.h"
24+
#include "storage/bufmgr.h"
3525

36-
#include "catalog/ag_label.h"
37-
#include "commands/label_commands.h"
3826
#include "executor/cypher_executor.h"
3927
#include "executor/cypher_utils.h"
40-
#include "parser/cypher_parse_node.h"
41-
#include "nodes/cypher_nodes.h"
42-
#include "utils/agtype.h"
43-
#include "utils/graphid.h"
4428

4529
static void begin_cypher_set(CustomScanState *node, EState *estate,
4630
int eflags);

‎src/backend/executor/cypher_utils.c

+1-13
Original file line numberDiff line numberDiff line change
@@ -24,27 +24,15 @@
2424

2525
#include "postgres.h"
2626

27-
#include "access/htup_details.h"
28-
#include "access/sysattr.h"
2927
#include "access/xact.h"
30-
#include "access/multixact.h"
31-
#include "nodes/extensible.h"
28+
#include "utils/rel.h"
3229
#include "nodes/makefuncs.h"
33-
#include "nodes/nodes.h"
34-
#include "nodes/nodeFuncs.h"
35-
#include "nodes/plannodes.h"
36-
#include "parser/parsetree.h"
3730
#include "parser/parse_relation.h"
38-
#include "storage/procarray.h"
39-
#include "utils/rel.h"
4031

4132
#include "catalog/ag_label.h"
4233
#include "commands/label_commands.h"
43-
#include "executor/cypher_executor.h"
4434
#include "executor/cypher_utils.h"
45-
#include "utils/agtype.h"
4635
#include "utils/ag_cache.h"
47-
#include "utils/graphid.h"
4836

4937
/*
5038
* Given the graph name and the label name, create a ResultRelInfo for the table

‎src/backend/nodes/ag_nodes.c

-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919

2020
#include "postgres.h"
2121

22-
#include "nodes/extensible.h"
23-
2422
#include "nodes/ag_nodes.h"
2523
#include "nodes/cypher_copyfuncs.h"
2624
#include "nodes/cypher_outfuncs.h"

‎src/backend/nodes/cypher_copyfuncs.c

-3
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,7 @@
1919

2020
#include "postgres.h"
2121

22-
#include "nodes/bitmapset.h"
2322
#include "nodes/extensible.h"
24-
#include "nodes/nodes.h"
25-
#include "utils/palloc.h"
2623

2724
#include "nodes/cypher_copyfuncs.h"
2825
#include "nodes/cypher_nodes.h"

‎src/backend/nodes/cypher_outfuncs.c

-4
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,6 @@
1919

2020
#include "postgres.h"
2121

22-
#include "lib/stringinfo.h"
23-
#include "nodes/extensible.h"
24-
#include "nodes/nodes.h"
25-
2622
#include "nodes/cypher_nodes.h"
2723
#include "nodes/cypher_outfuncs.h"
2824

‎src/backend/optimizer/cypher_createplan.c

-8
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,6 @@
1919

2020
#include "postgres.h"
2121

22-
#include "access/sysattr.h"
23-
#include "catalog/pg_type_d.h"
24-
#include "nodes/extensible.h"
25-
#include "nodes/nodes.h"
26-
#include "nodes/pg_list.h"
27-
#include "nodes/plannodes.h"
28-
#include "nodes/relation.h"
29-
3022
#include "executor/cypher_executor.h"
3123
#include "optimizer/cypher_createplan.h"
3224

‎src/backend/optimizer/cypher_pathnode.c

-3
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@
2020
#include "postgres.h"
2121

2222
#include "nodes/extensible.h"
23-
#include "nodes/nodes.h"
24-
#include "nodes/pg_list.h"
25-
#include "nodes/relation.h"
2623

2724
#include "optimizer/cypher_createplan.h"
2825
#include "optimizer/cypher_pathnode.h"

‎src/backend/optimizer/cypher_paths.c

-5
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,6 @@
1919

2020
#include "postgres.h"
2121

22-
#include "access/sysattr.h"
23-
#include "catalog/pg_type_d.h"
24-
#include "nodes/parsenodes.h"
25-
#include "nodes/primnodes.h"
26-
#include "nodes/relation.h"
2722
#include "optimizer/pathnode.h"
2823
#include "optimizer/paths.h"
2924

0 commit comments

Comments
 (0)