Changeset: 0e737819fa92 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0e737819fa92
Modified Files:
monetdb5/modules/mal/extensions.c
Branch: headless
Log Message:
Use COLelement (name may have to be changed) instead of home-brewn (and
incorrect) COLvalue.
diffs (50 lines):
diff --git a/monetdb5/modules/mal/extensions.c
b/monetdb5/modules/mal/extensions.c
--- a/monetdb5/modules/mal/extensions.c
+++ b/monetdb5/modules/mal/extensions.c
@@ -213,28 +213,6 @@
* variable. If it returns zero the control variable has been reset
* to zero and end of stream has been reached.
*/
-static ptr
-COLvalue(COL *b, oid o)
-{
- switch( COLtype(b)){
- case TYPE_bte:
- return (ptr)(((bte*)COLbase(b))+o);
- case TYPE_sht:
- return (ptr)(((sht*)COLbase(b))+o);
- case TYPE_int:
- return (ptr)(((int*)COLbase(b))+o);
- case TYPE_lng:
- return (ptr)(((lng*)COLbase(b))+o);
- case TYPE_flt:
- return (ptr)(((flt*)COLbase(b))+o);
- case TYPE_dbl:
- return (ptr)(((dbl*)COLbase(b))+o);
- case TYPE_str:
- return (ptr)COLget_str(b,o);
- default:
- return NULL;
- }
-}
str
CHPnewIterator(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{
@@ -260,7 +238,7 @@
return MAL_SUCCEED;
}
*cursor = o = COLfirst(b);
- VALinit(val, COLtype(b), COLvalue(b, o));
+ VALinit(val, COLtype(b), COLelement(b, o));
CBPreleaseref(b);
return MAL_SUCCEED;
}
@@ -292,7 +270,7 @@
return MAL_SUCCEED;
}
*cursor = o;
- VALinit(val, COLtype(b), COLvalue(b, o));
+ VALinit(val, COLtype(b), COLelement(b, o));
CBPreleaseref(b);
return MAL_SUCCEED;
}
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
