From 7b464015577e6e7544a7aacf19ca55b271e740ac Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Thu, 30 Dec 2010 22:12:40 -0500 Subject: 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. --- src/backend/executor/nodeMergejoin.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'src/backend/executor/nodeMergejoin.c') 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" @@ -104,6 +103,21 @@ #include "utils/syscache.h" +/* + * 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 */ -- cgit v1.2.3