diff --git a/src/backend/optimizer/path/allpaths.c b/src/backend/optimizer/path/allpaths.c index ff68a7fde4..3f7b5281cf 100644 --- a/src/backend/optimizer/path/allpaths.c +++ b/src/backend/optimizer/path/allpaths.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/path/allpaths.c,v 1.17 1998/07/18 04:22:29 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/path/allpaths.c,v 1.18 1998/08/04 00:42:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -105,7 +105,6 @@ static void find_rel_paths(Query *root, List *rels) { List *temp; - RelOptInfo *rel; List *lastpath; foreach(temp, rels) @@ -113,8 +112,8 @@ find_rel_paths(Query *root, List *rels) List *sequential_scan_list; List *rel_index_scan_list; List *or_index_scan_list; + RelOptInfo *rel = (RelOptInfo *) lfirst(temp); - rel = (RelOptInfo *) lfirst(temp); sequential_scan_list = lcons(create_seqscan_path(rel), NIL); @@ -125,8 +124,7 @@ find_rel_paths(Query *root, List *rels) rel->clauseinfo, rel->joininfo); - or_index_scan_list = - create_or_index_paths(root, rel, rel->clauseinfo); + or_index_scan_list = create_or_index_paths(root, rel, rel->clauseinfo); rel->pathlist = add_pathlist(rel, sequential_scan_list, diff --git a/src/backend/optimizer/path/indxpath.c b/src/backend/optimizer/path/indxpath.c index 191b1966b8..4f888ffb55 100644 --- a/src/backend/optimizer/path/indxpath.c +++ b/src/backend/optimizer/path/indxpath.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.23 1998/08/03 05:49:19 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.24 1998/08/04 00:42:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -1291,8 +1291,7 @@ create_index_paths(Query *root, if (!join || temp) { /* restriction, ordering scan */ temp_path = create_index_path(root, rel, index, clausegroup, join); - temp_node = - lcons(temp_path, NIL); + temp_node = lcons(temp_path, NIL); ip_list = nconc(ip_list, temp_node); } } diff --git a/src/backend/optimizer/path/mergeutils.c b/src/backend/optimizer/path/mergeutils.c index 938fb13864..7523fbd706 100644 --- a/src/backend/optimizer/path/mergeutils.c +++ b/src/backend/optimizer/path/mergeutils.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/mergeutils.c,v 1.5 1998/02/26 04:32:41 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/mergeutils.c,v 1.6 1998/08/04 00:42:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -61,8 +61,7 @@ group_clauses_by_order(List *clauseinfo_list, p_ordering.ordtype = MERGE_ORDER; p_ordering.ord.merge = merge_ordering; - xmergeinfo = - match_order_mergeinfo(&p_ordering, mergeinfo_list); + xmergeinfo = match_order_mergeinfo(&p_ordering, mergeinfo_list); if (inner_relid == leftop->varno) { keys = makeNode(JoinKey); diff --git a/src/tools/backend/flow.fig b/src/tools/backend/flow.fig index 87b9df8e6b..8e7d70436a 100644 --- a/src/tools/backend/flow.fig +++ b/src/tools/backend/flow.fig @@ -3,134 +3,129 @@ Landscape Center Inches 1200 2 -6 450 375 2250 1575 -4 0 -1 0 0 0 24 0.0000 4 255 735 450 1515 Flow\001 -4 0 -1 0 0 0 24 0.0000 4 330 1800 450 675 PostgreSQL\001 -4 0 -1 0 0 0 24 0.0000 4 330 1290 450 1095 Program\001 --6 +2 1 0 2 29 7 0 0 -1 0.000 0 0 -1 1 1 2 + 0 0 2.00 150.00 180.00 + 0 0 2.00 150.00 180.00 + 7950 10200 7950 10800 2 1 0 1 -1 7 0 0 -1 0.000 0 0 -1 0 0 1 - 8475 2175 + 8400 375 2 1 0 1 -1 7 0 0 -1 0.000 0 0 -1 0 0 1 - 8475 2175 + 8400 375 2 4 0 1 -1 29 0 0 20 0.000 0 0 7 0 0 5 - 2850 13200 450 13200 450 12600 2850 12600 2850 13200 + 2775 11400 375 11400 375 10800 2775 10800 2775 11400 2 1 0 2 29 7 0 0 -1 0.000 0 0 -1 1 1 2 0 0 2.00 150.00 180.00 0 0 2.00 150.00 180.00 - 1650 12600 1650 12000 + 1575 10800 1575 10200 2 4 0 1 -1 29 0 0 20 0.000 0 0 7 0 0 5 - 9225 13200 6825 13200 6825 12600 9225 12600 9225 13200 + 9150 11400 6750 11400 6750 10800 9150 10800 9150 11400 +2 4 0 1 -1 29 0 0 20 0.000 0 0 7 0 0 5 + 5925 11400 3525 11400 3525 10800 5925 10800 5925 11400 2 1 0 2 29 7 0 0 -1 0.000 0 0 -1 1 1 2 0 0 2.00 150.00 180.00 0 0 2.00 150.00 180.00 - 8025 11925 8025 12525 + 4725 10800 4725 10200 2 4 0 1 -1 29 0 0 20 0.000 0 0 7 0 0 5 - 6000 13200 3600 13200 3600 12600 6000 12600 6000 13200 + 4350 12600 1950 12600 1950 12000 4350 12000 4350 12600 2 1 0 2 29 7 0 0 -1 0.000 0 0 -1 1 1 2 0 0 2.00 150.00 180.00 0 0 2.00 150.00 180.00 - 4800 12600 4800 12000 -2 4 0 1 -1 29 0 0 20 0.000 0 0 7 0 0 5 - 4425 14400 2025 14400 2025 13800 4425 13800 4425 14400 -2 1 0 2 29 7 0 0 -1 0.000 0 0 -1 1 1 2 - 0 0 2.00 150.00 180.00 - 0 0 2.00 150.00 180.00 - 3225 13200 3225 13800 + 3150 11400 3150 12000 2 1 0 2 8 7 0 0 -1 0.000 0 0 -1 1 0 2 0 0 2.00 150.00 180.00 - 2625 6675 2625 7275 + 2550 4875 2550 5475 2 4 0 1 -1 4 0 0 20 0.000 0 0 7 0 0 5 - 3825 3975 1425 3975 1425 3375 3825 3375 3825 3975 + 3750 2175 1350 2175 1350 1575 3750 1575 3750 2175 2 4 0 1 -1 8 0 0 20 0.000 0 0 7 0 0 5 - 3825 6675 1425 6675 1425 6075 3825 6075 3825 6675 + 3750 4875 1350 4875 1350 4275 3750 4275 3750 4875 2 4 0 1 -1 8 0 0 20 0.000 0 0 7 0 0 5 - 3825 9075 1425 9075 1425 8475 3825 8475 3825 9075 + 3750 7275 1350 7275 1350 6675 3750 6675 3750 7275 2 1 0 2 8 7 0 0 -1 0.000 0 0 -1 1 0 2 0 0 2.00 150.00 180.00 - 2625 7875 2625 8475 + 2550 6075 2550 6675 2 4 0 1 -1 8 0 0 20 0.000 0 0 7 0 0 5 - 3825 10275 1425 10275 1425 9675 3825 9675 3825 10275 + 3750 8475 1350 8475 1350 7875 3750 7875 3750 8475 2 1 0 2 8 7 0 0 -1 0.000 0 0 -1 1 0 2 0 0 2.00 150.00 180.00 - 2625 9075 2625 9675 + 2550 7275 2550 7875 2 1 0 2 8 7 0 0 -1 0.000 0 0 -1 1 0 2 0 0 2.00 150.00 180.00 - 2625 10275 2625 10875 + 2550 8475 2550 9075 2 4 0 1 -1 8 0 0 20 0.000 0 0 7 0 0 5 - 7725 7875 5325 7875 5325 7275 7725 7275 7725 7875 + 7650 6075 5250 6075 5250 5475 7650 5475 7650 6075 2 1 0 2 8 7 0 0 -1 0.000 0 0 -1 1 0 2 0 0 2.00 150.00 180.00 - 2625 5775 2625 6075 + 2550 3975 2550 4275 2 4 0 1 -1 8 0 0 20 0.000 0 0 7 0 0 5 - 3825 11475 1425 11475 1425 10875 3825 10875 3825 11475 -2 1 0 2 31 7 0 0 -1 0.000 0 0 -1 1 0 2 - 0 0 2.00 150.00 180.00 - 2625 5175 2625 5775 + 3750 9675 1350 9675 1350 9075 3750 9075 3750 9675 2 4 0 1 -1 31 0 0 20 0.000 0 0 7 0 0 5 - 3825 5175 1425 5175 1425 4575 3825 4575 3825 5175 + 3750 3375 1350 3375 1350 2775 3750 2775 3750 3375 2 4 0 1 -1 31 0 0 20 0.000 0 0 7 0 0 5 - 7725 5175 5325 5175 5325 4575 7725 4575 7725 5175 + 7650 3375 5250 3375 5250 2775 7650 2775 7650 3375 2 4 0 1 -1 17 1 0 20 0.000 0 0 40 0 0 5 - 8775 11775 375 11775 375 5625 8775 5625 8775 11775 + 8700 9975 300 9975 300 3825 8700 3825 8700 9975 2 4 0 1 -1 0 0 0 20 0.000 0 0 7 0 0 5 - 7725 3375 5325 3375 5325 2775 7725 2775 7725 3375 + 7650 1575 5250 1575 5250 975 7650 975 7650 1575 2 4 0 1 -1 23 0 0 20 0.000 0 0 8 0 0 5 - 2925 15675 525 15675 525 15075 2925 15075 2925 15675 + 2850 13875 450 13875 450 13275 2850 13275 2850 13875 2 1 0 2 25 7 0 0 -1 0.000 0 0 -1 1 0 2 0 0 2.00 150.00 180.50 - 2625 2775 2625 3375 + 2550 975 2550 1575 2 4 0 1 -1 26 0 0 20 0.000 0 0 7 0 0 5 - 3825 2775 1425 2775 1425 2175 3825 2175 3825 2775 + 3750 975 1350 975 1350 375 3750 375 3750 975 2 1 0 2 20 7 0 0 -1 0.000 0 0 -1 1 0 2 0 0 2.00 150.00 180.00 - 2625 3975 2625 4575 + 2550 2175 2550 2775 2 1 0 2 20 7 0 0 -1 0.000 0 0 -1 1 0 2 0 0 2.00 150.00 180.00 - 2625 3975 6525 4575 + 2550 2175 6450 2775 2 1 1 2 -1 7 0 0 -1 4.000 0 0 -1 1 1 2 0 0 2.00 150.00 180.00 0 0 2.00 150.00 180.00 - 4890 3708 5325 3150 + 4815 1908 5250 1350 2 4 0 1 -1 29 0 0 20 0.000 0 0 7 0 0 5 - 7725 14400 5325 14400 5325 13800 7725 13800 7725 14400 + 7650 12600 5250 12600 5250 12000 7650 12000 7650 12600 2 1 0 2 29 7 0 0 -1 0.000 0 0 -1 1 1 2 0 0 2.00 150.00 180.00 0 0 2.00 150.00 180.00 - 6450 13200 6450 13800 + 6375 11400 6375 12000 2 1 0 2 8 7 0 0 -1 0.000 0 0 -1 1 0 2 0 0 2.00 150.00 180.00 - 3825 7575 5325 7575 + 3750 5775 5250 5775 2 4 0 1 -1 8 0 0 20 0.000 0 0 7 0 0 5 - 3825 7875 1425 7875 1425 7275 3825 7275 3825 7875 + 3750 6075 1350 6075 1350 5475 3750 5475 3750 6075 2 1 1 2 -1 7 0 0 -1 3.000 0 0 -1 1 1 2 0 0 2.00 150.00 180.00 0 0 2.00 150.00 180.00 - 4735 3324 5370 3093 + 4660 1524 5295 1293 +2 1 0 2 31 7 0 0 -1 0.000 0 0 -1 1 0 2 + 0 0 2.00 150.00 180.00 + 2550 3300 2550 3900 3 0 0 2 8 7 0 0 -1 0.000 0 1 0 5 0 0 2.00 150.00 180.00 - 7725 7575 8325 7275 8325 6375 7800 5775 2625 5775 + 7650 5775 8250 5475 8250 4575 7725 3975 2550 3975 3 0 0 2 8 7 0 0 -1 0.000 0 1 0 5 0 0 2.00 150.00 180.00 - 1425 11175 825 10725 825 6225 1575 5775 2625 5775 -4 1 -1 0 0 28 18 0.0000 4 195 1050 1635 12990 Utilities\001 -4 1 -1 0 0 28 18 0.0000 4 240 2325 8040 12990 Storage Managers\001 -4 1 -1 0 0 0 18 0.0000 4 255 840 4800 12975 Catalog\001 -4 1 -1 0 0 28 18 0.0000 4 195 2100 3210 14205 Access Methods\001 -4 1 7 0 0 28 18 0.0000 4 195 1980 2610 9030 Generate Paths\001 -4 1 7 0 0 28 18 0.0000 4 195 1485 6525 7830 Commands\001 -4 1 7 0 0 28 18 0.0000 4 195 1830 2640 10245 Generate Plan\001 -4 1 -1 0 0 28 18 0.0000 4 195 1470 2610 3765 Postmaster\001 -4 1 -1 0 0 28 18 0.0000 4 240 1110 6510 4950 Postgres\001 -4 1 -1 0 0 28 18 0.0000 4 240 1110 2625 4965 Postgres\001 -4 1 7 0 0 28 18 0.0000 4 195 1275 2640 8745 Rewrite &\001 -4 1 7 0 0 28 18 0.0000 4 255 1500 2640 7665 Traffic Cop\001 -4 1 7 0 0 28 18 0.0000 4 195 825 2610 6450 Parser\001 -4 1 7 0 0 28 18 0.0000 4 195 1890 2625 9975 Choose Path &\001 -4 1 7 0 0 28 18 0.0000 4 195 1140 2610 11295 Executor\001 -4 1 8 0 0 28 18 0.0000 4 240 795 4530 7500 utility\001 -4 1 7 0 0 28 18 0.0000 4 240 825 6525 7545 Utility\001 -4 1 -1 0 0 28 18 0.0000 4 195 630 2595 2565 Main\001 -4 1 8 0 0 28 18 0.0000 4 240 1125 2640 8235 complex\001 -4 1 -1 0 0 0 18 0.0000 4 225 1425 6525 14175 Nodes / Lists\001 -4 1 7 0 0 0 18 0.0000 4 255 645 6525 3150 Libpq\001 -4 1 -1 0 0 0 18 0.0000 4 255 1095 1725 15450 Bootstrap\001 + 1350 9375 750 8925 750 4425 1500 3975 2550 3975 +4 1 -1 0 0 28 18 0.0000 4 195 1050 1560 11190 Utilities\001 +4 1 -1 0 0 28 18 0.0000 4 240 2325 7965 11190 Storage Managers\001 +4 1 -1 0 0 0 18 0.0000 4 255 840 4725 11175 Catalog\001 +4 1 -1 0 0 28 18 0.0000 4 195 2100 3135 12405 Access Methods\001 +4 1 7 0 0 28 18 0.0000 4 195 1980 2535 7230 Generate Paths\001 +4 1 7 0 0 28 18 0.0000 4 195 1485 6450 6030 Commands\001 +4 1 7 0 0 28 18 0.0000 4 195 1830 2565 8445 Generate Plan\001 +4 1 -1 0 0 28 18 0.0000 4 195 1470 2535 1965 Postmaster\001 +4 1 -1 0 0 28 18 0.0000 4 240 1110 6435 3150 Postgres\001 +4 1 -1 0 0 28 18 0.0000 4 240 1110 2550 3165 Postgres\001 +4 1 7 0 0 28 18 0.0000 4 195 1275 2565 6945 Rewrite &\001 +4 1 7 0 0 28 18 0.0000 4 255 1500 2565 5865 Traffic Cop\001 +4 1 7 0 0 28 18 0.0000 4 195 825 2535 4650 Parser\001 +4 1 7 0 0 28 18 0.0000 4 195 1890 2550 8175 Choose Path &\001 +4 1 7 0 0 28 18 0.0000 4 195 1140 2535 9495 Executor\001 +4 1 8 0 0 28 18 0.0000 4 240 795 4455 5700 utility\001 +4 1 7 0 0 28 18 0.0000 4 240 825 6450 5745 Utility\001 +4 1 -1 0 0 28 18 0.0000 4 195 630 2520 765 Main\001 +4 1 8 0 0 28 18 0.0000 4 240 1125 2565 6435 complex\001 +4 1 -1 0 0 0 18 0.0000 4 225 1425 6450 12375 Nodes / Lists\001 +4 1 7 0 0 0 18 0.0000 4 255 645 6450 1350 Libpq\001 +4 1 -1 0 0 0 18 0.0000 4 255 1095 1650 13650 Bootstrap\001 diff --git a/src/tools/backend/flow.jpg b/src/tools/backend/flow.jpg index d2cfb67acc..ae5e3f7a55 100644 Binary files a/src/tools/backend/flow.jpg and b/src/tools/backend/flow.jpg differ diff --git a/src/tools/backend/index.html b/src/tools/backend/index.html index 8a3244b6d6..f43d6385cb 100644 --- a/src/tools/backend/index.html +++ b/src/tools/backend/index.html @@ -13,32 +13,33 @@ by Bruce Momjian


-flowchart +flowchart
- - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + +
Click on an item to see more detail or look at the full index.

+