Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 0c444a7

Browse files
committed
Simplify PathKey checking code
pathkeys_useful_for_ordering() contained some needless checks to return 0 when either root->query_pathkeys or pathkeys lists were empty. This is already handled by pathkeys_count_contained_in(), so let's have it do the work instead of having redundant checks. Similarly, in pathkeys_useful_for_grouping(), checking pathkeys is an empty list just before looping over it isn't required. Technically, neither is the list empty check for group_pathkeys, but I felt a bit more work would have to be done to get the equivalent behavior if we'd left it up to the foreach loop to call list_member_ptr(). This was noticed by Andy while he was reviewing a patch to improve the UNION planner. Since that patch adds another function similar to pathkeys_useful_for_ordering() and since I wasn't planning to copy these redundant checks over to the new function, let's adjust the existing code so that both functions will be consistent. Author: Andy Fan Discussion: https://postgr.es/m/87o7cti48f.fsf@163.com
1 parent 87027cb commit 0c444a7

File tree

1 file changed

+0
-10
lines changed

1 file changed

+0
-10
lines changed

src/backend/optimizer/path/pathkeys.c

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2143,12 +2143,6 @@ pathkeys_useful_for_ordering(PlannerInfo *root, List *pathkeys)
21432143
{
21442144
int n_common_pathkeys;
21452145

2146-
if (root->query_pathkeys == NIL)
2147-
return 0; /* no special ordering requested */
2148-
2149-
if (pathkeys == NIL)
2150-
return 0; /* unordered path */
2151-
21522146
(void) pathkeys_count_contained_in(root->query_pathkeys, pathkeys,
21532147
&n_common_pathkeys);
21542148

@@ -2184,10 +2178,6 @@ pathkeys_useful_for_grouping(PlannerInfo *root, List *pathkeys)
21842178
if (root->group_pathkeys == NIL)
21852179
return 0;
21862180

2187-
/* unordered path */
2188-
if (pathkeys == NIL)
2189-
return 0;
2190-
21912181
/* walk the pathkeys and search for matching group key */
21922182
foreach(key, pathkeys)
21932183
{

0 commit comments

Comments
 (0)