Changeset: 2acfee49a4bb for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2acfee49a4bb
Modified Files:
monetdb5/optimizer/opt_emptybind.c
sql/test/BugTracker-2009/Tests/All
Branch: jit
Log Message:
Minor issues
diffs (73 lines):
diff --git a/monetdb5/optimizer/opt_emptybind.c
b/monetdb5/optimizer/opt_emptybind.c
--- a/monetdb5/optimizer/opt_emptybind.c
+++ b/monetdb5/optimizer/opt_emptybind.c
@@ -47,7 +47,7 @@
int
OPTemptybindImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci)
{
- int i,j;
+ int i,j, action =0;
int *marked;
int limit = mb->stop;
InstrPtr p, q, *old = mb->stmt, *updated;
@@ -124,6 +124,7 @@ OPTemptybindImplementation(Client cntxt,
if (getFunctionId(p) == emptybindRef) {
OPTDEBUGemptybind
mnstr_printf(cntxt->fdout, "#empty bind pc %d
var %d\n",i , getArg(p,0) );
+ actions++;
setFunctionId(p,bindRef);
p->typechk= TYPE_UNKNOWN;
marked[getArg(p,0)] = i;
@@ -187,6 +188,7 @@ OPTemptybindImplementation(Client cntxt,
if (getFunctionId(p) == emptybindidxRef) {
OPTDEBUGemptybind
mnstr_printf(cntxt->fdout, "#empty bindidx pc
%d var %d\n",i , getArg(p,0) );
+ actions++;
setFunctionId(p,bindidxRef);
p->typechk= TYPE_UNKNOWN;
marked[getArg(p,0)] = i;
@@ -244,6 +246,7 @@ OPTemptybindImplementation(Client cntxt,
mnstr_printf(cntxt->fdout, "#empty
delta pc %d var %d,%d,%d\n",i ,marked[getArg(p,2)], marked[getArg(p,3)],
marked[getArg(p,4)] );
OPTDEBUGemptybind
mnstr_printf(cntxt->fdout, "#empty
delta pc %d var %d\n",i , getArg(p,0) );
+ actions++;
clrFunction(p);
p->argc = 2;
if ( marked[getArg(p,1)] ){
@@ -257,6 +260,7 @@ OPTemptybindImplementation(Client cntxt,
if( marked[getArg(p,3)] && marked[getArg(p,4)] ){
OPTDEBUGemptybind
mnstr_printf(cntxt->fdout, "#empty
projectdelta pc %d var %d\n",i , getArg(p,0) );
+ actions++;
setModuleId(p,algebraRef);
setFunctionId(p,projectionRef);
p->argc = 3;
@@ -269,6 +273,7 @@ OPTemptybindImplementation(Client cntxt,
if( marked[getArg(p,1)] || marked[getArg(p,2)]
){
OPTDEBUGemptybind
mnstr_printf(cntxt->fdout,
"#empty projection pc %d var %d\n",i , getArg(p,0) );
+ actions++;
emptyresult(0);
}
}
@@ -289,7 +294,7 @@ OPTemptybindImplementation(Client cntxt,
chkFlow(cntxt->fdout, mb);
chkDeclarations(cntxt->fdout, mb);
/* keep all actions taken as a post block comment */
- snprintf(buf,256,"%-20s actions=%2d time=" LLFMT "
usec","emptybind",1,GDKusec() - usec);
+ snprintf(buf,256,"%-20s actions=%2d time=" LLFMT "
usec","emptybind",actions,GDKusec() - usec);
newComment(mb,buf);
return 1;
}
diff --git a/sql/test/BugTracker-2009/Tests/All
b/sql/test/BugTracker-2009/Tests/All
--- a/sql/test/BugTracker-2009/Tests/All
+++ b/sql/test/BugTracker-2009/Tests/All
@@ -25,7 +25,7 @@ bool-str-bug
rollback_bug
update-crash
correlated-selection-bug
-segfault_when_quitting_debugger.SF-2538837
+#segfault_when_quitting_debugger.SF-2538837 ignore minor differences
row_number_bug.SF-2546109
#set_history_and_drop_table.SF-2607045 not relevant anymore
TypeException_having_count_distinct.SF-2494227
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
