aboutsummaryrefslogtreecommitdiff
path: root/src/backend/executor/nodeMergejoin.c
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2010-12-30 22:12:40 -0500
committerTom Lane <tgl@sss.pgh.pa.us>2010-12-30 22:12:40 -0500
commit7b464015577e6e7544a7aacf19ca55b271e740ac (patch)
treec6c15eb90094ef6d57306b0822ec2570d2760a60 /src/backend/executor/nodeMergejoin.c
parentf4e4b3274317d9ce30de7e7e5b04dece7c4e1791 (diff)
downloadpostgresql-7b464015577e6e7544a7aacf19ca55b271e740ac.tar.gz
postgresql-7b464015577e6e7544a7aacf19ca55b271e740ac.zip
Move symbols for ExecMergeJoin's state machine into nodeMergejoin.c.
There's no reason for these values to be known anywhere else. After doing this, executor/execdefs.h is vestigial and can be removed.
Diffstat (limited to 'src/backend/executor/nodeMergejoin.c')
-rw-r--r--src/backend/executor/nodeMergejoin.c16
1 files changed, 15 insertions, 1 deletions
diff --git a/src/backend/executor/nodeMergejoin.c b/src/backend/executor/nodeMergejoin.c
index 98d1615514b..a6c0cc786ec 100644
--- a/src/backend/executor/nodeMergejoin.c
+++ b/src/backend/executor/nodeMergejoin.c
@@ -95,7 +95,6 @@
#include "access/nbtree.h"
#include "catalog/pg_amop.h"
#include "executor/execdebug.h"
-#include "executor/execdefs.h"
#include "executor/nodeMergejoin.h"
#include "miscadmin.h"
#include "utils/acl.h"
@@ -105,6 +104,21 @@
/*
+ * States of the ExecMergeJoin state machine
+ */
+#define EXEC_MJ_INITIALIZE_OUTER 1
+#define EXEC_MJ_INITIALIZE_INNER 2
+#define EXEC_MJ_JOINTUPLES 3
+#define EXEC_MJ_NEXTOUTER 4
+#define EXEC_MJ_TESTOUTER 5
+#define EXEC_MJ_NEXTINNER 6
+#define EXEC_MJ_SKIP_TEST 7
+#define EXEC_MJ_SKIPOUTER_ADVANCE 8
+#define EXEC_MJ_SKIPINNER_ADVANCE 9
+#define EXEC_MJ_ENDOUTER 10
+#define EXEC_MJ_ENDINNER 11
+
+/*
* Runtime data for each mergejoin clause
*/
typedef struct MergeJoinClauseData