Skip to content

Commit 6bc61fc

Browse files
tglsfdctglsfdc
committed
Adjust parser so that 'x NOT IN (subselect)' is converted to
'NOT (x IN (subselect))', that is 'NOT (x = ANY (subselect))', rather than 'x <> ALL (subselect)' as we formerly did. This opens the door to optimizing NOT IN the same way as IN, whereas there's no hope of optimizing the expression using <>. Also, convert 'x <> ALL (subselect)' to the NOT(IN) style, so that the optimization will be available when processing rules dumped by older Postgres versions. initdb forced due to small change in SubLink node representation.
1 parent 59779c8 commit 6bc61fc

File tree

11 files changed

+111
-56
lines changed

11 files changed

+111
-56
lines changed

‎src/backend/executor/nodeSubplan.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1994, Regents of the University of California
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/executor/nodeSubplan.c,v 1.40 2002/12/26 22:37:42 tgl Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/executor/nodeSubplan.c,v 1.41 2003/01/09 20:50:50 tgl Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -37,7 +37,7 @@ ExecSubPlan(SubPlanState *node,
3737
SubPlan *subplan = (SubPlan *) node->xprstate.expr;
3838
PlanState *planstate = node->planstate;
3939
SubLinkType subLinkType = subplan->subLinkType;
40-
bool useor = subplan->useor;
40+
bool useOr = subplan->useOr;
4141
MemoryContext oldcontext;
4242
TupleTableSlot *slot;
4343
Datum result;
@@ -84,7 +84,7 @@ ExecSubPlan(SubPlanState *node,
8484
* For all sublink types except EXPR_SUBLINK, the result is boolean as
8585
* are the results of the combining operators. We combine results
8686
* within a tuple (if there are multiple columns) using OR semantics
87-
* if "useor" is true, AND semantics if not. We then combine results
87+
* if "useOr" is true, AND semantics if not. We then combine results
8888
* across tuples (if the subplan produces more than one) using OR
8989
* semantics for ANY_SUBLINK or AND semantics for ALL_SUBLINK.
9090
* (MULTIEXPR_SUBLINK doesn't allow multiple tuples from the subplan.)
@@ -107,7 +107,7 @@ ExecSubPlan(SubPlanState *node,
107107
{
108108
HeapTuple tup = slot->val;
109109
TupleDesc tdesc = slot->ttc_tupleDescriptor;
110-
Datum rowresult = BoolGetDatum(!useor);
110+
Datum rowresult = BoolGetDatum(!useOr);
111111
bool rownull = false;
112112
int col = 1;
113113

@@ -212,7 +212,7 @@ ExecSubPlan(SubPlanState *node,
212212
rowresult = expresult;
213213
rownull = expnull;
214214
}
215-
else if (useor)
215+
else if (useOr)
216216
{
217217
/* combine within row per OR semantics */
218218
if (expnull)

‎src/backend/nodes/copyfuncs.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* Portions Copyright (c) 1994, Regents of the University of California
1616
*
1717
* IDENTIFICATION
18-
* $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.233 2002/12/14 00:17:50 tgl Exp $
18+
* $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.234 2003/01/09 20:50:50 tgl Exp $
1919
*
2020
*-------------------------------------------------------------------------
2121
*/
@@ -809,7 +809,8 @@ _copySubLink(SubLink *from)
809809
SubLink *newnode = makeNode(SubLink);
810810

811811
COPY_SCALAR_FIELD(subLinkType);
812-
COPY_SCALAR_FIELD(useor);
812+
COPY_SCALAR_FIELD(operIsEquals);
813+
COPY_SCALAR_FIELD(useOr);
813814
COPY_NODE_FIELD(lefthand);
814815
COPY_NODE_FIELD(oper);
815816
COPY_NODE_FIELD(subselect);
@@ -826,7 +827,7 @@ _copySubPlan(SubPlan *from)
826827
SubPlan *newnode = makeNode(SubPlan);
827828

828829
COPY_SCALAR_FIELD(subLinkType);
829-
COPY_SCALAR_FIELD(useor);
830+
COPY_SCALAR_FIELD(useOr);
830831
COPY_NODE_FIELD(oper);
831832
COPY_NODE_FIELD(plan);
832833
COPY_SCALAR_FIELD(plan_id);

‎src/backend/nodes/equalfuncs.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
* Portions Copyright (c) 1994, Regents of the University of California
1919
*
2020
* IDENTIFICATION
21-
* $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.177 2002/12/14 00:17:51 tgl Exp $
21+
* $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.178 2003/01/09 20:50:50 tgl Exp $
2222
*
2323
*-------------------------------------------------------------------------
2424
*/
@@ -287,7 +287,8 @@ static bool
287287
_equalSubLink(SubLink *a, SubLink *b)
288288
{
289289
COMPARE_SCALAR_FIELD(subLinkType);
290-
COMPARE_SCALAR_FIELD(useor);
290+
COMPARE_SCALAR_FIELD(operIsEquals);
291+
COMPARE_SCALAR_FIELD(useOr);
291292
COMPARE_NODE_FIELD(lefthand);
292293
COMPARE_NODE_FIELD(oper);
293294
COMPARE_NODE_FIELD(subselect);
@@ -299,7 +300,7 @@ static bool
299300
_equalSubPlan(SubPlan *a, SubPlan *b)
300301
{
301302
COMPARE_SCALAR_FIELD(subLinkType);
302-
COMPARE_SCALAR_FIELD(useor);
303+
COMPARE_SCALAR_FIELD(useOr);
303304
COMPARE_NODE_FIELD(oper);
304305
/* should compare plans, but have to settle for comparing plan IDs */
305306
COMPARE_SCALAR_FIELD(plan_id);

‎src/backend/nodes/outfuncs.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/nodes/outfuncs.c,v 1.190 2002/12/14 00:17:52 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/nodes/outfuncs.c,v 1.191 2003/01/09 20:50:50 tgl Exp $
1212
*
1313
* NOTES
1414
* Every node type that can appear in stored rules' parsetrees *must*
@@ -658,7 +658,8 @@ _outSubLink(StringInfo str, SubLink *node)
658658
WRITE_NODE_TYPE("SUBLINK");
659659

660660
WRITE_ENUM_FIELD(subLinkType, SubLinkType);
661-
WRITE_BOOL_FIELD(useor);
661+
WRITE_BOOL_FIELD(operIsEquals);
662+
WRITE_BOOL_FIELD(useOr);
662663
WRITE_NODE_FIELD(lefthand);
663664
WRITE_NODE_FIELD(oper);
664665
WRITE_NODE_FIELD(subselect);
@@ -670,7 +671,7 @@ _outSubPlan(StringInfo str, SubPlan *node)
670671
WRITE_NODE_TYPE("SUBPLAN");
671672

672673
WRITE_ENUM_FIELD(subLinkType, SubLinkType);
673-
WRITE_BOOL_FIELD(useor);
674+
WRITE_BOOL_FIELD(useOr);
674675
WRITE_NODE_FIELD(oper);
675676
WRITE_NODE_FIELD(plan);
676677
WRITE_INT_FIELD(plan_id);

‎src/backend/nodes/readfuncs.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.144 2002/12/14 00:17:54 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.145 2003/01/09 20:50:51 tgl Exp $
1212
*
1313
* NOTES
1414
* Path and Plan nodes do not have any readfuncs support, because we
@@ -531,7 +531,8 @@ _readSubLink(void)
531531
READ_LOCALS(SubLink);
532532

533533
READ_ENUM_FIELD(subLinkType, SubLinkType);
534-
READ_BOOL_FIELD(useor);
534+
READ_BOOL_FIELD(operIsEquals);
535+
READ_BOOL_FIELD(useOr);
535536
READ_NODE_FIELD(lefthand);
536537
READ_NODE_FIELD(oper);
537538
READ_NODE_FIELD(subselect);

‎src/backend/optimizer/plan/subselect.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1994, Regents of the University of California
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/optimizer/plan/subselect.c,v 1.61 2002/12/14 00:17:55 tgl Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/optimizer/plan/subselect.c,v 1.62 2003/01/09 20:50:51 tgl Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -225,7 +225,7 @@ make_subplan(SubLink *slink, List *lefthand)
225225
* Fill in other fields of the SubPlan node.
226226
*/
227227
node->subLinkType = slink->subLinkType;
228-
node->useor = slink->useor;
228+
node->useOr = slink->useOr;
229229
node->oper = NIL;
230230
node->setParam = NIL;
231231
node->parParam = NIL;
@@ -283,7 +283,7 @@ make_subplan(SubLink *slink, List *lefthand)
283283
&node->setParam);
284284
PlannerInitPlan = lappend(PlannerInitPlan, node);
285285
if (length(oper) > 1)
286-
result = (Node *) (node->useor ? make_orclause(oper) :
286+
result = (Node *) (node->useOr ? make_orclause(oper) :
287287
make_andclause(oper));
288288
else
289289
result = (Node *) lfirst(oper);

‎src/backend/parser/gram.y

Lines changed: 20 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*
1212
*
1313
* IDENTIFICATION
14-
* $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.391 2003/01/08 00:22:27 tgl Exp $
14+
* $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.392 2003/01/09 20:50:51 tgl Exp $
1515
*
1616
* HISTORY
1717
* AUTHOR DATE MAJOR EVENT
@@ -5420,40 +5420,39 @@ opt_interval:
54205420

54215421
/* Expressions using row descriptors
54225422
* Define row_descriptor to allow yacc to break the reduce/reduce conflict
5423-
* with singleton expressions. Use SQL99's ROW keyword to allow rows of
5424-
* one element.
5423+
* with singleton expressions. Use SQL99's ROW keyword to allow rows of
5424+
* one element.
54255425
*/
54265426
r_expr: row IN_P select_with_parens
54275427
{
54285428
SubLink *n = makeNode(SubLink);
54295429
n->lefthand = $1;
54305430
n->oper = (List *) makeSimpleA_Expr(OP, "=", NULL, NULL);
5431-
n->useor = FALSE;
54325431
n->subLinkType = ANY_SUBLINK;
5432+
/* operIsEquals and useOr will be set later */
54335433
n->subselect = $3;
54345434
$$ = (Node *)n;
54355435
}
54365436
| row NOT IN_P select_with_parens
54375437
{
5438+
/* Make an IN node */
54385439
SubLink *n = makeNode(SubLink);
54395440
n->lefthand = $1;
5440-
n->oper = (List *) makeSimpleA_Expr(OP, "<>", NULL, NULL);
5441-
n->useor = TRUE;
5442-
n->subLinkType = ALL_SUBLINK;
5441+
n->oper = (List *) makeSimpleA_Expr(OP, "=", NULL, NULL);
5442+
n->subLinkType = ANY_SUBLINK;
5443+
/* operIsEquals and useOr will be set later */
54435444
n->subselect = $4;
5444-
$$ = (Node *)n;
5445+
/* Stick a NOT on top */
5446+
$$ = (Node *) makeA_Expr(NOT, NIL, NULL, (Node *) n);
54455447
}
54465448
| row qual_all_Op sub_type select_with_parens
54475449
%prec Op
54485450
{
54495451
SubLink *n = makeNode(SubLink);
54505452
n->lefthand = $1;
54515453
n->oper = (List *) makeA_Expr(OP, $2, NULL, NULL);
5452-
if (strcmp(strVal(llast($2)), "<>") == 0)
5453-
n->useor = TRUE;
5454-
else
5455-
n->useor = FALSE;
54565454
n->subLinkType = $3;
5455+
/* operIsEquals and useOr will be set later */
54575456
n->subselect = $4;
54585457
$$ = (Node *)n;
54595458
}
@@ -5463,11 +5462,8 @@ r_expr: row IN_P select_with_parens
54635462
SubLink *n = makeNode(SubLink);
54645463
n->lefthand = $1;
54655464
n->oper = (List *) makeA_Expr(OP, $2, NULL, NULL);
5466-
if (strcmp(strVal(llast($2)), "<>") == 0)
5467-
n->useor = TRUE;
5468-
else
5469-
n->useor = FALSE;
54705465
n->subLinkType = MULTIEXPR_SUBLINK;
5466+
/* operIsEquals and useOr will be set later */
54715467
n->subselect = $3;
54725468
$$ = (Node *)n;
54735469
}
@@ -5850,8 +5846,8 @@ a_expr: c_expr { $$ = $1; }
58505846
SubLink *n = (SubLink *)$3;
58515847
n->lefthand = makeList1($1);
58525848
n->oper = (List *) makeSimpleA_Expr(OP, "=", NULL, NULL);
5853-
n->useor = FALSE;
58545849
n->subLinkType = ANY_SUBLINK;
5850+
/* operIsEquals and useOr will be set later */
58555851
$$ = (Node *)n;
58565852
}
58575853
else
@@ -5875,12 +5871,14 @@ a_expr: c_expr { $$ = $1; }
58755871
/* in_expr returns a SubLink or a list of a_exprs */
58765872
if (IsA($4, SubLink))
58775873
{
5874+
/* Make an IN node */
58785875
SubLink *n = (SubLink *)$4;
58795876
n->lefthand = makeList1($1);
5880-
n->oper = (List *) makeSimpleA_Expr(OP, "<>", NULL, NULL);
5881-
n->useor = FALSE;
5882-
n->subLinkType = ALL_SUBLINK;
5883-
$$ = (Node *)n;
5877+
n->oper = (List *) makeSimpleA_Expr(OP, "=", NULL, NULL);
5878+
n->subLinkType = ANY_SUBLINK;
5879+
/* operIsEquals and useOr will be set later */
5880+
/* Stick a NOT on top */
5881+
$$ = (Node *) makeA_Expr(NOT, NIL, NULL, (Node *) n);
58845882
}
58855883
else
58865884
{
@@ -5903,8 +5901,8 @@ a_expr: c_expr { $$ = $1; }
59035901
SubLink *n = makeNode(SubLink);
59045902
n->lefthand = makeList1($1);
59055903
n->oper = (List *) makeA_Expr(OP, $2, NULL, NULL);
5906-
n->useor = FALSE; /* doesn't matter since only one col */
59075904
n->subLinkType = $3;
5905+
/* operIsEquals and useOr will be set later */
59085906
n->subselect = $4;
59095907
$$ = (Node *)n;
59105908
}
@@ -6447,7 +6445,6 @@ c_expr: columnref { $$ = (Node *) $1; }
64476445
SubLink *n = makeNode(SubLink);
64486446
n->lefthand = NIL;
64496447
n->oper = NIL;
6450-
n->useor = FALSE;
64516448
n->subLinkType = EXPR_SUBLINK;
64526449
n->subselect = $1;
64536450
$$ = (Node *)n;
@@ -6457,7 +6454,6 @@ c_expr: columnref { $$ = (Node *) $1; }
64576454
SubLink *n = makeNode(SubLink);
64586455
n->lefthand = NIL;
64596456
n->oper = NIL;
6460-
n->useor = FALSE;
64616457
n->subLinkType = EXISTS_SUBLINK;
64626458
n->subselect = $2;
64636459
$$ = (Node *)n;

‎src/backend/parser/parse_expr.c

Lines changed: 45 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.138 2002/12/27 20:06:19 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.139 2003/01/09 20:50:52 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -367,6 +367,8 @@ transformExpr(ParseState *pstate, Node *expr)
367367
*/
368368
sublink->lefthand = NIL;
369369
sublink->oper = NIL;
370+
sublink->operIsEquals = FALSE;
371+
sublink->useOr = FALSE;
370372
}
371373
else if (sublink->subLinkType == EXPR_SUBLINK)
372374
{
@@ -391,27 +393,60 @@ transformExpr(ParseState *pstate, Node *expr)
391393
*/
392394
sublink->lefthand = NIL;
393395
sublink->oper = NIL;
396+
sublink->operIsEquals = FALSE;
397+
sublink->useOr = FALSE;
394398
}
395399
else
396400
{
397401
/* ALL, ANY, or MULTIEXPR: generate operator list */
398402
List *left_list = sublink->lefthand;
399403
List *right_list = qtree->targetList;
404+
int row_length = length(left_list);
405+
bool needNot = false;
400406
List *op;
401407
char *opname;
402408
List *elist;
403409

410+
/* transform lefthand expressions */
404411
foreach(elist, left_list)
405412
lfirst(elist) = transformExpr(pstate, lfirst(elist));
406413

414+
/* get the combining-operator name */
407415
Assert(IsA(sublink->oper, A_Expr));
408416
op = ((A_Expr *) sublink->oper)->name;
409417
opname = strVal(llast(op));
410418
sublink->oper = NIL;
411419

420+
/*
421+
* If the expression is "<> ALL" (with unqualified opname)
422+
* then convert it to "NOT IN". This is a hack to improve
423+
* efficiency of expressions output by pre-7.4 Postgres.
424+
*/
425+
if (sublink->subLinkType == ALL_SUBLINK &&
426+
length(op) == 1 && strcmp(opname, "<>") == 0)
427+
{
428+
sublink->subLinkType = ANY_SUBLINK;
429+
opname = pstrdup("=");
430+
op = makeList1(makeString(opname));
431+
needNot = true;
432+
}
433+
434+
/* Set operIsEquals if op is unqualified "=" */
435+
if (length(op) == 1 && strcmp(opname, "=") == 0)
436+
sublink->operIsEquals = TRUE;
437+
else
438+
sublink->operIsEquals = FALSE;
439+
440+
/* Set useOr if op is "<>" (possibly qualified) */
441+
if (strcmp(opname, "<>") == 0)
442+
sublink->useOr = TRUE;
443+
else
444+
sublink->useOr = FALSE;
445+
412446
/* Combining operators other than =/<> is dubious... */
413-
if (length(left_list) != 1 &&
414-
strcmp(opname, "=") != 0 && strcmp(opname, "<>") != 0)
447+
if (row_length != 1 &&
448+
strcmp(opname, "=") != 0 &&
449+
strcmp(opname, "<>") != 0)
415450
elog(ERROR, "Row comparison cannot use operator %s",
416451
opname);
417452

@@ -474,6 +509,13 @@ transformExpr(ParseState *pstate, Node *expr)
474509
}
475510
if (left_list != NIL)
476511
elog(ERROR, "Subselect has too few fields");
512+
513+
if (needNot)
514+
{
515+
expr = coerce_to_boolean(expr, "NOT");
516+
expr = (Node *) makeBoolExpr(NOT_EXPR,
517+
makeList1(expr));
518+
}
477519
}
478520
result = (Node *) expr;
479521
break;

0 commit comments

Comments
 (0)