Changeset: 1cdaf1bb1770 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1cdaf1bb1770
Modified Files:
monetdb5/mal/mal_profiler.c
sql/server/rel_optimizer.c
Branch: default
Log Message:
merged with Jun2016
diffs (59 lines):
diff --git a/monetdb5/mal/mal_profiler.c b/monetdb5/mal/mal_profiler.c
--- a/monetdb5/mal/mal_profiler.c
+++ b/monetdb5/mal/mal_profiler.c
@@ -786,19 +786,19 @@ clearTrace(void)
return; /* not initialized */
}
/* drop all trace tables */
- BBPunfix(TRACE_id_event->batCacheid);
- BBPunfix(TRACE_id_time->batCacheid);
- BBPunfix(TRACE_id_pc->batCacheid);
- BBPunfix(TRACE_id_thread->batCacheid);
- BBPunfix(TRACE_id_ticks->batCacheid);
- BBPunfix(TRACE_id_rssMB->batCacheid);
- BBPunfix(TRACE_id_tmpspace->batCacheid);
- BBPunfix(TRACE_id_inblock->batCacheid);
- BBPunfix(TRACE_id_oublock->batCacheid);
- BBPunfix(TRACE_id_minflt->batCacheid);
- BBPunfix(TRACE_id_majflt->batCacheid);
- BBPunfix(TRACE_id_nvcsw->batCacheid);
- BBPunfix(TRACE_id_stmt->batCacheid);
+ BBPclear(TRACE_id_event->batCacheid);
+ BBPclear(TRACE_id_time->batCacheid);
+ BBPclear(TRACE_id_pc->batCacheid);
+ BBPclear(TRACE_id_thread->batCacheid);
+ BBPclear(TRACE_id_ticks->batCacheid);
+ BBPclear(TRACE_id_rssMB->batCacheid);
+ BBPclear(TRACE_id_tmpspace->batCacheid);
+ BBPclear(TRACE_id_inblock->batCacheid);
+ BBPclear(TRACE_id_oublock->batCacheid);
+ BBPclear(TRACE_id_minflt->batCacheid);
+ BBPclear(TRACE_id_majflt->batCacheid);
+ BBPclear(TRACE_id_nvcsw->batCacheid);
+ BBPclear(TRACE_id_stmt->batCacheid);
TRACE_init = 0;
MT_lock_unset(&mal_contextLock);
initTrace();
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
@@ -223,6 +223,8 @@ rel_properties(mvc *sql, global_props *g
switch (rel->op) {
case op_basetable:
case op_table:
+ if (rel->op == op_table && rel->l)
+ rel_properties(sql, gp, rel->l);
break;
case op_join:
case op_left:
@@ -7839,6 +7841,10 @@ rewrite_topdown(mvc *sql, sql_rel *rel,
switch (rel->op) {
case op_basetable:
case op_table:
+ if (rel->op == op_table && rel->l)
+ rel->l = rewrite(sql, rel->l, rewriter, has_changes);
+ if (rel->op == op_table && rel->l)
+ rel->l = rewrite_topdown(sql, rel->l, rewriter,
has_changes);
break;
case op_join:
case op_left:
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
