MonetDB: jit - Minor issues.

[Martin Kersten]

Changeset: 5220d6e927d6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5220d6e927d6
Modified Files:
        monetdb5/optimizer/opt_support.c
        sql/backends/monet5/sql_execute.c
        sql/test/Triggers/trigger_insert.sql
Branch: jit
Log Message:

Minor issues.


diffs (38 lines):

diff --git a/monetdb5/optimizer/opt_support.c b/monetdb5/optimizer/opt_support.c
--- a/monetdb5/optimizer/opt_support.c
+++ b/monetdb5/optimizer/opt_support.c
@@ -252,10 +252,9 @@ optimizeMALBlock(Client cntxt, MalBlkPtr
                return 0;
 
        /* force at least once a complete type check by resetting the type 
check flag */
+
        resetMalBlk(mb,mb->stop);
-       chkTypes(cntxt->fdout, cntxt->nspace, mb, TRUE);
-       chkFlow(cntxt->fdout, mb);
-       chkDeclarations(cntxt->fdout, mb);
+       chkProgram(cntxt->fdout,cntxt->nspace,mb);
        if (mb->errors)
                throw(MAL, "optimizer.MALoptimizer", "Start with inconsistent 
MAL plan");
 
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
@@ -311,7 +311,6 @@ SQLrun(Client c, backend *be, mvc *m){
                                setVarFixed(mb, j+retc);
                        }
                        mb->stmt[0]->argc = 1;
-                       chkProgram(c->fdout, c->nspace, mb);
                        break;
                }
        }
diff --git a/sql/test/Triggers/trigger_insert.sql 
b/sql/test/Triggers/trigger_insert.sql
--- a/sql/test/Triggers/trigger_insert.sql
+++ b/sql/test/Triggers/trigger_insert.sql
@@ -5,7 +5,6 @@ create trigger test_8_1
        after insert on t_8_1 referencing new row as ins
        for each statement insert into t_8_2 values( ins.id );
 
-explain insert into t_8_1 values (1, 'testing');
 insert into t_8_1 values (1, 'testing');
 
 select * from t_8_1;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list