Changeset: 034ea00e283a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/034ea00e283a
Modified Files:
monetdb5/mal/mal_function.c
monetdb5/optimizer/opt_dataflow.c
Branch: pp_hashjoin
Log Message:
allow for a bit more concurrency in classic mode.
diffs (32 lines):
diff --git a/monetdb5/mal/mal_function.c b/monetdb5/mal/mal_function.c
--- a/monetdb5/mal/mal_function.c
+++ b/monetdb5/mal/mal_function.c
@@ -530,9 +530,11 @@ setVariableScope(MalBlkPtr mb)
if (dflow != -1)
addMalException(mb,
"setLifeSpan nested dataflow blocks not allowed");
- pp = pc;
dflow = depth;
- jump = p->jump;
+ if (getFunctionId(p) == pipelinesRef) {
+ pp = pc;
+ jump = p->jump;
+ }
} else
depth++;
}
diff --git a/monetdb5/optimizer/opt_dataflow.c
b/monetdb5/optimizer/opt_dataflow.c
--- a/monetdb5/optimizer/opt_dataflow.c
+++ b/monetdb5/optimizer/opt_dataflow.c
@@ -139,9 +139,9 @@ dataflowBreakpoint(Client ctx, MalBlkPtr
* explicitly mentioned as arguments (and certainly not as the
* first argument), but that can still be available to the MAL
* program (see bugs.monetdb.org/6641) */
-// if (getModuleId(p) == sqlRef)
+ if (getModuleId(p) == sqlRef)
return 1;
-// return getState(states, p, p->retc) & (VARREAD | VARBLOCK);
+ return getState(states, p, p->retc) & (VARREAD | VARBLOCK);
}
for (j = p->retc; j < p->argc; j++) {
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
