diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2007-06-07 19:19:57 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2007-06-07 19:19:57 +0000 |
| commit | 24ee8af57378ee3b065f6a0d62aeb5a5c7313284 (patch) | |
| tree | a6cac1fd93221aad889f8f869d8fdbc97ff8834b /src/include/executor | |
| parent | 2d9d7a6bf56801e38ba93e22346a5ef3b9ac73ea (diff) | |
| download | postgresql-24ee8af57378ee3b065f6a0d62aeb5a5c7313284.tar.gz | |
Rework temp_tablespaces patch so that temp tablespaces are assigned separately
for each temp file, rather than once per sort or hashjoin; this allows
spreading the data of a large sort or join across multiple tablespaces.
(I remain dubious that this will make any difference in practice, but certain
people insisted.) Arrange to cache the results of parsing the GUC variable
instead of recomputing from scratch on every demand, and push usage of the
cache down to the bottommost fd.c level.
Diffstat (limited to 'src/include/executor')
| -rw-r--r-- | src/include/executor/hashjoin.h | 4 | ||||
| -rw-r--r-- | src/include/executor/nodeHashjoin.h | 7 |
2 files changed, 4 insertions, 7 deletions
diff --git a/src/include/executor/hashjoin.h b/src/include/executor/hashjoin.h index 70db576ebe..5613ca3870 100644 --- a/src/include/executor/hashjoin.h +++ b/src/include/executor/hashjoin.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/executor/hashjoin.h,v 1.46 2007/06/03 17:08:32 tgl Exp $ + * $PostgreSQL: pgsql/src/include/executor/hashjoin.h,v 1.47 2007/06/07 19:19:57 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -102,8 +102,6 @@ typedef struct HashJoinTableData BufFile **innerBatchFile; /* buffered virtual temp file per batch */ BufFile **outerBatchFile; /* buffered virtual temp file per batch */ - Oid hashTblSpc; /* tablespace to put temp files in */ - /* * Info about the datatype-specific hash functions for the datatypes being * hashed. These are arrays of the same length as the number of hash join diff --git a/src/include/executor/nodeHashjoin.h b/src/include/executor/nodeHashjoin.h index 2de661b8c1..77efa1d8d1 100644 --- a/src/include/executor/nodeHashjoin.h +++ b/src/include/executor/nodeHashjoin.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/executor/nodeHashjoin.h,v 1.35 2007/06/03 17:08:32 tgl Exp $ + * $PostgreSQL: pgsql/src/include/executor/nodeHashjoin.h,v 1.36 2007/06/07 19:19:57 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -23,8 +23,7 @@ extern TupleTableSlot *ExecHashJoin(HashJoinState *node); extern void ExecEndHashJoin(HashJoinState *node); extern void ExecReScanHashJoin(HashJoinState *node, ExprContext *exprCtxt); -extern void ExecHashJoinSaveTuple(HashJoinTable hashtable, - MinimalTuple tuple, uint32 hashvalue, - BufFile **fileptr); +extern void ExecHashJoinSaveTuple(MinimalTuple tuple, uint32 hashvalue, + BufFile **fileptr); #endif /* NODEHASHJOIN_H */ |