Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit7b46401

Browse files
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 commit7b46401

File tree

3 files changed

+16
-35
lines changed

3 files changed

+16
-35
lines changed

‎src/backend/executor/nodeMergejoin.c

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@
9595
#include"access/nbtree.h"
9696
#include"catalog/pg_amop.h"
9797
#include"executor/execdebug.h"
98-
#include"executor/execdefs.h"
9998
#include"executor/nodeMergejoin.h"
10099
#include"miscadmin.h"
101100
#include"utils/acl.h"
@@ -104,6 +103,21 @@
104103
#include"utils/syscache.h"
105104

106105

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+
107121
/*
108122
* Runtime data for each mergejoin clause
109123
*/

‎src/include/executor/execdefs.h

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎src/include/nodes/execnodes.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1425,7 +1425,7 @@ typedef struct NestLoopState
14251425
*
14261426
*NumClauses number of mergejoinable join clauses
14271427
*Clauses info for each mergejoinable clause
1428-
*JoinState current"state" ofjoin. see execdefs.h
1428+
*JoinState current state ofExecMergeJoin state machine
14291429
*ExtraMarks true to issue extra Mark operations on inner scan
14301430
*ConstFalseJoin true if we have a constant-false joinqual
14311431
*FillOuter true if should emit unjoined outer tuples anyway

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp