Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
postgres-lambda-diff
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jakob Huber
postgres-lambda-diff
Commits
994cfba1
Commit
994cfba1
authored
26 years ago
by
Vadim B. Mikheev
Browse files
Options
Downloads
Patches
Plain Diff
Fix GroupBY func broken by HAVING.
parent
6866cbc7
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/backend/optimizer/plan/planner.c
+26
-43
26 additions, 43 deletions
src/backend/optimizer/plan/planner.c
with
26 additions
and
43 deletions
src/backend/optimizer/plan/planner.c
+
26
−
43
View file @
994cfba1
...
...
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.3
3
1998/09/0
3
02:
34:30 momjian
Exp $
* $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.3
4
1998/09/0
8
02:
50:20 vadim
Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -95,17 +95,9 @@ Plan *
union_planner
(
Query
*
parse
)
{
List
*
tlist
=
parse
->
targetList
;
/*
* copy the original tlist, we will need the original one for the AGG
* node later on
*/
List
*
new_tlist
=
new_unsorted_tlist
(
tlist
);
int
tlist_len
=
length
(
tlist
);
List
*
rangetable
=
parse
->
rtable
;
Plan
*
result_plan
=
(
Plan
*
)
NULL
;
Index
rt_index
;
...
...
@@ -133,36 +125,18 @@ union_planner(Query *parse)
List
**
vpm
=
NULL
;
/*
* This is only necessary if aggregates are in use in queries
* like: SELECT sid FROM part GROUP BY sid HAVING MIN(pid) > 1;
* (pid is used but never selected for!!!) because the function
* 'query_planner' creates the plan for the lefttree of the
* 'GROUP' node and returns only those attributes contained in
* 'tlist'. The original 'tlist' contains only 'sid' here and
* that's why we have to to extend it to attributes which are not
* selected but are used in the havingQual.
*/
/*
* 'check_having_qual_for_vars' takes the havingQual and the
* actual 'tlist' as arguments and recursively scans the
* havingQual for attributes (VAR nodes) that are not contained in
* 'tlist' yet. If so, it creates a new entry and attaches it to
* the list 'new_tlist' (consisting of the VAR node and the RESDOM
* node as usual with tlists :-) )
* check_having_qual_for_vars takes the havingQual and the tlist
* as arguments and recursively scans the havingQual for VAR nodes
* that are not contained in tlist yet. If so, it creates a new entry
* and attaches it to the tlist. Latter, we use tlist_len to
* truncate tlist - ie restore actual tlist...
*/
if
(
parse
->
hasAggs
)
{
if
(
parse
->
havingQual
!=
NULL
)
new_
tlist
=
check_having_qual_for_vars
(
parse
->
havingQual
,
new_
tlist
);
tlist
=
check_having_qual_for_vars
(
parse
->
havingQual
,
tlist
);
}
new_tlist
=
preprocess_targetlist
(
new_tlist
,
parse
->
commandType
,
parse
->
resultRelation
,
parse
->
rtable
);
/* Here starts the original (pre having) code */
tlist
=
preprocess_targetlist
(
tlist
,
parse
->
commandType
,
parse
->
resultRelation
,
...
...
@@ -176,7 +150,7 @@ union_planner(Query *parse)
PlannerVarParam
=
lcons
(
vpm
,
PlannerVarParam
);
result_plan
=
query_planner
(
parse
,
parse
->
commandType
,
new_
tlist
,
tlist
,
(
List
*
)
parse
->
qual
);
PlannerVarParam
=
lnext
(
PlannerVarParam
);
if
(
vpm
!=
NULL
)
...
...
@@ -199,9 +173,8 @@ union_planner(Query *parse)
*/
tuplePerGroup
=
parse
->
hasAggs
;
/* Use 'new_tlist' instead of 'tlist' */
result_plan
=
make_groupPlan
(
&
new_
tlist
,
make_groupPlan
(
&
tlist
,
tuplePerGroup
,
parse
->
groupClause
,
result_plan
);
...
...
@@ -215,11 +188,6 @@ union_planner(Query *parse)
int
old_length
=
0
,
new_length
=
0
;
/*
* Create the AGG node but use 'tlist' not 'new_tlist' as target
* list because we don't want the additional attributes (only used
* for the havingQual, see above) to show up in the result
*/
result_plan
=
(
Plan
*
)
make_agg
(
tlist
,
result_plan
);
/*
...
...
@@ -235,7 +203,22 @@ union_planner(Query *parse)
List
*
clause
;
List
**
vpm
=
NULL
;
/*
* Restore target list: get rid of Vars added for havingQual.
* Assumption: tlist_len > 0...
*/
{
List
*
l
;
int
tlen
=
0
;
foreach
(
l
,
((
Agg
*
)
result_plan
)
->
plan
.
targetlist
)
{
if
(
++
tlen
==
tlist_len
)
break
;
}
lnext
(
l
)
=
NIL
;
}
/*
* stuff copied from above to handle the use of attributes
* from outside in subselects
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment