From 1fd0c59e25063e664f8a5cee6f723470c5979544 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Thu, 5 Dec 2002 15:50:39 +0000 Subject: Phase 1 of read-only-plans project: cause executor state nodes to point to plan nodes, not vice-versa. All executor state nodes now inherit from struct PlanState. Copying of plan trees has been simplified by not storing a list of SubPlans in Plan nodes (eliminating duplicate links). The executor still needs such a list, but it can build it during ExecutorStart since it has to scan the plan tree anyway. No initdb forced since no stored-on-disk structures changed, but you will need a full recompile because of node-numbering changes. --- src/include/executor/nodeHash.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/include/executor/nodeHash.h') diff --git a/src/include/executor/nodeHash.h b/src/include/executor/nodeHash.h index 654906cd3c..c30073ec8c 100644 --- a/src/include/executor/nodeHash.h +++ b/src/include/executor/nodeHash.h @@ -7,19 +7,21 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodeHash.h,v 1.26 2002/11/30 00:08:20 tgl Exp $ + * $Id: nodeHash.h,v 1.27 2002/12/05 15:50:37 tgl Exp $ * *------------------------------------------------------------------------- */ #ifndef NODEHASH_H #define NODEHASH_H -#include "nodes/plannodes.h" +#include "nodes/execnodes.h" -extern TupleTableSlot *ExecHash(Hash *node); -extern bool ExecInitHash(Hash *node, EState *estate, Plan *parent); extern int ExecCountSlotsHash(Hash *node); -extern void ExecEndHash(Hash *node); +extern HashState *ExecInitHash(Hash *node, EState *estate); +extern TupleTableSlot *ExecHash(HashState *node); +extern void ExecEndHash(HashState *node); +extern void ExecReScanHash(HashState *node, ExprContext *exprCtxt); + extern HashJoinTable ExecHashTableCreate(Hash *node); extern void ExecHashTableDestroy(HashJoinTable hashtable); extern void ExecHashTableInsert(HashJoinTable hashtable, @@ -31,7 +33,6 @@ extern int ExecHashGetBucket(HashJoinTable hashtable, extern HeapTuple ExecScanHashBucket(HashJoinState *hjstate, List *hjclauses, ExprContext *econtext); extern void ExecHashTableReset(HashJoinTable hashtable, long ntuples); -extern void ExecReScanHash(Hash *node, ExprContext *exprCtxt, Plan *parent); extern void ExecChooseHashTableSize(double ntuples, int tupwidth, int *virtualbuckets, int *physicalbuckets, -- cgit v1.2.1