MonetDB: iot - Intermittent commit

[Martin Kersten]

Changeset: 1ddeb8e5b43a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1ddeb8e5b43a
Modified Files:
        sql/backends/monet5/iot/Tests/iot99.sql
        sql/backends/monet5/iot/iot.c
        sql/backends/monet5/iot/petrinet.h
Branch: iot
Log Message:

Intermittent commit


diffs (62 lines):

diff --git a/sql/backends/monet5/iot/Tests/iot99.sql 
b/sql/backends/monet5/iot/Tests/iot99.sql
--- a/sql/backends/monet5/iot/Tests/iot99.sql
+++ b/sql/backends/monet5/iot/Tests/iot99.sql
@@ -1,9 +1,8 @@
 -- initialize the stream testing environment
 set schema iot;
-set optimizer='iot_pipe';
 
+drop procedure cq00;
 drop procedure clk1;
 drop procedure clk3;
-drop procedure collector;
 drop table result;
-drop table stream_tmp;
+drop table stmp;
diff --git a/sql/backends/monet5/iot/iot.c b/sql/backends/monet5/iot/iot.c
--- a/sql/backends/monet5/iot/iot.c
+++ b/sql/backends/monet5/iot/iot.c
@@ -75,7 +75,6 @@ IOTquery(Client cntxt, MalBlkPtr mb, Mal
        str msg = NULL;
        InstrPtr p;
        Module scope;
-       lng clk = GDKusec();
        char buf[BUFSIZ], name[IDLENGTH];
        static int iotquerycnt=0;
 
@@ -116,7 +115,7 @@ IOTquery(Client cntxt, MalBlkPtr mb, Mal
        if( qry->errors)
                msg = createException(SQL,"iot.query","Error in iot query");
 
-       _DEBUG_IOT_ fprintf(stderr,"#iot: bake a new continuous query plan\n");
+       _DEBUG_IOT_ fprintf(stderr,"#iot: register a new continuous query 
plan\n");
        scope = findModule(cntxt->nspace, putName(sch));
        s = newFunction(putName(sch), putName(nme), FUNCTIONsymbol);
        if (s == NULL)
@@ -130,13 +129,8 @@ IOTquery(Client cntxt, MalBlkPtr mb, Mal
        insertSymbol(scope, s);
        _DEBUG_IOT_ printFunction(cntxt->fdout, s->def, 0, LIST_MAL_ALL);
        /* optimize the code and register at scheduler */
-       if (msg == MAL_SUCCEED) {
-               addOptimizers(cntxt, s->def,"iot_pipe");
-               msg = optimizeMALBlock(cntxt, s->def);
-               if (msg == MAL_SUCCEED) 
-                       msg = optimizerCheck(cntxt, s->def, "optimizer.iot", 1, 
GDKusec() - clk);
+       if (msg == MAL_SUCCEED) 
                addtoMalBlkHistory(mb);
-       }
        if (msg == MAL_SUCCEED) {
                _DEBUG_IOT_ fprintf(stderr,"#iot: continuous query plan\n");
                msg = PNregisterInternal(cntxt, s->def);
diff --git a/sql/backends/monet5/iot/petrinet.h 
b/sql/backends/monet5/iot/petrinet.h
--- a/sql/backends/monet5/iot/petrinet.h
+++ b/sql/backends/monet5/iot/petrinet.h
@@ -23,7 +23,7 @@
 #include "sql_scenario.h"
 #include "basket.h"
 
-#define _DEBUG_PETRINET_ if(0)
+#define _DEBUG_PETRINET_ if(1)
 
 #define PNout mal_clients[1].fdout
 /*#define  _BASKET_SIZE_*/
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list