Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitb122e16

Browse files
Jan WieckJan Wieck
Jan Wieck
authored and
Jan Wieck
committed
Bugfix - Range table entries that are unused after rewriting should
not be marked inFromCl any longer. Otherwise the planner gets confusedand joins over them where in fact it does not have to.Adjust hasSubLinks now with a recursive lookup - could be wrong inmulti action rules because parse state isn't reset correctly and allactions in the rule are marked hasSubLinks if one of them has.Jan
1 parentf4fadbe commitb122e16

File tree

1 file changed

+140
-2
lines changed

1 file changed

+140
-2
lines changed

‎src/backend/rewrite/rewriteHandler.c‎

Lines changed: 140 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
*
88
* IDENTIFICATION
9-
* $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteHandler.c,v 1.43 1999/05/17 18:22:19 momjian Exp $
9+
* $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteHandler.c,v 1.44 1999/05/25 13:16:10 wieck Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -1393,6 +1393,129 @@ checkQueryHasAggs(Node *node)
13931393
}
13941394

13951395

1396+
/*
1397+
* checkQueryHasSubLink -
1398+
*Queries marked hasAggs might not have them any longer after
1399+
*rewriting. Check it.
1400+
*/
1401+
staticbool
1402+
checkQueryHasSubLink(Node*node)
1403+
{
1404+
if (node==NULL)
1405+
return FALSE;
1406+
1407+
switch(nodeTag(node)) {
1408+
caseT_TargetEntry:
1409+
{
1410+
TargetEntry*tle= (TargetEntry*)node;
1411+
1412+
returncheckQueryHasSubLink((Node*)(tle->expr));
1413+
}
1414+
break;
1415+
1416+
caseT_Aggref:
1417+
return TRUE;
1418+
1419+
caseT_Expr:
1420+
{
1421+
Expr*exp= (Expr*)node;
1422+
1423+
returncheckQueryHasSubLink((Node*)(exp->args));
1424+
}
1425+
break;
1426+
1427+
caseT_Iter:
1428+
{
1429+
Iter*iter= (Iter*)node;
1430+
1431+
returncheckQueryHasSubLink((Node*)(iter->iterexpr));
1432+
}
1433+
break;
1434+
1435+
caseT_ArrayRef:
1436+
{
1437+
ArrayRef*ref= (ArrayRef*)node;
1438+
1439+
if (checkQueryHasSubLink((Node*)(ref->refupperindexpr)))
1440+
return TRUE;
1441+
1442+
if (checkQueryHasSubLink((Node*)(ref->reflowerindexpr)))
1443+
return TRUE;
1444+
1445+
if (checkQueryHasSubLink((Node*)(ref->refexpr)))
1446+
return TRUE;
1447+
1448+
if (checkQueryHasSubLink((Node*)(ref->refassgnexpr)))
1449+
return TRUE;
1450+
1451+
return FALSE;
1452+
}
1453+
break;
1454+
1455+
caseT_Var:
1456+
return FALSE;
1457+
1458+
caseT_Param:
1459+
return FALSE;
1460+
1461+
caseT_Const:
1462+
return FALSE;
1463+
1464+
caseT_List:
1465+
{
1466+
List*l;
1467+
1468+
foreach (l, (List*)node) {
1469+
if (checkQueryHasSubLink((Node*)lfirst(l)))
1470+
return TRUE;
1471+
}
1472+
return FALSE;
1473+
}
1474+
break;
1475+
1476+
caseT_CaseExpr:
1477+
{
1478+
CaseExpr*exp= (CaseExpr*)node;
1479+
1480+
if (checkQueryHasSubLink((Node*)(exp->args)))
1481+
return TRUE;
1482+
1483+
if (checkQueryHasSubLink((Node*)(exp->defresult)))
1484+
return TRUE;
1485+
1486+
return FALSE;
1487+
}
1488+
break;
1489+
1490+
caseT_CaseWhen:
1491+
{
1492+
CaseWhen*when= (CaseWhen*)node;
1493+
1494+
if (checkQueryHasSubLink((Node*)(when->expr)))
1495+
return TRUE;
1496+
1497+
if (checkQueryHasSubLink((Node*)(when->result)))
1498+
return TRUE;
1499+
1500+
return FALSE;
1501+
}
1502+
break;
1503+
1504+
caseT_SubLink:
1505+
return TRUE;
1506+
1507+
default:
1508+
elog(NOTICE,"unknown node tag %d in checkQueryHasSubLink()",nodeTag(node));
1509+
elog(NOTICE,"Node is: %s",nodeToString(node));
1510+
break;
1511+
1512+
1513+
}
1514+
1515+
return FALSE;
1516+
}
1517+
1518+
13961519
staticNode*
13971520
FindMatchingTLEntry(List*tlist,char*e_attname)
13981521
{
@@ -2116,10 +2239,23 @@ fireRIRrules(Query *parsetree)
21162239
while(rt_index<length(parsetree->rtable)) {
21172240
++rt_index;
21182241

2242+
rte=nth(rt_index-1,parsetree->rtable);
2243+
21192244
if (!rangeTableEntry_used((Node*)parsetree,rt_index,0))
2245+
{
2246+
/*
2247+
* Unused range table entries must not be marked as coming
2248+
* from a clause. Otherwise the planner will generate
2249+
* joins over relations that in fact shouldn't be scanned
2250+
* at all and the result will contain duplicates
2251+
*
2252+
* Jan
2253+
*
2254+
*/
2255+
rte->inFromCl= FALSE;
21202256
continue;
2257+
}
21212258

2122-
rte=nth(rt_index-1,parsetree->rtable);
21232259
rel=heap_openr(rte->relname);
21242260
if (rel->rd_rules==NULL) {
21252261
heap_close(rel);
@@ -2705,6 +2841,8 @@ BasicQueryRewrite(Query *parsetree)
27052841
if (query->hasAggs)
27062842
query->hasAggs=checkQueryHasAggs((Node*)(query->targetList))
27072843
|checkQueryHasAggs((Node*)(query->havingQual));
2844+
query->hasSubLinks=checkQueryHasSubLink((Node*)(query->qual))
2845+
|checkQueryHasSubLink((Node*)(query->havingQual));
27082846
results=lappend(results,query);
27092847
}
27102848
returnresults;

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp