NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitb60c397

committed

Move inheritance expansion code into its own file

This commit moves expand_inherited_tables and underlings fromoptimizer/prep/prepunionc.c to optimizer/utils/inherit.c.Also, all of the AppendRelInfo-based expression manipulation routinesare moved to optimizer/utils/appendinfo.c.No functional code changes. One exception is the introduction ofmake_append_rel_info, but that's still just moving around code.Also, stop including <limits.h> in prepunion.c, which no longer needsit since3fc6e2d. I (Álvaro) noticed this because Amit was copyingthat to inherit.c, which likewise doesn't need it.Author: Amit LangoteDiscussion:https://postgr.es/m/3be67028-a00a-502c-199a-da00eec8fb6e@lab.ntt.co.jp

1 parentdacadcd commitb60c397Copy full SHA for b60c397

File tree

15 files changed

+1343

-1227

lines changed

src
- backend
  - optimizer
    - path
    - plan
      - planmain.c
      - planner.c
    - prep
      - prepunion.c
    - util
  - partitioning
    - partprune.c
- include/optimizer

15 files changed

+1343

-1227

lines changed

`‎src/backend/optimizer/path/allpaths.c`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -30,14 +30,15 @@`
`30`	`30`	`#ifdefOPTIMIZER_DEBUG`
`31`	`31`	`#include"nodes/print.h"`
`32`	`32`	`#endif`
	`33`	`+#include"optimizer/appendinfo.h"`
`33`	`34`	`#include"optimizer/clauses.h"`
`34`	`35`	`#include"optimizer/cost.h"`
`35`	`36`	`#include"optimizer/geqo.h"`
	`37`	`+#include"optimizer/inherit.h"`
`36`	`38`	`#include"optimizer/pathnode.h"`
`37`	`39`	`#include"optimizer/paths.h"`
`38`	`40`	`#include"optimizer/plancat.h"`
`39`	`41`	`#include"optimizer/planner.h"`
`40`		`-#include"optimizer/prep.h"`
`41`	`42`	`#include"optimizer/restrictinfo.h"`
`42`	`43`	`#include"optimizer/tlist.h"`
`43`	`44`	`#include"optimizer/var.h"`

`‎src/backend/optimizer/path/equivclass.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -22,11 +22,11 @@`
`22`	`22`	`#include"catalog/pg_type.h"`
`23`	`23`	`#include"nodes/makefuncs.h"`
`24`	`24`	`#include"nodes/nodeFuncs.h"`
	`25`	`+#include"optimizer/appendinfo.h"`
`25`	`26`	`#include"optimizer/clauses.h"`
`26`	`27`	`#include"optimizer/pathnode.h"`
`27`	`28`	`#include"optimizer/paths.h"`
`28`	`29`	`#include"optimizer/planmain.h"`
`29`		`-#include"optimizer/prep.h"`
`30`	`30`	`#include"optimizer/restrictinfo.h"`
`31`	`31`	`#include"optimizer/var.h"`
`32`	`32`	`#include"utils/lsyscache.h"`

`‎src/backend/optimizer/path/joinrels.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -15,11 +15,11 @@`
`15`	`15`	`#include"postgres.h"`
`16`	`16`
`17`	`17`	`#include"miscadmin.h"`
	`18`	`+#include"optimizer/appendinfo.h"`
`18`	`19`	`#include"optimizer/clauses.h"`
`19`	`20`	`#include"optimizer/joininfo.h"`
`20`	`21`	`#include"optimizer/pathnode.h"`
`21`	`22`	`#include"optimizer/paths.h"`
`22`		`-#include"optimizer/prep.h"`
`23`	`23`	`#include"partitioning/partbounds.h"`
`24`	`24`	`#include"utils/lsyscache.h"`
`25`	`25`	`#include"utils/memutils.h"`

`‎src/backend/optimizer/plan/planmain.c`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,9 @@`
`20`	`20`	`*/`
`21`	`21`	`#include"postgres.h"`
`22`	`22`
	`23`	`+#include"optimizer/appendinfo.h"`
`23`	`24`	`#include"optimizer/clauses.h"`
	`25`	`+#include"optimizer/inherit.h"`
`24`	`26`	`#include"optimizer/orclauses.h"`
`25`	`27`	`#include"optimizer/pathnode.h"`
`26`	`28`	`#include"optimizer/paths.h"`

`‎src/backend/optimizer/plan/planner.c`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,10 @@`
`37`	`37`	`#ifdefOPTIMIZER_DEBUG`
`38`	`38`	`#include"nodes/print.h"`
`39`	`39`	`#endif`
	`40`	`+#include"optimizer/appendinfo.h"`
`40`	`41`	`#include"optimizer/clauses.h"`
`41`	`42`	`#include"optimizer/cost.h"`
	`43`	`+#include"optimizer/inherit.h"`
`42`	`44`	`#include"optimizer/pathnode.h"`
`43`	`45`	`#include"optimizer/paths.h"`
`44`	`46`	`#include"optimizer/plancat.h"`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitb60c397

File tree

15 files changed

15 files changed

`‎src/backend/optimizer/path/allpaths.c`

`‎src/backend/optimizer/path/equivclass.c`

`‎src/backend/optimizer/path/joinrels.c`

`‎src/backend/optimizer/plan/planmain.c`

`‎src/backend/optimizer/plan/planner.c`

0 commit comments