MonetDB: Oct2014 - Make datacell compile again

[Martin Kersten]

Changeset: d159d55264b0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d159d55264b0
Modified Files:
        sql/backends/monet5/datacell/datacell.c
        sql/backends/monet5/datacell/opt_datacell.c
        sql/backends/monet5/datacell/opt_datacell.h
Branch: Oct2014
Log Message:

Make datacell compile again


diffs (53 lines):

diff --git a/sql/backends/monet5/datacell/datacell.c 
b/sql/backends/monet5/datacell/datacell.c
--- a/sql/backends/monet5/datacell/datacell.c
+++ b/sql/backends/monet5/datacell/datacell.c
@@ -332,7 +332,7 @@ DCquery(Client cntxt, MalBlkPtr mb, MalS
        if (s == NULL) {
                if (pci->argc == 3) {
                        def = *getArgReference_str(stk, pci, 2);
-                       msg = SQLstatementIntern(cntxt, &def, lnme, 0, 0);
+                       msg = SQLstatementIntern(cntxt, &def, lnme, 1, 0, 0);
                        if (msg)
                                return msg;
                        qry = cntxt->curprg->def;
@@ -441,8 +441,8 @@ str
 DCdump(void *ret)
 {
        BSKTdump(ret);
-       RCdump();
-       EMdump();
+       RCdump(ret);
+       EMdump(ret);
        PNdump(ret);
        return MAL_SUCCEED;
 }
diff --git a/sql/backends/monet5/datacell/opt_datacell.c 
b/sql/backends/monet5/datacell/opt_datacell.c
--- a/sql/backends/monet5/datacell/opt_datacell.c
+++ b/sql/backends/monet5/datacell/opt_datacell.c
@@ -35,7 +35,7 @@
 #include "opt_statistics.h"
 #include "opt_dataflow.h"
 
-static int
+int
 OPTdatacellImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr 
pci)
 {
        int actions = 0, fnd, mvc = 0;
@@ -315,7 +315,7 @@ OPTdatacellImplementation(Client cntxt, 
 }
 
 str
-OPTdatacell(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
+OPTdatacell(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p)
 {
        str modnme;
        str fcnnme;
diff --git a/sql/backends/monet5/datacell/opt_datacell.h 
b/sql/backends/monet5/datacell/opt_datacell.h
--- a/sql/backends/monet5/datacell/opt_datacell.h
+++ b/sql/backends/monet5/datacell/opt_datacell.h
@@ -26,4 +26,5 @@
 //#define OPTDEBUGdatacell   if (1)
 #define OPTDEBUGdatacell  if (optDebug & ((lng) 1 << DEBUG_OPT_DATACELL))
 opt_export str OPTdatacell(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr 
pci);
+opt_export int OPTdatacellImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr 
stk, InstrPtr pci);
 #endif
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list