MonetDB: iot - iot branch working again!

[Pedro Ferreira]

Changeset: 03761bfcaa22 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=03761bfcaa22
Modified Files:
        monetdb5/optimizer/opt_iot.c
        monetdb5/optimizer/opt_iot.h
        sql/backends/monet5/Makefile.ag
Branch: iot
Log Message:

iot branch working again!


diffs (87 lines):

diff --git a/monetdb5/optimizer/opt_iot.c b/monetdb5/optimizer/opt_iot.c
--- a/monetdb5/optimizer/opt_iot.c
+++ b/monetdb5/optimizer/opt_iot.c
@@ -30,7 +30,6 @@
 #include "opt_deadcode.h"
 #include "mal_interpreter.h"    /* for showErrors() */
 #include "mal_builder.h"
-#include "opt_statistics.h"
 #include "opt_dataflow.h"
 
 #define MAXBSKT 64
@@ -40,7 +39,7 @@
                fnd= 1; break;\
        }
 
-int
+str
 OPTiotImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
 {
        int i, j, k, fnd, limit, slimit;
@@ -66,7 +65,7 @@ OPTiotImplementation(Client cntxt, MalBl
                        break;
        }
        if( i == mb->stop)
-               return 0;
+               return MAL_SUCCEED;
 
 #ifdef DEBUG_OPT_IOT
        mnstr_printf(cntxt->fdout, "#iot optimizer start\n");
@@ -141,7 +140,7 @@ OPTiotImplementation(Client cntxt, MalBl
                }
        }
        if( btop == MAXBSKT || btop == 0)
-               return 0;
+               return MAL_SUCCEED;
 
 #ifdef DEBUG_OPT_IOT
        mnstr_printf(cntxt->fdout, "#iot optimizer started with %d streams, mvc 
%d\n", btop,lastmvc);
@@ -151,10 +150,10 @@ OPTiotImplementation(Client cntxt, MalBl
 
        alias = (int *) GDKzalloc(mb->vtop * 2 * sizeof(int));
        if (alias == 0)
-               return 0;
+               return MAL_SUCCEED;
 
        if (newMalBlkStmt(mb, slimit) < 0)
-               return 0;
+               return MAL_SUCCEED;
 
        pushInstruction(mb, old[0]);
        for (i = 1; i < limit; i++)
@@ -318,6 +317,10 @@ OPTiotImplementation(Client cntxt, MalBl
 #endif
        GDKfree(alias);
        GDKfree(old);
-       return btop > 0;
+
+    if( btop > 0)
+        return MAL_SUCCEED;
+    else {
+        return createException(MAL,"optimizer.iot", "The iot optimizer failed 
to start! (btop = %d)", btop);
+    }
 }
-
diff --git a/monetdb5/optimizer/opt_iot.h b/monetdb5/optimizer/opt_iot.h
--- a/monetdb5/optimizer/opt_iot.h
+++ b/monetdb5/optimizer/opt_iot.h
@@ -23,6 +23,6 @@
 #include "opt_support.h"
 #include "opt_pipes.h"
 
-mal_export int OPTiotImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr pci);
+mal_export str OPTiotImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr pci);
 
 #endif
diff --git a/sql/backends/monet5/Makefile.ag b/sql/backends/monet5/Makefile.ag
--- a/sql/backends/monet5/Makefile.ag
+++ b/sql/backends/monet5/Makefile.ag
@@ -4,7 +4,7 @@
 #
 # Copyright 1997 - July 2008 CWI, August 2008 - 2017 MonetDB B.V.
 
-SUBDIRS = NOT_WIN32?vaults UDF LSST HAVE_GSL?gsl generator iot
+SUBDIRS = NOT_WIN32?vaults UDF LSST generator iot
 
 INCLUDES = ../../include ../../common ../../storage ../../server \
                   ../../../monetdb5/modules/atoms \
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list