Commit7b46401

committed

Move symbols for ExecMergeJoin's state machine into nodeMergejoin.c.

There's no reason for these values to be known anywhere else. Afterdoing this, executor/execdefs.h is vestigial and can be removed.

1 parentf4e4b32 commit7b46401Copy full SHA for 7b46401

File tree

+16

-35

lines changed

+16

-35

lines changed

Lines changed: 15 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,6 @@`
`95`	`95`	`#include"access/nbtree.h"`
`96`	`96`	`#include"catalog/pg_amop.h"`
`97`	`97`	`#include"executor/execdebug.h"`
`98`		`-#include"executor/execdefs.h"`
`99`	`98`	`#include"executor/nodeMergejoin.h"`
`100`	`99`	`#include"miscadmin.h"`
`101`	`100`	`#include"utils/acl.h"`
`@@ -104,6 +103,21 @@`
`104`	`103`	`#include"utils/syscache.h"`
`105`	`104`
`106`	`105`
	`106`	`+/*`
	`107`	`+ * States of the ExecMergeJoin state machine`
	`108`	`+ */`
	`109`	`+#defineEXEC_MJ_INITIALIZE_OUTER1`
	`110`	`+#defineEXEC_MJ_INITIALIZE_INNER2`
	`111`	`+#defineEXEC_MJ_JOINTUPLES3`
	`112`	`+#defineEXEC_MJ_NEXTOUTER4`
	`113`	`+#defineEXEC_MJ_TESTOUTER5`
	`114`	`+#defineEXEC_MJ_NEXTINNER6`
	`115`	`+#defineEXEC_MJ_SKIP_TEST7`
	`116`	`+#defineEXEC_MJ_SKIPOUTER_ADVANCE8`
	`117`	`+#defineEXEC_MJ_SKIPINNER_ADVANCE9`
	`118`	`+#defineEXEC_MJ_ENDOUTER10`
	`119`	`+#defineEXEC_MJ_ENDINNER11`
	`120`	`+`
`107`	`121`	`/*`
`108`	`122`	`* Runtime data for each mergejoin clause`
`109`	`123`	`*/`

Lines changed: 0 additions & 33 deletions

This file was deleted.

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1425,7 +1425,7 @@ typedef struct NestLoopState`
`1425`	`1425`	`*`
`1426`	`1426`	`*NumClauses number of mergejoinable join clauses`
`1427`	`1427`	`*Clauses info for each mergejoinable clause`
`1428`		`- *JoinState current"state" ofjoin. see execdefs.h`
	`1428`	`+ *JoinState current state ofExecMergeJoin state machine`
`1429`	`1429`	`*ExtraMarks true to issue extra Mark operations on inner scan`
`1430`	`1430`	`*ConstFalseJoin true if we have a constant-false joinqual`
`1431`	`1431`	`*FillOuter true if should emit unjoined outer tuples anyway`

Comments

(0)