Changeset: 7a05829b9426 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/7a05829b9426 Modified Files: monetdb5/optimizer/opt_pipes.c Branch: string_imprints Log Message:
Fix setoptimizer test diffs (57 lines): diff --git a/monetdb5/optimizer/opt_pipes.c b/monetdb5/optimizer/opt_pipes.c --- a/monetdb5/optimizer/opt_pipes.c +++ b/monetdb5/optimizer/opt_pipes.c @@ -51,8 +51,10 @@ static struct PIPELINES { "optimizer.generator();" //"optimizer.candidates();" only for decoration in explain //"optimizer.mask();" - "optimizer.garbageCollector();", + "optimizer.garbageCollector();" + "optimizer.profiler();", "stable", NULL, 1}, +#ifdef USE_STRIMPS_OPTIMIZERS {"minimal_strimps_pipe", "optimizer.inline();" "optimizer.remap();" @@ -63,13 +65,12 @@ static struct PIPELINES { "optimizer.multiplex();" "optimizer.strimps();" "optimizer.generator();" - "optimizer.profiler();" - "optimizer.profiler();" //"optimizer.candidates();" only for decoration in explain //"optimizer.mask();" "optimizer.garbageCollector();" "optimizer.profiler();", "stable", NULL, 1}, +#endif // USE_STRIMPS_OPTIMIZERS {"minimal_fast", "optimizer.minimalfast()", "stable", NULL, 1}, @@ -116,6 +117,7 @@ static struct PIPELINES { "optimizer.garbageCollector();" "optimizer.profiler();", "stable", NULL, 1}, +#ifdef USE_STRIMPS_OPTIMIZERS {"strimps_pipe", "optimizer.inline();" "optimizer.remap();" @@ -142,15 +144,16 @@ static struct PIPELINES { "optimizer.multiplex();" "optimizer.strimps();" "optimizer.generator();" - "optimizer.profiler();" "optimizer.candidates();" //"optimizer.mask();" "optimizer.deadcode();" "optimizer.postfix();" // "optimizer.jit();" awaiting the new batcalc api "optimizer.wlc();" - "optimizer.garbageCollector();", + "optimizer.garbageCollector();" + "optimizer.profiler();", "stable", NULL, 1}, +#endif // USE_STRIMPS_OPTIMIZERS {"default_fast", "optimizer.defaultfast()", "stable", NULL, 1}, _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list