Changeset: b0a840ee2335 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b0a840ee2335
Modified Files:
        monetdb5/optimizer/opt_postfix.c
Branch: default
Log Message:

Cleanup the postfix operator using the normal scheme to resolve types.
It should fix the crashes observerd on some systems.


diffs (23 lines):

diff --git a/monetdb5/optimizer/opt_postfix.c b/monetdb5/optimizer/opt_postfix.c
--- a/monetdb5/optimizer/opt_postfix.c
+++ b/monetdb5/optimizer/opt_postfix.c
@@ -38,17 +38,13 @@ OPTpostfixImplementation(Client cntxt, M
                p= getInstrPtr(mb, i);
                if ( getModuleId(p) == algebraRef && getFunctionId(p) == 
joinRef && getVarEolife(mb, getArg(p, p->retc -1)) == i){
                        delArgument(p, p->retc -1);
-                       /* The typechecker is overruled here, because we only 
change the function binding */
-                       p->fcn = ALGjoin1; 
-                       //typeChecker(cntxt->usermodule, mb, p, TRUE);
+                       typeChecker(cntxt->usermodule, mb, p, TRUE);
                        actions++;
                        continue;
                }
                if ( getModuleId(p) == algebraRef && getFunctionId(p) == 
leftjoinRef && getVarEolife(mb, getArg(p, p->retc -1)) == i){
                        delArgument(p, p->retc -1);
-                       /* The typechecker is overruled here, because we only 
change the function binding */
-                       p->fcn = ALGleftjoin1; 
-                       //typeChecker(cntxt->usermodule, mb, p, TRUE);
+                       typeChecker(cntxt->usermodule, mb, p, TRUE);
                        actions++;
                        continue;
                }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to