Skip to content

Commit e46df2f

Browse files
bmomjianbmomjian
committed
OPTIMIZER_DEBUG additions.
1 parent af5fde7 commit e46df2f

File tree

8 files changed

+42
-44
lines changed

8 files changed

+42
-44
lines changed

‎src/backend/optimizer/README

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ planner()
99
preprocess target list
1010
preprocess qualifications(WHERE)
1111
--query_planner()
12+
cnfify qualification, so qual are expressions (were AND's) and OR clauses
1213
pull out constants from target list
1314
get a target list that only contains column names, no expressions
1415
if none, then return

‎src/backend/optimizer/path/allpaths.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/allpaths.c,v 1.18 1998/08/04 00:42:07 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/allpaths.c,v 1.19 1998/08/07 05:02:15 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -45,6 +45,7 @@ int32 _use_geqo_rels_ = GEQO_RELS;
4545

4646
static void find_rel_paths(Query *root, List *rels);
4747
static List *find_join_paths(Query *root, List *outer_rels, int levels_needed);
48+
static void debug_print_rel(Query *root, RelOptInfo *rel);
4849

4950
/*
5051
* find-paths--
@@ -173,7 +174,7 @@ find_join_paths(Query *root, List *outer_rels, int levels_needed)
173174
{
174175
List *x;
175176
List *new_rels = NIL;
176-
RelOptInfo *rel;
177+
RelOptInfo *rel;
177178

178179
/*******************************************
179180
* genetic query optimizer entry point *
@@ -236,7 +237,7 @@ find_join_paths(Query *root, List *outer_rels, int levels_needed)
236237

237238
/* #define OPTIMIZER_DEBUG */
238239
#ifdef OPTIMIZER_DEBUG
239-
printf("levels left: %d\n", levels_left);
240+
printf("levels left: %d\n", levels_needed);
240241
debug_print_rel(root, rel);
241242
#endif
242243
}

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/optimizer/plan/initsplan.c,v 1.14 1998/08/04 16:44:14 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/optimizer/plan/initsplan.c,v 1.15 1998/08/07 05:02:17 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -36,8 +36,7 @@
3636
extern int Quiet;
3737

3838
static void add_clause_to_rels(Query *root, List *clause);
39-
static void
40-
add_join_clause_info_to_rels(Query *root, CInfo *clauseinfo,
39+
static void add_join_clause_info_to_rels(Query *root, CInfo *clauseinfo,
4140
List *join_relids);
4241
static void add_vars_to_rels(Query *root, List *vars, List *join_relids);
4342

@@ -183,8 +182,6 @@ add_clause_to_rels(Query *root, List *clause)
183182
clauseinfo->mergejoinorder = (MergeOrder *) NULL;
184183
clauseinfo->hashjoinoperator = (Oid) 0;
185184

186-
187-
188185
if (length(relids) == 1)
189186
{
190187
RelOptInfo *rel = get_base_rel(root, lfirsti(relids));

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planmain.c,v 1.23 1998/07/18 04:22:37 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planmain.c,v 1.24 1998/08/07 05:02:19 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -18,6 +18,7 @@
1818
#include "nodes/pg_list.h"
1919
#include "nodes/plannodes.h"
2020
#include "nodes/parsenodes.h"
21+
#include "nodes/print.h"
2122
#include "nodes/relation.h"
2223
#include "nodes/makefuncs.h"
2324

@@ -85,7 +86,11 @@ query_planner(Query *root,
8586
qual = (List *) SS_process_sublinks((Node *) qual);
8687

8788
qual = cnfify((Expr *) qual, true);
88-
89+
#ifdef OPTIMIZER_DEBUG
90+
printf("After cnfify()\n");
91+
pprint(qual);
92+
#endif
93+
8994
/*
9095
* A command without a target list or qualification is an error,
9196
* except for "delete foo".
@@ -250,8 +255,8 @@ subplanner(Query *root,
250255
List *flat_tlist,
251256
List *qual)
252257
{
253-
RelOptInfo *final_relation;
254-
List *final_relation_list;
258+
RelOptInfo *final_relation;
259+
List *final_relation_list;
255260

256261
/*
257262
* Initialize the targetlist and qualification, adding entries to

‎src/backend/optimizer/util/clauses.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/optimizer/util/clauses.c,v 1.17 1998/06/15 19:28:47 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/optimizer/util/clauses.c,v 1.18 1998/08/07 05:02:22 momjian Exp $
1111
*
1212
* HISTORY
1313
* AUTHOR DATE MAJOR EVENT
@@ -350,8 +350,6 @@ pull_constant_clauses(List *quals, List **constantQual)
350350
*
351351
* Returns the list of relids and vars.
352352
*
353-
* XXX take the nreverse's out later
354-
*
355353
*/
356354
void
357355
clause_relids_vars(Node *clause, List **relids, List **vars)

‎src/tools/backend/flow.fig

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@ Inches
77
0 0 2.00 150.00 180.00
88
0 0 2.00 150.00 180.00
99
7950 10200 7950 10800
10-
2 1 0 1 -1 7 0 0 -1 0.000 0 0 -1 0 0 1
11-
8400 375
12-
2 1 0 1 -1 7 0 0 -1 0.000 0 0 -1 0 0 1
13-
8400 375
1410
2 4 0 1 -1 29 0 0 20 0.000 0 0 7 0 0 5
1511
2775 11400 375 11400 375 10800 2775 10800 2775 11400
1612
2 1 0 2 29 7 0 0 -1 0.000 0 0 -1 1 1 2
@@ -73,10 +69,6 @@ Inches
7369
2 1 0 2 20 7 0 0 -1 0.000 0 0 -1 1 0 2
7470
0 0 2.00 150.00 180.00
7571
2550 2175 6450 2775
76-
2 1 1 2 -1 7 0 0 -1 4.000 0 0 -1 1 1 2
77-
0 0 2.00 150.00 180.00
78-
0 0 2.00 150.00 180.00
79-
4815 1908 5250 1350
8072
2 4 0 1 -1 29 0 0 20 0.000 0 0 7 0 0 5
8173
7650 12600 5250 12600 5250 12000 7650 12000 7650 12600
8274
2 1 0 2 29 7 0 0 -1 0.000 0 0 -1 1 1 2
@@ -88,16 +80,20 @@ Inches
8880
3750 5775 5250 5775
8981
2 4 0 1 -1 8 0 0 20 0.000 0 0 7 0 0 5
9082
3750 6075 1350 6075 1350 5475 3750 5475 3750 6075
91-
2 1 1 2 -1 7 0 0 -1 3.000 0 0 -1 1 1 2
92-
0 0 2.00 150.00 180.00
93-
0 0 2.00 150.00 180.00
94-
4660 1524 5295 1293
9583
2 1 0 2 8 7 0 0 -1 0.000 0 0 -1 1 0 2
9684
0 0 2.00 150.00 180.00
9785
2550 7275 2550 7875
9886
2 1 0 2 31 7 0 0 -1 0.000 0 0 -1 1 0 2
9987
0 0 2.00 150.00 180.00
10088
2550 3300 2550 4275
89+
2 1 2 2 -1 7 0 0 -1 4.000 0 1 -1 1 1 2
90+
0 0 2.00 80.00 150.00
91+
0 0 2.00 80.00 150.00
92+
4800 1875 5235 1317
93+
2 1 2 2 -1 7 0 0 -1 3.000 0 1 -1 1 1 2
94+
0 0 2.00 80.00 150.00
95+
0 0 2.00 80.00 150.00
96+
4584 1524 5219 1293
10197
3 0 0 2 8 7 0 0 -1 0.000 0 1 0 8
10298
0 0 2.00 150.00 150.00
10399
1350 9375 1050 9375 825 9000 825 4425 1050 4050 1500 3975

‎src/tools/backend/flow.jpg

-833 Bytes
Loading

‎src/tools/backend/index.html

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,23 @@ <H2 ALIGN=CENTER>
1616
<IMG src="flow.jpg" usemap="#flowmap" alt="flowchart" border=0>
1717
</CENTER>
1818
<MAP name="flowmap">
19-
<AREA COORDS="80,10,240,50" HREF="backend_dirs.html#main">
20-
<AREA COORDS="80,90,240,130" HREF="backend_dirs.html#postmaster">
21-
<AREA COORDS="340,50,500,90" HREF="backend_dirs.html#libpq">
22-
<AREA COORDS="80,170,240,210" HREF="backend_dirs.html#tcop">
23-
<AREA COORDS="340,170,500,210" HREF="backend_dirs.html#tcop">
24-
<AREA COORDS="80,270,240,310" HREF="backend_dirs.html#parser">
25-
<AREA COORDS="80,350,240,390" HREF="backend_dirs.html#tcop">
26-
<AREA COORDS="80,430,240,470" HREF="backend_dirs.html#optimizer">
27-
<AREA COORDS="80,410,240,550" HREF="backend_dirs.html#optimizer/plan">
28-
<AREA COORDS="80,590,240,630" HREF="backend_dirs.html#executor">
29-
<AREA COORDS="340,350,500,390" HREF="backend_dirs.html#commands">
30-
<AREA COORDS="10,700,170,750" HREF="backend_dirs.html#utils">
31-
<AREA COORDS="220,700,380,740" HREF="backend_dirs.html#catalog">
32-
<AREA COORDS="430,700,600,750" HREF="backend_dirs.html#storage">
33-
<AREA COORDS="110,780,280,830" HREF="backend_dirs.html#access">
34-
<AREA COORDS="340,780,500,830" HREF="backend_dirs.html#nodes">
35-
<AREA COORDS="20,870,180,910" HREF="backend_dirs.html#bootstrap">
19+
<AREA COORDS="70,0,230,40" HREF="backend_dirs.html#main">
20+
<AREA COORDS="70,80,230,120" HREF="backend_dirs.html#postmaster">
21+
<AREA COORDS="330,40,490,80" HREF="backend_dirs.html#libpq">
22+
<AREA COORDS="70,160,230,200" HREF="backend_dirs.html#tcop">
23+
<AREA COORDS="330,160,490,200" HREF="backend_dirs.html#tcop">
24+
<AREA COORDS="70,260,230,300" HREF="backend_dirs.html#parser">
25+
<AREA COORDS="70,340,230,380" HREF="backend_dirs.html#tcop">
26+
<AREA COORDS="70,420,230,460" HREF="backend_dirs.html#optimizer">
27+
<AREA COORDS="70,400,230,540" HREF="backend_dirs.html#optimizer/plan">
28+
<AREA COORDS="70,580,230,620" HREF="backend_dirs.html#executor">
29+
<AREA COORDS="330,340,490,380" HREF="backend_dirs.html#commands">
30+
<AREA COORDS="0,690,160,740" HREF="backend_dirs.html#utils">
31+
<AREA COORDS="210,690,370,730" HREF="backend_dirs.html#catalog">
32+
<AREA COORDS="420,690,590,740" HREF="backend_dirs.html#storage">
33+
<AREA COORDS="100,770,270,820" HREF="backend_dirs.html#access">
34+
<AREA COORDS="330,770,490,820" HREF="backend_dirs.html#nodes">
35+
<AREA COORDS="10,860,170,900" HREF="backend_dirs.html#bootstrap">
3636
</MAP>
3737
<CENTER><EM>
3838
Click on an item to see more detail or look at the full

0 commit comments

Comments
 (0)