Changeset: a0fbd66d5720 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a0fbd66d5720
Modified Files:
        monetdb5/modules/mal/xid.c
        monetdb5/modules/mal/xid.h
Branch: xid
Log Message:

xid.c: BAT IDs are of type bat, rather than int


diffs (45 lines):

diff --git a/monetdb5/modules/mal/xid.c b/monetdb5/modules/mal/xid.c
--- a/monetdb5/modules/mal/xid.c
+++ b/monetdb5/modules/mal/xid.c
@@ -132,8 +132,8 @@ XIDencode(XIDcolumn col, oid *p, oid *q)
 str
 XIDcompress(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
 {      
-       int *ret = (int*) getArgReference(stk,pci,0);
-       int *bid = (int*) getArgReference(stk,pci,1);
+       bat *ret = (bat*) getArgReference(stk,pci,0);
+       bat *bid = (bat*) getArgReference(stk,pci,1);
        BAT *b, *bn;
        oid *p,*q;
        XIDcolumn col;
@@ -242,8 +242,8 @@ static BUN XIDdecode(XIDcolumn col, oid 
 str
 XIDdecompress(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
 {      
-       int *ret = (int*) getArgReference(stk,pci,0);
-       int *bid = (int*) getArgReference(stk,pci,1);
+       bat *ret = (bat*) getArgReference(stk,pci,0);
+       bat *bid = (bat*) getArgReference(stk,pci,1);
        BAT *b, *bn;
        BUN cnt, lim;
        XIDcolumn col;
@@ -342,7 +342,7 @@ static void XIDcolumndump(stream *f, XID
        }
 }
 str
-XIDdump(int *ret, int *bid)
+XIDdump(int *ret, bat *bid)
 {      
        BAT *b;
        XIDcolumn col;
diff --git a/monetdb5/modules/mal/xid.h b/monetdb5/modules/mal/xid.h
--- a/monetdb5/modules/mal/xid.h
+++ b/monetdb5/modules/mal/xid.h
@@ -32,6 +32,6 @@
 
 xid_export str XIDcompress(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr 
pci);
 xid_export str XIDdecompress(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr pci);
-xid_export str XIDdump(int *ret, int *bid);
+xid_export str XIDdump(int *ret, bat *bid);
 
 #endif /* _XIDLIST_H */
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

Reply via email to