MonetDB: headless - Minor changes BUN->oid

[mk]

Changeset: 7a2d0f24cdbf for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7a2d0f24cdbf
Modified Files:
        monetdb5/mal/mal_client.h
        monetdb5/mal/mal_debugger.h
        monetdb5/mal/mal_exception.h
        monetdb5/mal/mal_runtime.c
Branch: headless
Log Message:

Minor changes BUN->oid


diffs (57 lines):

diff --git a/monetdb5/mal/mal_client.h b/monetdb5/mal/mal_client.h
--- a/monetdb5/mal/mal_client.h
+++ b/monetdb5/mal/mal_client.h
@@ -97,7 +97,7 @@
        lng     bigfoot; /* maximum virtual memory use */
        lng     vmfoot;  /* virtual memory use */
        lng memory;     /* memory claimed for keeping columns */
-       BUN     cnt;    /* bat count */
+       oid     cnt;    /* bat count */
 
 #define timerFlag      1
 #define memoryFlag     2
diff --git a/monetdb5/mal/mal_debugger.h b/monetdb5/mal/mal_debugger.h
--- a/monetdb5/mal/mal_debugger.h
+++ b/monetdb5/mal/mal_debugger.h
@@ -58,7 +58,7 @@
 mal_export void mdbStep(Client cntxt, MalBlkPtr mb, MalStkPtr stk, int pc);
 mal_export void mdbDump(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr 
pci);
 mal_export void mdbHelp(stream *f);
-mal_export void printCOLelm(stream *f, int i, BUN cnt, BUN first);
+mal_export void printCOLelm(stream *f, int i, oid cnt, oid first);
 mal_export void printStack(stream *f, MalBlkPtr mb, MalStkPtr s);
 mal_export void printBatDetails(stream *f, int bid);
 mal_export void printBatInfo(stream *f, VarPtr n, ValPtr v);
diff --git a/monetdb5/mal/mal_exception.h b/monetdb5/mal/mal_exception.h
--- a/monetdb5/mal/mal_exception.h
+++ b/monetdb5/mal/mal_exception.h
@@ -50,6 +50,8 @@
        return createException
 #define rethrow(FCN, TMP, PRV) \
        if ((TMP = PRV) != MAL_SUCCEED) return(TMP);
+#define throwagain(KIND,FCN,MSG) \
+       return createException(KIND,FCN,"passed up\n%s",msg)
 
 mal_export str createException(enum malexception, str, str, ...);
 mal_export void        showException(enum malexception, str, str, ...);
diff --git a/monetdb5/mal/mal_runtime.c b/monetdb5/mal/mal_runtime.c
--- a/monetdb5/mal/mal_runtime.c
+++ b/monetdb5/mal/mal_runtime.c
@@ -134,7 +134,7 @@
                }
                if (cntxt->flags & cntFlag){
                        char buf[32];
-                       snprintf(buf, sizeof(buf), BUNFMT , cntxt->cnt);
+                       snprintf(buf, sizeof(buf), OIDFMT , cntxt->cnt);
                        mnstr_printf(cntxt->fdout,":%6s ", buf);
                }
                line= instruction2str(mb, stk, pci, LIST_MAL_DEBUG);
@@ -169,7 +169,7 @@
        }
        for(; i<limit; i++) {
                if (stk->stk[getArg(pci,i)].vtype == TYPE_bat){
-                       BUN cnt = 0;
+                       oid cnt = 0;
 
                        b = CBPquickdesc(ABS(stk->stk[getArg(pci,i)].val.bval), 
TRUE);
                        if (b==NULL)
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list