diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2008-04-13 20:51:21 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2008-04-13 20:51:21 +0000 |
| commit | 226837e57eb6092b160e7272e7d09a3748c0eb47 (patch) | |
| tree | 9d69fdeed5f89838191d2ba223e0d7a920bd4797 /src/backend/executor/nodeMergejoin.c | |
| parent | 24558da14a26337e945732d3b435b07edcbb6733 (diff) | |
| download | postgresql-226837e57eb6092b160e7272e7d09a3748c0eb47.tar.gz postgresql-226837e57eb6092b160e7272e7d09a3748c0eb47.zip | |
Since createplan.c no longer cares whether index operators are lossy, it has
no particular need to do get_op_opfamily_properties() while building an
indexscan plan. Postpone that lookup until executor start. This simplifies
createplan.c a lot more than it complicates nodeIndexscan.c, and makes things
more uniform since we already had to do it that way for RowCompare
expressions. Should be a bit faster too, at least for plans that aren't
re-used many times, since we avoid palloc'ing and perhaps copying the
intermediate list data structure.
Diffstat (limited to 'src/backend/executor/nodeMergejoin.c')
| -rw-r--r-- | src/backend/executor/nodeMergejoin.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/backend/executor/nodeMergejoin.c b/src/backend/executor/nodeMergejoin.c index 85891eeac8c..cf1bb7d0a69 100644 --- a/src/backend/executor/nodeMergejoin.c +++ b/src/backend/executor/nodeMergejoin.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/nodeMergejoin.c,v 1.90 2008/01/01 19:45:49 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/executor/nodeMergejoin.c,v 1.91 2008/04/13 20:51:20 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -180,7 +180,6 @@ MJExamineQuals(List *mergeclauses, int op_strategy; Oid op_lefttype; Oid op_righttype; - bool op_recheck; RegProcedure cmpproc; AclResult aclresult; @@ -197,12 +196,10 @@ MJExamineQuals(List *mergeclauses, get_op_opfamily_properties(qual->opno, opfamily, &op_strategy, &op_lefttype, - &op_righttype, - &op_recheck); + &op_righttype); if (op_strategy != BTEqualStrategyNumber) /* should not happen */ elog(ERROR, "cannot merge using non-equality operator %u", qual->opno); - Assert(!op_recheck); /* never true for btree */ /* And get the matching support procedure (comparison function) */ cmpproc = get_opfamily_proc(opfamily, |