NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit7c509f7

committed

Remove unnecessary code in dependency_is_compatible_expression().

Scanning the expression for compatible Vars isn't really necessary,because the subsequent match against StatisticExtInfo entries willeliminate expressions containing other Vars just fine. Moreover,this code hadn't stopped to think about what to do withPlaceHolderVars or Aggrefs in the clause; and at least for the PHVcase, that demonstrably leads to failures. Rather than work outwhether it's reasonable to ignore those, let's just remove thewhole stanza.Per report from Richard Guo. Back-patch to v14 where this codewas added.Discussion:https://postgr.es/m/CAMbWs48Mmvm-acGevXuwpB=g5JMqVSL6i9z5UaJyLGJqa-XPAA@mail.gmail.com

1 parent0ee9d68 commit7c509f7Copy full SHA for 7c509f7

File tree

1 file changed

-25

lines changed

src/backend/statistics
- dependencies.c

1 file changed

-25

lines changed

`‎src/backend/statistics/dependencies.c`

Lines changed: 3 additions & 25 deletions

Original file line number	Diff line number	Diff line change
`@@ -1162,13 +1162,12 @@ clauselist_apply_dependencies(PlannerInfo root, List clauses,`
`1162`	`1162`	`*Determines if the expression is compatible with functional dependencies`
`1163`	`1163`	`*`
`1164`	`1164`	`* Similar to dependency_is_compatible_clause, but doesn't enforce that the`
`1165`		`- * expression is a simple Var.OTOH we check that there's at least one`
`1166`		`- *statistics object matching the expression.`
	`1165`	`+ * expression is a simple Var. On success, return the matching statistics`
	`1166`	`+ expression into expr.`
`1167`	`1167`	`*/`
`1168`	`1168`	`staticbool`
`1169`	`1169`	`dependency_is_compatible_expression(Nodeclause,Indexrelid,Liststatlist,Node**expr)`
`1170`	`1170`	`{`
`1171`		`-List*vars;`
`1172`	`1171`	`ListCell*lc,`
`1173`	`1172`	`*lc2;`
`1174`	`1173`	`Node*clause_expr;`
`@@ -1316,29 +1315,8 @@ dependency_is_compatible_expression(Node clause, Index relid, List statlist, N`
`1316`	`1315`	`if (IsA(clause_expr,RelabelType))`
`1317`	`1316`	`clause_expr= (Node) ((RelabelType)clause_expr)->arg;`
`1318`	`1317`
`1319`		`-vars=pull_var_clause(clause_expr,0);`
`1320`		`-`
`1321`		`-foreach(lc,vars)`
`1322`		`-{`
`1323`		`-Varvar= (Var)lfirst(lc);`
`1324`		`-`
`1325`		`-/* Ensure Var is from the correct relation */`
`1326`		`-if (var->varno!=relid)`
`1327`		`-return false;`
`1328`		`-`
`1329`		`-/* We also better ensure the Var is from the current level */`
`1330`		`-if (var->varlevelsup!=0)`
`1331`		`-return false;`
`1332`		`-`
`1333`		`-/* Also ignore system attributes (we don't allow stats on those) */`
`1334`		`-if (!AttrNumberIsForUserDefinedAttr(var->varattno))`
`1335`		`-return false;`
`1336`		`-}`
`1337`		`-`
`1338`	`1318`	`/*`
`1339`		`- * Check if we actually have a matching statistics for the expression.`
`1340`		`- *`
`1341`		`- * XXX Maybe this is an overkill. We'll eliminate the expressions later.`
	`1319`	`+ * Search for a matching statistics expression.`
`1342`	`1320`	`*/`
`1343`	`1321`	`foreach(lc,statlist)`
`1344`	`1322`	`{`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit7c509f7

File tree

1 file changed

1 file changed

`‎src/backend/statistics/dependencies.c`

0 commit comments