Add innercost to result in cost_hashjoin.

This commit is contained in:
Vadim B. Mikheev 1997-04-24 15:49:30 +00:00
parent 72b523d055
commit 4ec8a148ed

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/costsize.c,v 1.14 1997/04/09 02:13:41 vadim Exp $ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/costsize.c,v 1.15 1997/04/24 15:49:30 vadim Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -321,15 +321,19 @@ cost_hashjoin(Cost outercost,
return _disable_cost_; return _disable_cost_;
if ( !_enable_hashjoin_ ) if ( !_enable_hashjoin_ )
temp += _disable_cost_; temp += _disable_cost_;
/* temp += outercost + (nrun + 1) * innercost; */ /*
/* temp += outercost + (nrun + 1) * innercost;
the innercost shouldn't be used it. Instead the *
cost of hashing the innerpath should be used * the innercost shouldn't be used it. Instead the
* cost of hashing the innerpath should be used
ASSUME innercost is 1 for now -- a horrible hack *
- jolly * ASSUME innercost is 1 for now -- a horrible hack
*/ * - jolly
temp += outercost + (nrun + 1); temp += outercost + (nrun + 1);
*
* But we must add innercost to result. - vadim 04/24/97
*/
temp += outercost + innercost + (nrun + 1);
temp += _cpu_page_wight_ * (outersize + nrun * innersize); temp += _cpu_page_wight_ * (outersize + nrun * innersize);
Assert(temp >= 0); Assert(temp >= 0);