Changeset: f4936e609cb1 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/f4936e609cb1
Modified Files:
sql/server/rel_optimizer.c
Branch: sqloptimizer
Log Message:
Cleanup
diffs (30 lines):
diff --git a/sql/server/rel_optimizer.c b/sql/server/rel_optimizer.c
--- a/sql/server/rel_optimizer.c
+++ b/sql/server/rel_optimizer.c
@@ -751,7 +751,7 @@ rel_optimizer(mvc *sql, sql_rel *rel, in
if (!(rel = rel_keep_renames(sql, rel)))
return rel;
- sql_optimizer_run *runs = !(GDKdebug & FORCEMITOMASK) && profile ?
sa_zalloc(sql->sa, NSQLREWRITERS * sizeof(sql_optimizer_run)) : NULL;
+ sql->runs = !(GDKdebug & FORCEMITOMASK) && profile ? sa_zalloc(sql->sa,
NSQLREWRITERS * sizeof(sql_optimizer_run)) : NULL;
for ( ;rel && gp.opt_cycle < 20 && v.changes; gp.opt_cycle++) {
v.changes = 0;
gp = (global_props) {.cnt = {0}, .instantiate =
(uint8_t)instantiate, .opt_cycle = gp.opt_cycle};
@@ -759,15 +759,13 @@ rel_optimizer(mvc *sql, sql_rel *rel, in
gp.opt_level = calculate_opt_level(sql, rel);
if (gp.opt_level == 0 && !gp.needs_mergetable_rewrite)
break;
- rel = run_optimizer_set(&v, runs, rel, &gp, pre_sql_optimizers);
+ rel = run_optimizer_set(&v, sql->runs, rel, &gp,
pre_sql_optimizers);
}
#ifndef NDEBUG
assert(gp.opt_cycle < 20);
#endif
/* these optimizers run statistics gathered by the last optimization
cycle */
- rel = run_optimizer_set(&v, runs, rel, &gp, post_sql_optimizers);
- if (rel && profile)
- sql->runs = runs;
+ rel = run_optimizer_set(&v, sql->runs, rel, &gp, post_sql_optimizers);
return rel;
}
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
