diff options
Diffstat (limited to 'src/backend/optimizer')
-rw-r--r-- | src/backend/optimizer/geqo/geqo_cx.c | 1 | ||||
-rw-r--r-- | src/backend/optimizer/geqo/geqo_erx.c | 3 | ||||
-rw-r--r-- | src/backend/optimizer/geqo/geqo_ox1.c | 1 | ||||
-rw-r--r-- | src/backend/optimizer/geqo/geqo_ox2.c | 1 | ||||
-rw-r--r-- | src/backend/optimizer/geqo/geqo_pmx.c | 6 | ||||
-rw-r--r-- | src/backend/optimizer/geqo/geqo_px.c | 3 | ||||
-rw-r--r-- | src/backend/optimizer/plan/planner.c | 1 |
7 files changed, 0 insertions, 16 deletions
diff --git a/src/backend/optimizer/geqo/geqo_cx.c b/src/backend/optimizer/geqo/geqo_cx.c index 3b8d2fe560..34cc53af53 100644 --- a/src/backend/optimizer/geqo/geqo_cx.c +++ b/src/backend/optimizer/geqo/geqo_cx.c @@ -115,7 +115,6 @@ cx(PlannerInfo *root, Gene *tour1, Gene *tour2, Gene *offspring, for (i = 0; i < num_gene; i++) if (tour1[i] != offspring[i]) num_diffs++; - } return num_diffs; diff --git a/src/backend/optimizer/geqo/geqo_erx.c b/src/backend/optimizer/geqo/geqo_erx.c index 3b92f420e0..cc0661365f 100644 --- a/src/backend/optimizer/geqo/geqo_erx.c +++ b/src/backend/optimizer/geqo/geqo_erx.c @@ -222,11 +222,9 @@ gimme_tour(PlannerInfo *root, Edge *edge_table, Gene *new_gene, int num_gene) /* mark this node as incorporated */ edge_table[(int) new_gene[i - 1]].unused_edges = -1; - } /* for (i=1; i<num_gene; i++) */ return edge_failures; - } /* remove_gene @@ -337,7 +335,6 @@ gimme_gene(PlannerInfo *root, Edge edge, Edge *edge_table) elog(ERROR, "minimum_count not set"); else if (edge_table[(int) friend].unused_edges == minimum_edges) minimum_count++; - } /* for (i=0; i<edge.unused_edges; i++) */ diff --git a/src/backend/optimizer/geqo/geqo_ox1.c b/src/backend/optimizer/geqo/geqo_ox1.c index 10d2d0a33a..ede7abb417 100644 --- a/src/backend/optimizer/geqo/geqo_ox1.c +++ b/src/backend/optimizer/geqo/geqo_ox1.c @@ -89,7 +89,6 @@ ox1(PlannerInfo *root, Gene *tour1, Gene *tour2, Gene *offspring, int num_gene, } p = (p + 1) % num_gene; /* increment tour2-index */ } - } #endif /* defined(OX1) */ diff --git a/src/backend/optimizer/geqo/geqo_ox2.c b/src/backend/optimizer/geqo/geqo_ox2.c index 72b9b0fb87..080dbc076c 100644 --- a/src/backend/optimizer/geqo/geqo_ox2.c +++ b/src/backend/optimizer/geqo/geqo_ox2.c @@ -106,7 +106,6 @@ ox2(PlannerInfo *root, Gene *tour1, Gene *tour2, Gene *offspring, int num_gene, /* city isn't used yet, so inherit from tour2 */ offspring[k] = tour2[k]; } - } #endif /* defined(OX2) */ diff --git a/src/backend/optimizer/geqo/geqo_pmx.c b/src/backend/optimizer/geqo/geqo_pmx.c index ddbc78172c..e44fd0bae5 100644 --- a/src/backend/optimizer/geqo/geqo_pmx.c +++ b/src/backend/optimizer/geqo/geqo_pmx.c @@ -131,7 +131,6 @@ pmx(PlannerInfo *root, Gene *tour1, Gene *tour2, Gene *offspring, int num_gene) j++; } - } if (!(found)) @@ -140,7 +139,6 @@ pmx(PlannerInfo *root, Gene *tour1, Gene *tour2, Gene *offspring, int num_gene) indx[mx_fail] = k; mx_fail++; } - } /* ... for */ @@ -172,9 +170,7 @@ pmx(PlannerInfo *root, Gene *tour1, Gene *tour2, Gene *offspring, int num_gene) j++; } - } /* ... for */ - } /* ... if */ @@ -206,12 +202,10 @@ pmx(PlannerInfo *root, Gene *tour1, Gene *tour2, Gene *offspring, int num_gene) j++; } - } /* ... if */ i++; } /* end while */ - } } /* ... for */ diff --git a/src/backend/optimizer/geqo/geqo_px.c b/src/backend/optimizer/geqo/geqo_px.c index ad5ad3f1e5..914296b53d 100644 --- a/src/backend/optimizer/geqo/geqo_px.c +++ b/src/backend/optimizer/geqo/geqo_px.c @@ -96,15 +96,12 @@ px(PlannerInfo *root, Gene *tour1, Gene *tour2, Gene *offspring, int num_gene, { /* next city in tour2 has been used */ tour2_index++; } - } else { /* next position in offspring is filled */ offspring_index++; } - } - } #endif /* defined(PX) */ diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c index b090b087e9..9a4accb4d9 100644 --- a/src/backend/optimizer/plan/planner.c +++ b/src/backend/optimizer/plan/planner.c @@ -6848,7 +6848,6 @@ create_partial_grouping_paths(PlannerInfo *root, dNumPartialGroups)); } } - } if (can_sort && cheapest_partial_path != NULL) |