Update of /cvsroot/monetdb/MonetDB5/src/modules/kernel
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv28642
Modified Files:
algebra.mx bat5.mx mmath.mx
Log Message:
Move all signatures to the .h section to ease compilation of
programs using the interface directly. More files to do.
Index: mmath.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/kernel/mmath.mx,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- mmath.mx 13 Sep 2007 13:45:13 -0000 1.35
+++ mmath.mx 14 Oct 2007 08:41:47 -0000 1.36
@@ -206,16 +206,9 @@
@h
#ifndef __MMATH_H__
#define __MMATH_H__
-
-#include <gdk.h>
-
-#endif /* __MMATH_H__ */
-
[EMAIL PROTECTED] Implementation Code
[EMAIL PROTECTED]
#include "mal_config.h"
-
-#include "mmath.h"
+#include "mal.h"
+#include "mal_exception.h"
#include <math.h>
extern double sqrt(double x);
@@ -234,29 +227,6 @@
#define mmath_export extern
#endif
-#define acos_unary(x, z) *z = acos(*x)
-#define asin_unary(x, z) *z = asin(*x)
-#define atan_unary(x, z) *z = atan(*x)
-#define atan2_binary(x, y, z) *z = atan2(*x,*y)
-#define cos_unary(x, z) *z = cos(*x)
-#define sin_unary(x, z) *z = sin(*x)
-#define tan_unary(x, z) *z = tan(*x)
-
-#define cosh_unary(x, z) *z = cosh(*x)
-#define sinh_unary(x, z) *z = sinh(*x)
-#define tanh_unary(x, z) *z = tanh(*x)
-
-#define exp_unary(x, z) *z = exp(*x)
-#define log_unary(x, z) *z = log(*x)
-#define log10_unary(x, z) *z = log10(*x)
-
-#define pow_binary(x, y, z) *z = pow(*x,*y)
-#define sqrt_unary(x, z) *z = sqrt(*x)
-
-#define ceil_unary(x, z) *z = ((-1.0<*x)&&(*x<0.0))?0.0:ceil(*x)
-#define fabs_unary(x, z) *z = fabs(*x)
-#define floor_unary(x, z) *z = floor(*x)
-#define fmod_binary(x, y, z) *z = fmod(*x,*y)
#ifdef _MSC_VER
#include <float.h>
@@ -306,11 +276,78 @@
#endif /* HAVE_ISINF */
#endif /* HAVE_FPCLASSIFY */
-#include "mal.h"
-#include "mal_exception.h"
-mmath_export str math_unary_FINITE(bit *res, dbl *a);
-mmath_export str math_unary_ISNAN(bit *res, dbl *a);
-mmath_export str math_unary_ISINF(int *res, dbl *a);
+#define acos_unary(x, z) *z = acos(*x)
+#define asin_unary(x, z) *z = asin(*x)
+#define atan_unary(x, z) *z = atan(*x)
+#define atan2_binary(x, y, z) *z = atan2(*x,*y)
+#define cos_unary(x, z) *z = cos(*x)
+#define sin_unary(x, z) *z = sin(*x)
+#define tan_unary(x, z) *z = tan(*x)
+
+#define cosh_unary(x, z) *z = cosh(*x)
+#define sinh_unary(x, z) *z = sinh(*x)
+#define tanh_unary(x, z) *z = tanh(*x)
+
+#define exp_unary(x, z) *z = exp(*x)
+#define log_unary(x, z) *z = log(*x)
+#define log10_unary(x, z) *z = log10(*x)
+
+#define pow_binary(x, y, z) *z = pow(*x,*y)
+#define sqrt_unary(x, z) *z = sqrt(*x)
+
+#define ceil_unary(x, z) *z = ((-1.0<*x)&&(*x<0.0))?0.0:ceil(*x)
+#define fabs_unary(x, z) *z = fabs(*x)
+#define floor_unary(x, z) *z = floor(*x)
+#define fmod_binary(x, y, z) *z = fmod(*x,*y)
+
[EMAIL PROTECTED] unopbaseM5_export
+mmath_export str [EMAIL PROTECTED]@3(@3 *res , @3 *a );
[EMAIL PROTECTED] unopM5_export
+ @:unopbaseM5_export(@1,@2,dbl)@
+ @:unopbaseM5_export(@1,@2,flt)@
[EMAIL PROTECTED] binopbaseM5_export
+mmath_export str [EMAIL PROTECTED]@3(@3 *res, @3 *a, @3 *b );
[EMAIL PROTECTED] binopM5_export
+ @:binopbaseM5_export(@1,@2,dbl)@
+ @:binopbaseM5_export(@1,@2,flt)@
+
[EMAIL PROTECTED]
+@:unopM5_export(_ACOS,acos)@
+@:unopM5_export(_ASIN,asin)@
+@:unopM5_export(_ATAN,atan)@
+@:binopM5_export(_ATAN2,atan2)@
+@:unopM5_export(_COS,cos)@
+@:unopM5_export(_SIN,sin)@
+@:unopM5_export(_TAN,tan)@
+
+@:unopM5_export(_COSH,cosh)@
+@:unopM5_export(_SINH,sinh)@
+@:unopM5_export(_TANH,tanh)@
+
+@:unopM5_export(_EXP,exp)@
+@:unopM5_export(_LOG,log)@
+@:unopM5_export(_LOG10,log10)@
+
+@:binopM5_export(_POW,pow)@
+@:unopM5_export(_SQRT,sqrt)@
+
+@:unopM5_export(_CEIL,ceil)@
+@:unopbaseM5_export(_FABS,fabs,dbl)@
+@:unopM5_export(_FLOOR,floor)@
+@:binopM5_export(_FMOD,fmod)@
+
+
+mmath_export str MATHunary_ISNAN(bit *res, dbl *a);
+mmath_export str MATHunary_ISINF(int *res, dbl *a);
+mmath_export str MATHunary_FINITE(bit *res, dbl *a);
+mmath_export str MATHrandint(int *res);
+mmath_export str MATHsrandint(int *seed);
+mmath_export str MATHpi(dbl *pi);
+#endif /* __MMATH_H__ */
+
[EMAIL PROTECTED] Implementation Code
[EMAIL PROTECTED]
+#include "mmath.h"
@:unop(_ACOS,acos)@
@:unop(_ASIN,asin)@
@@ -375,7 +412,6 @@
}
return MAL_SUCCEED;
}
-@
@c
str
@@ -453,7 +489,6 @@
Wrapping around the M4 code base
@-
@= unopbaseM5
-mmath_export str [EMAIL PROTECTED]@3(@3 *res , @3 *a );
str [EMAIL PROTECTED]@3(@3 *res , @3 *a ) {
#ifdef DEBUG
printf( "[EMAIL PROTECTED]@3\n");
@@ -476,7 +511,6 @@
@:unopbaseM5(@1,@2,flt)@
@= binopbaseM5
-mmath_export str [EMAIL PROTECTED]@3(@3 *res, @3 *a, @3 *b );
str [EMAIL PROTECTED]@3(@3 *res, @3 *a, @3 *b ) {
#ifdef DEBUG
printf( "[EMAIL PROTECTED]");
@@ -495,7 +529,6 @@
@:binopbaseM5(@1,@2,flt)@
@
@= roundM5
-mmath_export str [EMAIL PROTECTED](@1 *res, @1 *x, int *y);
str [EMAIL PROTECTED](@1 *res, @1 *x, int *y) {
if(*x == @1_nil || *y == int_nil) {
*res = @1_nil;
@@ -545,28 +578,24 @@
@:roundM5(dbl)@
@:roundM5(flt)@
-mmath_export str MATHunary_ISNAN(bit *res, dbl *a);
str
MATHunary_ISNAN(bit *res, dbl *a)
{
return math_unary_ISNAN(res, a);
}
-mmath_export str MATHunary_ISINF(int *res, dbl *a);
str
MATHunary_ISINF(int *res, dbl *a)
{
return math_unary_ISINF(res, a);
}
-mmath_export str MATHunary_FINITE(bit *res, dbl *a);
str
MATHunary_FINITE(bit *res, dbl *a)
{
return math_unary_FINITE(res, a);
}
-mmath_export str MATHrandint(int *res);
str
MATHrandint(int *res)
{
@@ -574,7 +603,6 @@
return MAL_SUCCEED;
}
-mmath_export str MATHsrandint(int *seed);
str
MATHsrandint(int *seed)
{
@@ -582,11 +610,11 @@
return MAL_SUCCEED;
}
-mmath_export str MATHpi(dbl *pi);
str
MATHpi(dbl *pi)
{
*pi = 3.14159265358979323846;
return MAL_SUCCEED;
}
+
@}
Index: bat5.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/kernel/bat5.mx,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- bat5.mx 12 Oct 2007 17:40:07 -0000 1.26
+++ bat5.mx 14 Oct 2007 08:41:47 -0000 1.27
@@ -3338,8 +3338,10 @@
}
@-
[EMAIL PROTECTED] accessMode
[EMAIL PROTECTED] accessMode_export
bat5_export str [EMAIL PROTECTED](int *res, int *bid) ;
+bat5_export str [EMAIL PROTECTED](bit *res, int *bid);
[EMAIL PROTECTED] accessMode
str [EMAIL PROTECTED](int *res, int *bid) {
BAT *b, *bn = NULL;
int [EMAIL PROTECTED];
@@ -3352,7 +3354,6 @@
BBPreleaseref(b->batCacheid);
return MAL_SUCCEED;
}
-bat5_export str [EMAIL PROTECTED](bit *res, int *bid);
str [EMAIL PROTECTED](bit *res, int *bid) {
BAT *b;
if( (b= BATdescriptor(*bid)) == NULL ){
@@ -3363,6 +3364,10 @@
return MAL_SUCCEED;
}
@-
[EMAIL PROTECTED]
+@:accessMode_export(WriteMode,0,w)@
+@:accessMode_export(ReadMode,1,r)@
+@:accessMode_export(AppendMode,2,a)@
@c
@:accessMode(WriteMode,0,w)@
@:accessMode(ReadMode,1,r)@
Index: algebra.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/kernel/algebra.mx,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -d -r1.184 -r1.185
--- algebra.mx 4 Oct 2007 10:37:16 -0000 1.184
+++ algebra.mx 14 Oct 2007 08:41:46 -0000 1.185
@@ -819,10 +819,6 @@
algebra_export ptr BATmax(BAT *b, ptr aggr);
algebra_export ptr BATmin(BAT *b, ptr aggr);
-//algebra_export int doCMDfetch(ptr ret, BAT *b, lng i);
-algebra_export str ALGprojectNIL(int *ret, int *bid);
-algebra_export str ALGselectInclusive(int *result, int *bid, ptr low, ptr
high, bit *lin, bit *rin);
-algebra_export str ALGselect(int *result, int *bid, ptr low, ptr high);
@= avg_export
algebra_export str [EMAIL PROTECTED](dbl *res, int *bid);
@@ -835,8 +831,201 @@
@:avg_export(flt)@
@:avg_export(dbl)@
-#endif
[EMAIL PROTECTED] ALGsum_export
+algebra_export str [EMAIL PROTECTED]@2(@2* res, int *bid) ;
[EMAIL PROTECTED] ALGprod_export
+algebra_export str [EMAIL PROTECTED]@2(@2* res, int *bid) ;
[EMAIL PROTECTED]
+@:ALGsum_export(bte,bte,0)@
+@:ALGsum_export(bte,sht,0)@
+@:ALGsum_export(bte,int,0)@
+@:ALGsum_export(bte,wrd,0)@
+@:ALGsum_export(bte,lng,0)@
+@:ALGsum_export(sht,sht,0)@
+@:ALGsum_export(sht,int,0)@
+@:ALGsum_export(sht,wrd,0)@
+@:ALGsum_export(sht,lng,0)@
+@:ALGsum_export(int,int,0)@
+@:ALGsum_export(int,wrd,0)@
+@:ALGsum_export(int,lng,0)@
+@:ALGsum_export(wrd,wrd,0)@
+@:ALGsum_export(wrd,lng,0)@
+@:ALGsum_export(lng,wrd,0)@
+@:ALGsum_export(lng,lng,0)@
+@:ALGsum_export(flt,flt,0.0)@
+@:ALGsum_export(flt,dbl,0.0)@
+@:ALGsum_export(dbl,dbl,0.0)@
+
+@:ALGsum_export(bte,dbl,0.0)@
+@:ALGsum_export(sht,dbl,0.0)@
+@:ALGsum_export(int,dbl,0.0)@
+@:ALGsum_export(wrd,dbl,0.0)@
+@:ALGsum_export(lng,dbl,0.0)@
+
+@:ALGprod_export(bte,bte,1)@
+@:ALGprod_export(bte,sht,1)@
+@:ALGprod_export(bte,int,1)@
+@:ALGprod_export(bte,wrd,1)@
+@:ALGprod_export(bte,lng,1)@
+@:ALGprod_export(sht,sht,1)@
+@:ALGprod_export(sht,int,1)@
+@:ALGprod_export(sht,wrd,1)@
+@:ALGprod_export(sht,lng,1)@
+@:ALGprod_export(int,int,1)@
+@:ALGprod_export(int,wrd,1)@
+@:ALGprod_export(int,lng,1)@
+@:ALGprod_export(wrd,wrd,1)@
+@:ALGprod_export(wrd,lng,1)@
+@:ALGprod_export(lng,wrd,1)@
+@:ALGprod_export(lng,lng,1)@
+@:ALGprod_export(flt,flt,1.0)@
+@:ALGprod_export(flt,dbl,1.0)@
+@:ALGprod_export(dbl,dbl,1.0)@
+
+@:ALGprod_export(bte,dbl,0.0)@
+@:ALGprod_export(sht,dbl,0.0)@
+@:ALGprod_export(int,dbl,0.0)@
+@:ALGprod_export(wrd,dbl,0.0)@
+@:ALGprod_export(lng,dbl,0.0)@
+
[EMAIL PROTECTED] ALGaggregate_export
+algebra_export str [EMAIL PROTECTED](@1* res, int *bid) ;
+algebra_export str [EMAIL PROTECTED](@1* res, int *bid) ;
[EMAIL PROTECTED]
+@:ALGaggregate_export(bte)@
+@:ALGaggregate_export(sht)@
+@:ALGaggregate_export(int)@
+@:ALGaggregate_export(wrd)@
+@:ALGaggregate_export(lng)@
+@:ALGaggregate_export(flt)@
+@:ALGaggregate_export(dbl)@
+
+algebra_export str ALGminany(ptr result, int *bid);
+algebra_export str ALGmaxany(ptr result, int *bid);
+algebra_export str ALGtopN(int *res, int *bid, lng *top);
+algebra_export str ALGgroupby(int *res, int *bid);
+algebra_export str ALGcard(lng *result, int *bid);
+algebra_export str ALGBATminimum(ptr *result, int *bid);
+algebra_export str ALGBATmaximum(ptr *result, int *bid);
+algebra_export str ALGselect1(int *result, int *bid, ptr value);
+algebra_export str ALGselect1Head(int *result, int *bid, ptr value);
+algebra_export str ALGuselect1(int *result, int *bid, ptr value);
+algebra_export str ALGselect(int *result, int *bid, ptr low, ptr high);
+algebra_export str ALGselectHead(int *result, int *bid, ptr low, ptr high);
+algebra_export str ALGuselect(int *result, int *bid, ptr low, ptr high);
+algebra_export str ALGselectInclusive(int *result, int *bid, ptr low, ptr
high, bit *lin, bit *rin);
+algebra_export str ALGselectInclusiveHead(int *result, int *bid, ptr low, ptr
high, bit *lin, bit *rin);
+algebra_export str ALGuselectInclusive(int *result, int *bid, ptr low, ptr
high, bit *lin, bit *rin);
+algebra_export str ALGfragment(int *result, int *bid, ptr hlow, ptr hhigh, ptr
tlow, ptr thigh);
+algebra_export str ALGthetajoinEstimate(int *result, int *lid, int *rid, int
*opc, lng *estimate);
+algebra_export str ALGthetajoin(int *result, int *lid, int *rid, int *opc);
+algebra_export str ALGbandjoin(int *result, int *lid, int *rid, ptr *minus,
ptr *plus);
+
[EMAIL PROTECTED] ALGunaryExport
+algebra_export str [EMAIL PROTECTED](int *result, int *bid);
[EMAIL PROTECTED] ALGunaryintExport
+algebra_export str [EMAIL PROTECTED](int *result, int *bid);
[EMAIL PROTECTED] ALGbinaryExport
+algebra_export str [EMAIL PROTECTED](int *result, int *lid, int *rid) ;
[EMAIL PROTECTED] ALGbinaryintExport
+algebra_export str [EMAIL PROTECTED](int *result, int* bid, int *param) ;
[EMAIL PROTECTED] ALGbinaryestimateExport
+algebra_export str [EMAIL PROTECTED](int *result, int *lid, int *rid, lng
*estimate);
+algebra_export str [EMAIL PROTECTED](int *result, int* lid, int *rid);
[EMAIL PROTECTED]
+@:ALGunaryExport(histogram)@
+@:ALGunaryExport(number)@
+@:ALGunaryExport(merge)@
+@:ALGunaryExport(split)@
+@:ALGunaryExport(copy)@
+@:ALGunaryExport(kunique)@
+@:ALGunaryExport(sunique)@
+@:ALGbinaryExport(cross)@
+@:ALGbinaryExport(antijoin)@
+@:ALGbinaryestimateExport(join)@
+@:ALGbinaryestimateExport(fetchjoin)@
+@:ALGbinaryestimateExport(leftjoin)@
+@:ALGbinaryestimateExport(leftfetchjoin)@
+@:ALGbinaryestimateExport(outerjoin)@
+@:ALGbinaryExport(semijoin)@
+@:ALGbinaryExport(sunion)@
+@:ALGbinaryExport(kunion)@
+@:ALGbinaryExport(sintersect)@
+@:ALGbinaryExport(kintersect)@
+@:ALGbinaryExport(sdiff)@
+@:ALGbinaryExport(kdiff)@
+@:ALGbinaryintExport(sample)@
+algebra_export str ALGtunique(int *result, int *bid);
+algebra_export str ALGtsort(int *result, int *bid);
+algebra_export str ALGtsort_rev(int *result, int *bid);
+algebra_export str ALGhsort(int *result, int *bid);
+algebra_export str ALGhsort_rev(int *result, int *bid);
+algebra_export str ALGhtsort(int *result, int *lid);
+algebra_export str ALGthsort(int *result, int *lid);
+algebra_export str ALGssort(int *result, int *bid);
+algebra_export str ALGssort_rev(int *result, int *bid);
+algebra_export str ALGrevert(int *result, int *bid);
+algebra_export str ALGcount_bat(int *result, int *bid);
+algebra_export str ALGcount_nil(int *result, int *bid, bit *ignore_nils);
+algebra_export str ALGcount_no_nil(int *result, int *bid);
+algebra_export str ALGtmark(int *result, int *bid, oid *base);
+algebra_export str ALGtmark_default(int *result, int *bid);
+algebra_export str ALGmarkHead(int *result, int *bid, oid *base);
+algebra_export str ALGmarkHead_default(int *result, int *bid);
+algebra_export str ALGmark_grp_1(int *result, int *bid, int *gid);
+algebra_export str ALGmark_grp_2(int *result, int *bid, int *gid, oid *base);
+algebra_export str ALGhashsplit(int *result, int *bid, int *nfrag);
+algebra_export str ALGrangesplit(int *result, int *bid, int *nfrag);
+algebra_export str ALGurangesplit(int *result, int *bid, int *nfrag);
+algebra_export str ALGhistogram_rev(int *result, int *bid);
+algebra_export str ALGlike(int *ret, int *bid, str *k);
+algebra_export str ALGslice(int *ret, bat *bid, lng *start, lng *end);
+algebra_export str ALGslice_int(int *ret, bat *bid, int *start, int *end);
+algebra_export str ALGposition(wrd *retval, int *bid, ptr val);
+algebra_export str ALGpositionBUN(wrd *retval, int *bid, ptr val, ptr tval);
+algebra_export str doALGfetch(ptr ret, BAT *b, lng *pos);
+algebra_export str ALGfetch(ptr ret, int *bid, lng *pos);
+algebra_export str ALGfetchoid(int *ret, int *bid, oid *pos);
+algebra_export str ALGfetchint(int *ret, int *bid, int *pos);
+algebra_export str ALGfetchbat(int *ret, int *bid, int *sid);
+algebra_export str ALGexist(bit *ret, int *bid, ptr val);
+algebra_export str ALGexistBUN(bit *ret, int *bid, ptr val, ptr tval);
+algebra_export str ALGfind(ptr ret, int *bid, ptr val);
+algebra_export str ALGhashjoin(int *result, int *lid, int *rid);
+algebra_export str ALGmergejoin(int *result, int *lid, int *rid);
+algebra_export str ALGindexjoin(int *result, int *lid, int *rid);
+algebra_export str ALGprojectNIL(int *ret, int *bid);
+
[EMAIL PROTECTED] project_export
+algebra_export str [EMAIL PROTECTED](int *ret,ptr *val, int *bid);
+algebra_export str [EMAIL PROTECTED](int *ret,int *bid, ptr *val);
[EMAIL PROTECTED]
+@:project_export(int)@
+@:project_export(sht)@
+@:project_export(lng)@
+@:project_export(oid)@
+@:project_export(flt)@
+@:project_export(dbl)@
+@:project_export(str)@
+@:project_export(chr)@
+@:project_export(bit)@
+
+algebra_export str ALGidentity(int *ret, int *bid);
+algebra_export str ALGmaterialize(int *ret, int *bid);
+algebra_export str ALGreuse(int *ret, int *bid);
+
[EMAIL PROTECTED] avg_export
+algebra_export str [EMAIL PROTECTED](dbl *res, int *bid) {
[EMAIL PROTECTED]
+@:avg_export(bte)@
+@:avg_export(sht)@
+@:avg_export(int)@
+@:avg_export(wrd)@
+@:avg_export(lng)@
+@:avg_export(flt)@
+@:avg_export(dbl)@
+#endif
@c
#include "mal_config.h"
#include "algebra.h"
@@ -1886,7 +2075,6 @@
is large enough to prevent overflow.
@= ALGsum_implementation
-algebra_export str [EMAIL PROTECTED]@2(@2* res, int *bid) ;
str [EMAIL PROTECTED]@2(@2* res, int *bid) {
BAT *b;
if( (b= BATdescriptor(*bid)) == NULL ){
@@ -1899,7 +2087,6 @@
}
@= ALGprod_implementation
-algebra_export str [EMAIL PROTECTED]@2(@2* res, int *bid) ;
str [EMAIL PROTECTED]@2(@2* res, int *bid) {
BAT *b;
if( (b= BATdescriptor(*bid)) == NULL ){
@@ -1910,7 +2097,6 @@
return MAL_SUCCEED;
}
@c
-
@:ALGsum_implementation(bte,bte,0)@
@:ALGsum_implementation(bte,sht,0)@
@:ALGsum_implementation(bte,int,0)@
@@ -1963,9 +2149,9 @@
@:ALGprod_implementation(wrd,dbl,0.0)@
@:ALGprod_implementation(lng,dbl,0.0)@
+
@-
@= ALGaggregate_implementation
-algebra_export str [EMAIL PROTECTED](@1* res, int *bid) ;
str [EMAIL PROTECTED](@1* res, int *bid) {
BAT *b;
if( (b= BATdescriptor(*bid)) == NULL ){
@@ -1978,7 +2164,6 @@
BBPreleaseref(b->batCacheid);
throw(MAL, "algebra.min", "GDKerror");
}
-algebra_export str [EMAIL PROTECTED](@1* res, int *bid) ;
str [EMAIL PROTECTED](@1* res, int *bid) {
BAT *b;
if( (b= BATdescriptor(*bid)) == NULL ){
@@ -2000,7 +2185,8 @@
@:ALGaggregate_implementation(flt)@
@:ALGaggregate_implementation(dbl)@
-algebra_export str ALGminany(ptr result, int *bid);
+
[EMAIL PROTECTED]
str
ALGminany(ptr result, int *bid)
{
@@ -2017,7 +2203,6 @@
throw(MAL, "algebra.min", "GDKerror");
}
-algebra_export str ALGmaxany(ptr result, int *bid);
str
ALGmaxany(ptr result, int *bid)
{
@@ -2035,7 +2220,6 @@
}
-algebra_export str ALGtopN(int *res, int *bid, lng *top);
str
ALGtopN(int *res, int *bid, lng *top)
{
@@ -2051,7 +2235,7 @@
BBPkeepref(b->batCacheid);
return MAL_SUCCEED;
}
-algebra_export str ALGgroupby(int *res, int *bid);
+
str
ALGgroupby(int *res, int *bid)
{
@@ -2074,7 +2258,6 @@
return MAL_SUCCEED;
}
-algebra_export str ALGcard(lng *result, int *bid);
str
ALGcard(lng *result, int *bid)
{
@@ -2093,7 +2276,6 @@
return MAL_SUCCEED;
}
-algebra_export str ALGBATminimum(ptr *result, int *bid);
str
ALGBATminimum(ptr *result, int *bid)
{
@@ -2107,7 +2289,6 @@
return MAL_SUCCEED;
}
-algebra_export str ALGBATmaximum(ptr *result, int *bid);
str
ALGBATmaximum(ptr *result, int *bid)
{
@@ -2121,7 +2302,6 @@
return MAL_SUCCEED;
}
-algebra_export str ALGselect1(int *result, int *bid, ptr value);
str
ALGselect1(int *result, int *bid, ptr value)
{
@@ -2142,7 +2322,6 @@
throw(MAL, "algebra.select", "GDKerror");
}
-algebra_export str ALGselect1Head(int *result, int *bid, ptr value);
str
ALGselect1Head(int *result, int *bid, ptr value)
{
@@ -2165,7 +2344,6 @@
throw(MAL, "algebra.select", "GDKerror");
}
-algebra_export str ALGuselect1(int *result, int *bid, ptr value);
str
ALGuselect1(int *result, int *bid, ptr value)
{
@@ -2207,7 +2385,6 @@
throw(MAL, "algebra.select", "GDKerror");
}
-algebra_export str ALGselectNotNil(int *result, int *bid);
str
ALGselectNotNil(int *result, int *bid)
{
@@ -2236,7 +2413,6 @@
return MAL_SUCCEED;
}
-algebra_export str ALGselectHead(int *result, int *bid, ptr low, ptr high);
str
ALGselectHead(int *result, int *bid, ptr low, ptr high)
{
@@ -2260,7 +2436,6 @@
throw(MAL, "algebra.select", "GDKerror");
}
-algebra_export str ALGuselect(int *result, int *bid, ptr low, ptr high);
str
ALGuselect(int *result, int *bid, ptr low, ptr high)
{
@@ -2282,7 +2457,6 @@
throw(MAL, "algebra.uselect", "GDKerror");
}
-algebra_export str ALGselectInclusive(int *result, int *bid, ptr low, ptr
high, bit *lin, bit *rin);
str
ALGselectInclusive(int *result, int *bid, ptr low, ptr high, bit *lin, bit
*rin)
{
@@ -2304,7 +2478,6 @@
throw(MAL, "algebra.select", "GDKerror");
}
-algebra_export str ALGselectInclusiveHead(int *result, int *bid, ptr low, ptr
high, bit *lin, bit *rin);
str
ALGselectInclusiveHead(int *result, int *bid, ptr low, ptr high, bit *lin, bit
*rin)
{
@@ -2328,7 +2501,6 @@
throw(MAL, "algebra.select", "GDKerror");
}
-algebra_export str ALGuselectInclusive(int *result, int *bid, ptr low, ptr
high, bit *lin, bit *rin);
str
ALGuselectInclusive(int *result, int *bid, ptr low, ptr high, bit *lin, bit
*rin)
{
@@ -2350,7 +2522,6 @@
throw(MAL, "algebra.uselect", "GDKerror");
}
-algebra_export str ALGfragment(int *result, int *bid, ptr hlow, ptr hhigh, ptr
tlow, ptr thigh);
str
ALGfragment(int *result, int *bid, ptr hlow, ptr hhigh, ptr tlow, ptr thigh)
{
@@ -2374,7 +2545,6 @@
throw(MAL, "algebra.fragment", "GDKerror");
}
-algebra_export str ALGthetajoinEstimate(int *result, int *lid, int *rid, int
*opc, lng *estimate);
str
ALGthetajoinEstimate(int *result, int *lid, int *rid, int *opc, lng *estimate)
{
@@ -2405,14 +2575,12 @@
throw(MAL, "algebra.thetajoin", "GDKerror");
}
-algebra_export str ALGthetajoin(int *result, int *lid, int *rid, int *opc);
str
ALGthetajoin(int *result, int *lid, int *rid, int *opc)
{
return ALGthetajoinEstimate(result, lid, rid, opc, (ptr)&lng_nil);
}
-algebra_export str ALGbandjoin(int *result, int *lid, int *rid, ptr *minus,
ptr *plus);
str
ALGbandjoin(int *result, int *lid, int *rid, ptr *minus, ptr *plus)
{
@@ -2440,7 +2608,6 @@
@-
Let cut this text down with some Mx macro's
@= ALGunary
-algebra_export str [EMAIL PROTECTED](int *result, int *bid);
str [EMAIL PROTECTED](int *result, int *bid) {
BAT *b,*bn;
if( (b= BATdescriptor(*bid)) == NULL ){
@@ -2457,7 +2624,6 @@
throw(MAL, "[EMAIL PROTECTED]", "GDKerror");
}
@= ALGunaryint
-algebra_export str [EMAIL PROTECTED](int *result, int *bid);
str [EMAIL PROTECTED](int *result, int *bid) {
BAT *b,*bn= NULL;
if( (b= BATdescriptor(*bid)) == NULL ){
@@ -2474,7 +2640,6 @@
return MAL_SUCCEED;
}
@= ALGbinary
-algebra_export str [EMAIL PROTECTED](int *result, int *lid, int *rid) ;
str [EMAIL PROTECTED](int *result, int *lid, int *rid) {
BAT *left, *right,*bn= NULL;
if( (left= BATdescriptor(*lid)) == NULL ){
@@ -2501,7 +2666,6 @@
throw(MAL, "[EMAIL PROTECTED]", "GDKerror");
}
@= ALGbinaryint
-algebra_export str [EMAIL PROTECTED](int *result, int* bid, int *param) ;
str [EMAIL PROTECTED](int *result, int* bid, int *param) {
BAT *b, *bn= NULL;
if( (b= BATdescriptor(*bid)) == NULL ){
@@ -2518,7 +2682,6 @@
throw(MAL, "[EMAIL PROTECTED]", "GDKerror");
}
@= ALGbinaryestimate
-algebra_export str [EMAIL PROTECTED](int *result, int *lid, int *rid, lng
*estimate);
str [EMAIL PROTECTED](int *result, int *lid, int *rid, lng *estimate) {
BAT *left, *right,*bn=NULL;
if( (left= BATdescriptor(*lid)) == NULL ){
@@ -2544,7 +2707,6 @@
}
throw(MAL, "[EMAIL PROTECTED]", "GDKerror");
}
-algebra_export str [EMAIL PROTECTED](int *result, int* lid, int *rid);
str [EMAIL PROTECTED](int *result, int* lid, int *rid) {
lng estimate= lng_nil;
return [EMAIL PROTECTED](result,lid,rid,&estimate);
@@ -2574,7 +2736,6 @@
@:ALGbinaryint(sample)@
/* add item missing in the kernel */
-algebra_export str ALGtunique(int *result, int *bid);
str
ALGtunique(int *result, int *bid)
{
@@ -2595,7 +2756,6 @@
throw(MAL, "algebra.tunique", "GDKerror");
}
-algebra_export str ALGtsort(int *result, int *bid);
str
ALGtsort(int *result, int *bid)
{
@@ -2615,7 +2775,7 @@
}
throw(MAL, "algebra.tsort", "GDKerror");
}
-algebra_export str ALGtsort_rev(int *result, int *bid);
+
str
ALGtsort_rev(int *result, int *bid)
{
@@ -2636,7 +2796,6 @@
throw(MAL, "algebra.tsort", "GDKerror");
}
-algebra_export str ALGhsort(int *result, int *bid);
str
ALGhsort(int *result, int *bid)
{
@@ -2656,7 +2815,6 @@
throw(MAL, "algebra.hsort", "GDKerror");
}
-algebra_export str ALGhsort_rev(int *result, int *bid);
str
ALGhsort_rev(int *result, int *bid)
{
@@ -2675,7 +2833,6 @@
}
throw(MAL, "algebra.tsort", "GDKerror");
}
-algebra_export str ALGhtsort(int *result, int *lid);
str
ALGhtsort(int *result, int *lid)
{
@@ -2700,7 +2857,6 @@
throw(MAL, "algebra.htsort", "GDKerror: tsort failed");
}
-algebra_export str ALGthsort(int *result, int *lid);
str
ALGthsort(int *result, int *lid)
{
@@ -2726,7 +2882,6 @@
throw(MAL, "algebra.thsort", "GDKerror: tsort failed");
}
-algebra_export str ALGssort(int *result, int *bid);
str
ALGssort(int *result, int *bid)
{
@@ -2746,7 +2901,6 @@
throw(MAL, "algebra.ssort", "GDKerror");
}
-algebra_export str ALGssort_rev(int *result, int *bid);
str
ALGssort_rev(int *result, int *bid)
{
@@ -2766,7 +2920,6 @@
throw(MAL, "algebra.ssort_rev", "GDKerror");
}
-algebra_export str ALGrevert(int *result, int *bid);
str
ALGrevert(int *result, int *bid)
{
@@ -2783,7 +2936,6 @@
return MAL_SUCCEED;
}
-algebra_export str ALGcount_bat(int *result, int *bid);
str
ALGcount_bat(int *result, int *bid)
{
@@ -2799,7 +2951,6 @@
return MAL_SUCCEED;
}
-algebra_export str ALGcount_nil(int *result, int *bid, bit *ignore_nils);
str
ALGcount_nil(int *result, int *bid, bit *ignore_nils)
{
@@ -2818,7 +2969,6 @@
return MAL_SUCCEED;
}
-algebra_export str ALGcount_no_nil(int *result, int *bid);
str
ALGcount_no_nil(int *result, int *bid)
{
@@ -2827,7 +2977,6 @@
return ALGcount_nil(result, bid, &ignore_nils);
}
-algebra_export str ALGtmark(int *result, int *bid, oid *base);
str
ALGtmark(int *result, int *bid, oid *base)
{
@@ -2847,7 +2996,6 @@
throw(MAL, "algebra.markT", "marking group failed");
}
-algebra_export str ALGtmark_default(int *result, int *bid);
str
ALGtmark_default(int *result, int *bid)
{
@@ -2856,7 +3004,6 @@
return ALGtmark(result, bid, &o);
}
-algebra_export str ALGmarkHead(int *result, int *bid, oid *base);
str
ALGmarkHead(int *result, int *bid, oid *base)
{
@@ -2878,7 +3025,6 @@
throw(MAL, "algebra.markH", "marking group failed");
}
-algebra_export str ALGmarkHead_default(int *result, int *bid);
str
ALGmarkHead_default(int *result, int *bid)
{
@@ -2887,7 +3033,6 @@
return ALGmarkHead(result, bid, &o);
}
-algebra_export str ALGmark_grp_1(int *result, int *bid, int *gid);
str
ALGmark_grp_1(int *result, int *bid, int *gid)
{
@@ -2913,7 +3058,6 @@
throw(MAL, "algebra.mark_grp", "marking group failed");
}
-algebra_export str ALGmark_grp_2(int *result, int *bid, int *gid, oid *base);
str
ALGmark_grp_2(int *result, int *bid, int *gid, oid *base)
{
@@ -2939,7 +3083,6 @@
throw(MAL, "algebra.mark_grp", "marking group failed");
}
-algebra_export str ALGhashsplit(int *result, int *bid, int *nfrag);
str
ALGhashsplit(int *result, int *bid, int *nfrag)
{
@@ -2959,7 +3102,6 @@
throw(MAL, "algebra.hashsplit", "GDKerror");
}
-algebra_export str ALGuhashsplit(int *result, int *bid, int *nfrag);
str
ALGuhashsplit(int *result, int *bid, int *nfrag)
{
@@ -2979,7 +3121,6 @@
throw(MAL, "algebra.uhashsplit", "GDKerror");
}
-algebra_export str ALGrangesplit(int *result, int *bid, int *nfrag);
str
ALGrangesplit(int *result, int *bid, int *nfrag)
{
@@ -2999,7 +3140,6 @@
throw(MAL, "algebra.rangesplit", "GDKerror");
}
-algebra_export str ALGurangesplit(int *result, int *bid, int *nfrag);
str
ALGurangesplit(int *result, int *bid, int *nfrag)
{
@@ -3019,7 +3159,6 @@
throw(MAL, "algebra.urangesplit", "GDKerror");
}
-algebra_export str ALGhistogram_rev(int *result, int *bid);
str
ALGhistogram_rev(int *result, int *bid)
{
@@ -3040,7 +3179,6 @@
throw(MAL, "algebra.histogram", "GDKerror");
}
-algebra_export str ALGlike(int *ret, int *bid, str *k);
str
ALGlike(int *ret, int *bid, str *k)
{
@@ -3060,7 +3198,6 @@
throw(MAL, "algebra.like", "GDKerror");
}
-algebra_export str ALGslice(int *ret, bat *bid, lng *start, lng *end);
str
ALGslice(int *ret, bat *bid, lng *start, lng *end)
{
@@ -3080,7 +3217,6 @@
throw(MAL, "algebra.slice", "GDKerror");
}
-algebra_export str ALGslice_int(int *ret, bat *bid, int *start, int *end);
str
ALGslice_int(int *ret, bat *bid, int *start, int *end)
{
@@ -3092,7 +3228,6 @@
@- BUN Get/Fetch
@c
-algebra_export str ALGposition(wrd *retval, int *bid, ptr val);
str
ALGposition(wrd *retval, int *bid, ptr val)
{
@@ -3107,7 +3242,6 @@
return MAL_SUCCEED;
}
-algebra_export str ALGpositionBUN(wrd *retval, int *bid, ptr val, ptr tval);
str
ALGpositionBUN(wrd *retval, int *bid, ptr val, ptr tval)
{
@@ -3123,7 +3257,6 @@
return MAL_SUCCEED;
}
-algebra_export str doALGfetch(ptr ret, BAT *b, lng *pos);
str
doALGfetch(ptr ret, BAT *b, lng *pos)
{
@@ -3149,7 +3282,6 @@
return MAL_SUCCEED;
}
-algebra_export str ALGfetch(ptr ret, int *bid, lng *pos);
str
ALGfetch(ptr ret, int *bid, lng *pos)
{
@@ -3164,7 +3296,6 @@
return msg;
}
-algebra_export str ALGfetchoid(int *ret, int *bid, oid *pos);
str
ALGfetchoid(int *ret, int *bid, oid *pos)
{
@@ -3174,7 +3305,6 @@
return MAL_SUCCEED;
}
-algebra_export str ALGfetchint(int *ret, int *bid, int *pos);
str
ALGfetchint(int *ret, int *bid, int *pos)
{
@@ -3183,7 +3313,6 @@
return ALGfetch(ret, bid, &o);
}
-algebra_export str ALGfetchbat(int *ret, int *bid, int *sid);
str
ALGfetchbat(int *ret, int *bid, int *sid)
{
@@ -3210,7 +3339,6 @@
}
-algebra_export str ALGexist(bit *ret, int *bid, ptr val);
str
ALGexist(bit *ret, int *bid, ptr val)
{
@@ -3225,7 +3353,6 @@
return MAL_SUCCEED;
}
-algebra_export str ALGexistBUN(bit *ret, int *bid, ptr val, ptr tval);
str
ALGexistBUN(bit *ret, int *bid, ptr val, ptr tval)
{
@@ -3241,7 +3368,6 @@
return MAL_SUCCEED;
}
-algebra_export str ALGfind(ptr ret, int *bid, ptr val);
str
ALGfind(ptr ret, int *bid, ptr val)
{
@@ -3279,7 +3405,6 @@
}
-algebra_export str ALGhashjoin(int *result, int *lid, int *rid);
str
ALGhashjoin(int *result, int *lid, int *rid)
{
@@ -3313,7 +3438,6 @@
throw(MAL, "algebra.hashjoin", "can not perform a hashjoin");
}
-algebra_export str ALGmergejoin(int *result, int *lid, int *rid);
str
ALGmergejoin(int *result, int *lid, int *rid)
{
@@ -3343,7 +3467,6 @@
throw(MAL, "algebra.mergejoin", "can not perform a mergejoin");
}
-algebra_export str ALGindexjoin(int *result, int *lid, int *rid);
str
ALGindexjoin(int *result, int *lid, int *rid)
{
@@ -3391,7 +3514,6 @@
@-
The constant versions are typed by the parser
@= projectImpl
-algebra_export str [EMAIL PROTECTED](int *ret,ptr *val, int *bid);
str [EMAIL PROTECTED](int *ret,ptr *val, int *bid){
BAT *b, *bn;
BUN p,q;
@@ -3413,7 +3535,6 @@
BBPreleaseref(b->batCacheid);
return MAL_SUCCEED;
}
-algebra_export str [EMAIL PROTECTED](int *ret,int *bid, ptr *val);
str [EMAIL PROTECTED](int *ret,int *bid, ptr *val){
BAT *b, *bn;
BUN p,q;
@@ -3448,11 +3569,9 @@
@:projectImpl(chr)@
@:projectImpl(bit)@
+
/* You don;t have to materialize the oids.
This is taken care upon access */
[EMAIL PROTECTED]
-algebra_export str ALGidentity(int *ret, int *bid);
[EMAIL PROTECTED]
str
ALGidentity(int *ret, int *bid)
{
@@ -3463,9 +3582,6 @@
BBPkeepref(*ret = b->batCacheid);
return MAL_SUCCEED;
}
[EMAIL PROTECTED]
-algebra_export str ALGmaterialize(int *ret, int *bid);
[EMAIL PROTECTED]
str
ALGmaterialize(int *ret, int *bid)
{
@@ -3483,7 +3599,7 @@
return MAL_SUCCEED;
}
-algebra_export str ALGreuse(int *ret, int *bid)
+str ALGreuse(int *ret, int *bid)
{
BAT *b,*bn;
@:getBATdescriptor(bid,b,"algebra.reuse")@
@@ -3551,5 +3667,4 @@
@:avg_impl(lng)@
@:avg_impl(flt)@
@:avg_impl(dbl)@
-
@}
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
