MonetDB: jit - Don't ignore optimizer error messages

[Martin Kersten]

Changeset: 7f46c458b53a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7f46c458b53a
Modified Files:
        sql/backends/monet5/sql_execute.c
Branch: jit
Log Message:

Don't ignore optimizer error messages


diffs (32 lines):

diff --git a/sql/backends/monet5/sql_execute.c 
b/sql/backends/monet5/sql_execute.c
--- a/sql/backends/monet5/sql_execute.c
+++ b/sql/backends/monet5/sql_execute.c
@@ -316,7 +316,7 @@ SQLrun(Client c, backend *be, mvc *m){
        }
        // JIT optimize the SQL query using all current information
        // This include template constants, BAT sizes.
-       SQLoptimizeQuery(c,mb);
+       msg = SQLoptimizeQuery(c,mb);
 
        if( mb->errors){
                freeMalBlk(mb);
@@ -483,7 +483,9 @@ SQLstatementIntern(Client c, str *expr, 
                        err = 1;
                /* always keep it around for inspection */
                SQLaddQueryToCache(c);
-               SQLoptimizeFunction(c,c->curprg->def);
+               msg =SQLoptimizeFunction(c,c->curprg->def);
+               if( msg)
+                       goto endofcompile;
 
                if (err ||c->curprg->def->errors) {
                        /* restore the state */
@@ -703,7 +705,7 @@ RAstatement(Client c, MalBlkPtr mb, MalS
                        msg = createException(SQL,"RAstatement","Program 
contains errors");
                else {
                        SQLaddQueryToCache(c);
-                       SQLoptimizeFunction(c,c->curprg->def);
+                       msg = SQLoptimizeFunction(c,c->curprg->def);
                }
                        SQLrun(c,b,m);
                if (!msg) {
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list